Changeset 70284 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Dec 21, 2017 2:36:05 PM (7 years ago)

Author:

vboxsync

Message:

VBoxGuest-win.cpp: State cleanups.

File:

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

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

@@ -58 +58 @@
 
 
-#define VBOXGUEST_UPDATE_DEVSTATE(a_pDevExt, a_enmNewDevState) \
-    do { \
-        (a_pDevExt)->enmPrevDevState = (a_pDevExt)->enmDevState; \
-        (a_pDevExt)->enmDevState     = (a_enmNewDevState); \
-    } while (0)
-
-
 /*********************************************************************************************************************************
 *   Structures and Typedefs                                                                                                      *
@@ -73 +66 @@
 typedef enum VGDRVNTDEVSTATE
 {
+    /** @name Stable states
+     * @{ */
+    VGDRVNTDEVSTATE_REMOVED = 0,
     VGDRVNTDEVSTATE_STOPPED,
-    VGDRVNTDEVSTATE_WORKING,
+    VGDRVNTDEVSTATE_OPERATIONAL,
+    /** @} */
+
+    /** @name Transitional states
+     *  @{ */
     VGDRVNTDEVSTATE_PENDINGSTOP,
     VGDRVNTDEVSTATE_PENDINGREMOVE,
-    VGDRVNTDEVSTATE_SURPRISEREMOVED,
-    VGDRVNTDEVSTATE_REMOVED
+    VGDRVNTDEVSTATE_SURPRISEREMOVED
+    /** @} */
 } VGDRVNTDEVSTATE;
 
@@ -124 +124 @@
     /** Device state. */
     VGDRVNTDEVSTATE volatile enmDevState;
-    /** The previous device state. */
+    /** The previous stable device state. */
     VGDRVNTDEVSTATE         enmPrevDevState;
 
@@ -840 +840 @@
                         /* Ready to rumble! */
                         LogRelFunc(("Device is ready!\n"));
-                        VBOXGUEST_UPDATE_DEVSTATE(pDevExt, VGDRVNTDEVSTATE_WORKING);
+                        pDevExt->enmDevState     = VGDRVNTDEVSTATE_OPERATIONAL;
+                        pDevExt->enmPrevDevState = VGDRVNTDEVSTATE_OPERATIONAL;
                         return STATUS_SUCCESS;
                     }
+
                     pDevExt->pInterruptObject = NULL;
 
@@ -1278 +1280 @@
                 {
                     rc = vgdrvNtSetupDevice(pDevExt, pDevObj, pIrp, NULL, NULL);
-                    if (!NT_SUCCESS(rc))
+                    if (NT_SUCCESS(rc))
+                        Log(("vgdrvNtNt5PlusPnP: START_DEVICE: success\n"));
+                    else
                         Log(("vgdrvNtNt5PlusPnP: START_DEVICE: vgdrvNtSetupDevice failed: %#x\n", rc));
                 }
@@ -1313 +1317 @@
             if (NT_SUCCESS(rc))
             {
-                VBOXGUEST_UPDATE_DEVSTATE(pDevExt, VGDRVNTDEVSTATE_PENDINGREMOVE);
+                pDevExt->enmDevState = VGDRVNTDEVSTATE_PENDINGREMOVE;
 
                 /* This IRP passed down to lower driver. */
@@ -1366 +1370 @@
         {
             Log(("vgdrvNtNt5PlusPnP: IRP_MN_SURPRISE_REMOVAL\n"));
-            VBOXGUEST_UPDATE_DEVSTATE(pDevExt, VGDRVNTDEVSTATE_SURPRISEREMOVED);
+            pDevExt->enmDevState = VGDRVNTDEVSTATE_SURPRISEREMOVED;
             LogRel(("VBoxGuest: unexpected device removal\n"));
 
@@ -1385 +1389 @@
         {
             Log(("vgdrvNtNt5PlusPnP: REMOVE_DEVICE\n"));
-            VBOXGUEST_UPDATE_DEVSTATE(pDevExt, VGDRVNTDEVSTATE_REMOVED);
+            pDevExt->enmDevState = VGDRVNTDEVSTATE_REMOVED;
 
             /*
@@ -1425 +1429 @@
         {
             Log(("vgdrvNtNt5PlusPnP: QUERY_STOP_DEVICE\n"));
-            VGDRVNTDEVSTATE const enmOldState = pDevExt->enmDevState;
             rc = vgdrvNtCheckIdle(pDevExt, "QUERY_STOP_DEVICE");
             if (NT_SUCCESS(rc))
             {
-                VBOXGUEST_UPDATE_DEVSTATE(pDevExt, VGDRVNTDEVSTATE_PENDINGSTOP);
+                pDevExt->enmPrevDevState = pDevExt->enmDevState;
+                pDevExt->enmDevState = VGDRVNTDEVSTATE_PENDINGSTOP;
 
                 /* This IRP passed down to lower driver. */
@@ -1482 +1486 @@
         {
             Log(("vgdrvNtNt5PlusPnP: STOP_DEVICE\n"));
-            VBOXGUEST_UPDATE_DEVSTATE(pDevExt, VGDRVNTDEVSTATE_STOPPED);
+            pDevExt->enmDevState = VGDRVNTDEVSTATE_STOPPED;
 
             /*
@@ -1843 +1847 @@
      * Check the device state.
      */
-    if (pDevExt->enmDevState != VGDRVNTDEVSTATE_WORKING)
+    if (pDevExt->enmDevState != VGDRVNTDEVSTATE_OPERATIONAL)
     {
         LogFlow(("vgdrvNtCreate: Failed. Device is not in 'working' state: %d\n", pDevExt->enmDevState));