Changeset 75651 in vbox for trunk/src/VBox

Timestamp:

Nov 21, 2018 7:28:03 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/fileio-win.cpp: Fixed console handle regression from previous change (tstRTVfs failed). Also fixed nul device (invalid info level status).

Location:

trunk/src/VBox/Runtime

Files:

• nt/RTErrConvertFromNtStatus.cpp (modified) (1 diff)
• r3/win/fileio-win.cpp (modified) (2 diffs)

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

@@ -50 +50 @@
         case STATUS_USER_APC:               return VERR_INTERRUPTED;
 
+        case STATUS_INVALID_INFO_CLASS:     return VERR_INVALID_FUNCTION;
         case STATUS_DATATYPE_MISALIGNMENT:  return VERR_INVALID_POINTER;
         case STATUS_NO_MORE_FILES:          return VERR_NO_MORE_FILES;

trunk/src/VBox/Runtime/r3/win/fileio-win.cpp

@@ -852 +852 @@
      * GetFileType should it not be there.
      */
-    if (rc == VERR_INVALID_HANDLE)
+    if (   rc == VERR_INVALID_HANDLE
+        || rc == VERR_ACCESS_DENIED
+        || rc == VERR_UNEXPECTED_FS_OBJ_TYPE)
     {
         static PFNVERIFYCONSOLEIOHANDLE s_pfnVerifyConsoleIoHandle = NULL;
@@ -870 +872 @@
     }
     /*
-     * On Windows 10 and (hopefully) 8.1 we get ERROR_INVALID_FUNCTION with console I/O
-     * handles.  We must ignore these just like the above invalid handle error.
+     * On Windows 10 and (hopefully) 8.1 we get ERROR_INVALID_FUNCTION with console
+     * I/O handles and null device handles.  We must ignore these just like the
+     * above invalid handle error.
      */
     else if (rc != VERR_INVALID_FUNCTION && rc != VERR_IO_BAD_COMMAND)