Changeset 88783 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 29, 2021 1:35:47 PM (4 years ago)

Author:

vboxsync

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

144113

Message:

VBoxSVC: The order is TranslateMessage *then* DispatchMessage. Here
it shouldn't affect anything I guess as the window is hidden. But do
the right thing.

File:

• trunk/src/VBox/Main/src-server/win/svcmain.cpp (modified) (24 diffs)

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

@@ -57 +57 @@
 {
 public:
+    LONG Lock();
     LONG Unlock();
     DWORD dwThreadID;
@@ -104 +105 @@
 }
 
+
+LONG CExeModule::Lock()
+{
+    LONG cLocks = ATL::CComModule::Lock();
+    LogRel(("CExeModule::Lock: cLocks = %d\n", (int)cLocks));
+    return cLocks;
+}
+
+
 LONG CExeModule::Unlock()
 {
     LONG cLocks = ATL::CComModule::Unlock();
+    LogRel(("CExeModule::Unlock: cLocks = %d\n", (int)cLocks));
     if (isIdleLockCount(cLocks))
     {
@@ -117 +128 @@
 bool CExeModule::HasActiveConnection()
 {
-    return bActivity || !isIdleLockCount(GetLockCount());
+    const LONG cLocks = GetLockCount();
+    LogRel(("%s: bActivity = %s;  cLocks = %d\n",
+            __FUNCTION__,
+            bActivity ? "TRUE" : "false",
+            (int)cLocks));
+    return bActivity || !isIdleLockCount(cLocks);
 }
 
@@ -139 +155 @@
     while (1)
     {
-        WaitForSingleObject(hEventShutdown, INFINITE);
         DWORD dwWait;
+        dwWait = WaitForSingleObject(hEventShutdown, INFINITE);
+        LogRel(("%s: dwWait INFINITE = 0x%x\n", __FUNCTION__, dwWait));        
         do
         {
             bActivity = false;
             dwWait = WaitForSingleObject(hEventShutdown, dwTimeOut);
+            LogRel(("%s: dwWait %d = 0x%x\n", __FUNCTION__, dwTimeOut, dwWait));
         } while (dwWait == WAIT_OBJECT_0);
         /* timed out */
+        // LogRel(("%s: dwWait = %x\n", __FUNCTION__, dwWait));
         if (!HasActiveConnection()) /* if no activity let's really bail */
         {
@@ -171 +190 @@
 #if _WIN32_WINNT >= 0x0400
             CoSuspendClassObjects();
+            LogRel(("%s (end of loop)\n", __FUNCTION__));
             if (!HasActiveConnection())
 #endif
@@ -324 +344 @@
             rcRpc, CallAttribs.ClientPID, CallAttribs.IsClientLocal, CallAttribs.ProtocolSequence, CallAttribs.CallStatus,
             CallAttribs.CallType, CallAttribs.OpNum, &CallAttribs.InterfaceUuid));
+# else  // XXX: uwe
+    LogRel(("VirtualBoxClassFactory::i_registerWithSds\n"));
 # endif
 
@@ -354 +376 @@
 void VirtualBoxClassFactory::i_deregisterWithSds(void)
 {
-    Log(("VirtualBoxClassFactory::i_deregisterWithSds\n"));
+    LogRel(("VirtualBoxClassFactory::i_deregisterWithSds\n"));
 
     if (m_ptrVirtualBoxSDS.isNotNull())
@@ -391 +413 @@
         pObj->AddRef();
         *ppResult = pObj;
-        Log(("VirtualBoxClassFactory::GetVirtualBox: S_OK - %p\n", pObj));
+        LogRel(("VirtualBoxClassFactory::GetVirtualBox: S_OK - %p\n", pObj));
         return S_OK;
     }
     *ppResult = NULL;
-    Log(("VirtualBoxClassFactory::GetVirtualBox: E_FAIL\n"));
+    LogRel(("VirtualBoxClassFactory::GetVirtualBox: E_FAIL\n"));
     return E_FAIL;
 }
@@ -431 +453 @@
         {
             AssertMsg(ATL::_pAtlModule, ("ATL: referring to ATL module without having one declared in this linking namespace\n"));
+            LogRel(("VirtualBoxObjectCached::AddRef: cRefs = 2, LOCKING the module\n"));
             ATL::_pAtlModule->Lock();
+        }
+        else
+        {
+            LogRel(("VirtualBoxObjectCached::AddRef: cRefs = %u\n", (unsigned)cRefs));
         }
         return cRefs;
@@ -440 +467 @@
         ULONG cRefs = InternalRelease();
         if (cRefs == 0)
+        {
+            LogRel(("VirtualBoxObjectCached::Release: cRefs = 0: deleting...\n"));
             delete this;
+        }
         else if (cRefs == 1)
         {
             AssertMsg(ATL::_pAtlModule, ("ATL: referring to ATL module without having one declared in this linking namespace\n"));
+            LogRel(("VirtualBoxObjectCached::Release: cRefs = 1: unlocking the module\n"));
             ATL::_pAtlModule->Unlock();
+        }
+        else
+        {
+            LogRel(("VirtualBoxObjectCached::Release: cRefs = %u\n", (unsigned)cRefs));
         }
         return cRefs;
@@ -480 +515 @@
                 *ppObj = p;
         }
