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

Timestamp:

Jul 17, 2008 12:06:56 PM (17 years ago)

Author:

vboxsync

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

33448

Message:

Fixed issue in fast (METHOD_NEITHER) ioctls.
Write the last error to pVM->vmm.s.iLastGCRc instead of writing it to a user buffer.

Location:

trunk/src/VBox/HostDrivers/Support/win

Files:

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

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

@@ -296 +296 @@
         int   rc;
 
+        /* We're here with METHOD_NEITHER, which means no parameter validation has been performed. Do not use input
+         * or write to output parameters!
+         */
+
         /* Raise the IRQL to DISPATCH_LEVEl to prevent Windows from rescheduling us to another CPU/core. */
         Assert(KeGetCurrentIrql() <= DISPATCH_LEVEL);
@@ -304 +308 @@
         /* Complete the I/O request. */
         NTSTATUS rcNt = pIrp->IoStatus.Status = STATUS_SUCCESS;
-        pIrp->IoStatus.Information = sizeof(rc);
-        __try
-        {
-            *(int *)pIrp->UserBuffer = rc;
-        }
-        __except(EXCEPTION_EXECUTE_HANDLER)
-        {
-            rcNt = pIrp->IoStatus.Status = GetExceptionCode();
-            dprintf(("VBoxSupDrvDeviceContorl: Exception Code %#x\n", rcNt));
-        }
         IoCompleteRequest(pIrp, IO_NO_INCREMENT);
         return rcNt;

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

@@ -645 +645 @@
      */
     int rc = VERR_INTERNAL_ERROR;
-    DWORD cbReturned = (ULONG)sizeof(rc);
-    if (DeviceIoControl(g_hDevice, uFunction, NULL, 0, &rc, (DWORD)sizeof(rc), &cbReturned, NULL))
+    if (DeviceIoControl(g_hDevice, uFunction, NULL, 0, NULL, 0, NULL, NULL))
         return rc;
     return suplibConvertWin32Err(GetLastError());