Changeset 89219 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 21, 2021 12:12:38 PM (4 years ago)

Author:

vboxsync

Message:

FE/VBoxHeadless: Wait until WM_ENDSESSION and check that its wParam is
true before we actually initiating VM termination. bugref:8161.

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -870 +870 @@
                     (unsigned long)lParam));
 
+            /* do not block windows session termination */
+            lResult = TRUE;
+            break;
+
+        case WM_ENDSESSION:
+            lResult = 0;
+            LogRel(("WM_ENDSESSION:%s%s%s%s%s (%s/0x%08lx)\n",
+                    lParam == 0                  ? " shutdown"  : "",
+                    lParam & ENDSESSION_CRITICAL ? " critical"  : "",
+                    lParam & ENDSESSION_LOGOFF   ? " logoff"    : "",
+                    lParam & ENDSESSION_CLOSEAPP ? " close"     : "",
+                    wParam == FALSE              ? " cancelled" : "",
+                    wParam ? "TRUE" : "FALSE",
+                    (unsigned long)lParam));
+            if (wParam == FALSE)
+                break;
+
             /* tell the user what we are doing */
             ::ShutdownBlockReasonCreate(hwnd, L"Waiting for VM to terminate");
@@ -877 +894 @@
             gEventQ->interruptEventQueueProcessing();
 
-            /* do not block windows session termination */
-            lResult = TRUE;
-            break;
-
-        case WM_ENDSESSION:
             if (g_hCanQuit != NIL_RTSEMEVENT)
             {
@@ -896 +908 @@
                 LogRel(("VBoxHeadless: WM_ENDSESSION: cannot wait for VM termination\n"));
             }
-            lResult = TRUE;
             break;