Changeset 109067 in vbox for trunk/src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp

Timestamp:

Apr 24, 2025 10:08:54 AM (4 weeks ago)

Author:

vboxsync

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

168604

Message:

libs/xpcom,Main/glue,++: Bake the automatic re-registration of XPCOM components (in the components directory) into the NS_InitXPCOM2 call to avoid the problem of VBoxXPCOMIPCC.so/dylib being engaged at the end of NS_InitXPCOM2 and unable to re-register if this is done later by the client code. Added a fFlagsInit parameter to indicate whether this auto reg behaviour is required or not and renamed NS_InitXPCOM2 to NS_InitXPCOM2Ex (the latter to prevent confusion). bugref:10896 ticketref:22193

File:

• trunk/src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp (modified) (5 diffs)

trunk/src/libs/xpcom18a4/xpcom/components/nsComponentManager.cpp

@@ -3578 +3578 @@
     {
         // XPCOM needs initialization.
-        rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
+        rv = NS_InitXPCOM2Ex(nsnull, nsnull, nsnull, 0);
     }
 
@@ -3598 +3598 @@
     {
         // XPCOM needs initialization.
-        nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
+        nsresult rv = NS_InitXPCOM2Ex(nsnull, nsnull, nsnull, 0);
         if (NS_FAILED(rv))
             return rv;
@@ -3629 +3629 @@
 #else /* !VBOX */
         // XPCOM needs initialization.
-        rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
+        rv = NS_InitXPCOM2Ex(nsnull, nsnull, nsnull, 0);
 #endif /* !VBOX */
     }
@@ -3651 +3651 @@
     {
         // XPCOM needs initialization.
-        rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
+        rv = NS_InitXPCOM2Ex(nsnull, nsnull, nsnull, 0);
     }
 
@@ -3674 +3674 @@
     {
         // XPCOM needs initialization.
-        rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
+        rv = NS_InitXPCOM2Ex(nsnull, nsnull, nsnull, 0);
     }