+        LogRel(("VirtualBoxObjectCached::CreateInstance: %Rhrc\n", hrc));
         return hrc;
     }
@@ -526 +562 @@
                      * terminate the module in case when CreateInstance() fails)
                      */
+                    LogRel(("VirtualBoxClassFactory::CreateInstance: LOCKING the module\n"));
                     ATL::_pAtlModule->Lock();
                     __try
@@ -538 +575 @@
                         else if (SUCCEEDED(hrc))
                         {
+                            LogRel(("VirtualBoxClassFactory::CreateInstance: LOCKING the module\n"));
                             ATL::_pAtlModule->Lock();
                             VirtualBoxObjectCached *p;
@@ -558 +596 @@
                     __finally
                     {
+                        LogRel(("VirtualBoxClassFactory::CreateInstance: finally unlocking the module\n"));
                         ATL::_pAtlModule->Unlock();
                     }
@@ -630 +669 @@
         case WM_QUERYENDSESSION:
         {
+            LogRel(("WM_QUERYENDSESSION\n"));
             if (g_pModule)
             {
@@ -639 +679 @@
                     /* decrease a latency of MonitorShutdown loop */
                     ASMAtomicXchgU32(&dwTimeOut, 100);
-                    Log(("VBoxSVCWinMain: WM_QUERYENDSESSION: VBoxSvc has active connections. bActivity = %d. Loc count = %d\n",
+                    LogRel(("VBoxSVCWinMain: WM_QUERYENDSESSION: VBoxSvc has active connections. bActivity = %d. Loc count = %d\n",
                          g_pModule->bActivity, g_pModule->GetLockCount()));
                 }
@@ -650 +690 @@
         case WM_ENDSESSION:
         {
+            LogRel(("WM_ENDSESSION(%s)\n", wParam == FALSE ? "false" : "true"));
             /* Restore timeout of Monitor Shutdown if user canceled system shutdown */
             if (wParam == FALSE)
             {
                 ASMAtomicXchgU32(&dwTimeOut, dwNormalTimeout);
-                Log(("VBoxSVCWinMain: user canceled system shutdown.\n"));
+                LogRel(("VBoxSVCWinMain: user canceled system shutdown.\n"));
             }
             break;
@@ -694 +735 @@
     if (atomWindowClass == 0)
     {
-        Log(("Failed to register main window class\n"));
+        LogRel(("Failed to register main window class\n"));
         rc = VERR_NOT_SUPPORTED;
     }
@@ -706 +747 @@
         if (g_hMainWindow == NULL)
         {
-            Log(("Failed to create main window\n"));
+            LogRel(("Failed to create main window\n"));
             rc = VERR_NOT_SUPPORTED;
         }
@@ -723 +764 @@
 {
     Assert(g_hMainWindow != NULL);
-    Log(("SVCMain: DestroyMainWindow \n"));
+    LogRel(("SVCMain: DestroyMainWindow \n"));
     if (g_hMainWindow != NULL)
     {
@@ -973 +1014 @@
         if (pszPipeName)
         {
-            Log(("SVCMAIN: Processing Helper request (cmdline=\"%s\")...\n", pszPipeName));
+            LogRel(("SVCMAIN: Processing Helper request (cmdline=\"%s\")...\n", pszPipeName));
 
             if (!*pszPipeName)
@@ -988 +1029 @@
             if (RT_FAILURE(vrc))
             {
-                Log(("SVCMAIN: Failed to process Helper request (%Rrc).\n", vrc));
+                LogRel(("SVCMAIN: Failed to process Helper request (%Rrc).\n", vrc));
                 nRet = 1;
             }
@@ -1006 +1047 @@
 
         if (RT_SUCCESS(CreateMainWindow()))
-            Log(("SVCMain: Main window succesfully created\n"));
+            LogRel(("SVCMain: Main window succesfully created\n"));
         else
-            Log(("SVCMain: Failed to create main window\n"));
+            LogRel(("SVCMain: Failed to create main window\n"));
 
         MSG msg;
         while (GetMessage(&msg, 0, 0, 0) > 0)
         {
+            TranslateMessage(&msg);
             DispatchMessage(&msg);
-            TranslateMessage(&msg);
         }
 
@@ -1033 +1074 @@
     g_pModule = NULL;
 
-    Log(("SVCMAIN: Returning, COM server process ends.\n"));
+    LogRel(("SVCMAIN: Returning, COM server process ends.\n"));
     return nRet;
 }