Changeset 30427 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jun 24, 2010 12:28:50 PM (15 years ago)

Author:

vboxsync

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

63062

Message:

Windows guest additions: fixed return status in VBoxMouse.

File:

• trunk/src/VBox/Additions/WINNT/MouseFilter/VBoxMouse.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/MouseFilter/VBoxMouse.cpp

@@ -471 +471 @@
     // to be set.
     //
-    KeSetEvent(event, 0, FALSE);
+    // If the lower driver didn't return STATUS_PENDING, we don't need to
+    // set the event because we won't be waiting on it.
+    // This optimization avoids grabbing the dispatcher lock and improves perf.
+    //
+    if (Irp->PendingReturned == TRUE)
+        KeSetEvent(event, 0, FALSE);
 
     return STATUS_MORE_PROCESSING_REQUIRED;
@@ -841 +846 @@
                Executive, // Waiting for reason of a driver
                KernelMode, // Waiting in kernel mode
-               FALSE, // No allert
+               FALSE, // No alert
                NULL); // No timeout
+
+            // Transfer the status from the IOSB
+            status = Irp->IoStatus.Status;
         }
 
         dprintf(("VBoxMouse_PnP: Status: %x, irp status: %x\n", Irp->IoStatus.Status));
 
-        if (NT_SUCCESS(status) && NT_SUCCESS(Irp->IoStatus.Status)) {
+        if (NT_SUCCESS(status)) {
             devExt->Started = TRUE;
             devExt->Removed = FALSE;
@@ -858 +866 @@
         //
         Irp->IoStatus.Status = status;
-        Irp->IoStatus.Information = 0;
         IoCompleteRequest(Irp, IO_NO_INCREMENT);