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

Timestamp:

Oct 20, 1999, 10:09:05 AM (26 years ago)

Author:

sandervl

Message:

Odin ini changes

File:

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

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.5 1999-09-28 01:17:01 phaller Exp $ */
+/* $Id: directory.cpp,v 1.6 1999-10-20 08:09:04 sandervl Exp $ */
 
 /*
@@ -22 +22 @@
 #include <unicode.h>
 #include <heapstring.h>
+#include <options.h>
 
 
@@ -170 +171 @@
  *****************************************************************************/
 
-ODINFUNCTION2(UINT,GetSystemDirectoryA,LPSTR,arg1,
-                                       UINT, arg2)
+ODINFUNCTION2(UINT,GetSystemDirectoryA,LPSTR,lpBuffer,
+                                       UINT,uSize)
 {
   LPSTR lpstrEnv = getenv("WIN32.DIR.SYSTEM");          /* query environment */
@@ -177 +178 @@
   if (lpstrEnv != NULL)
   {
-    lstrcpynA(arg1,                   /* copy environment variable to buffer */
+    lstrcpynA(lpBuffer,                   /* copy environment variable to buffer */
               lpstrEnv,
-              arg2);
-    return (lstrlenA(arg1));                /* return number of copies bytes */
+              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
+                               /* if no override by environment is available */
+      return O32_GetSystemDirectory(lpBuffer,uSize);
   }
-  else
-                               /* if no override by environment is available */
-    return O32_GetSystemDirectory(arg1, arg2);
 }
 
@@ -225 +232 @@
  *****************************************************************************/
 
-ODINFUNCTION2(UINT,GetWindowsDirectoryA,LPSTR,arg1,
-                                        UINT, arg2)
+ODINFUNCTION2(UINT,GetWindowsDirectoryA,LPSTR,lpBuffer,
+                                        UINT,uSize)
 {
   LPSTR lpstrEnv = getenv("WIN32.DIR.WINDOWS");         /* query environment */
@@ -232 +239 @@
   if (lpstrEnv != NULL)
   {
-    lstrcpynA(arg1,                   /* copy environment variable to buffer */
+    lstrcpynA(lpBuffer,                   /* copy environment variable to buffer */
               lpstrEnv,
-              arg2);
-    return (lstrlenA(arg1));                /* return number of copies bytes */
+              uSize);
+    return (lstrlenA(lpBuffer));                /* return number of copies bytes */
+  } else
+  {
+    int len;
+
+    len = PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",lpBuffer,uSize);
+    if (len > 2) return len;
+    else
+
+                               /* if no override by environment is available */
+      return O32_GetWindowsDirectory(lpBuffer,uSize);
   }
-  else
-                               /* if no override by environment is available */
-    return O32_GetWindowsDirectory(arg1,
-                                   arg2);
 }