Changeset 101846 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Nov 6, 2023 9:34:26 AM (17 months ago)

Author:

vboxsync

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

159942

Message:

libs/xpcom: Little helper to query whether XPCOM was initialized to get rid of the hack in the python bindings abusing nsIThread for checking, bugref:10545

Location:

trunk/src/libs/xpcom18a4

Files:

• python/src/dllmain.cpp (modified) (2 diffs)
• xpcom/build/nsXPCOM.h (modified) (1 diff)
• xpcom/build/nsXPComInit.cpp (modified) (4 diffs)

trunk/src/libs/xpcom18a4/python/src/dllmain.cpp

@@ -47 +47 @@
 
 #include "PyXPCOM_std.h"
-#include <prthread.h>
-#include "nsIThread.h"
 #include "nsILocalFile.h"
 
@@ -294 +292 @@
         static PRBool bHaveInitXPCOM = PR_FALSE;
         if (!bHaveInitXPCOM) {
-                nsCOMPtr<nsIThread> thread_check;
-                // xpcom appears to assert if already initialized
-                // Is there an official way to determine this?
-                if (NS_FAILED(nsIThread::GetMainThread(getter_AddRefs(thread_check)))) {
+
+                if (!NS_IsXPCOMInitialized()) {
                         // not already initialized.
-#ifdef XP_WIN
-                        // On Windows, we need to locate the Mozilla bin
-                        // directory.  This by using locating a Moz DLL we depend
-                        // on, and assume it lives in that bin dir.  Different
-                        // moz build types (eg, xulrunner, suite) package
-                        // XPCOM itself differently - but all appear to require
-                        // nspr4.dll - so this is what we use.
-                        char landmark[MAX_PATH+1];
-                        HMODULE hmod = GetModuleHandle("nspr4.dll");
-                        if (hmod==NULL) {
-                                PyErr_SetString(PyExc_RuntimeError, "We dont appear to be linked against nspr4.dll.");
-                                return PR_FALSE;
-                        }
-                        GetModuleFileName(hmod, landmark, sizeof(landmark)/sizeof(landmark[0]));
-                        char *end = landmark + (strlen(landmark)-1);
-                        while (end > landmark && *end != '\\')
-                                end--;
-                        if (end > landmark) *end = '\0';
-
-                        nsCOMPtr<nsILocalFile> ns_bin_dir;
-                        NS_ConvertASCIItoUCS2 strLandmark(landmark);
-                        NS_NewLocalFile(strLandmark, PR_FALSE, getter_AddRefs(ns_bin_dir));
-                        nsresult rv = NS_InitXPCOM2(nsnull, ns_bin_dir, nsnull);
-#else
                         // Elsewhere, Mozilla can find it itself (we hope!)
                         nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
-#endif // XP_WIN
                         if (NS_FAILED(rv)) {
                                 PyErr_SetString(PyExc_RuntimeError, "The XPCOM subsystem could not be initialized");

trunk/src/libs/xpcom18a4/xpcom/build/nsXPCOM.h

@@ -68 +68 @@
 class nsITraceRefcnt;
 
+#ifdef VBOX
+/**
+ * Checks whether XPCOM was initialized by a call to NS_InitXPCOM2().
+ */
+extern "C" NS_COM PRBool
+NS_IsXPCOMInitialized(void);
+#endif
+
 /**
  * Initialises XPCOM. You must call this method before proceeding 

trunk/src/libs/xpcom18a4/xpcom/build/nsXPComInit.cpp

@@ -310 +310 @@
 nsIProperties     *gDirectoryService = NULL;
 PRBool gXPCOMShuttingDown = PR_FALSE;
+#ifdef VBOX
+static PRBool gXPCOMInitialized = PR_FALSE;
+#endif
 
 // For each class that wishes to support nsIClassInfo, add a line like this
@@ -469 +472 @@
 }
 
+#ifdef VBOX
+PRBool NS_COM NS_IsXPCOMInitialized(void)
+{
+    return gXPCOMInitialized;
+}
+#endif
+
 nsresult NS_COM NS_InitXPCOM(nsIServiceManager* *result,
                              nsIFile* binDirectory)
@@ -732 +742 @@
                                   NS_XPCOM_STARTUP_OBSERVER_ID);
 
+#ifdef VBOX
+    gXPCOMInitialized = PR_TRUE;
+#endif
     return NS_OK;
 }
@@ -915 +928 @@
 #endif
 
+#ifdef VBOX
+    gXPCOMInitialized = PR_FALSE;
+#endif
     return NS_OK;
 }