Changeset 59368 in vbox

Timestamp:

Jan 17, 2016 5:48:01 AM (9 years ago)

Author:

vboxsync

Message:

VBoxCOM,VBoxSVC: Call VBoxProxyStub to gently update the MS COM registrations for the VBox components (requires VBOX_WITH_MIDL_PROXY_STUB=1).

Location:

trunk

Files:

• include/VBox/com/com.h (modified) (1 diff)
• src/VBox/Main/glue/initterm.cpp (modified) (2 diffs)
• src/VBox/Main/src-server/win/svcmain.cpp (modified) (1 diff)

trunk/include/VBox/com/com.h

@@ -41 +41 @@
  *  willing to perform COM operations.
  *
- *  @param fGui     if call is performed on the GUI thread
+ *  @param fGui             if call is performed on the GUI thread
+ *  @param fAutoRegUpdate   if to do auto MS COM registration updates.
  *  @return COM result code
  */
-HRESULT Initialize(bool fGui = false);
+HRESULT Initialize(bool fGui = false, bool fAutoRegUpdate = true);
 
 /**

trunk/src/VBox/Main/glue/initterm.cpp

@@ -46 +46 @@
 #include <iprt/asm.h>
 #include <iprt/env.h>
+#include <iprt/ldr.h>
 #include <iprt/param.h>
 #include <iprt/path.h>
@@ -237 +238 @@
  * @return S_OK on success and a COM result code in case of failure.
  */
-HRESULT Initialize(bool fGui)
+HRESULT Initialize(bool fGui /*= false*/, bool fAutoRegUpdate /*= true*/)
 {
     HRESULT rc = E_FAIL;
+    NOREF(fAutoRegUpdate);
 
 #if !defined(VBOX_WITH_XPCOM)
+
+# ifdef VBOX_WITH_AUTO_COM_REG_UPDATE
+    /*
+     * First time we're called in a process, we refresh the VBox COM registrations.
+     */
+    if (fAutoRegUpdate && gCOMMainThread == NIL_RTTHREAD)
+    {
+        char szPath[RTPATH_MAX];
+        int vrc = RTPathAppPrivateArch(szPath, sizeof(szPath));
+        if (RT_SUCCESS(vrc))
+#  ifndef VBOX_IN_32_ON_64_MAIN_API
+            rc = RTPathAppend(szPath, sizeof(szPath), "VBoxProxyStub.dll");
+#  else
+            rc = RTPathAppend(szPath, sizeof(szPath), "x86\\VBoxProxyStub-x86.dll");
+#  endif
+        if (RT_SUCCESS(vrc))
+        {
+            RTLDRMOD hMod;
+            vrc = RTLdrLoad(szPath, &hMod);
+            if (RT_SUCCESS(vrc))
+            {
+                union
+                {
+                    void *pv;
+                    DECLCALLBACKMEMBER(uint32_t, pfnRegUpdate)(void);
+                } u;
+                rc = RTLdrGetSymbol(hMod, "VbpsUpdateRegistrations", &u.pv);
+                if (RT_SUCCESS(rc))
+                    u.pfnRegUpdate();
+                /* Just keep it loaded. */
+            }
+        }
+    }
+# endif
 
     /*

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

@@ -339 +339 @@
 
     int nRet = 0;
-    HRESULT hRes = com::Initialize();
+    HRESULT hRes = com::Initialize(false /*fGui*/, fRun /*fAutoRegUpdate*/);
 
     _ASSERTE(SUCCEEDED(hRes));