Changeset 59424 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 20, 2016 7:20:11 PM (9 years ago)

Author:

vboxsync

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

105150

Message:

VBoxCOM/VBoxProxyStub: Don't update COM registrations if there are other users around, only first client or server started does the updating, to avoid confusing already running VBox processes (like VMs and VBoxSVC).

File:

• trunk/src/VBox/Main/glue/initterm.cpp (modified) (1 diff)

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

@@ -248 +248 @@
 # ifdef VBOX_WITH_AUTO_COM_REG_UPDATE
     /*
-     * First time we're called in a process, we refresh the VBox COM registrations.
+     * First time we're called in a process, we refresh the VBox COM
+     * registrations.   Use a global mutex to prevent updating when there are
+     * API users already active, as that could lead to a bit of a mess.
      */
-    if (fAutoRegUpdate && gCOMMainThread == NIL_RTTHREAD)
-    {
-        char szPath[RTPATH_MAX];
-        int vrc = RTPathAppPrivateArch(szPath, sizeof(szPath));
-        if (RT_SUCCESS(vrc))
-        {
+    if (   fAutoRegUpdate
+        && gCOMMainThread == NIL_RTTHREAD)
+    {
+        SetLastError(ERROR_SUCCESS);
+        HANDLE hLeakIt = CreateMutexW(NULL/*pSecAttr*/, FALSE, L"Global\\VirtualBoxComLazyRegistrationMutant");
+        DWORD  dwErr   = GetLastError();
+        AssertMsg(dwErr == ERROR_SUCCESS || dwErr == ERROR_ALREADY_EXISTS, ("%u\n", dwErr));
+        if (dwErr == ERROR_SUCCESS)
+        {
+            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),
-                                 RT_MAKE_U64(((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMinorVersion,
-                                             ((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMajorVersion)
-                              >= RT_MAKE_U64(1/*Lo*/,6/*Hi*/)
-                              ? "VBoxProxyStub.dll" : "VBoxProxyStubLegacy.dll");
+                rc = RTPathAppend(szPath, sizeof(szPath),
+                                     RT_MAKE_U64(((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMinorVersion,
+                                                 ((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMajorVersion)
+                                  >= RT_MAKE_U64(1/*Lo*/,6/*Hi*/)
+                                  ? "VBoxProxyStub.dll" : "VBoxProxyStubLegacy.dll");
 #  else
-            rc = RTPathAppend(szPath, sizeof(szPath), "x86\\VBoxProxyStub-x86.dll");
+                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
+                RTLDRMOD hMod;
+                vrc = RTLdrLoad(szPath, &hMod);
+                if (RT_SUCCESS(vrc))
                 {
-                    void *pv;
-                    DECLCALLBACKMEMBER(uint32_t, pfnRegUpdate)(void);
-                } u;
-                rc = RTLdrGetSymbol(hMod, "VbpsUpdateRegistrations", &u.pv);
-                if (RT_SUCCESS(rc))
-                    u.pfnRegUpdate();
-                /* Just keep it loaded. */
+                    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. */
+                }
             }
         }
+        Assert(hLeakIt != NULL); NOREF(hLeakIt);
     }
 # endif