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

Timestamp:

Nov 24, 1999, 8:33:34 PM (26 years ago)

Author:

sandervl

Message:

exe loader fixes + updates

File:

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

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.11 1999-11-11 19:10:08 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.12 1999-11-24 19:31:22 sandervl Exp $ */
 
 /*
@@ -32 +32 @@
 #include <string.h>
 #include "oslibdos.h"
+#include "profile.h"
 
 ODINDEBUGCHANNEL(KERNEL32-DIRECTORY)
@@ -219 +220 @@
     int len;
 
-    len = PROFILE_GetOdinIniString(ODINDIRECTORIES,"SYSTEM","",lpBuffer,uSize);
+    len = ODIN_PROFILE_GetOdinIniString(ODINDIRECTORIES,"SYSTEM","",lpBuffer,uSize);
     if (len > 2) {
         if(lpBuffer[len-1] == '\\') {
@@ -293 +294 @@
     int len;
 
-    len = PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",lpBuffer,uSize);
+    len = ODIN_PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",lpBuffer,uSize);
     if (len > 2) {
         if(lpBuffer[len-1] == '\\') {
@@ -301 +302 @@
         return len;
     }
-    else
-        /* if no override by environment is available */
-        return O32_GetWindowsDirectory(lpBuffer,uSize);
+    else {//SvL: Use path of kernel32.dll instead of calling Open32 api (which returns \OS2\SYSTEM)
+     CHAR buf[255];
+
+        lstrcpynA(buf, kernel32Path, sizeof(buf)-1);
+        strcat(buf, "WIN");
+        O32_CreateDirectory(buf, NULL);
+
+        lstrcpynA(lpBuffer, buf, uSize);
+        len = lstrlenA(lpBuffer);;
+        if(lpBuffer[len-1] == '\\') {
+                lpBuffer[len-1] = 0; 
+                len--;
+        }
+        return len;
+    }
   }
 }