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

Timestamp:

Nov 21, 2023 10:50:09 AM (15 months ago)

Author:

vboxsync

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

160312

Message:

libs/xpcom/xpcom: Convert nsComponentManager registry reading from nsprpub to IPRT streams, bugref:10545

File:

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

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

@@ -1038 +1038 @@
     nsCOMPtr<nsILocalFile> localFile(do_QueryInterface(file));
 
-    rv = localFile->OpenNSPRFileDesc(PR_RDONLY, 0444, &fd);
+    nsCAutoString pathName;
+    rv = localFile->GetNativePath(pathName);
     if (NS_FAILED(rv))
         return rv;
 
-    PRInt64 fileSize;
-    rv = localFile->GetFileSize(&fileSize);
-    if (NS_FAILED(rv))
-    {
-        PR_Close(fd);
-        return rv;
-    }
-
-    PRInt32 flen = nsInt64(fileSize);
+    size_t cbRead = 0;
+    RTFILE hFile = NIL_RTFILE;
+    int vrc = RTFileOpen(&hFile, pathName.get(),
+                         RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_NONE);
+    if (RT_FAILURE(vrc))
+        return NS_ERROR_FAILURE;
+
+    uint64_t fileSize;
+    vrc = RTFileQuerySize(hFile, &fileSize);
+    if (RT_FAILURE(vrc))
+    {
+        RTFileClose(hFile);
+        return NS_ERROR_FAILURE;
+    }
+
+    PRInt32 flen = nsInt64((int64_t)fileSize);
     if (flen == 0)
     {
-        PR_Close(fd);
+        RTFileClose(hFile);
         NS_WARNING("Persistent Registry Empty!");
         return NS_OK; // ERROR CONDITION
@@ -1062 +1070 @@
         goto out;
 
-    if (flen > PR_Read(fd, registry, flen))
+    vrc = RTFileRead(hFile, registry, flen, &cbRead);
+    if (RT_FAILURE(vrc) || cbRead < flen)
     {
         rv = NS_ERROR_FAILURE;
@@ -1267 +1276 @@
     mRegistryDirty = PR_FALSE;
 out:
-    if (fd)
-        PR_Close(fd);
+    if (hFile != NIL_RTFILE)
+        RTFileClose(hFile);
 
     if (registry)