Changeset 44986 in vbox

Timestamp:

Mar 11, 2013 1:49:43 PM (12 years ago)

Author:

vboxsync

Message:

VBoxGuest-win-pnp.cpp: More cleaning up.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp (modified) (15 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp

@@ -69 +69 @@
 static NTSTATUS vbgdNtSendIrpSynchronously(PDEVICE_OBJECT pDevObj, PIRP pIrp, BOOLEAN fStrict)
 {
-    KEVENT event;
-
-    KeInitializeEvent(&event, SynchronizationEvent, FALSE);
+    KEVENT Event;
+
+    KeInitializeEvent(&Event, SynchronizationEvent, FALSE);
 
     IoCopyCurrentIrpStackLocationToNext(pIrp);
     IoSetCompletionRoutine(pIrp, (PIO_COMPLETION_ROUTINE)vbgdNtPnpIrpComplete,
-                           &event, TRUE, TRUE, TRUE);
+                           &Event, TRUE, TRUE, TRUE);
 
     NTSTATUS rc = IoCallDriver(pDevObj, pIrp);
@@ -81 +81 @@
     if (rc == STATUS_PENDING)
     {
-        KeWaitForSingleObject(&event, Executive, KernelMode, FALSE, NULL);
+        KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL);
         rc = pIrp->IoStatus.Status;
     }
@@ -108 +108 @@
 
 #ifdef LOG_ENABLED
-    static char* aszFnctName[] =
+    static char *s_apszFnctName[] =
     {
         "IRP_MN_START_DEVICE",
@@ -124 +124 @@
         "IRP_MN_QUERY_DEVICE_TEXT",
         "IRP_MN_FILTER_RESOURCE_REQUIREMENTS",
-        "",
+        "IRP_MN_0xE",
         "IRP_MN_READ_CONFIG",
         "IRP_MN_WRITE_CONFIG",
@@ -136 +136 @@
     };
     Log(("VBoxGuest::vbgdNtGuestPnp: MinorFunction: %s\n",
-           pStack->MinorFunction < (sizeof(aszFnctName) / sizeof(aszFnctName[0]))
-         ? aszFnctName[pStack->MinorFunction]
-         : "Unknown"));
+         pStack->MinorFunction < RT_ELEMENTS(s_apszFnctName)) ? s_apszFnctName[pStack->MinorFunction] : "Unknown"));
 #endif
 
@@ -225 +223 @@
             Log(("VBoxGuest::vbgdNtGuestPnp: QUERY_REMOVE_DEVICE: Device cannot be removed without a reboot.\n"));
             rc = STATUS_UNSUCCESSFUL;
-#endif /* VBOX_REBOOT_ON_UNINSTALL */
+#endif
 
             if (NT_SUCCESS(rc))
@@ -320 +318 @@
             Log(("VBoxGuest::vbgdNtGuestPnp: QUERY_STOP_DEVICE: Device cannot be stopped without a reboot!\n"));
             pIrp->IoStatus.Status = STATUS_UNSUCCESSFUL;
-#endif /* VBOX_REBOOT_ON_UNINSTALL */
+#endif
 
             if (NT_SUCCESS(rc))
