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

Timestamp:

Apr 15, 2000, 12:35:29 AM (25 years ago)

Author:

sandervl

Message:

GetFileAttributes, pe loader & command line fixes

File:

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

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.18 2000-04-07 19:43:46 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.19 2000-04-14 22:35:26 sandervl Exp $ */
 
 /*
@@ -13 +13 @@
  *
  * Copyright 1995 Alexandre Julliard
+ *
+ * TODO: System/window directories should be created by install program!
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -229 +231 @@
                                        UINT,uSize)
 {
-  LPSTR lpstrEnv = getenv("WIN32.DIR.SYSTEM");          /* query environment */
-  CHAR  buf[255];
-
-  if (lpstrEnv != NULL)
-  {
-        if(lpBuffer)
-                lstrcpynA(lpBuffer, lpstrEnv, uSize);
-
-        return (lstrlenA(lpstrEnv));                /* return number of copies bytes */
-  } 
-  else
-  {
-    int len;
-
-    len = ODIN_PROFILE_GetOdinIniString(ODINDIRECTORIES,"SYSTEM","",buf,sizeof(buf));
-    if (len > 2) {
-        if(buf[len-1] == '\\') {
-                buf[len-1] = 0; 
-                len--;
-        }
-        if(lpBuffer)
-                lstrcpynA(lpBuffer, buf, uSize);
-
-        return len;
-    }
-    else {//SvL: Use path of kernel32.dll instead of calling Open32 api (which returns \OS2\SYSTEM)
-        lstrcpynA(buf, kernel32Path, sizeof(buf)-1);
+  char buf[255];
+  int  len;
+
+        lstrcpynA(buf, kernel32Path, sizeof(buf)-1);
         len = lstrlenA(buf);;
         if(buf[len-1] == '\\') {
@@ -264 +243 @@
                 lstrcpynA(lpBuffer, buf, uSize);
         return len;
-    }
-  }
 }
 
@@ -315 +292 @@
                                         UINT,uSize)
 {
-  LPSTR lpstrEnv = getenv("WIN32.DIR.WINDOWS");         /* query environment */
+  static int fWindirExists = FALSE;
   CHAR  buf[255];
-
-  if (lpstrEnv != NULL)
-  {
-        if(lpBuffer)
-                lstrcpynA(lpBuffer, lpstrEnv, uSize);
-
-        return (lstrlenA(lpstrEnv));                /* return number of copies bytes */
-  } 
-  else
-  {
-    int len;
-
-    len = ODIN_PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",buf,sizeof(buf));
-    if (len > 2) {
-        if(buf[len-1] == '\\') {
-                buf[len-1] = 0; 
-                len--;
-        }
-        if(lpBuffer)
-                lstrcpynA(lpBuffer, buf, uSize);
-
-        return len;
-    }
-    else {//SvL: Use path of kernel32.dll instead of calling Open32 api (which returns \OS2\SYSTEM)
-
+  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");
-        O32_CreateDirectory(buf, NULL);
+        if(!fWindirExists) {
+                O32_CreateDirectory(buf, NULL);
+                fWindirExists = TRUE;
+        }
 
         len = lstrlenA(buf);;
@@ -354 +312 @@
                 lstrcpynA(lpBuffer, buf, uSize);
         return len;
-    }
-  }
 }