Changeset 101944 in vbox

Timestamp:

Nov 7, 2023 2:37:39 PM (13 months ago)

Author:

vboxsync

Message:

libs/xpcom: Convert xcDll.{cpp,h} and nsLocalFileUnix.cpp to use our RTLdr* API directly instead of going through the API defined in prlink.h (which is also just using RTLdr* internally), bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom

Files:

• build/nsXPComInit.cpp (modified) (1 diff)
• components/xcDll.cpp (modified) (6 diffs)
• components/xcDll.h (modified) (4 diffs)
• io/nsILocalFile.idl (modified) (2 diffs)
• io/nsLocalFileUnix.cpp (modified) (3 diffs)
• tests/RegFactory.cpp (modified) (1 diff)

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

@@ -39 +39 @@
 #include "nsXPCOMPrivate.h"
 #include "nscore.h"
-#include "prlink.h"
 #include "nsCOMPtr.h"
 #include "nsObserverList.h"

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

@@ -71 +71 @@
 nsDll::nsDll(nsIFile *dllSpec, nsNativeComponentLoader *loader)
     : m_dllSpec(do_QueryInterface(dllSpec)),
-      m_instance(NULL),
+      m_hMod(NIL_RTLDRMOD),
       m_moduleObject(NULL),
       m_loader(loader),
