Changeset 21720 for branches/gcc-kmk/src/kernel32/directory.cpp

Timestamp:

Oct 19, 2011, 11:26:02 AM (14 years ago)

Author:

dmik

Message:

Replace "\" with "/" in include statements.

File:

• branches/gcc-kmk/src/kernel32/directory.cpp (modified) (20 diffs)

branches/gcc-kmk/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!
  *
@@ -34 +34 @@
 #include <options.h>
 #include "initterm.h"
-#include <win\file.h>
+#include <win/file.h>
 #include <string.h>
 #include "oslibdos.h"
@@ -80 +80 @@
    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 +116 @@
    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 +146 @@
   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 +196 @@
     return FALSE;
   }
-  
+
   // cut off trailing backslashes
   // not if a process wants to change to the root directory
@@ -264 +264 @@
 
   int len = strlen(lpstrDirectory);
-  
+
   // cut off trailing backslashes
   if ( (lpstrDirectory[len - 1] == '\\') ||
@@ -275 +275 @@
     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 +287 @@
           return FALSE;
       }
-  }  
+  }
   return(OSLibDosCreateDirectory(lpstrDirectory));
 }
@@ -437 +437 @@
     asciibuffer = (char *)alloca(uSize+1);
 
-  if(lpBuffer && asciibuffer == NULL) 
+  if(lpBuffer && asciibuffer == NULL)
   {
     DebugInt3();
@@ -445 +445 @@
   if(rc && asciibuffer)
     AsciiToUnicode(asciibuffer, lpBuffer);
-  
+
   return(rc);
 }
@@ -495 +495 @@
     asciibuffer = (char *)alloca(uSize+1);
 
-  if(lpBuffer && asciibuffer == NULL) 
+  if(lpBuffer && asciibuffer == NULL)
   {
     DebugInt3();
@@ -503 +503 @@
   if(rc && asciibuffer)
     AsciiToUnicode(asciibuffer, lpBuffer);
-  
+
   return(rc);
 }
@@ -524 +524 @@
 {
   int len = strlen(lpstrDirectory);
-  
+
   if(lpstrDirectory == NULL) {
      SetLastError(ERROR_INVALID_PARAMETER);
@@ -539 +539 @@
     lpstrDirectory = lpTemp;
   }
-  
+
   dprintf(("RemoveDirectory %s", lpstrDirectory));
 
@@ -619 +619 @@
        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 +647 @@
         name = tmp;
     }
-    
+
     /* If we have an explicit path, everything's easy */
 
@@ -704 +704 @@
  *             filename is returned.
  *    Failure: Zero
- * 
+ *
  * NOTES
  *    Should call SetLastError(but currently doesn't).
@@ -732 +732 @@
     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;