Changeset 49150 in vbox for trunk/src/VBox/HostDrivers/Support

Timestamp:

Oct 17, 2013 7:22:02 AM (11 years ago)

Author:

vboxsync

Message:

SUPR3: Use NtDeviceIoControlFile instead of DeviceIoControl to avoid wasting precious ticks on silly API conversions.

File:

• trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp (modified) (7 diffs)

trunk/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp

@@ -38 +38 @@
 #endif
 
-#include <Windows.h>
+#define USE_NT_DEVICE_IO_CONTROL_FILE
+#ifdef USE_NT_DEVICE_IO_CONTROL_FILE
+# include <iprt/nt/nt-and-windows.h>
+#else
+# include <Windows.h>
+#endif
 
 #include <VBox/sup.h>
@@ -75 +80 @@
 static int suplibOsStartService(void);
 static int suplibOsStopService(void);
+#ifdef USE_NT_DEVICE_IO_CONTROL_FILE
+static int suplibConvertNtStatus(NTSTATUS rcNt);
+#else
 static int suplibConvertWin32Err(int);
+#endif
 
 
@@ -496 +505 @@
     PSUPREQHDR pHdr = (PSUPREQHDR)pvReq;
     Assert(cbReq == RT_MAX(pHdr->cbIn, pHdr->cbOut));
+# ifdef USE_NT_DEVICE_IO_CONTROL_FILE
+    IO_STATUS_BLOCK Ios;
+    Ios.Status = -1;
+    Ios.Information = 0;
+    NTSTATUS rcNt = NtDeviceIoControlFile((HANDLE)pThis->hDevice, NULL /*hEvent*/, NULL /*pfnApc*/, NULL /*pvApcCtx*/, &Ios,
+                                          (ULONG)uFunction,
+                                          pvReq /*pvInput */, pHdr->cbIn /* cbInput */,
+                                          pvReq /*pvOutput*/, pHdr->cbOut /* cbOutput */);
+    if (NT_SUCCESS(rcNt))
+    {
+        if (NT_SUCCESS(Ios.Status))
+            return VINF_SUCCESS;
+        rcNt = Ios.Status;
+    }
+    return suplibConvertNtStatus(rcNt);
+
+# else
     DWORD cbReturned = (ULONG)pHdr->cbOut;
     if (DeviceIoControl((HANDLE)pThis->hDevice, uFunction, pvReq, pHdr->cbIn, pvReq, cbReturned, &cbReturned, NULL))
         return 0;
     return suplibConvertWin32Err(GetLastError());
+# endif
 }
 
@@ -508 +535 @@
      * Issue device I/O control.
      */
+# ifdef USE_NT_DEVICE_IO_CONTROL_FILE
+    IO_STATUS_BLOCK Ios;
+    Ios.Status = -1;
+    Ios.Information = 0;
+    NTSTATUS rcNt = NtDeviceIoControlFile((HANDLE)pThis->hDevice, NULL /*hEvent*/, NULL /*pfnApc*/, NULL /*pvApcCtx*/, &Ios,
+                                          (ULONG)uFunction,
+                                          (PVOID)idCpu /*pvInput */, 0 /* cbInput */,
+                                          NULL /*pvOutput*/, 0 /* cbOutput */);
+    if (NT_SUCCESS(rcNt))
+    {
+        if (NT_SUCCESS(Ios.Status))
+            return VINF_SUCCESS;
+        rcNt = Ios.Status;
+    }
+    return suplibConvertNtStatus(rcNt);
+# else
     DWORD cbReturned = 0;
     if (DeviceIoControl((HANDLE)pThis->hDevice, uFunction, NULL, 0, (LPVOID)idCpu, 0, &cbReturned, NULL))
         return VINF_SUCCESS;
     return suplibConvertWin32Err(GetLastError());
+# endif
 }
 
@@ -521 +565 @@
     if (*ppvPages)
         return VINF_SUCCESS;
-    return suplibConvertWin32Err(GetLastError());
+    return RTErrConvertFromWin32(GetLastError());
 }
 
@@ -530 +574 @@
     if (VirtualFree(pvPages, 0, MEM_RELEASE))
         return VINF_SUCCESS;
-    return suplibConvertWin32Err(GetLastError());
-}
-
-
+    return RTErrConvertFromWin32(GetLastError());
+}
+
+
+# ifndef USE_NT_DEVICE_IO_CONTROL_FILE
 /**
  * Converts a supdrv win32 error code to an IPRT status code.
@@ -585 +630 @@
     return RTErrConvertFromWin32(rc);
 }
+# else
+/**
+ * Reverse of VBoxDrvNtErr2NtStatus
+ * returns VBox status code.
+ * @param   rcNt    NT status code.
+ */
+static int suplibConvertNtStatus(NTSTATUS rcNt)
+{
+    switch (rcNt)
+    {
+        case STATUS_SUCCESS:                    return VINF_SUCCESS;
+        case STATUS_NOT_SUPPORTED:              return VERR_GENERAL_FAILURE;
+        case STATUS_INVALID_PARAMETER:          return VERR_INVALID_PARAMETER;
+        case STATUS_UNKNOWN_REVISION:           return VERR_INVALID_MAGIC;
+        case STATUS_INVALID_HANDLE:             return VERR_INVALID_HANDLE;
+        case STATUS_INVALID_ADDRESS:            return VERR_INVALID_POINTER;
+        case STATUS_NOT_LOCKED:                 return VERR_LOCK_FAILED;
+        case STATUS_IMAGE_ALREADY_LOADED:       return VERR_ALREADY_LOADED;
+        case STATUS_ACCESS_DENIED:              return VERR_PERMISSION_DENIED;
+        case STATUS_REVISION_MISMATCH:          return VERR_VERSION_MISMATCH;
+    }
+
+    /* Fall back on IPRT for the rest. */
+    return RTErrConvertFromNtStatus(rcNt);
+}
+# endif
 
 #endif /* !IN_SUP_HARDENED_R3 */