@@ -81 +81 @@
 nsDll::~nsDll(void)
 {
+    /** @todo r=aeichner Does this need fixing at all? */
     //#if DEBUG_dougt
     // The dll gets deleted when the dllStore is destroyed. This happens on
@@ -120 +121 @@
 PRBool nsDll::Load(void)
 {
-        if (m_instance != NULL)
-        {
-                // Already loaded
-                return (PR_TRUE);
-        }
+    /* Already loaded? Nothing to do. */
+    if (m_hMod != NIL_RTLDRMOD)
+        return PR_TRUE;
 
     if (m_dllSpec)
@@ -132 +131 @@
 #endif
 
-    // Load any library dependencies
-    //   The Component Loader Manager may hold onto some extra data
-    //   set by either the native component loader or the native
-    //   component.  We assume that this data is a space delimited
-    //   listing of dependent libraries which are required to be
-    //   loaded prior to us loading the given component.  Once, the
-    //   component is loaded into memory, we can release our hold
-    //   on the dependent libraries with the assumption that the
-    //   component library holds a reference via the OS so loader.
-    nsCOMPtr<nsIComponentLoaderManager> manager = do_QueryInterface(m_loader->mCompMgr);
-    if (!manager)
-        return PR_TRUE;
-
-    nsXPIDLCString extraData;
-    manager->GetOptionalData(m_dllSpec, nsnull, getter_Copies(extraData));
-
-    nsVoidArray dependentLibArray;
-
-    // if there was any extra data, treat it as a listing of dependent libs
-    if (extraData != nsnull)
-    {
-        // all dependent libraries are suppose to be in the "gre" directory.
-        // note that the gre directory is the same as the "bin" directory,
-        // when there isn't a real "gre" found.
-
-        nsXPIDLCString path;
-        nsCOMPtr<nsIFile> file;
-        NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(file));
-
-        if (!file)
-            return NS_ERROR_FAILURE;
-
-        // we are talking about a file in the GRE dir.  Lets append something
-        // stupid right now, so that later we can just set the leaf name.
-        file->AppendNative(NS_LITERAL_CSTRING("dummy"));
-
-        char *buffer = (char *)nsMemory::Clone(extraData, strlen(extraData) + 1);
-        if (!buffer)
-            return NS_ERROR_OUT_OF_MEMORY;
-
-        char* newStr;
-        char *token = nsCRT::strtok(buffer, " ", &newStr);
-        while (token!=nsnull)
+        // Load any library dependencies
+        //   The Component Loader Manager may hold onto some extra data
+        //   set by either the native component loader or the native
+        //   component.  We assume that this data is a space delimited
+        //   listing of dependent libraries which are required to be
+        //   loaded prior to us loading the given component.  Once, the
+        //   component is loaded into memory, we can release our hold
+        //   on the dependent libraries with the assumption that the
+        //   component library holds a reference via the OS so loader.
+        nsCOMPtr<nsIComponentLoaderManager> manager = do_QueryInterface(m_loader->mCompMgr);
+        if (!manager)
+            return PR_TRUE;
+
+        nsXPIDLCString extraData;
+        manager->GetOptionalData(m_dllSpec, nsnull, getter_Copies(extraData));
+
+        nsVoidArray dependentLibArray;
+
+        // if there was any extra data, treat it as a listing of dependent libs
+        if (extraData != nsnull)
         {
-            nsCStringKey key(token);
-            if (m_loader->mLoadedDependentLibs.Get(&key)) {
+            // all dependent libraries are suppose to be in the "gre" directory.
+            // note that the gre directory is the same as the "bin" directory,
+            // when there isn't a real "gre" found.
+
+            nsXPIDLCString path;
+            nsCOMPtr<nsIFile> file;
+            NS_GetSpecialDirectory(NS_GRE_DIR, getter_AddRefs(file));
+
+            if (!file)
+                return NS_ERROR_FAILURE;
+
+            // we are talking about a file in the GRE dir.  Lets append something
+            // stupid right now, so that later we can just set the leaf name.
+            file->AppendNative(NS_LITERAL_CSTRING("dummy"));
+
+            char *buffer = (char *)nsMemory::Clone(extraData, strlen(extraData) + 1);
+            if (!buffer)
+                return NS_ERROR_OUT_OF_MEMORY;
+
+            char* newStr;
+            char *token = nsCRT::strtok(buffer, " ", &newStr);
+            while (token!=nsnull)
+            {
+                nsCStringKey key(token);
+                if (m_loader->mLoadedDependentLibs.Get(&key)) {
+                    token = nsCRT::strtok(newStr, " ", &newStr);
+                    continue;
+                }
+
+                m_loader->mLoadedDependentLibs.Put(&key, (void*)1);
+
+                nsXPIDLCString libpath;
+                file->SetNativeLeafName(nsDependentCString(token));
+                file->GetNativePath(path);
+                if (!path)
+                    return NS_ERROR_FAILURE;
+
+                // Load this dependent library with the global flag and stash
+                // the result for later so that we can unload it.
+                const char *pszFilename = NULL;
+
+                // if the depend library path starts with a / we are
+                // going to assume that it is a full path and should
+                // be loaded without prepending the gre diretory
+                // location.  We could have short circuited the
+                // SetNativeLeafName above, but this is clearer and
+                // the common case is a relative path.
+                if (token[0] == '/')
+                    pszFilename = token;
+                else
+                    pszFilename = path;
+
+                RTLDRMOD hMod = NIL_RTLDRMOD;
+                RTERRINFOSTATIC ErrInfo;
+                RTErrInfoInitStatic(&ErrInfo);
+
+                int vrc = RTLdrLoadEx(pszFilename, &hMod, RTLDRLOAD_FLAGS_LOCAL, &ErrInfo.Core);
+                // if we couldn't load the dependent library.  We did the best we
+                // can.  Now just let us fail later if this really was a required
+                // dependency.
+                if (RT_SUCCESS(vrc))
+                    dependentLibArray.AppendElement((void*)hMod);
+
                 token = nsCRT::strtok(newStr, " ", &newStr);
-                continue;
             }
-
-            m_loader->mLoadedDependentLibs.Put(&key, (void*)1);
-
-            nsXPIDLCString libpath;
-            file->SetNativeLeafName(nsDependentCString(token));
-            file->GetNativePath(path);
-            if (!path)
-                return NS_ERROR_FAILURE;
-
-            // Load this dependent library with the global flag and stash
-            // the result for later so that we can unload it.
-            PRLibSpec libSpec;
-            libSpec.type = PR_LibSpec_Pathname;
-
-            // if the depend library path starts with a / we are
-            // going to assume that it is a full path and should
-            // be loaded without prepending the gre diretory
-            // location.  We could have short circuited the
-            // SetNativeLeafName above, but this is clearer and
-            // the common case is a relative path.
-
-            if (token[0] == '/')
-                libSpec.value.pathname = token;
-            else
-                libSpec.value.pathname = path;
-
-            PRLibrary* lib = PR_LoadLibraryWithFlags(libSpec, PR_LD_LAZY|PR_LD_GLOBAL);
-            // if we couldn't load the dependent library.  We did the best we
-            // can.  Now just let us fail later if this really was a required
-            // dependency.
-            if (lib)
-                dependentLibArray.AppendElement((void*)lib);
-
-            token = nsCRT::strtok(newStr, " ", &newStr);
+            nsMemory::Free(buffer);
         }
-        nsMemory::Free(buffer);
-    }
-
-    // load the component
-    nsCOMPtr<nsILocalFile> lf(do_QueryInterface(m_dllSpec));
-    NS_ASSERTION(lf, "nsIFile here must implement a nsILocalFile");
-    lf->Load(&m_instance);
-
-    // Unload any of library dependencies we loaded earlier. The assumption
-    // here is that the component will have a "internal" reference count to
-    // the dependency library we just loaded.
-    // XXX should we unload later - or even at all?
-    if (extraData != nsnull)
-    {
-        PRInt32 arrayCount = dependentLibArray.Count();
-        for (PRInt32 index = 0; index < arrayCount; index++)
-            PR_UnloadLibrary((PRLibrary*)dependentLibArray.ElementAt(index));
-    }
+
+        // load the component
+        nsCOMPtr<nsILocalFile> lf(do_QueryInterface(m_dllSpec));
+        NS_ASSERTION(lf, "nsIFile here must implement a nsILocalFile");
+        lf->Load(&m_hMod);
+
+        // Unload any of library dependencies we loaded earlier. The assumption
+        // here is that the component will have a "internal" reference count to
+        // the dependency library we just loaded.
+        // XXX should we unload later - or even at all?
+        if (extraData != nsnull)
+        {
+            PRInt32 arrayCount = dependentLibArray.Count();
+            for (PRInt32 index = 0; index < arrayCount; index++)
+                RTLdrClose((RTLDRMOD)dependentLibArray.ElementAt(index));
+        }
 
 #ifdef NS_BUILD_REFCNT_LOGGING
         nsTraceRefcntImpl::SetActivityIsLegal(PR_TRUE);
-        if (m_instance) {
+        if (m_hMod != NIL_RTLDRMOD)
+        {
             // Inform refcnt tracer of new library so that calls through the
             // new library can be traced.
             nsXPIDLCString displayPath;
             GetDisplayPath(displayPath);
-            nsTraceRefcntImpl::LoadLibrarySymbols(displayPath.get(), m_instance);
+            nsTraceRefcntImpl::LoadLibrarySymbols(displayPath.get(), m_hMod);
         }
 #endif
     }
 
-    return ((m_instance == NULL) ? PR_FALSE : PR_TRUE);
+    return ((m_hMod == NIL_RTLDRMOD) ? PR_FALSE : PR_TRUE);
 }
 
 PRBool nsDll::Unload(void)
 {
-        if (m_instance == NULL)
-                return (PR_FALSE);
+    if (m_hMod == NULL)
+        return PR_FALSE;
 
     // Shutdown the dll
@@ -261 +263 @@
     nsTraceRefcntImpl::SetActivityIsLegal(PR_FALSE);
 #endif
-        PRStatus ret = PR_UnloadLibrary(m_instance);
+    int vrc = RTLdrClose(m_hMod);
 #ifdef NS_BUILD_REFCNT_LOGGING
     nsTraceRefcntImpl::SetActivityIsLegal(PR_TRUE);
 #endif
 
-        if (ret == PR_SUCCESS)
-        {
-                m_instance = NULL;
-                return (PR_TRUE);
-        }
-        else
-                return (PR_FALSE);
+    if (RT_SUCCESS(vrc))
+    {
+        m_hMod = NIL_RTLDRMOD;
+        return PR_TRUE;
+    }
+
+    return PR_FALSE;
 }
 
 void * nsDll::FindSymbol(const char *symbol)
 {
-        if (symbol == NULL)
-                return (NULL);
-
-        // If not already loaded, load it now.
-        if (Load() != PR_TRUE)
-                return (NULL);
-
-    return(PR_FindSymbol(m_instance, symbol));
+    if (symbol == NULL)
+        return NULL;
+
+    // If not already loaded, load it now.
+    if (Load() != PR_TRUE)
+        return NULL;
+
+    void *pvSym = NULL;
+    int vrc = RTLdrGetSymbol(m_hMod, symbol, &pvSym);
+    RT_NOREF(vrc);
+
+    return pvSym;
 }
 
@@ -315 +321 @@
     }
 
