Changeset 71198 in vbox for trunk/src/VBox/HostDrivers/Support/win

Timestamp:

Mar 5, 2018 10:59:17 AM (7 years ago)

Author:

vboxsync

Message:

SUPDrv,VMMR0: Prepped for extending the fast I/O control interface a bit for NEM; SUPDRV version increment. bugref:9044

Location:

trunk/src/VBox/HostDrivers/Support/win

Files:

• SUPDrv-win.cpp (modified) (2 diffs)
• SUPLib-win.cpp (modified) (2 diffs)

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

@@ -1129 +1129 @@
          * the session and iCmd, and does not return anything.
          */
-        if (   uCmd == SUP_IOCTL_FAST_DO_RAW_RUN
-            || uCmd == SUP_IOCTL_FAST_DO_HM_RUN
-            || uCmd == SUP_IOCTL_FAST_DO_NOP)
-        {
-            int rc = supdrvIOCtlFast(uCmd, (unsigned)(uintptr_t)pvOutput/* VMCPU id */, pDevExt, pSession);
+        if (   (uCmd & 3) == METHOD_NEITHER
+            && (uint32_t)((uCmd - SUP_IOCTL_FAST_DO_FIRST) >> 2) < (uint32_t)32)
+        {
+            int rc = supdrvIOCtlFast((uCmd - SUP_IOCTL_FAST_DO_FIRST) >> 2,
+                                     (unsigned)(uintptr_t)pvOutput/* VMCPU id */,
+                                     pDevExt, pSession);
             pIoStatus->Status      = RT_SUCCESS(rc) ? STATUS_SUCCESS : STATUS_INVALID_PARAMETER;
             pIoStatus->Information = 0; /* Could be used to pass rc if we liked. */
@@ -1318 +1319 @@
 #endif
 
-        ULONG ulCmd = pStack->Parameters.DeviceIoControl.IoControlCode;
-        if (   ulCmd == SUP_IOCTL_FAST_DO_RAW_RUN
-            || ulCmd == SUP_IOCTL_FAST_DO_HM_RUN
-            || ulCmd == SUP_IOCTL_FAST_DO_NOP)
-        {
-            int rc = supdrvIOCtlFast(ulCmd, (unsigned)(uintptr_t)pIrp->UserBuffer /* VMCPU id */, pDevExt, pSession);
+        ULONG uCmd = pStack->Parameters.DeviceIoControl.IoControlCode;
+        if (   (uCmd & 3) == METHOD_NEITHER
+            && (uint32_t)((uCmd - SUP_IOCTL_FAST_DO_FIRST) >> 2) < (uint32_t)32)
+        {
+            int rc = supdrvIOCtlFast((uCmd - SUP_IOCTL_FAST_DO_FIRST) >> 2,
+                                     (unsigned)(uintptr_t)pIrp->UserBuffer /* VMCPU id */,
+                                     pDevExt, pSession);
 
             /* Complete the I/O request. */

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

@@ -673 +673 @@
     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;
+    IO_STATUS_BLOCK Ios = RTNT_IO_STATUS_BLOCK_INITIALIZER;
     NTSTATUS rcNt = NtDeviceIoControlFile((HANDLE)pThis->hDevice, NULL /*hEvent*/, NULL /*pfnApc*/, NULL /*pvApcCtx*/, &Ios,
                                           (ULONG)uFunction,
@@ -703 +701 @@
      */
 # ifdef USE_NT_DEVICE_IO_CONTROL_FILE
-    IO_STATUS_BLOCK Ios;
-    Ios.Status = -1;
-    Ios.Information = 0;
+    IO_STATUS_BLOCK Ios = RTNT_IO_STATUS_BLOCK_INITIALIZER;
     NTSTATUS rcNt = NtDeviceIoControlFile((HANDLE)pThis->hDevice, NULL /*hEvent*/, NULL /*pfnApc*/, NULL /*pvApcCtx*/, &Ios,
                                           (ULONG)uFunction,