Changeset 63643 in vbox

Timestamp:

Aug 25, 2016 5:19:22 PM (8 years ago)

Author:

vboxsync

Message:

VBoxC: VirtualBoxClient need to go away ASAP nobody is using it any more because it is patently unsafe to destroy the instance from DllMain/detach. This is a uttly gross hack, but it seems to cure the GUI issue for me.

Location:

trunk/src/VBox/Main

Files:

• include/VirtualBoxBase.h (modified) (1 diff)
• include/VirtualBoxClientImpl.h (modified) (1 diff)
• src-client/win/dllmain.cpp (modified) (1 diff)

trunk/src/VBox/Main/include/VirtualBoxBase.h

@@ -67 +67 @@
 #undef DECLARE_CLASSFACTORY_SINGLETON
 #define DECLARE_CLASSFACTORY_SINGLETON(obj) DECLARE_CLASSFACTORY_EX(CMyComClassFactorySingleton<obj>)
+
+/**
+ * @todo r=bird: This CMyComClassFactorySingleton stuff is probably obsoleted by
+ *                microatl.h? Right?
+ */
 
 template <class T>

trunk/src/VBox/Main/include/VirtualBoxClientImpl.h

@@ -47 +47 @@
     HRESULT init();
     void uninit();
+
+#ifdef RT_OS_WINDOWS
+    /* HACK ALERT! Implemented in dllmain.cpp. */
+    ULONG InternalRelease();
+#endif
 
 private:

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

@@ -117 +117 @@
 }
 
+
+#ifdef RT_OS_WINDOWS
+/*
+ * HACK ALERT! Really ugly trick to make the VirtualBoxClient object go away
+ *             when nobody uses it anymore.  This is to prevent its uninit()
+ *             method from accessing IVirtualBox and similar proxy stubs after
+ *             COM has been officially shut down.
+ *
+ *             It is simply TOO LATE to destroy the client object from DllMain/detach!
+ *
+ *             This hack ASSUMES ObjectMap order.
+ *             This hack is subject to a re-instantiation race.
+ */
+ULONG VirtualBoxClient::InternalRelease()
+{
+    ULONG cRefs = VirtualBoxClientWrap::InternalRelease();
+# ifdef DEBUG_bird
+    char szMsg[64];
+    RTStrPrintf(szMsg, sizeof(szMsg), "VirtualBoxClient: cRefs=%d\n", cRefs);
+    OutputDebugStringA(szMsg);
+# endif
+# if 1 /* enable ugly hack */
+    if (cRefs == 1)
+    {
+        /* Make the factory to drop its reference. */
+        if (ObjectMap[1].pCF)
+        {
+            InternalAddRef();
+
+            CMyComClassFactorySingleton<VirtualBoxClient> *pFactory;
+            pFactory = dynamic_cast<CMyComClassFactorySingleton<VirtualBoxClient> *>(ObjectMap[1].pCF);
+            Assert(pFactory);
+            if (pFactory)
+            {
+                IUnknown *pUnknown = pFactory->m_spObj;
+                pFactory->m_spObj = NULL;
+                if (pUnknown)
+                    pUnknown->Release();
+            }
+
+            cRefs = VirtualBoxClientWrap::InternalRelease();
+        }
+    }
+# endif
+    return cRefs;
+}
+#endif
+
+