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

Timestamp:

Apr 29, 2000, 8:26:59 PM (25 years ago)

Author:

sandervl

Message:

init changes, export for installation program, create additional directories & registry keys, added lvl2 debug log feature, override for windows dir re-added

File:

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

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.19 2000-04-14 22:35:26 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.20 2000-04-29 18:26:58 sandervl Exp $ */
 
 /*
@@ -63 +63 @@
 void InitDirectories()
 {
-        GetWindowsDirectoryA((LPSTR)&DIR_Windows, sizeof(DIR_Windows));
-        GetSystemDirectoryA((LPSTR)&DIR_System, sizeof(DIR_System));
-}
-
+ char *endofwinpath, *tmp;
+ int   len;
+
+   strcpy(DIR_System, kernel32Path);
+   len = strlen(DIR_System);
+   if(DIR_System[len-1] == '\\') {
+        DIR_System[len-1] = 0; 
+   }
+   len = ODIN_PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",DIR_Windows,sizeof(DIR_Windows));
+   if (len > 2) {
+        if(DIR_Windows[len-1] == '\\') {
+                DIR_Windows[len-1] = 0; 
+        }
+   }
+   else {
+        strcpy(DIR_Windows, DIR_System);
+        endofwinpath = tmp = strchr(DIR_Windows, '\\');
+        while(tmp) {
+                tmp = strchr(endofwinpath+1, '\\');
+                if(tmp)
+                        endofwinpath = tmp;
+        }
+        if(endofwinpath) {
+                *endofwinpath = 0; //remove \SYSTEM32
+        }
+        else DebugInt3();
+   }
+}
 /*****************************************************************************
  * Name      : GetCurrentDirectoryA
@@ -231 +255 @@
                                        UINT,uSize)
 {
-  char buf[255];
-  int  len;
-
-        lstrcpynA(buf, kernel32Path, sizeof(buf)-1);
-        len = lstrlenA(buf);;
-        if(buf[len-1] == '\\') {
-                buf[len-1] = 0; 
-                len--;
-        }
+ int   len;
+ char *dir;
+
+        dir = InternalGetSystemDirectoryA();
+        len = lstrlenA(dir);
         if(lpBuffer)
-                lstrcpynA(lpBuffer, buf, uSize);
+                lstrcpynA(lpBuffer, dir, uSize);
         return len;
 }
@@ -265 +285 @@
 
   if(lpBuffer)
-        asciibuffer = (char *)malloc(uSize+1);
+        asciibuffer = (char *)alloca(uSize+1);
+
+  if(lpBuffer && asciibuffer == NULL) {
+        DebugInt3();
+  }
 
   rc = GetSystemDirectoryA(asciibuffer, uSize);
@@ -271 +295 @@
         AsciiToUnicode(asciibuffer, lpBuffer);
 
-  if(asciibuffer)
-        free(asciibuffer);
   return(rc);
 }
@@ -292 +314 @@
                                         UINT,uSize)
 {
-  static int fWindirExists = FALSE;
-  CHAR  buf[255];
-  int   len;
-  
-        //SvL: Use path of kernel32.dll instead of calling Open32 api (which returns \OS2\SYSTEM)
-        lstrcpynA(buf, kernel32Path, sizeof(buf)-1);
-        strcat(buf, "WIN");
-        if(!fWindirExists) {
-                O32_CreateDirectory(buf, NULL);
-                fWindirExists = TRUE;
-        }
-
-        len = lstrlenA(buf);;
-        if(buf[len-1] == '\\') {
-                buf[len-1] = 0; 
-                len--;
-        }
+ char *dir;
+ int   len;
+
+        dir = InternalGetWindowsDirectoryA();
+        len = lstrlenA(dir);
         if(lpBuffer)
-                lstrcpynA(lpBuffer, buf, uSize);
+                lstrcpynA(lpBuffer, dir, uSize);
         return len;
 }
@@ -334 +344 @@
 
   if(lpBuffer)
-        asciibuffer = (char *)malloc(uSize+1);
+        asciibuffer = (char *)alloca(uSize+1);
+
+  if(lpBuffer && asciibuffer == NULL) {
+        DebugInt3();
+  }
 
   rc = GetWindowsDirectoryA(asciibuffer, uSize);
@@ -340 +354 @@
         AsciiToUnicode(asciibuffer, lpBuffer);
 
-  if(asciibuffer)
-        free(asciibuffer);
   return(rc);
 }