From 807458be4911288f35837ad7a0a17510b68d9963 Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org" <timeless%mozdev.org>
Date: Sun, 3 Aug 2003 09:59:05 +0000
Subject: [PATCH] Bug 213549 regxpcom thinks SelfRegisterDll FAILED =
 successful registration. r=dougt

---
 xpcom/components/nsComponentManager.cpp      | 12 +++++++-----
 xpcom/components/nsNativeComponentLoader.cpp |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/xpcom/components/nsComponentManager.cpp b/xpcom/components/nsComponentManager.cpp
index 59edc1c67d4..dfd205e61b2 100644
--- a/xpcom/components/nsComponentManager.cpp
+++ b/xpcom/components/nsComponentManager.cpp
@@ -3313,7 +3313,7 @@ nsresult
 nsComponentManagerImpl::AutoRegisterComponent(PRInt32 when,
                                               nsIFile *component)
 {
-    nsresult rv = NS_OK;
+    nsresult rv = NS_OK, res = NS_ERROR_FACTORY_NOT_REGISTERED;
     /*
      * Do we have to give the native loader first crack at it?
      * I vote ``no''.
@@ -3329,11 +3329,13 @@ nsComponentManagerImpl::AutoRegisterComponent(PRInt32 when,
             NS_ASSERTION(loader == mLoaderData[i].loader, "oops");
         }
         rv = mLoaderData[i].loader->AutoRegisterComponent((int)when, component, &didRegister);
-        if (NS_SUCCEEDED(rv) && didRegister)
-            break;
+        if (NS_FAILED(rv)) {
+            res = rv;
+        } else if (didRegister) {
+            return rv;
+        }
     }
-    return NS_FAILED(rv) ? NS_ERROR_FACTORY_NOT_REGISTERED : NS_OK;
-
+    return res;
 }
 
 nsresult
diff --git a/xpcom/components/nsNativeComponentLoader.cpp b/xpcom/components/nsNativeComponentLoader.cpp
index 121c3dad10d..7637dc278fe 100644
--- a/xpcom/components/nsNativeComponentLoader.cpp
+++ b/xpcom/components/nsNativeComponentLoader.cpp
@@ -516,7 +516,7 @@ nsNativeComponentLoader::DumpLoadError(nsDll *dll,
     dll->GetDisplayPath(displayPath);
 
     fprintf(stderr, 
-            "nsNativeComponentLoader: %s(%s) Load FAILED with error:%s\n", 
+            "nsNativeComponentLoader: %s(%s) Load FAILED with error: %s\n", 
             aCallerName,
             displayPath.get(), 
             errorMsg.get());
@@ -524,7 +524,7 @@ nsNativeComponentLoader::DumpLoadError(nsDll *dll,
     // Do NSPR log
 #ifdef PR_LOGGING
     PR_LOG(nsComponentManagerLog, PR_LOG_ALWAYS,
-           ("nsNativeComponentLoader: %s(%s) Load FAILED with error:%s", 
+           ("nsNativeComponentLoader: %s(%s) Load FAILED with error: %s", 
             aCallerName,
             displayPath.get(), 
             errorMsg.get()));