@@ -436 +434 @@
 NTSTATUS vbgdNtPower(PDEVICE_OBJECT pDevObj, PIRP pIrp)
 {
-    PIO_STACK_LOCATION pStack = IoGetCurrentIrpStackLocation(pIrp);
-    PVBOXGUESTDEVEXT   pDevExt = (PVBOXGUESTDEVEXT)pDevObj->DeviceExtension;
-    POWER_STATE_TYPE   powerType;
-    POWER_STATE        powerState;
-    POWER_ACTION       powerAction;
+    PIO_STACK_LOCATION pStack   = IoGetCurrentIrpStackLocation(pIrp);
+    PVBOXGUESTDEVEXT   pDevExt  = (PVBOXGUESTDEVEXT)pDevObj->DeviceExtension;
+    POWER_STATE_TYPE   enmPowerType   = pStack->Parameters.Power.Type;
+    POWER_STATE        PowerState     = pStack->Parameters.Power.State;
+    POWER_ACTION       enmPowerAction = pStack->Parameters.Power.ShutdownType;
 
     Log(("VBoxGuest::vbgdNtGuestPower\n"));
-
-    powerType   = pStack->Parameters.Power.Type;
-    powerAction = pStack->Parameters.Power.ShutdownType;
-    powerState  = pStack->Parameters.Power.State;
 
     switch (pStack->MinorFunction)
@@ -452 +446 @@
         case IRP_MN_SET_POWER:
         {
-            Log(("VBoxGuest::vbgdNtGuestPower: IRP_MN_SET_POWER, type= %d\n", powerType));
-            switch (powerType)
+            Log(("VBoxGuest::vbgdNtGuestPower: IRP_MN_SET_POWER, type= %d\n", enmPowerType));
+            switch (enmPowerType)
             {
                 case SystemPowerState:
                 {
-                    Log(("VBoxGuest::vbgdNtGuestPower: SystemPowerState, action = %d, state = %d\n", powerAction, powerState));
-
-                    switch (powerAction)
+                    Log(("VBoxGuest::vbgdNtGuestPower: SystemPowerState, action = %d, state = %d/%d\n",
+                         enmPowerAction, PowerState.SystemState, PowerState.DeviceState));
+
+                    switch (enmPowerAction)
                     {
                         case PowerActionSleep:
 
                             /* System now is in a working state. */
-                            if (powerState.SystemState == PowerSystemWorking)
+                            if (PowerState.SystemState == PowerSystemWorking)
                             {
                                 if (   pDevExt
@@ -484 +479 @@
                             /* Tell the VMM that we no longer support mouse pointer integration. */
                             VMMDevReqMouseStatus *pReq = NULL;
-                            int vrc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof (VMMDevReqMouseStatus), VMMDevReq_SetMouseStatus);
+                            int vrc = VbglGRAlloc((VMMDevRequestHeader **)&pReq, sizeof (VMMDevReqMouseStatus),
+                                                  VMMDevReq_SetMouseStatus);
                             if (RT_SUCCESS(vrc))
                             {
@@ -510 +506 @@
                         {
                             Log(("VBoxGuest::vbgdNtGuestPower: Power action shutdown!\n"));
-                            if (powerState.SystemState >= PowerSystemShutdown)
+                            if (PowerState.SystemState >= PowerSystemShutdown)
                             {
                                 Log(("VBoxGuest::vbgdNtGuestPower: Telling the VMMDev to close the VM ...\n"));
@@ -524 +520 @@
                                 }
                                 if (RT_FAILURE(vrc))
-                                {
-                                    Log(("VBoxGuest::PowerStateRequest: Error communicating new power status to VMMDev. "
-                                             "vrc = %Rrc\n", vrc));
-                                }
+                                    Log(("VBoxGuest::PowerStateRequest: Error communicating new power status to VMMDev. vrc = %Rrc\n", vrc));
 
                                 /* No need to do cleanup here; at this point we should've been
@@ -546 +539 @@
                      */
                     if (pDevExt)
-                        pDevExt->win.s.LastSystemPowerAction = powerAction;
+                        pDevExt->win.s.LastSystemPowerAction = enmPowerAction;
 
                     break;
@@ -560 +553 @@
 
     /*
-     *  Whether we are completing or relaying this power IRP,
-     *  we must call PoStartNextPowerIrp.
+     * Whether we are completing or relaying this power IRP,
+     * we must call PoStartNextPowerIrp.
      */
     PoStartNextPowerIrp(pIrp);
 
     /*
-     *  Send the IRP down the driver stack,
-     *  using PoCallDriver (not IoCallDriver, as for non-power irps).
+     * Send the IRP down the driver stack, using PoCallDriver
+     * (not IoCallDriver, as for non-power irps).
      */
     IoCopyCurrentIrpStackLocationToNext(pIrp);
@@ -578 +571 @@
     return PoCallDriver(pDevExt->win.s.pNextLowerDriver, pIrp);
 }
+