Changeset 1410 for trunk/src/kernel32/directory.cpp

Timestamp:

Oct 23, 1999, 2:34:48 PM (26 years ago)

Author:

sandervl

Message:

Changes for logging & getversionsize/struct

File:

• trunk/src/kernel32/directory.cpp (modified) (4 diffs)

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.6 1999-10-20 08:09:04 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.7 1999-10-23 12:34:46 sandervl Exp $ */
 
 /*
@@ -23 +23 @@
 #include <heapstring.h>
 #include <options.h>
-
+#include "initterm.h"
 
 ODINDEBUGCHANNEL(KERNEL32-DIRECTORY)
@@ -175 +175 @@
 {
   LPSTR lpstrEnv = getenv("WIN32.DIR.SYSTEM");          /* query environment */
+
+  if (lpstrEnv != NULL)
+  {
+    lstrcpynA(lpBuffer,                   /* copy environment variable to buffer */
+              lpstrEnv,
+              uSize);
+    return (lstrlenA(lpBuffer));                /* return number of copies bytes */
+  } 
+  else
+  {
+    int len;
+
+    len = PROFILE_GetOdinIniString(ODINDIRECTORIES,"SYSTEM","",lpBuffer,uSize);
+    if (len > 2) {
+        return len;
+    }
+    else {//SvL: Use path of kernel32.dll instead of calling Open32 api (which returns \OS2\SYSTEM)
+        lstrcpynA(lpBuffer, kernel32Path, uSize);
+        return lstrlenA(lpBuffer);
+    }
+  }
+}
+
+
+/*****************************************************************************
+ * Name      : GetSystemDirectoryW
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    :
+ *
+ * Author    : Patrick Haller [Wed, 1999/09/28 20:44]
+ *****************************************************************************/
+
+ODINFUNCTION2(UINT,GetSystemDirectoryW,LPWSTR,lpBuffer,
+                                       UINT,  uSize)
+{
+  char *asciibuffer = (char *)malloc(uSize+1);
+  UINT  rc;
+
+  rc = GetSystemDirectoryA(asciibuffer, uSize);
+  if(rc) AsciiToUnicode(asciibuffer, lpBuffer);
+  free(asciibuffer);
+  return(rc);
+}
+
+
+/*****************************************************************************
+ * Name      : GetWindowsDirectoryA
+ * Purpose   :
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    :
+ *
+ * Author    : Patrick Haller [Wed, 1999/09/28 20:44]
+ *****************************************************************************/
+
+ODINFUNCTION2(UINT,GetWindowsDirectoryA,LPSTR,lpBuffer,
+                                        UINT,uSize)
+{
+  LPSTR lpstrEnv = getenv("WIN32.DIR.WINDOWS");         /* query environment */
 
   if (lpstrEnv != NULL)
@@ -186 +251 @@
     int len;
 
-    len = PROFILE_GetOdinIniString(ODINDIRECTORIES,"SYSTEM","",lpBuffer,uSize);
-    if (len > 2) return len;
-    else
-                               /* if no override by environment is available */
-      return O32_GetSystemDirectory(lpBuffer,uSize);
-  }
-}
-
-
-/*****************************************************************************
- * Name      : GetSystemDirectoryW
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    :
- *
- * Author    : Patrick Haller [Wed, 1999/09/28 20:44]
- *****************************************************************************/
-
-ODINFUNCTION2(UINT,GetSystemDirectoryW,LPWSTR,lpBuffer,
-                                       UINT,  uSize)
-{
-  char *asciibuffer = (char *)malloc(uSize+1);
-  UINT  rc;
-
-  rc = GetSystemDirectoryA(asciibuffer, uSize);
-  if(rc) AsciiToUnicode(asciibuffer, lpBuffer);
-  free(asciibuffer);
-  return(rc);
-}
-
-
-/*****************************************************************************
- * Name      : GetWindowsDirectoryA
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    :
- *
- * Author    : Patrick Haller [Wed, 1999/09/28 20:44]
- *****************************************************************************/
-
-ODINFUNCTION2(UINT,GetWindowsDirectoryA,LPSTR,lpBuffer,
-                                        UINT,uSize)
-{
-  LPSTR lpstrEnv = getenv("WIN32.DIR.WINDOWS");         /* query environment */
-
-  if (lpstrEnv != NULL)
-  {
-    lstrcpynA(lpBuffer,                   /* copy environment variable to buffer */
-              lpstrEnv,
-              uSize);
-    return (lstrlenA(lpBuffer));                /* return number of copies bytes */
-  } else
-  {
-    int len;
-
     len = PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",lpBuffer,uSize);
     if (len > 2) return len;