Changeset 101944 in vbox for trunk/src/libs/xpcom18a4/xpcom/io

Timestamp:

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

Author:

vboxsync

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

160041

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/io

Files:

• nsILocalFile.idl (modified) (2 diffs)
• nsLocalFileUnix.cpp (modified) (3 diffs)

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;
 }