Changeset 13483 in vbox

Timestamp:

Oct 22, 2008 9:58:25 AM (16 years ago)

Author:

vboxsync

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

38285

Message:

Fixed Windows2000 guest shutdown crash in VBoxGuest.sys

Location:

trunk/src/VBox/Additions/WINNT/VBoxGuest

Files:

• NTLegacy.cpp (modified) (1 diff)
• VBoxGuest.cpp (modified) (2 diffs)
• VBoxGuestPnP.cpp (modified) (3 diffs)
• VBoxGuest_Internal.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/VBoxGuest/NTLegacy.cpp

@@ -149 +149 @@
     if (!VBOX_SUCCESS(rc))
     {
-       dprintf(("VBoxGuest::START_DEVICE: VbglAlloc failed. rc = %d\n", rc));
+       dprintf(("VBoxGuest::START_DEVICE: VbglAlloc failed for irqAckEvents. rc = %d\n", rc));
+    }
+    rc = VbglGRAlloc ((VMMDevRequestHeader **)&pDevExt->powerStateRequest, sizeof (VMMDevPowerStateRequest), VMMDevReq_SetPowerStatus);
+    if (!VBOX_SUCCESS(rc))
+    {
+       dprintf(("VBoxGuest::START_DEVICE: VbglAlloc failed for powerStateRequest. rc = %d\n", rc));
     }
 

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest.cpp

@@ -1116 +1116 @@
 NTSTATUS VBoxGuestShutdown(PDEVICE_OBJECT pDevObj, PIRP pIrp)
 {
-    VMMDevPowerStateRequest *req = NULL;
+    PVBOXGUESTDEVEXT pDevExt = (PVBOXGUESTDEVEXT)pDevObj->DeviceExtension;
 
     dprintf(("VBoxGuest::VBoxGuestShutdown\n"));
 
-    int rc = VbglGRAlloc ((VMMDevRequestHeader **)&req, sizeof (VMMDevPowerStateRequest), VMMDevReq_SetPowerStatus);
-
-    if (VBOX_SUCCESS(rc))
-    {
+    if (pDevExt && pDevExt->powerStateRequest)
+    {
+        VMMDevPowerStateRequest *req = pDevExt->powerStateRequest;
+
+        req->header.requestType = VMMDevReq_SetPowerStatus;
         req->powerState = VMMDevPowerState_PowerOff;
 
-        rc = VbglGRPerform (&req->header);
+        int rc = VbglGRPerform (&req->header);
 
         if (VBOX_FAILURE(rc) || VBOX_FAILURE(req->header.rc))
@@ -1133 +1134 @@
                       "rc = %d, VMMDev rc = %Vrc\n", rc, req->header.rc));
         }
-
-        VbglGRFree (&req->header);
     }
 

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuestPnP.cpp

@@ -185 +185 @@
                         if (!VBOX_SUCCESS(rc))
                         {
-                            dprintf(("VBoxGuest::START_DEVICE: VbglAlloc failed. rcVBox = %d\n", rcVBox));
+                            dprintf(("VBoxGuest::START_DEVICE: VbglAlloc failed for irqAckEvents. rcVBox = %d\n", rcVBox));
+                            rc = STATUS_UNSUCCESSFUL;
+                        }
+                    }
+
+                    if (NT_SUCCESS(rc))
+                    {
+                        rcVBox = VbglGRAlloc ((VMMDevRequestHeader **)&pDevExt->powerStateRequest, sizeof (VMMDevPowerStateRequest), VMMDevReq_SetPowerStatus);
+                        if (!VBOX_SUCCESS(rc))
+                        {
+                            dprintf(("VBoxGuest::START_DEVICE: VbglAlloc failed for powerStateRequest. rcVBox = %d\n", rcVBox));
                             rc = STATUS_UNSUCCESSFUL;
                         }
@@ -561 +571 @@
                             {
                                 dprintf(("VBoxGuest::VBoxGuestPower: Telling the VMMDev to close the VM...\n"));
-                                VMMDevPowerStateRequest *req = NULL;
-
-                                int rc = VbglGRAlloc ((VMMDevRequestHeader **)&req, sizeof (VMMDevPowerStateRequest), VMMDevReq_SetPowerStatus);
-
-                                if (VBOX_SUCCESS(rc))
+
+                                if (pDevExt && pDevExt->powerStateRequest)
                                 {
+                                    VMMDevPowerStateRequest *req = pDevExt->powerStateRequest;
+
+                                    req->header.requestType = VMMDevReq_SetPowerStatus;
                                     req->powerState = VMMDevPowerState_PowerOff;
 
-                                    rc = VbglGRPerform (&req->header);
+                                    int rc = VbglGRPerform (&req->header);
 
                                     if (VBOX_FAILURE(rc) || VBOX_FAILURE(req->header.rc))
@@ -576 +586 @@
                                                  "rc = %d, VMMDev rc = %Vrc\n", rc, req->header.rc));
                                     }
-
-                                    VbglGRFree (&req->header);
                                 }
                             }

trunk/src/VBox/Additions/WINNT/VBoxGuest/VBoxGuest_Internal.h

@@ -206 +206 @@
     } MemBalloon;
 
+    /* Preallocated generic request for shutdown. */
+    VMMDevPowerStateRequest *powerStateRequest;
+
 } VBOXGUESTDEVEXT, *PVBOXGUESTDEVEXT;