Changeset 21675 for trunk/src

Timestamp:

Jul 29, 2011, 2:30:58 PM (14 years ago)

Author:

dmik

Message:

Fixed a regression in r21674.

This broke the Select Directory dialog in SmartSVN/SmartGit
since GetFileAttributesEx(x:\) would returne a failure again.

Location:

trunk/src/kernel32

Files:

• oslibdos.cpp (modified) (1 diff)
• virtual.cpp (modified) (2 diffs)

trunk/src/kernel32/oslibdos.cpp

@@ -810 +810 @@
   // GetFileAttributesEx() does on Win32 -- instead of returning an error as
   // DosQueryPathInfo() does
-  if (pszOemName[1] == ':' && pszOemName[2] == '\0')
+  int len = strlen(pszOemName);
+  if (len == 2 && pszOemName[1] == ':')
   {
       pszOemName[2] = '\\';
       pszOemName[3] = '\0';
   }
-  else
-  {
-      int len = strlen(pszOemName);
-      // note: the below leaves '\' (i.e. the root dir) as is
-      while (len > 1 && (pszOemName[len-1] == '\\' || pszOemName[len-1] == '/'))
-          pszOemName[--len] = '\0';
+  else if (len > 1 && (len != 3 || pszOemName[1] != ':'))
+  {
+      // note: len > 1 above leaves '\' (i.e. the root dir) as is
+      // and the second condition prevents 'x:\' from being cut
+      while (pszOemName[len-1] == '\\' || pszOemName[len-1] == '/')
+          --len;
+      pszOemName[len] = '\0';
   }
 

trunk/src/kernel32/virtual.cpp

@@ -392 +392 @@
     }
 
+    // The below doesn't seem to be true any longer, at least when it comes to
+    // Odin and Java. Need to do more testing to make sure
+#if 1
     if(fdwAllocationType & MEM_RESERVE) {
         //SvL: DosRead crashes if memory is initially reserved with write
@@ -401 +404 @@
         flag |= PAG_READ|PAG_WRITE;
     }
+#endif
 
     //just do this if other options are used