Changeset 57919 in vbox for trunk/src/VBox/Runtime

Timestamp:

Sep 27, 2015 11:39:09 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

102891

Message:

direnum-r3-nt.cpp: Don't try FileIdBothDirectoryInformation on W2K and NT4, the cifs file system driver / server may get upset.

Location:

trunk/src/VBox/Runtime

Files:

• nt/RTErrConvertFromNtStatus.cpp (modified) (1 diff)
• r3/nt/direnum-r3-nt.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp

@@ -65 +65 @@
         case STATUS_BAD_NETWORK_PATH:       return VERR_NET_PATH_NOT_FOUND;
         case STATUS_NOT_A_DIRECTORY:        return VERR_NOT_A_DIRECTORY;
+
+        case STATUS_UNEXPECTED_NETWORK_ERROR:
+                                            return VERR_NET_IO_ERROR;
     }
 

trunk/src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp

@@ -350 +350 @@
          * Thus the mess.
          */
-        pThis->enmInfoClass = FileIdBothDirectoryInformation;
+        if (RT_MAKE_U64(RTNtCurrentPeb()->OSMinorVersion, RTNtCurrentPeb()->OSMajorVersion) > RT_MAKE_U64(0,5) /* > W2K */)
+            pThis->enmInfoClass = FileIdBothDirectoryInformation; /* Introduced in XP, from I can tell. */
+        else
+            pThis->enmInfoClass = FileBothDirectoryInformation;
         rcNt = NtQueryDirectoryFile(pThis->hDir,
                                     NULL /* Event */,