儲存庫 vbox 的更動 89202

時間撮記:

2021-5-20 下午02:32:08 (4 年 以前)

作者:

vboxsync

訊息:

VBoxSVC: Add a bit more release logging around WM_QUERYENDSESSION.
Make the monitoring window truely hidden. Add placeholder for
SetConsoleCtrlHandler - we won't get window events in the context of
an autostart session. bugref:8161.

檔案:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (修改) (9 筆差異)

trunk/src/VBox/Main/src-server/win/svcmain.cpp

@@ -625 +625 @@
 static LRESULT CALLBACK WinMainWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
-    LRESULT rc = 0;
+    LRESULT lResult = 0;
+
     switch (msg)
     {
         case WM_QUERYENDSESSION:
         {
+            LogRel(("WM_QUERYENDSESSION:%s%s%s%s (0x%08lx)\n",
+                    lParam == 0                  ? " shutdown" : "",
+                    lParam & ENDSESSION_CRITICAL ? " critical" : "",
+                    lParam & ENDSESSION_LOGOFF   ? " logoff"   : "",
+                    lParam & ENDSESSION_CLOSEAPP ? " close"    : "",
+                    (unsigned long)lParam));
             if (g_pModule)
             {
@@ -635 +642 @@
                 if (fActiveConnection)
                 {
+                    lResult = FALSE;
+                    LogRel(("VBoxSvc has active connections:"
+                            " bActivity = %RTbool, lock count = %d\n",
+                            g_pModule->bActivity, g_pModule->GetLockCount()));
+
                     /* place the VBoxSVC into system shutdown list */
                     ShutdownBlockReasonCreateAPI(hwnd, L"Has active connections.");
                     /* decrease a latency of MonitorShutdown loop */
                     ASMAtomicXchgU32(&dwTimeOut, 100);
-                    Log(("VBoxSVCWinMain: WM_QUERYENDSESSION: VBoxSvc has active connections. bActivity = %d. Loc count = %d\n",
+                    Log(("VBoxSVCWinMain: WM_QUERYENDSESSION: VBoxSvc has active connections."
+                         " bActivity = %d. Lock count = %d\n",
                          g_pModule->bActivity, g_pModule->GetLockCount()));
                 }
-                rc = !fActiveConnection;
+                else
+                {
+                    LogRel(("No active connections:"
+                            " bActivity = %RTbool, lock count = %d\n",
+                            g_pModule->bActivity, g_pModule->GetLockCount()));
+                    lResult = TRUE;
+                }
             }
             else
@@ -650 +669 @@
         case WM_ENDSESSION:
         {
+            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));
+
             /* Restore timeout of Monitor Shutdown if user canceled system shutdown */
             if (wParam == FALSE)
             {
+                Log(("VBoxSVCWinMain: user canceled system shutdown.\n"));
                 ASMAtomicXchgU32(&dwTimeOut, dwNormalTimeout);
-                Log(("VBoxSVCWinMain: user canceled system shutdown.\n"));
+                ShutdownBlockReasonDestroyAPI(hwnd);
             }
             break;
         }
+
         case WM_DESTROY:
         {
@@ -664 +694 @@
             break;
         }
+
         default:
         {
-            rc = DefWindowProc(hwnd, msg, wParam, lParam);
-        }
-    }
-    return rc;
+            lResult = DefWindowProc(hwnd, msg, wParam, lParam);
+            break;
+        }
+    }
+    return lResult;
 }
 
@@ -694 +726 @@
     if (atomWindowClass == 0)
     {
-        Log(("Failed to register main window class\n"));
+        LogRel(("Failed to register window class for session monitoring\n"));
         rc = VERR_NOT_SUPPORTED;
     }
@@ -700 +732 @@
     {
         /* Create the window. */
-        g_hMainWindow = CreateWindowEx(WS_EX_TOOLWINDOW |  WS_EX_TOPMOST,
-                                       MAIN_WND_CLASS, MAIN_WND_CLASS,
-                                       WS_POPUPWINDOW,
+        g_hMainWindow = CreateWindowEx(0, MAIN_WND_CLASS, MAIN_WND_CLASS, 0,
                                        0, 0, 1, 1, NULL, NULL, g_hInstance, NULL);
         if (g_hMainWindow == NULL)
         {
-            Log(("Failed to create main window\n"));
+            LogRel(("Failed to create window for session monitoring\n"));
             rc = VERR_NOT_SUPPORTED;
         }
-        else
-        {
-            SetWindowPos(g_hMainWindow, HWND_TOPMOST, -200, -200, 0, 0,
-                         SWP_NOACTIVATE | SWP_HIDEWINDOW | SWP_NOCOPYBITS | SWP_NOREDRAW | SWP_NOSIZE);
-
-        }
-    }
-    return 0;
+    }
+    return rc;
 }
 
@@ -735 +759 @@
     }
 }
+
+
+static const char * const ctrl_event_names[] = {
+    "CTRL_C_EVENT",
+    "CTRL_BREAK_EVENT",
+    "CTRL_CLOSE_EVENT",
+    /* reserved, not used */
+    "<console control event 3>",
+    "<console control event 4>",
+    /* not sent to processes that load gdi32.dll or user32.dll */
+    "CTRL_LOGOFF_EVENT",
+    "CTRL_SHUTDOWN_EVENT",
+};
+
+/** @todo r=uwe placeholder */
+BOOL WINAPI
+ConsoleCtrlHandler(DWORD dwCtrlType) RT_NOTHROW_DEF
+{
+    const char *signame;
+    char namebuf[48];
+    // int rc;
+
+    if (dwCtrlType < RT_ELEMENTS(ctrl_event_names))
+        signame = ctrl_event_names[dwCtrlType];
+    else
+    {
+        /* should not happen, but be prepared */
+        RTStrPrintf(namebuf, sizeof(namebuf),
+                    "<console control event %lu>", (unsigned long)dwCtrlType);
+        signame = namebuf;
+    }
+    LogRel(("Got %s\n", signame));
+
+    if (RT_UNLIKELY(g_pModule == NULL))
+    {
+        LogRel(("%s: g_pModule == NULL\n", __FUNCTION__));
+        return TRUE;
+    }
+
+    /* decrease latency of the MonitorShutdown loop */
+    ASMAtomicXchgU32(&dwTimeOut, 100);
+
+    bool fHasClients = g_pModule->HasActiveConnection();
+    if (!fHasClients)
+    {
+        LogRel(("No clients, closing the shop.\n"));
+        return TRUE;
+    }
+
+    LogRel(("VBoxSvc has clients: bActivity = %RTbool, lock count = %d\n",
+            g_pModule->bActivity, g_pModule->GetLockCount()));
+
+    /** @todo r=uwe wait for clients to disconnect */
+    return TRUE;
+}
+
 
 
@@ -995 +1075 @@
     else
     {
+
         g_pModule->StartMonitor();
 #if _WIN32_WINNT >= 0x0400
@@ -1005 +1086 @@
         _ASSERTE(SUCCEEDED(hRes));
 
+        /*
+         * Register windows console signal handler to react to Ctrl-C,
+         * Ctrl-Break, Close; but more importantly - to get notified
+         * about shutdown when we are running in the context of the
+         * autostart service - we won't get WM_ENDSESSION in that
+         * case.
+         */
+        ::SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE);
+
+
         if (RT_SUCCESS(CreateMainWindow()))
             Log(("SVCMain: Main window succesfully created\n"));