Changeset 63639 in vbox for trunk/src/VBox/Main/src-client/win/dllmain.cpp

Timestamp:

Aug 25, 2016 2:31:10 PM (8 years ago)

Author:

vboxsync

Message:

VBoxC: Looks like VirtualBoxClient::Data::m_pEventSource is holding in extra reference on the ATL module, causing VBoxC to be unloaded too late because DllCanUnloadNow() returns S_FALSE due to GetLockCount() being 1 instead of 0. Created a hack for discounting the module lock held by the EventSource in the VirtualBoxClient singelton.

File:

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

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

@@ -75 +75 @@
 {
     AssertReturn(g_pAtlComModule, S_OK);
-    return g_pAtlComModule->GetLockCount() == 0 ? S_OK : S_FALSE;
+    LONG const cLocks = g_pAtlComModule->GetLockCount();
+    Assert(cLocks >= VirtualBoxClient::s_cUnnecessaryAtlModuleLocks);
+    return cLocks <= VirtualBoxClient::s_cUnnecessaryAtlModuleLocks ? S_OK : S_FALSE;
 }
 
@@ -83 +85 @@
 STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
+    HRESULT hrc;
     AssertReturn(g_pAtlComModule, E_UNEXPECTED);
     return g_pAtlComModule->GetClassObject(rclsid, riid, ppv);