Changeset 102186 in vbox for trunk/src

Timestamp:

Nov 21, 2023 10:38:17 AM (17 months ago)

Author:

vboxsync

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

160311

Message:

libs/xpcom/xpcom: Convert nsComponentManager and nsCategoryManager registry writing from nsprpub to IPRT streams, bugref:10545

Location:

trunk/src/libs/xpcom18a4/xpcom/components

Files:

• nsCategoryManager.cpp (modified) (5 diffs)
• nsCategoryManager.h (modified) (3 diffs)
• nsComponentManager.cpp (modified) (11 diffs)

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

@@ -356 +356 @@
 
 struct persistent_userstruct {
-  PRFileDesc* fd;
+  PRTSTREAM   fd;
   const char* categoryName;
   PRBool      success;
@@ -370 +370 @@
 
   if (aLeaf->pValue) {
-    if (PR_fprintf(args->fd,
-                   "%s,%s,%s\n",
-                   args->categoryName,
-                   aLeaf->GetKey(),
-                   aLeaf->pValue) == (PRUint32) -1) {
+    if (RTStrmPrintf(args->fd,
+                     "%s,%s,%s\n",
+                     args->categoryName,
+                     aLeaf->GetKey(),
+                     aLeaf->pValue) == -1) {
       args->success = PR_FALSE;
       status = PL_DHASH_STOP;
@@ -384 +384 @@
 
 PRBool
-CategoryNode::WritePersistentEntries(PRFileDesc* fd, const char* aCategoryName)
+CategoryNode::WritePersistentEntries(PRTSTREAM fd, const char* aCategoryName)
 {
   persistent_userstruct args = {
@@ -645 +645 @@
 
 struct writecat_struct {
-  PRFileDesc* fd;
+  PRTSTREAM   fd;
   PRBool      success;
 };
@@ -665 +665 @@
 
 NS_METHOD
-nsCategoryManager::WriteCategoryManagerToRegistry(PRFileDesc* fd)
+nsCategoryManager::WriteCategoryManagerToRegistry(PRTSTREAM fd)
 {
   writecat_struct args = {

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

@@ -46 +46 @@
 
 #include <iprt/semaphore.h>
+#include <iprt/stream.h>
 
 #define NS_CATEGORYMANAGER_CLASSNAME     "Category Manager"
@@ -110 +111 @@
   NS_METHOD Enumerate(nsISimpleEnumerator** _retval);
 
-  PRBool WritePersistentEntries(PRFileDesc* fd, const char* aCategoryName);
+  PRBool WritePersistentEntries(PRTSTREAM fd, const char* aCategoryName);
 
   // CategoryNode is arena-allocated, with the strings
@@ -142 +143 @@
    * This is to be used by nsComponentManagerImpl (and NO ONE ELSE).
    */
-  NS_METHOD WriteCategoryManagerToRegistry(PRFileDesc* fd);
+  NS_METHOD WriteCategoryManagerToRegistry(PRTSTREAM fd);
 
   nsCategoryManager() : mLock(nsnull) { }

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

@@ -88 +88 @@
 
 #include <iprt/assert.h>
+#include <iprt/file.h>
+#include <iprt/stream.h>
 #include <iprt/string.h>
 #include <VBox/log.h>
@@ -1276 +1278 @@
 struct PersistentWriterArgs
 {
-    PRFileDesc *mFD;
+    PRTSTREAM    mFD;
     nsLoaderdata *mLoaderData;
 };
@@ -1296 +1298 @@
         return PL_DHASH_NEXT;
 
-    PRFileDesc* fd = ((PersistentWriterArgs*)arg)->mFD;
+    PRTSTREAM fd = ((PersistentWriterArgs*)arg)->mFD;
 
     char cidString[UID_STRING_LENGTH];
     GetIDString(factoryEntry->mCid, cidString);
-    PR_fprintf(fd, "%s,%s\n", contractID, cidString); // what if this fails?
+    RTStrmPrintf(fd, "%s,%s\n", contractID, cidString); // what if this fails?
     return PL_DHASH_NEXT;
 }
@@ -1311 +1313 @@
 {
     nsFactoryEntry *factoryEntry = ((nsFactoryTableEntry*)hdr)->mFactoryEntry;
-    PRFileDesc* fd = ((PersistentWriterArgs*)arg)->mFD;
+    PRTSTREAM fd = ((PersistentWriterArgs*)arg)->mFD;
     nsLoaderdata *loaderData = ((PersistentWriterArgs*)arg)->mLoaderData;
 
@@ -1341 +1343 @@
 
     // cid,contract_id,type,class_name,inproc_server
-    PR_fprintf(fd,
-               "%s,%s,%s,%s,%s\n",
-               cidString,
-               (contractID ? contractID : ""),
-               (loaderName ? loaderName : ""),
-               (className  ? className  : ""),
-               (location   ? location   : ""));
+    RTStrmPrintf(fd,
+                 "%s,%s,%s,%s,%s\n",
+                 cidString,
+                 (contractID ? contractID : ""),
+                 (loaderName ? loaderName : ""),
+                 (className  ? className  : ""),
+                 (location   ? location   : ""));
 
     if (contractID)
@@ -1360 +1362 @@
 AutoRegEntryWriter(nsHashKey *aKey, void *aData, void* aClosure)
 {
-    PRFileDesc* fd = (PRFileDesc*) aClosure;
+    PRTSTREAM fd = (PRTSTREAM) aClosure;
     AutoRegEntry* entry = (AutoRegEntry*) aData;
 
@@ -1369 +1371 @@
     else
         fmt = "%s,%lld\n";
-    PR_fprintf(fd, fmt, entry->GetName().get(), entry->GetDate(), extraData);
+    RTStrmPrintf(fd, fmt, entry->GetName().get(), entry->GetDate(), extraData);
 
     return PR_TRUE;
@@ -1395 +1397 @@
     localFile->SetNativeLeafName(leafName);
 
-    PRFileDesc* fd = nsnull;
-    nsresult rv = localFile->OpenNSPRFileDesc(PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE, 0600, &fd);
+    nsCAutoString pathName;
+    nsresult rv = localFile->GetNativePath(pathName);
     if (NS_FAILED(rv))
         return rv;
 
-    if (PR_fprintf(fd, "Generated File. Do not edit.\n") == (PRUint32) -1) {
+    RTFILE hFile      = NIL_RTFILE;
+    PRTSTREAM pStream = NULL;
+    int vrc = RTFileOpen(&hFile, pathName.get(),
+                         RTFILE_O_CREATE | RTFILE_O_WRITE | RTFILE_O_TRUNCATE | RTFILE_O_DENY_NONE
+                         | (0600 << RTFILE_O_CREATE_MODE_SHIFT));
+    if (RT_SUCCESS(vrc))
+    {
+        vrc = RTStrmOpenFileHandle(hFile, "at", 0 /*fFlags*/, &pStream);
+        if (RT_FAILURE(vrc))
+        {
+            RTFileClose(hFile);
+            return NS_ERROR_UNEXPECTED;
+        }
+    }
+    else
+        return NS_ERROR_UNEXPECTED;
+
+    if (RTStrmPrintf(pStream, "Generated File. Do not edit.\n") == -1) {
         rv = NS_ERROR_UNEXPECTED;
         goto out;
     }
 
-    if (PR_fprintf(fd, "\n[HEADER]\nVersion,%d,%d\n",
+    if (RTStrmPrintf(pStream, "\n[HEADER]\nVersion,%d,%d\n",
                    PERSISTENT_REGISTRY_VERSION_MAJOR,
-                   PERSISTENT_REGISTRY_VERSION_MINOR) == (PRUint32) -1) {
+                   PERSISTENT_REGISTRY_VERSION_MINOR) == -1) {
         rv = NS_ERROR_UNEXPECTED;
         goto out;
     }
 
-    if (PR_fprintf(fd, "\n[COMPONENTS]\n") == (PRUint32) -1) {
+    if (RTStrmPrintf(pStream, "\n[COMPONENTS]\n") == -1) {
         rv = NS_ERROR_UNEXPECTED;
         goto out;
     }
 
-    mAutoRegEntries.Enumerate(AutoRegEntryWriter, (void*)fd);
+    mAutoRegEntries.Enumerate(AutoRegEntryWriter, (void*)pStream);
 
     PersistentWriterArgs args;
-    args.mFD = fd;
+    args.mFD = pStream;
     args.mLoaderData = mLoaderData;
 
-    if (PR_fprintf(fd, "\n[CLASSIDS]\n") == (PRUint32) -1) {
+    if (RTStrmPrintf(pStream, "\n[CLASSIDS]\n") == -1) {
         rv = NS_ERROR_UNEXPECTED;
         goto out;
@@ -1431 +1450 @@
     PL_DHashTableEnumerate(&mFactories, ClassIDWriter, (void*)&args);
 
-    if (PR_fprintf(fd, "\n[CONTRACTIDS]\n") == (PRUint32) -1) {
+    if (RTStrmPrintf(pStream, "\n[CONTRACTIDS]\n") == -1) {
         rv = NS_ERROR_UNEXPECTED;
         goto out;
@@ -1439 +1458 @@
     PL_DHashTableEnumerate(&mContractIDs, ContractIDWriter, (void*)&args);
 
-    if (PR_fprintf(fd, "\n[CATEGORIES]\n") == (PRUint32) -1) {
+    if (RTStrmPrintf(pStream, "\n[CATEGORIES]\n") == -1) {
         rv = NS_ERROR_UNEXPECTED;
         goto out;
@@ -1449 +1468 @@
         rv = NS_ERROR_UNEXPECTED;
     } else {
-        rv = mCategoryManager->WriteCategoryManagerToRegistry(fd);
+        rv = mCategoryManager->WriteCategoryManagerToRegistry(pStream);
     }
 
 out:
-    if (fd)
-        PR_Close(fd);
+    if (pStream)
+        RTStrmClose(pStream);
 
     // don't create the file is there was a problem????