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

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/kernel32/directory.cpp (modified) (22 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/kernel32/directory.cpp

@@ -6 +6 @@
  * Copyright 1998 Sander van Leeuwen
  *
- * NOTE: Directory creation has to be done in install program (odin\win) 
+ * NOTE: Directory creation has to be done in install program (odin\win)
  *
  * Parts based on Wine code (991031) (files\directory.c)
@@ -14 +14 @@
  * Copyright 1995 Alexandre Julliard
  *
- * TODO: 
+ * TODO:
  *  - System/window directories should be created by install program!
  *
@@ -30 +30 @@
 #include <os2win.h>
 #include <stdlib.h>
+#include <string.h>
+#ifdef __GNUC__
+#include <alloca.h>
+#endif
 #include <unicode.h>
 #include <heapstring.h>
 #include <options.h>
 #include "initterm.h"
-#include <win\file.h>
-#include <string.h>
+#include <win/file.h>
 #include "oslibdos.h"
 #include "profile.h"
@@ -80 +83 @@
    len = strlen(DIR_System);
    if(DIR_System[len-1] == '\\') {
-        DIR_System[len-1] = 0; 
+        DIR_System[len-1] = 0;
    }
    len = PROFILE_GetOdinIniString(ODINDIRECTORIES,"WINDOWS","",DIR_Windows,sizeof(DIR_Windows));
    if (len > 2) {
         if(DIR_Windows[len-1] == '\\') {
-                DIR_Windows[len-1] = 0; 
+                DIR_Windows[len-1] = 0;
         }
    }
@@ -116 +119 @@
    len = strlen(DIR_System);
    if(DIR_System[len-1] == '\\') {
-        DIR_System[len-1] = 0; 
+        DIR_System[len-1] = 0;
    }
    strcpy(DIR_Windows, szWindowsDir);
    len = strlen(DIR_Windows);
    if(DIR_Windows[len-1] == '\\') {
-        DIR_Windows[len-1] = 0; 
+        DIR_Windows[len-1] = 0;
    }
 
@@ -146 +149 @@
   rc = OSLibDosQueryDir(nBufferLength, lpBuffer);
   if(rc && rc < nBufferLength) {
-       dprintf(("CurrentDirectory = %s (%d)", lpBuffer, rc)); 
-  }
-  else dprintf(("CurrentDirectory returned %d", rc)); 
+       dprintf(("CurrentDirectory = %s (%d)", lpBuffer, rc));
+  }
+  else dprintf(("CurrentDirectory returned %d", rc));
   return rc;
 }
@@ -196 +199 @@
     return FALSE;
   }
-  
+
   // cut off trailing backslashes
   // not if a process wants to change to the root directory
@@ -204 +207 @@
        (len != 1) )
   {
-    LPSTR lpTemp = (LPSTR)_alloca(len);
+    LPSTR lpTemp = (LPSTR)alloca(len);
     lstrcpynA(lpTemp,
               lpstrDirectory,
@@ -264 +267 @@
 
   int len = strlen(lpstrDirectory);
-  
+
   // cut off trailing backslashes
   if ( (lpstrDirectory[len - 1] == '\\') ||
        (lpstrDirectory[len - 1] == '/') )
   {
-    LPSTR lpTemp = (LPSTR)_alloca(len);
+    LPSTR lpTemp = (LPSTR)alloca(len);
     lstrcpynA(lpTemp,
               lpstrDirectory,
@@ -275 +278 @@
     lpstrDirectory = lpTemp;
   }
-  
+
   dprintf(("CreateDirectoryA %s", lpstrDirectory));
-  
+
   // Creation of an existing directory will fail (verified in NT4 & XP)
   DWORD dwAttr = GetFileAttributesA(lpstrDirectory);
-  if(dwAttr != -1) 
+  if(dwAttr != -1)
   {
       if (dwAttr & FILE_ATTRIBUTE_DIRECTORY)
@@ -287 +290 @@
           return FALSE;
       }
-  }  
+  }
   return(OSLibDosCreateDirectory(lpstrDirectory));
 }
@@ -437 +440 @@
     asciibuffer = (char *)alloca(uSize+1);
 
-  if(lpBuffer && asciibuffer == NULL) 
+  if(lpBuffer && asciibuffer == NULL)
   {
     DebugInt3();
@@ -445 +448 @@
   if(rc && asciibuffer)
     AsciiToUnicode(asciibuffer, lpBuffer);
-  
+
   return(rc);
 }
@@ -495 +498 @@
     asciibuffer = (char *)alloca(uSize+1);
 
-  if(lpBuffer && asciibuffer == NULL) 
+  if(lpBuffer && asciibuffer == NULL)
   {
     DebugInt3();
@@ -503 +506 @@
   if(rc && asciibuffer)
     AsciiToUnicode(asciibuffer, lpBuffer);
-  
+
   return(rc);
 }
@@ -524 +527 @@
 {
   int len = strlen(lpstrDirectory);
-  
+
   if(lpstrDirectory == NULL) {
      SetLastError(ERROR_INVALID_PARAMETER);
@@ -533 +536 @@
        (lpstrDirectory[len - 1] == '/') )
   {
-    LPSTR lpTemp = (LPSTR)_alloca(len);
+    LPSTR lpTemp = (LPSTR)alloca(len);
     lstrcpynA(lpTemp,
               lpstrDirectory,
@@ -539 +542 @@
     lpstrDirectory = lpTemp;
   }
-  
+
   dprintf(("RemoveDirectory %s", lpstrDirectory));
 
@@ -619 +622 @@
        those (according to SDK docs) */
     if ((path != NULL) && strchr(path, ';')) {
-        ret = OSLibDosSearchPath(OSLIB_SEARCHDIR, (LPSTR)path, (LPSTR)name, 
+        ret = OSLibDosSearchPath(OSLIB_SEARCHDIR, (LPSTR)path, (LPSTR)name,
                                  full_name, MAX_PATHNAME_LEN);
         goto done;
@@ -647 +650 @@
         name = tmp;
     }
-    
+
     /* If we have an explicit path, everything's easy */
 
@@ -704 +707 @@
  *             filename is returned.
  *    Failure: Zero
- * 
+ *
  * NOTES
  *    Should call SetLastError(but currently doesn't).
@@ -732 +735 @@
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
     LPSTR extA  = HEAP_strdupWtoA( GetProcessHeap(), 0, ext );
-  
+
     dprintf(("SearchPathA %s %s %s", pathA, nameA, extA));
     DWORD ret = DIR_SearchPath( pathA, nameA, extA, (LPSTR)full_name );
-  
+
     if (NULL != extA)
       HeapFree( GetProcessHeap(), 0, extA );
-  
+
     if (NULL != nameA)
       HeapFree( GetProcessHeap(), 0, nameA );
-  
+
     if (NULL != pathA)
       HeapFree( GetProcessHeap(), 0, pathA );
-  
+
     if (!ret) return 0;
 

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk