Changeset 60865 in vbox for trunk/src/VBox/Main/src-client/win

Timestamp:

May 6, 2016 2:43:04 PM (9 years ago)

Author:

vboxsync

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

107075

Message:

Never use static instances of CComModule as it messes up the log filename by using VBoxRT.dll before it's initialized.

File:

• trunk/src/VBox/Main/src-client/win/dllmain.cpp (modified) (6 diffs)

trunk/src/VBox/Main/src-client/win/dllmain.cpp

@@ -31 +31 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-static ATL::CComModule _Module;
+static ATL::CComModule *g_pAtlComModule;
 
 BEGIN_OBJECT_MAP(ObjectMap)
@@ -50 +50 @@
         RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
 
-        _Module.Init(ObjectMap, hInstance, &LIBID_VirtualBox);
+        g_pAtlComModule = new(ATL::CComModule);
+        if (!g_pAtlComModule)
+            return FALSE;
+
+        g_pAtlComModule->Init(ObjectMap, hInstance, &LIBID_VirtualBox);
         DisableThreadLibraryCalls(hInstance);
     }
     else if (dwReason == DLL_PROCESS_DETACH)
     {
-        _Module.Term();
+        if (g_pAtlComModule)
+        {
+            g_pAtlComModule->Term();
+            delete g_pAtlComModule;
+            g_pAtlComModule = NULL;
+        }
     }
     return TRUE;
@@ -65 +74 @@
 STDAPI DllCanUnloadNow(void)
 {
-    return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE;
+    AssertReturn(g_pAtlComModule, S_OK);
+    return g_pAtlComModule->GetLockCount() == 0 ? S_OK : S_FALSE;
 }
 
@@ -73 +83 @@
 STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
-    return _Module.GetClassObject(rclsid, riid, ppv);
+    AssertReturn(g_pAtlComModule, E_UNEXPECTED);
+    return g_pAtlComModule->GetClassObject(rclsid, riid, ppv);
 }
 
@@ -83 +94 @@
 #ifndef VBOX_WITH_MIDL_PROXY_STUB
     // registers object, typelib and all interfaces in typelib
-    return _Module.RegisterServer(TRUE);
+    AssertReturn(g_pAtlComModule, E_UNEXPECTED);
+    return g_pAtlComModule->RegisterServer(TRUE);
 #else
     return S_OK; /* VBoxProxyStub does all the work, no need to duplicate it here. */
@@ -95 +107 @@
 {
 #ifndef VBOX_WITH_MIDL_PROXY_STUB
-    HRESULT hrc = _Module.UnregisterServer(TRUE);
+    AssertReturn(g_pAtlComModule, E_UNEXPECTED);
+    HRESULT hrc = g_pAtlComModule->UnregisterServer(TRUE);
     return hrc;
 #else