-        // If not already loaded, load it now.
-        if (Load() != PR_TRUE) return NS_ERROR_FAILURE;
+    // If not already loaded, load it now.
+    if (Load() != PR_TRUE) return NS_ERROR_FAILURE;
 
     // We need a nsIFile for location

trunk/src/libs/xpcom18a4/xpcom/components/xcDll.h

@@ -47 +47 @@
 #define xcDll_h__
 
-#include "prio.h"
-#include "prlink.h"
 #include "nsISupports.h"
 #include "nsILocalFile.h"
 #include "nsCOMPtr.h"
 #include "nsString.h"
+
+#include <iprt/errcore.h>
+#include <iprt/ldr.h>
 
 class nsNativeComponentLoader;
@@ -71 +72 @@
 {
 private:
-    nsCOMPtr<nsIFile>         m_dllSpec; 
-    PRLibrary                *m_instance;       
+    nsCOMPtr<nsIFile>         m_dllSpec;
+    RTLDRMOD                  m_hMod;
     nsIModule                *m_moduleObject;
     nsNativeComponentLoader  *m_loader;
@@ -80 +81 @@
 
 public:
- 
-        nsDll(nsIFile *dllSpec, nsNativeComponentLoader* loader);
-        ~nsDll(void);
 
-        // Dll Loading
-        PRBool Load(void);
-        PRBool Unload(void);
-        PRBool IsLoaded(void)
-        {
-                return ((m_instance != 0) ? PR_TRUE : PR_FALSE);
-        }
+    nsDll(nsIFile *dllSpec, nsNativeComponentLoader* loader);
+    ~nsDll(void);
+
+    // Dll Loading
+    PRBool Load(void);
+    PRBool Unload(void);
+    PRBool IsLoaded(void) { return ((m_hMod != NIL_RTLDRMOD) ? PR_TRUE : PR_FALSE); }
+
     void MarkForUnload(PRBool mark) { m_markForUnload = mark; }
     PRBool IsMarkedForUnload(void) { return m_markForUnload; }
@@ -98 +97 @@
     nsresult Shutdown(void);
 
-        void *FindSymbol(const char *symbol);
-        
+    void *FindSymbol(const char *symbol);
+
     PRBool HasChanged(void);
 
     void GetDisplayPath(nsACString& string);
 
-        PRLibrary *GetInstance(void) { return (m_instance); }
+#if 0
+    PRLibrary *GetInstance(void) { return (m_instance); }
+#endif
 
     // NS_RELEASE() is required to be done on objects returned

trunk/src/libs/xpcom18a4/xpcom/io/nsILocalFile.idl

@@ -43 +43 @@
 %{C++
 #include "prio.h"
-#include "prlink.h"
 #include <stdio.h>
+
+#include <iprt/ldr.h>
 %}
 
 [ptr] native PRFileDescStar(PRFileDesc);
-[ptr] native PRLibraryStar(PRLibrary);
+[ptr] native RTLDRMOD(RTLDRMODINTERNAL);
 [ptr] native FILE(FILE);
 
@@ -105 +106 @@
     [noscript] FILE           openANSIFileDesc(in string mode);
 
-    [noscript] PRLibraryStar  load();
+    [noscript] RTLDRMOD       load();
     
     readonly attribute PRInt64 diskSpaceAvailable;

trunk/src/libs/xpcom18a4/xpcom/io/nsLocalFileUnix.cpp

@@ -58 +58 @@
 #include <ctype.h>
 #include <locale.h>
-#ifdef XP_BEOS
-    #include <Path.h>
-    #include <Entry.h>
-    #include <Roster.h>
-#endif
-#if defined(VMS)
-    #include <fabdef.h>
-#endif
 
 #include "nsDirectoryServiceDefs.h"
@@ -82 +74 @@
 #include "nsNativeCharsetUtils.h"
 
-// On some platforms file/directory name comparisons need to
-// be case-blind.
-#if defined(VMS)
-    #define FILE_STRCMP strcasecmp
-    #define FILE_STRNCMP strncasecmp
-#else
-    #define FILE_STRCMP strcmp
-    #define FILE_STRNCMP strncmp
-#endif
+#include <iprt/errcore.h>
+
+#define FILE_STRCMP strcmp
+#define FILE_STRNCMP strncmp
 
 #define VALIDATE_STAT_CACHE()                   \
@@ -1532 +1519 @@
 
 NS_IMETHODIMP
-nsLocalFile::Load(PRLibrary **_retval)
-{
-    CHECK_mPath();
-    NS_ENSURE_ARG_POINTER(_retval);
-
-    *_retval = PR_LoadLibrary(mPath.get());
-
-    if (!*_retval)
+nsLocalFile::Load(RTLDRMOD *phMod)
+{
+    CHECK_mPath();
+    NS_ENSURE_ARG_POINTER(phMod);
+
+    RTLDRMOD hMod = NIL_RTLDRMOD;
+    int vrc = RTLdrLoad(mPath.get(), &hMod);
+    if (RT_FAILURE(vrc))
         return NS_ERROR_FAILURE;
+
+    *phMod = hMod;
     return NS_OK;
 }

trunk/src/libs/xpcom18a4/xpcom/tests/RegFactory.cpp

@@ -38 +38 @@
 #include <iostream.h>
 #include "plstr.h"
-#include "prlink.h"
 #include "nsIComponentRegistrar.h"
 #include "nsIComponentManager.h"