Changeset 65525 in vbox for trunk

Timestamp:

Jan 30, 2017 6:38:26 PM (8 years ago)

Author:

vboxsync

Message:

Main/VBoxSVC: fix for ticketref:16409

File:

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

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

@@ -144 +144 @@
 END_OBJECT_MAP()
 
-CExeModule _Module;
+CExeModule* g_pModule = NULL;
 HWND g_hMainWindow = NULL;
 HINSTANCE g_hInstance = NULL;
@@ -191 +191 @@
     case WM_QUERYENDSESSION:
     {
-        rc = !_Module.HasActiveConnection();
-        if (!rc)
-        {
-            /* 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",
-                _Module.bActivity, _Module.GetLockCount()));
+        if (g_pModule)
+        {
+            rc = !g_pModule->HasActiveConnection();
+            if (!rc)
+            {
+                /* 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",
+                    g_pModule->bActivity, g_pModule->GetLockCount()));
+            }
+        }
+        else
+        {
+            Assert(g_pModule);
+            Log(("VBoxSVCWinMain: WM_QUERYENDSESSION: Error: g_pModule is NULL"));
         }
      } break;
@@ -500 +508 @@
     int nRet = 0;
     HRESULT hRes = com::Initialize(false /*fGui*/, fRun /*fAutoRegUpdate*/);
-
     _ASSERTE(SUCCEEDED(hRes));
-    _Module.Init(ObjectMap, hInstance, &LIBID_VirtualBox);
-    _Module.dwThreadID = GetCurrentThreadId();
+
+    g_pModule = new CExeModule();
+    if(g_pModule == NULL)
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "not enough memory to create ExeModule.");
+    g_pModule->Init(ObjectMap, hInstance, &LIBID_VirtualBox);
+    g_pModule->dwThreadID = GetCurrentThreadId();
 
     if (!fRun)
@@ -510 +521 @@
         if (fUnregister)
         {
-            _Module.UpdateRegistryFromResource(IDR_VIRTUALBOX, FALSE);
-            nRet = _Module.UnregisterServer(TRUE);
+            g_pModule->UpdateRegistryFromResource(IDR_VIRTUALBOX, FALSE);
+            nRet = g_pModule->UnregisterServer(TRUE);
         }
         if (fRegister)
         {
-            _Module.UpdateRegistryFromResource(IDR_VIRTUALBOX, TRUE);
-            nRet = _Module.RegisterServer(TRUE);
+            g_pModule->UpdateRegistryFromResource(IDR_VIRTUALBOX, TRUE);
+            nRet = g_pModule->RegisterServer(TRUE);
         }
 #endif
@@ -543 +554 @@
     else
     {
-        _Module.StartMonitor();
+        g_pModule->StartMonitor();
 #if _WIN32_WINNT >= 0x0400
-        hRes = _Module.RegisterClassObjects(CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE | REGCLS_SUSPENDED);
+        hRes = g_pModule->RegisterClassObjects(CLSCTX_LOCAL_SERVER, REGCLS_MULTIPLEUSE | REGCLS_SUSPENDED);
         _ASSERTE(SUCCEEDED(hRes));
         hRes = CoResumeClassObjects();
@@ -571 +582 @@
         DestroyMainWindow();
 
-        _Module.RevokeClassObjects();
-    }
-
-    _Module.Term();
+        g_pModule->RevokeClassObjects();
+    }
+
+    g_pModule->Term();
 
     com::Shutdown();
+
+    if(g_pModule)
+        delete g_pModule;
+    g_pModule = NULL;
 
     Log(("SVCMAIN: Returning, COM server process ends.\n"));