diff --git a/mozilla/content/base/src/nsSelection.cpp b/mozilla/content/base/src/nsSelection.cpp
index 6984aa8b93e..0e959126bc8 100644
--- a/mozilla/content/base/src/nsSelection.cpp
+++ b/mozilla/content/base/src/nsSelection.cpp
@@ -4233,17 +4233,17 @@ nsSelection::DeleteFromDocument()
   // Get an iterator
   nsSelectionIterator iter(mDomSelections[index]);
   res = iter.First();
-  if (!NS_SUCCEEDED(res))
+  if (NS_FAILED(res))
     return res;
 
   nsCOMPtr<nsIDOMRange> range;
   while (iter.IsDone())
   {
     res = iter.CurrentItem(NS_STATIC_CAST(nsIDOMRange**, getter_AddRefs(range)));
-    if (!NS_SUCCEEDED(res))
+    if (NS_FAILED(res))
       return res;
     res = range->DeleteContents();
-    if (!NS_SUCCEEDED(res))
+    if (NS_FAILED(res))
       return res;
     iter.Next();
   }
@@ -5670,7 +5670,7 @@ nsTypedSelection::GetEnumerator(nsIEnumerator **aIterator)
 {
   nsresult status = NS_ERROR_OUT_OF_MEMORY;
   nsSelectionIterator *iterator =  new nsSelectionIterator(this);
-  if ( iterator && !NS_SUCCEEDED(status = CallQueryInterface(iterator, aIterator)) )
+  if ( iterator && NS_FAILED(status = CallQueryInterface(iterator, aIterator)) )
   	delete iterator;
   return status;
 }
diff --git a/mozilla/content/html/content/src/nsFormSubmitter.cpp b/mozilla/content/html/content/src/nsFormSubmitter.cpp
index 14acf4740fe..9710d5c71a3 100644
--- a/mozilla/content/html/content/src/nsFormSubmitter.cpp
+++ b/mozilla/content/html/content/src/nsFormSubmitter.cpp
@@ -260,7 +260,7 @@ nsFormSubmitter::OnSubmit(nsIForm* form,
 
     if (href.IsEmpty()) {
       nsCOMPtr<nsIHTMLDocument> htmlDoc;
-      if (!NS_SUCCEEDED(document->QueryInterface(NS_GET_IID(nsIHTMLDocument),
+      if (NS_FAILED(document->QueryInterface(NS_GET_IID(nsIHTMLDocument),
                                              getter_AddRefs(htmlDoc)))) {
         // Must be a XML, XUL or other non-HTML document type
         // so do nothing.
diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
index 4085e590229..ec71eb380bc 100644
--- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
@@ -1969,7 +1969,7 @@ nsHTMLSelectElement::InitializeOption(nsIDOMHTMLOptionElement * aOption,
 {
   PRBool selected;
   nsresult rv = aOption->GetDefaultSelected(&selected);
-  if (!NS_SUCCEEDED(rv)) {
+  if (NS_FAILED(rv)) {
     selected = PR_FALSE;
   }
   SetOptionSelected(aOption, selected);
diff --git a/mozilla/directory/xpcom/base/src/nsLDAPConnection.cpp b/mozilla/directory/xpcom/base/src/nsLDAPConnection.cpp
index 5769461a579..a9d12e3e4a8 100644
--- a/mozilla/directory/xpcom/base/src/nsLDAPConnection.cpp
+++ b/mozilla/directory/xpcom/base/src/nsLDAPConnection.cpp
@@ -531,7 +531,7 @@ nsLDAPConnection::InvokeMessageCallback(LDAPMessage *aMsgHandle,
     // callback which should happen on another thread)
     //
     rv = operation->GetMessageListener(getter_AddRefs(listener));
-    if (!NS_SUCCEEDED(rv)) {
+    if (NS_FAILED(rv)) {
         NS_ERROR("nsLDAPConnection::InvokeMessageCallback(): probable "
                  "memory corruption: GetMessageListener() returned error");
         delete key;
@@ -547,7 +547,7 @@ nsLDAPConnection::InvokeMessageCallback(LDAPMessage *aMsgHandle,
     //
     if (aRemoveOpFromConnQ) {
         rv = mPendingOperations->Remove(key);
-        if (!NS_SUCCEEDED(rv)) {
+        if (NS_FAILED(rv)) {
             NS_ERROR("nsLDAPConnection::InvokeMessageCallback: unable to "
                      "remove operation from the connection queue\n");
             delete key;
diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 3d0aa8e477d..184fcefcb8a 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -5345,7 +5345,7 @@ nsDocShell::CloneAndReplace(nsISHEntry * src, PRUint32 aCloneID,
         result = nsComponentManager::CreateInstance(NS_SHENTRY_CONTRACTID, NULL,
                                                     NS_GET_IID(nsISHEntry),
                                                     (void **) &dest);
-        if (!NS_SUCCEEDED(result))
+        if (NS_FAILED(result))
             return result;
 
         srcHE->GetURI(getter_AddRefs(uri));
@@ -5389,15 +5389,15 @@ nsDocShell::CloneAndReplace(nsISHEntry * src, PRUint32 aCloneID,
             if (!srcChild)
                 return NS_ERROR_FAILURE;
             nsCOMPtr<nsISHEntry> destChild;
-            if (!NS_SUCCEEDED(result))
+            if (NS_FAILED(result))
                 return result;
             result =
                 CloneAndReplace(srcChild, aCloneID, replaceEntry,
                                 getter_AddRefs(destChild));
-            if (!NS_SUCCEEDED(result))
+            if (NS_FAILED(result))
                 return result;
             result = destContainer->AddChild(destChild, i);
-            if (!NS_SUCCEEDED(result))
+            if (NS_FAILED(result))
                 return result;
         }                       // for 
     }
diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp
index 0095de778a5..1e546a92813 100644
--- a/mozilla/editor/libeditor/base/nsEditor.cpp
+++ b/mozilla/editor/libeditor/base/nsEditor.cpp
@@ -3853,7 +3853,7 @@ nsEditor::GetFirstTextNode(nsIDOMNode *aNode, nsIDOMNode **aRetNode)
       nsCOMPtr<nsIDOMNode> node1;
       nsCOMPtr<nsIDOMNode> node2;
 
-      if (!NS_SUCCEEDED(aNode->GetFirstChild(getter_AddRefs(node1))))
+      if (NS_FAILED(aNode->GetFirstChild(getter_AddRefs(node1))))
       {
         NS_NOTREACHED("GetFirstTextNode Failed");
       }
@@ -4498,7 +4498,7 @@ nsEditor::DeleteSelectionAndCreateNode(const nsAReadableString& aTag,
   PRInt32 offsetOfNewNode;
   nsresult result = DeleteSelectionAndPrepareToCreateNode(parentSelectedNode,
                                                           offsetOfNewNode);
-  if (!NS_SUCCEEDED(result))
+  if (NS_FAILED(result))
     return result;
 
   nsCOMPtr<nsIDOMNode> newNode;
diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
index 335d2a278c4..1b5ae9cfd3c 100644
--- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp
@@ -1748,7 +1748,7 @@ nsHTMLEditor::InsertElementAtSelection(nsIDOMElement* aElement, PRBool aDeleteSe
 
   nsCOMPtr<nsISelection>selection;
   res = GetSelection(getter_AddRefs(selection));
-  if (!NS_SUCCEEDED(res) || !selection)
+  if (NS_FAILED(res) || !selection)
     return NS_ERROR_FAILURE;
 
   // hand off to the rules system, see if it has anything to say about this
@@ -1765,7 +1765,7 @@ nsHTMLEditor::InsertElementAtSelection(nsIDOMElement* aElement, PRBool aDeleteSe
       nsCOMPtr<nsIDOMNode> tempNode;
       PRInt32 tempOffset;
       nsresult result = DeleteSelectionAndPrepareToCreateNode(tempNode,tempOffset);
-      if (!NS_SUCCEEDED(result))
+      if (NS_FAILED(result))
         return result;
     }
 
@@ -2608,7 +2608,7 @@ NODE_FOUND:
     // Search up the parent chain
     // We should never fail because of root test below, but lets be safe
     // XXX: ERROR_HANDLING error return code lost
-    if (!NS_SUCCEEDED(currentNode->GetParentNode(getter_AddRefs(parent))) || !parent)
+    if (NS_FAILED(currentNode->GetParentNode(getter_AddRefs(parent))) || !parent)
       break;
 
     // Stop searching if parent is a body tag
@@ -2617,7 +2617,7 @@ NODE_FOUND:
     // Note: Originally used IsRoot to stop at table cells,
     //  but that's too messy when you are trying to find the parent table
     //PRBool isRoot;
-    //if (!NS_SUCCEEDED(IsRootTag(parentTagName, isRoot)) || isRoot)
+    //if (NS_FAILED(IsRootTag(parentTagName, isRoot)) || isRoot)
     if(parentTagName.EqualsIgnoreCase("body"))
       break;
 
@@ -4075,7 +4075,7 @@ nsCOMPtr<nsIDOMElement> nsHTMLEditor::FindPreElement()
 
   nsString prestr ("PRE");  // GetFirstNodeOfType requires capitals
   nsCOMPtr<nsIDOMNode> preNode;
-  if (!NS_SUCCEEDED(nsEditor::GetFirstNodeOfType(rootNode, prestr,
+  if (NS_FAILED(nsEditor::GetFirstNodeOfType(rootNode, prestr,
                                                  getter_AddRefs(preNode))))
     return 0;
 
diff --git a/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp b/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp
index 114d8da17bf..036075ec5a9 100644
--- a/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp
+++ b/mozilla/editor/libeditor/html/nsHTMLURIRefObject.cpp
@@ -314,7 +314,7 @@ nsresult NS_NewHTMLURIRefObject(nsIURIRefObject** aResult, nsIDOMNode* aNode)
   nsHTMLURIRefObject* refObject = new nsHTMLURIRefObject();
   if (!refObject) return NS_ERROR_OUT_OF_MEMORY;
   nsresult rv = refObject->SetNode(aNode);
-  if (!NS_SUCCEEDED(rv)) {
+  if (NS_FAILED(rv)) {
     *aResult = 0;
     delete refObject;
     return rv;
diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
index c70c743f258..54cba6a31df 100644
--- a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
+++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp
@@ -414,10 +414,10 @@ nsTextEditorMouseListener::MouseClick(nsIDOMEvent* aMouseEvent)
         if (!nsuiEvent)
           return NS_ERROR_NULL_POINTER;
         nsCOMPtr<nsIDOMNode> parent;
-        if (!NS_SUCCEEDED(nsuiEvent->GetRangeParent(getter_AddRefs(parent))))
+        if (NS_FAILED(nsuiEvent->GetRangeParent(getter_AddRefs(parent))))
           return NS_ERROR_NULL_POINTER;
         PRInt32 offset = 0;
-        if (!NS_SUCCEEDED(nsuiEvent->GetRangeOffset(&offset)))
+        if (NS_FAILED(nsuiEvent->GetRangeOffset(&offset)))
           return NS_ERROR_NULL_POINTER;
 
         nsCOMPtr<nsISelection> selection;
diff --git a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp
index 939e7789634..e5f423b7d7b 100644
--- a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp
+++ b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp
@@ -1381,7 +1381,7 @@ NS_IMETHODIMP nsPlaintextEditor::Cut()
 {
   nsCOMPtr<nsISelection> selection;
   nsresult res = GetSelection(getter_AddRefs(selection));
-  if (!NS_SUCCEEDED(res))
+  if (NS_FAILED(res))
     return res;
 
   PRBool isCollapsed;
@@ -1699,7 +1699,7 @@ nsPlaintextEditor::InsertAsQuotation(const nsAReadableString& aQuotedText,
   // Let the citer quote it for us:
   nsString quotedStuff;
   nsresult rv = citer->GetCiteString(aQuotedText, quotedStuff);
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
     return rv;
 
   // It's best to put a blank line after the quoted text so that mails
diff --git a/mozilla/embedding/browser/photon/src/PtMozilla.cpp b/mozilla/embedding/browser/photon/src/PtMozilla.cpp
index ab85ccbbd86..70cff989fc0 100644
--- a/mozilla/embedding/browser/photon/src/PtMozilla.cpp
+++ b/mozilla/embedding/browser/photon/src/PtMozilla.cpp
@@ -1170,7 +1170,7 @@ static int InitProfiles( char *aProfileDir, char *aProfileName ) {
 		// Load preferences service
 		nsIPref *mPrefs;
 		rv = nsServiceManager::GetService(kPrefCID, NS_GET_IID(nsIPref), (nsISupports **)&mPrefs);
-		if( !NS_FAILED( rv ) ) {
+		if( NS_SUCCEEDED( rv ) ) {
     	mPrefs->ResetPrefs();
   	  mPrefs->ReadUserPrefs( nsnull );  //Reads from default_prefs.js
 			}
diff --git a/mozilla/embedding/qa/testembed/Tests.cpp b/mozilla/embedding/qa/testembed/Tests.cpp
index 62c03d1a606..bc82d6eff0a 100644
--- a/mozilla/embedding/qa/testembed/Tests.cpp
+++ b/mozilla/embedding/qa/testembed/Tests.cpp
@@ -393,7 +393,7 @@ void CTests::OnToolsRemoveGHPage()
 		return;
 	}
 	nsCOMPtr<nsIBrowserHistory> myHistory = do_QueryInterface(myGHistory, &rv);
-	if(!NS_SUCCEEDED(rv)) {
+	if(NS_FAILED(rv)) {
 		QAOutput("Could not get the history object.", 2);
 		return;
 	}
@@ -433,7 +433,7 @@ void CTests::OnToolsRemoveAllGH()
 		return;
 	}
 	nsCOMPtr<nsIBrowserHistory> myHistory = do_QueryInterface(myGHistory, &rv);
-	if(!NS_SUCCEEDED(rv)) {
+	if(NS_FAILED(rv)) {
 		QAOutput("Could not get the history object.", 2);
 		return;
 	}
diff --git a/mozilla/extensions/cookie/nsCookies.cpp b/mozilla/extensions/cookie/nsCookies.cpp
index c32f71f142f..192fa5800a4 100644
--- a/mozilla/extensions/cookie/nsCookies.cpp
+++ b/mozilla/extensions/cookie/nsCookies.cpp
@@ -427,7 +427,7 @@ cookie_LifetimeLimitPrefChanged(const char * newpref, void * data) {
   PRInt32 n;
   nsresult rv;
   nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
-  if (!NS_FAILED(rv) && !NS_FAILED(prefs->GetIntPref(cookie_lifetimeValue, &n))) {
+  if (NS_SUCCEEDED(rv) && NS_SUCCEEDED(prefs->GetIntPref(cookie_lifetimeValue, &n))) {
     cookie_SetLifetimeLimit(n);
   }
   return 0;
@@ -463,7 +463,7 @@ cookie_LifetimeDaysPrefChanged(const char * newpref, void * data) {
   PRInt32 n;
   nsresult rv;
   nsCOMPtr<nsIPref> prefs(do_GetService(NS_PREF_CONTRACTID, &rv));
-  if (!prefs || !NS_FAILED(prefs->GetIntPref(cookie_lifetimeDaysPref, &n))) {
+  if (!prefs || NS_SUCCEEDED(prefs->GetIntPref(cookie_lifetimeDaysPref, &n))) {
     cookie_lifetimeDays = n;
     if (!cookie_lifetimeCurrentSession) {
       cookie_SetLifetimeLimit(n);
@@ -521,14 +521,14 @@ COOKIE_RegisterPrefCallbacks(void) {
   cookie_lifetimeDays = 90;
   cookie_lifetimeCurrentSession = PR_FALSE;
 
-  if (!NS_FAILED(prefs->GetIntPref(cookie_lifetimeDaysPref, &n))) {
+  if (NS_SUCCEEDED(prefs->GetIntPref(cookie_lifetimeDaysPref, &n))) {
     cookie_lifetimeDays = n;
   }
-  if (!NS_FAILED(prefs->GetIntPref(cookie_lifetimeBehaviorPref, &n))) {
+  if (NS_SUCCEEDED(prefs->GetIntPref(cookie_lifetimeBehaviorPref, &n))) {
     cookie_lifetimeCurrentSession = (n==0);
     cookie_SetLifetimeLimit((n==0) ? 0 : cookie_lifetimeDays);
   }
-  if (!NS_FAILED(prefs->GetBoolPref(cookie_lifetimeEnabledPref, &n))) {
+  if (NS_SUCCEEDED(prefs->GetBoolPref(cookie_lifetimeEnabledPref, &n))) {
     cookie_SetLifetimePref(n ? COOKIE_Trim : COOKIE_Normal);
   }
   prefs->RegisterCallback(cookie_lifetimeEnabledPref, cookie_LifetimeEnabledPrefChanged, nsnull);
@@ -536,12 +536,12 @@ COOKIE_RegisterPrefCallbacks(void) {
   prefs->RegisterCallback(cookie_lifetimeDaysPref, cookie_LifetimeDaysPrefChanged, nsnull);
 
   // Override cookie_lifetime initialization if the older prefs (with no UI) are used
-  if (!NS_FAILED(prefs->GetIntPref(cookie_lifetimePref, &n))) {
+  if (NS_SUCCEEDED(prefs->GetIntPref(cookie_lifetimePref, &n))) {
     cookie_SetLifetimePref((COOKIE_LifetimeEnum)n);
   }
   prefs->RegisterCallback(cookie_lifetimePref, cookie_LifetimeOptPrefChanged, nsnull);
 
-  if (!NS_FAILED(prefs->GetIntPref(cookie_lifetimeValue, &n))) {
+  if (NS_SUCCEEDED(prefs->GetIntPref(cookie_lifetimeValue, &n))) {
     cookie_SetLifetimeLimit(n);
   }
   prefs->RegisterCallback(cookie_lifetimeValue, cookie_LifetimeLimitPrefChanged, nsnull);
diff --git a/mozilla/extensions/wallet/src/singsign.cpp b/mozilla/extensions/wallet/src/singsign.cpp
index 37dcc620d33..c35ea2baf3a 100644
--- a/mozilla/extensions/wallet/src/singsign.cpp
+++ b/mozilla/extensions/wallet/src/singsign.cpp
@@ -157,7 +157,7 @@ PUBLIC void
 SI_RegisterCallback(const char* domain, PrefChangedFunc callback, void* instance_data) {
   nsresult ret;
   nsCOMPtr<nsIPref> pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret);
-  if (!NS_FAILED(ret)) {
+  if (NS_SUCCEEDED(ret)) {
     ret = pPrefService->RegisterCallback(domain, callback, instance_data);
   }
 }
@@ -166,7 +166,7 @@ PUBLIC void
 SI_UnregisterCallback(const char* domain, PrefChangedFunc callback, void* instance_data) {
   nsresult ret;
   nsCOMPtr<nsIPref> pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret);
-  if (!NS_FAILED(ret)) {
+  if (NS_SUCCEEDED(ret)) {
     ret = pPrefService->UnregisterCallback(domain, callback, instance_data);
   }
 }
@@ -175,9 +175,9 @@ PUBLIC void
 SI_SetBoolPref(const char * prefname, PRBool prefvalue) {
   nsresult ret;
   nsCOMPtr<nsIPref> pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret);
-  if (!NS_FAILED(ret)) {
+  if (NS_SUCCEEDED(ret)) {
     ret = pPrefService->SetBoolPref(prefname, prefvalue);
-    if (!NS_FAILED(ret)) {
+    if (NS_SUCCEEDED(ret)) {
       ret = pPrefService->SavePrefFile(nsnull); 
     }
   }
@@ -188,7 +188,7 @@ SI_GetBoolPref(const char * prefname, PRBool defaultvalue) {
   nsresult ret;
   PRBool prefvalue = defaultvalue;
   nsCOMPtr<nsIPref> pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret);
-  if (!NS_FAILED(ret)) {
+  if (NS_SUCCEEDED(ret)) {
     ret = pPrefService->GetBoolPref(prefname, &prefvalue);
   }
   return prefvalue;
@@ -201,9 +201,9 @@ SI_SetCharPref(const char * prefname, const char * prefvalue) {
   }
   nsresult ret;
   nsCOMPtr<nsIPref> pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret);
-  if (!NS_FAILED(ret)) {
+  if (NS_SUCCEEDED(ret)) {
     ret = pPrefService->SetCharPref(prefname, prefvalue);
-    if (!NS_FAILED(ret)) {
+    if (NS_SUCCEEDED(ret)) {
       ret = pPrefService->SavePrefFile(nsnull); 
     }
   }
@@ -213,7 +213,7 @@ PUBLIC void
 SI_GetCharPref(const char * prefname, char** aPrefvalue) {
   nsresult ret;
   nsCOMPtr<nsIPref> pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret);
-  if (!NS_FAILED(ret)) {
+  if (NS_SUCCEEDED(ret)) {
     ret = pPrefService->CopyCharPref(prefname, aPrefvalue);
     if (NS_FAILED(ret)) {
       *aPrefvalue = nsnull;
@@ -227,7 +227,7 @@ PUBLIC void
 SI_GetLocalizedUnicharPref(const char * prefname, PRUnichar** aPrefvalue) {
   nsresult ret;
   nsCOMPtr<nsIPref> pPrefService = do_GetService(NS_PREF_CONTRACTID, &ret);
-  if (!NS_FAILED(ret)) {
+  if (NS_SUCCEEDED(ret)) {
     ret = pPrefService->GetLocalizedUnicharPref(prefname, aPrefvalue);
     if (NS_FAILED(ret)) {
       *aPrefvalue = nsnull;
diff --git a/mozilla/gfx/src/photon/nsDeviceContextPh.cpp b/mozilla/gfx/src/photon/nsDeviceContextPh.cpp
index 6db9f418ed2..38fec9f4ad6 100644
--- a/mozilla/gfx/src/photon/nsDeviceContextPh.cpp
+++ b/mozilla/gfx/src/photon/nsDeviceContextPh.cpp
@@ -199,7 +199,7 @@ void nsDeviceContextPh :: CommonInit( nsNativeDeviceContext aDC ) {
     nsCOMPtr<nsIPref> prefs(do_GetService(kPrefCID, &res));
     if( NS_SUCCEEDED( res ) && prefs ) {
       res = prefs->GetIntPref("browser.display.screen_resolution", &prefVal);
-      if( !NS_SUCCEEDED( res ) ) {
+      if( NS_FAILED( res ) ) {
         prefVal = 96;
       	}
 
diff --git a/mozilla/gfx/src/ps/nsPostScriptObj.cpp b/mozilla/gfx/src/ps/nsPostScriptObj.cpp
index a3082a2065a..ef20ed5a0f0 100644
--- a/mozilla/gfx/src/ps/nsPostScriptObj.cpp
+++ b/mozilla/gfx/src/ps/nsPostScriptObj.cpp
@@ -1627,7 +1627,7 @@ nsPostScriptObj::GetUnixPrinterSetting(const nsCAutoString& aKey, char** aVal)
   key.AssignWithConversion(aKey.get());
   nsAutoString oValue;
   nsresult res = mPrinterProps->GetStringProperty(key, oValue);
-  if (!NS_SUCCEEDED(res)) {
+  if (NS_FAILED(res)) {
     return PR_FALSE;
   }
   *aVal = ToNewCString(oValue);
diff --git a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
index b1eca1755df..4edbf89d379 100644
--- a/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokenizer.cpp
@@ -793,7 +793,7 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,CToken*& aToken,nsScan
       //tag but ran out of data (not in the stream, but in this *part* of the stream.
       //For simplicity, we have to unwind our input. Therefore, we pop and discard
       //any new tokens we've cued this round. Later we can get smarter about this.
-      if(!NS_SUCCEEDED(result)) {
+      if(NS_FAILED(result)) {
         while(mTokenDeque.GetSize()>theDequeSize) {
           CToken* theToken=(CToken*)mTokenDeque.Pop();
           IF_FREE(theToken, mTokenAllocator);
@@ -942,7 +942,7 @@ nsresult nsHTMLTokenizer::ConsumeText(CToken*& aToken,nsScanner& aScanner){
   if(theToken) {
     PRUnichar ch=0;
     result=theToken->Consume(ch,aScanner,mFlags);
-    if(!NS_SUCCEEDED(result)) {
+    if(NS_FAILED(result)) {
       if(0==theToken->GetTextLength()){
         IF_FREE(aToken, mTokenAllocator);
         aToken = nsnull;
diff --git a/mozilla/intl/locale/src/nsCollation.cpp b/mozilla/intl/locale/src/nsCollation.cpp
index b8610076f17..e352b789276 100644
--- a/mozilla/intl/locale/src/nsCollation.cpp
+++ b/mozilla/intl/locale/src/nsCollation.cpp
@@ -228,7 +228,7 @@ nsresult nsCollation::UnicodeToChar(const nsAString& aSrc, char** dst, const nsA
                 }
               }
             }
-            if (!NS_SUCCEEDED(res)) {
+            if (NS_FAILED(res)) {
               PR_Free(*dst);
               *dst = nsnull;
             }
diff --git a/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp b/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp
index 8f0f1a43b46..5183dad5f3b 100644
--- a/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp
+++ b/mozilla/intl/uconv/ucvja/nsJapaneseToUnicode.cpp
@@ -756,7 +756,7 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert(
                 nsString tmpCharset;
                 nsCOMPtr<nsICharsetConverterManager> ccm = 
                          do_GetService(kCharsetConverterManagerCID, &rv);
-                if (!NS_FAILED(rv)) {
+                if (NS_SUCCEEDED(rv)) {
                   tmpCharset.AssignWithConversion("GB2312");
                   rv = ccm->GetUnicodeDecoder(&tmpCharset, &mGB2312Decoder);
                 }
@@ -810,7 +810,7 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert(
                 nsString tmpCharset;
                 nsCOMPtr<nsICharsetConverterManager> ccm = 
                          do_GetService(kCharsetConverterManagerCID, &rv);
-                if (!NS_FAILED(rv)) {
+                if (NS_SUCCEEDED(rv)) {
                   tmpCharset.AssignWithConversion("EUC-KR");
                   rv = ccm->GetUnicodeDecoder(&tmpCharset, &mEUCKRDecoder);
                 }
@@ -883,7 +883,7 @@ NS_IMETHODIMP nsISO2022JPToUnicodeV2::Convert(
                   nsString tmpCharset;
                   nsCOMPtr<nsICharsetConverterManager> ccm = 
                            do_GetService(kCharsetConverterManagerCID, &rv);
-                  if (!NS_FAILED(rv)) {
+                  if (NS_SUCCEEDED(rv)) {
                     tmpCharset.AssignWithConversion("ISO-8859-7");
                     rv = ccm->GetUnicodeDecoder(&tmpCharset, &mISO88597Decoder);
                   }
diff --git a/mozilla/intl/uconv/ucvko/nsISO2022KRToUnicode.cpp b/mozilla/intl/uconv/ucvko/nsISO2022KRToUnicode.cpp
index 47657b49691..190bf3a4d34 100644
--- a/mozilla/intl/uconv/ucvko/nsISO2022KRToUnicode.cpp
+++ b/mozilla/intl/uconv/ucvko/nsISO2022KRToUnicode.cpp
@@ -145,7 +145,7 @@ NS_IMETHODIMP nsISO2022KRToUnicode::Convert(const char * aSrc, PRInt32 * aSrcLen
             nsString tmpCharset;
             nsCOMPtr<nsICharsetConverterManager> ccm = 
                   do_GetService(kCharsetConverterManagerCID, &rv);
-            if (!NS_FAILED(rv)) {
+            if (NS_SUCCEEDED(rv)) {
               tmpCharset.AssignWithConversion("EUC-KR");
               rv = ccm->GetUnicodeDecoder(&tmpCharset, &mEUCKRDecoder);
             }
diff --git a/mozilla/js/src/xpconnect/tests/TestXPC.cpp b/mozilla/js/src/xpconnect/tests/TestXPC.cpp
index d72eb078c0c..2f7c725ff5c 100644
--- a/mozilla/js/src/xpconnect/tests/TestXPC.cpp
+++ b/mozilla/js/src/xpconnect/tests/TestXPC.cpp
@@ -322,7 +322,7 @@ TestSecurityManager(JSContext* jscontext, JSObject* glob, nsIXPConnect* xpc)
     rval = JSVAL_FALSE;
     JS_SetProperty(jscontext, glob, "failed", &rval);
     printf("Individual SecurityManager tests...\n");
-    if(!NS_SUCCEEDED(xpc->SetSecurityManagerForJSContext(jscontext, sm,
+    if(NS_FAILED(xpc->SetSecurityManagerForJSContext(jscontext, sm,
                                         nsIXPCSecurityManager::HOOK_ALL)))
     {
         success = JS_FALSE;
diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index 780342be000..c9a00e5b3d8 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -4299,7 +4299,7 @@ nsCSSFrameConstructor::ConstructFieldSetFrame(nsIPresShell*            aPresShel
 {
   nsIFrame * newFrame;
   nsresult rv = NS_NewFieldSetFrame(aPresShell, &newFrame, NS_BLOCK_SPACE_MGR);
-  if (!NS_SUCCEEDED(rv)) {
+  if (NS_FAILED(rv)) {
     return rv;
   }
 
diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp
index 93920965fd7..9f148c5749d 100644
--- a/mozilla/layout/base/nsPresShell.cpp
+++ b/mozilla/layout/base/nsPresShell.cpp
@@ -1570,7 +1570,7 @@ PresShell::Init(nsIDocument* aDocument,
   nsresult result = nsComponentManager::CreateInstance(kFrameSelectionCID, nsnull,
                                                  NS_GET_IID(nsIFrameSelection),
                                                  getter_AddRefs(mSelection));
-  if (!NS_SUCCEEDED(result))
+  if (NS_FAILED(result))
     return result;
 
   // Create and initialize the frame manager
@@ -1584,7 +1584,7 @@ PresShell::Init(nsIDocument* aDocument,
   }
 
   result = mSelection->Init((nsIFocusTracker *) this, nsnull);
-  if (!NS_SUCCEEDED(result))
+  if (NS_FAILED(result))
     return result;
   // Important: this has to happen after the selection has been set up
 #ifdef SHOW_CARET
diff --git a/mozilla/layout/generic/nsSelection.cpp b/mozilla/layout/generic/nsSelection.cpp
index 6984aa8b93e..0e959126bc8 100644
--- a/mozilla/layout/generic/nsSelection.cpp
+++ b/mozilla/layout/generic/nsSelection.cpp
@@ -4233,17 +4233,17 @@ nsSelection::DeleteFromDocument()
   // Get an iterator
   nsSelectionIterator iter(mDomSelections[index]);
   res = iter.First();
-  if (!NS_SUCCEEDED(res))
+  if (NS_FAILED(res))
     return res;
 
   nsCOMPtr<nsIDOMRange> range;
   while (iter.IsDone())
   {
     res = iter.CurrentItem(NS_STATIC_CAST(nsIDOMRange**, getter_AddRefs(range)));
-    if (!NS_SUCCEEDED(res))
+    if (NS_FAILED(res))
       return res;
     res = range->DeleteContents();
-    if (!NS_SUCCEEDED(res))
+    if (NS_FAILED(res))
       return res;
     iter.Next();
   }
@@ -5670,7 +5670,7 @@ nsTypedSelection::GetEnumerator(nsIEnumerator **aIterator)
 {
   nsresult status = NS_ERROR_OUT_OF_MEMORY;
   nsSelectionIterator *iterator =  new nsSelectionIterator(this);
-  if ( iterator && !NS_SUCCEEDED(status = CallQueryInterface(iterator, aIterator)) )
+  if ( iterator && NS_FAILED(status = CallQueryInterface(iterator, aIterator)) )
   	delete iterator;
   return status;
 }
diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp
index 93920965fd7..9f148c5749d 100644
--- a/mozilla/layout/html/base/src/nsPresShell.cpp
+++ b/mozilla/layout/html/base/src/nsPresShell.cpp
@@ -1570,7 +1570,7 @@ PresShell::Init(nsIDocument* aDocument,
   nsresult result = nsComponentManager::CreateInstance(kFrameSelectionCID, nsnull,
                                                  NS_GET_IID(nsIFrameSelection),
                                                  getter_AddRefs(mSelection));
-  if (!NS_SUCCEEDED(result))
+  if (NS_FAILED(result))
     return result;
 
   // Create and initialize the frame manager
@@ -1584,7 +1584,7 @@ PresShell::Init(nsIDocument* aDocument,
   }
 
   result = mSelection->Init((nsIFocusTracker *) this, nsnull);
-  if (!NS_SUCCEEDED(result))
+  if (NS_FAILED(result))
     return result;
   // Important: this has to happen after the selection has been set up
 #ifdef SHOW_CARET
diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
index 780342be000..c9a00e5b3d8 100644
--- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -4299,7 +4299,7 @@ nsCSSFrameConstructor::ConstructFieldSetFrame(nsIPresShell*            aPresShel
 {
   nsIFrame * newFrame;
   nsresult rv = NS_NewFieldSetFrame(aPresShell, &newFrame, NS_BLOCK_SPACE_MGR);
-  if (!NS_SUCCEEDED(rv)) {
+  if (NS_FAILED(rv)) {
     return rv;
   }
 
diff --git a/mozilla/layout/xul/base/src/nsStackFrame.cpp b/mozilla/layout/xul/base/src/nsStackFrame.cpp
index 6697ce1900a..0af01210766 100644
--- a/mozilla/layout/xul/base/src/nsStackFrame.cpp
+++ b/mozilla/layout/xul/base/src/nsStackFrame.cpp
@@ -136,7 +136,7 @@ nsStackFrame::GetFrameForPoint(nsIPresContext* aPresContext,
   } else
       rv = NS_ERROR_FAILURE;
 
-  if (!NS_SUCCEEDED(rv)) {
+  if (NS_FAILED(rv)) {
         const nsStyleColor* color =
     (const nsStyleColor*)mStyleContext->GetStyleData(eStyleStruct_Color);
 
diff --git a/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp b/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp
index 96719289ecd..cf4c57a10c3 100644
--- a/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp
+++ b/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp
@@ -112,7 +112,7 @@ NS_IMETHODIMP nsAbAddressCollecter::CollectAddress(const char *address)
 
 	if(sizeLimitEnabled == -1){
 		rv = pPref->GetBoolPref(PREF_COLLECT_EMAIL_ADDRESS_ENABLE_SIZE_LIMIT, &sizeLimitEnabled);
-		if (!NS_SUCCEEDED(rv))
+		if (NS_FAILED(rv))
 			return rv;
 	}
 
@@ -120,7 +120,7 @@ NS_IMETHODIMP nsAbAddressCollecter::CollectAddress(const char *address)
 	if(sizeLimitEnabled && maxCABsize == -1){
 		PRInt32 max = 0;
     rv = pPref->GetIntPref(PREF_COLLECT_EMAIL_ADDRESS_SIZE_LIMIT, &max);
-		if (!NS_SUCCEEDED(rv))
+		if (NS_FAILED(rv))
 			return rv;
 		maxCABsize = max;
 	}
@@ -128,7 +128,7 @@ NS_IMETHODIMP nsAbAddressCollecter::CollectAddress(const char *address)
 	if (!m_historyAB)
 	{
 		rv = OpenHistoryAB(getter_AddRefs(m_historyAB));
-		if (!NS_SUCCEEDED(rv) || !m_historyAB)
+		if (NS_FAILED(rv) || !m_historyAB)
 			return rv;
 	}
 	// note that we're now setting the whole recipient list,
@@ -248,7 +248,7 @@ nsresult nsAbAddressCollecter::OpenHistoryAB(nsIAddrDatabase **aDatabase)
 		if (NS_SUCCEEDED(rv) && addrDBFactory)
                 {
 			rv = addrDBFactory->Open(dbPath, PR_TRUE, aDatabase, PR_TRUE);
-                        if (!NS_SUCCEEDED(rv))
+                        if (NS_FAILED(rv))
                         {
                           // blow away corrupt db's
                           dbPath->Delete(PR_FALSE);
diff --git a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp
index 64e980887b2..e031de31e5c 100644
--- a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp
+++ b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp
@@ -594,7 +594,7 @@ nsresult nsMsgFilter::SaveRule(nsIOFileStream *aStream)
       condition += "OR (";
     
     nsresult searchError = term->EnStreamNew(stream);
-    if (!NS_SUCCEEDED(searchError))
+    if (NS_FAILED(searchError))
     {
       err = searchError;
       break;
diff --git a/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp b/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp
index cf5492b6610..424f90d1a38 100644
--- a/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp
+++ b/mozilla/mailnews/base/search/src/nsMsgFilterList.cpp
@@ -169,7 +169,7 @@ nsMsgFilterList::ApplyFiltersToHdr(nsMsgFilterTypeType filterType,
 					PRBool applyMore;
 
 					ret  = listener->ApplyFilterHit(filter, msgWindow, &applyMore);
-					if (!NS_SUCCEEDED(ret) || !applyMore)
+					if (NS_FAILED(ret) || !applyMore)
 						break;
 				}
 			}
diff --git a/mozilla/mailnews/base/search/src/nsMsgImapSearch.cpp b/mozilla/mailnews/base/search/src/nsMsgImapSearch.cpp
index c8f2dc9b2aa..ee054014d63 100644
--- a/mozilla/mailnews/base/search/src/nsMsgImapSearch.cpp
+++ b/mozilla/mailnews/base/search/src/nsMsgImapSearch.cpp
@@ -138,12 +138,12 @@ nsresult nsMsgSearchOnlineMail::Encode (nsCString& pEncoding,
         nsCOMPtr <nsIMsgSearchValue> searchValue;
 
         nsresult rv = pTerm->GetValue(getter_AddRefs(searchValue));
-        if (!NS_SUCCEEDED(rv) || !searchValue)
+        if (NS_FAILED(rv) || !searchValue)
           continue;
 
 
         rv = searchValue->GetStr(getter_Copies(pchar));
-      	if (!NS_SUCCEEDED(rv) || !pchar)
+      	if (NS_FAILED(rv) || !pchar)
       		continue;
         asciiOnly = nsCRT::IsAscii(NS_CONST_CAST(PRUnichar*, pchar.get()));
 			}
diff --git a/mozilla/mailnews/base/search/src/nsMsgLocalSearch.cpp b/mozilla/mailnews/base/search/src/nsMsgLocalSearch.cpp
index 63a35c643ab..ef27213f39c 100644
--- a/mozilla/mailnews/base/search/src/nsMsgLocalSearch.cpp
+++ b/mozilla/mailnews/base/search/src/nsMsgLocalSearch.cpp
@@ -697,7 +697,7 @@ nsresult nsMsgSearchOfflineMail::Search (PRBool *aDone)
         {
           msgDBHdr = do_QueryInterface(currentItem, &dbErr);
         }
-        if (!NS_SUCCEEDED(dbErr))      
+        if (NS_FAILED(dbErr))      
           *aDone = PR_TRUE; //###phil dbErr is dropped on the floor. just note that we did have an error so we'll clean up later
         else
         {
diff --git a/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp b/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp
index 634aa05ae2b..210454238a2 100644
--- a/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp
+++ b/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp
@@ -392,7 +392,7 @@ nsresult nsMsgSearchAdapter::EncodeImapTerm (nsIMsgSearchTerm *term, PRBool real
   nsCOMPtr <nsIMsgSearchValue> searchValue;
   nsresult rv = term->GetValue(getter_AddRefs(searchValue));
 
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
     return rv;
 
   nsMsgSearchOpValue op;
diff --git a/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp b/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp
index d68ff771f17..e555cdc0a54 100644
--- a/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp
+++ b/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp
@@ -186,13 +186,13 @@ char *nsMsgSearchNews::EncodeTerm (nsIMsgSearchTerm *term)
   nsCOMPtr <nsIMsgSearchValue> searchValue;
 
   nsresult rv = term->GetValue(getter_AddRefs(searchValue));
-  if (!NS_SUCCEEDED(rv) || !searchValue)
+  if (NS_FAILED(rv) || !searchValue)
     return nsnull;
 
 
   nsXPIDLString intlNonRFC1522Value;
   rv = searchValue->GetStr(getter_Copies(intlNonRFC1522Value));
-	if (!NS_SUCCEEDED(rv) || !intlNonRFC1522Value)
+	if (NS_FAILED(rv) || !intlNonRFC1522Value)
 		return nsnull;
 		
 	PRUnichar *caseInsensitiveValue = EncodeToWildmat (intlNonRFC1522Value);
diff --git a/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp b/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp
index 36df4ab0b7d..d6d1dfbdba4 100644
--- a/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp
+++ b/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp
@@ -949,7 +949,7 @@ nsresult nsMsgSearchTerm::MatchRfc822String (const char *string, const char *cha
 	*pResult = PR_FALSE;
 	PRBool result;
 	nsresult err = InitHeaderAddressParser();
-	if (!NS_SUCCEEDED(err))
+	if (NS_FAILED(err))
 		return err;
 	// Isolate the RFC 822 parsing weirdnesses here. MSG_ParseRFC822Addresses
 	// returns a catenated string of null-terminated strings, which we walk
diff --git a/mozilla/mailnews/base/src/nsMsgDBView.cpp b/mozilla/mailnews/base/src/nsMsgDBView.cpp
index a4ca46b9496..137083ebe45 100644
--- a/mozilla/mailnews/base/src/nsMsgDBView.cpp
+++ b/mozilla/mailnews/base/src/nsMsgDBView.cpp
@@ -2978,7 +2978,7 @@ nsresult nsMsgDBView::CollapseByIndex(nsMsgViewIndex index, PRUint32 *pNumCollap
 	firstIdInThread = m_keys[index];
 	nsCOMPtr <nsIMsgDBHdr> msgHdr;
   rv = m_db->GetMsgHdrForKey(firstIdInThread, getter_AddRefs(msgHdr));
-	if (!NS_SUCCEEDED(rv) || msgHdr == nsnull)
+	if (NS_FAILED(rv) || msgHdr == nsnull)
 	{
 		NS_ASSERTION(PR_FALSE, "error collapsing thread");
 		return NS_MSG_MESSAGE_NOT_FOUND;
diff --git a/mozilla/mailnews/base/src/nsMsgFolderCache.cpp b/mozilla/mailnews/base/src/nsMsgFolderCache.cpp
index a982affabf3..9367d1178d8 100644
--- a/mozilla/mailnews/base/src/nsMsgFolderCache.cpp
+++ b/mozilla/mailnews/base/src/nsMsgFolderCache.cpp
@@ -339,7 +339,7 @@ NS_IMETHODIMP nsMsgFolderCache::Init(nsIFileSpec *dbFileSpec)
 			// ### evil cast until MDB supports file streams.
 			rv = OpenMDB((const char *) m_dbFileSpec, exists);
       // if this fails and panacea.dat exists, try blowing away the db and recreating it
-      if (!NS_SUCCEEDED(rv) && exists)
+      if (NS_FAILED(rv) && exists)
       {
 	      if (m_mdbStore)
 		      m_mdbStore->Release();
diff --git a/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp b/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp
index 3631b5dd436..438c8305492 100644
--- a/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp
+++ b/mozilla/mailnews/base/src/nsMsgFolderCompactor.cpp
@@ -145,7 +145,7 @@ nsFolderCompactState::InitDB(nsIMsgDatabase *db)
                                      PR_FALSE,
                                      getter_AddRefs(m_db));
 
-    if(!NS_SUCCEEDED(folderOpen) &&
+    if(NS_FAILED(folderOpen) &&
        folderOpen == NS_MSG_ERROR_FOLDER_SUMMARY_OUT_OF_DATE || 
        folderOpen == NS_MSG_ERROR_FOLDER_SUMMARY_MISSING )
     {
@@ -606,7 +606,7 @@ nsOfflineStoreCompactState::OnStopRequest(nsIRequest *request, nsISupports *ctxt
     if (NS_FAILED(rv)) goto done;
     rv = m_messageService->CopyMessage(m_messageUri.get(), this, PR_FALSE, nsnull,
                                        /* ### should get msg window! */ nsnull, nsnull);
-   if (!NS_SUCCEEDED(rv))
+   if (NS_FAILED(rv))
    {
      PRUint32 resultFlags;
      msgHdr->AndFlags(~MSG_FLAG_OFFLINE, &resultFlags);
diff --git a/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp b/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp
index 557bc5c9121..8d9d1d0cd36 100644
--- a/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp
+++ b/mozilla/mailnews/base/src/nsMsgOfflineManager.cpp
@@ -124,7 +124,7 @@ nsresult nsMsgOfflineManager::StopRunning(nsresult exitStatus)
 
 nsresult nsMsgOfflineManager::AdvanceToNextState(nsresult exitStatus)
 {
-  if (!NS_SUCCEEDED(exitStatus))
+  if (NS_FAILED(exitStatus))
   {
     return StopRunning(exitStatus);
   }
@@ -303,7 +303,7 @@ nsresult nsMsgOfflineManager::DownloadOfflineNewsgroups()
   if (NS_SUCCEEDED(rv) && nntpService)
     rv = nntpService->DownloadNewsgroupsForOffline(m_window, this);
 
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
     return AdvanceToNextState(rv);
   return rv;
 }
diff --git a/mozilla/mailnews/base/src/nsMsgThreadedDBView.cpp b/mozilla/mailnews/base/src/nsMsgThreadedDBView.cpp
index 92e8036da23..99a5cfb5baa 100644
--- a/mozilla/mailnews/base/src/nsMsgThreadedDBView.cpp
+++ b/mozilla/mailnews/base/src/nsMsgThreadedDBView.cpp
@@ -319,7 +319,7 @@ nsresult nsMsgThreadedDBView::ListThreadIds(nsMsgKey *startMsg, PRBool unreadOnl
   {
     nsCOMPtr <nsISupports> supports;
     rv = m_threadEnumerator->GetNext(getter_AddRefs(supports));
-    if (!NS_SUCCEEDED(rv))
+    if (NS_FAILED(rv))
     {
       threadHdr = nsnull;
       break;
diff --git a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp
index 5043bbb72bf..d6c0886707f 100644
--- a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp
+++ b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp
@@ -1055,7 +1055,7 @@ NS_IMETHODIMP nsMsgDBFolder::WriteToFolderCache(nsIMsgFolderCache *folderCache,
 	nsCOMPtr<nsISupports> aItem;
 
 	rv = aEnumerator->First();
-	if (!NS_SUCCEEDED(rv))
+	if (NS_FAILED(rv))
 		return NS_OK;	// it's OK, there are no sub-folders.
 
 	while(NS_SUCCEEDED(rv))
@@ -1068,12 +1068,12 @@ NS_IMETHODIMP nsMsgDBFolder::WriteToFolderCache(nsIMsgFolderCache *folderCache,
 			if (folderCache)
 			{
 				rv = aMsgFolder->WriteToFolderCache(folderCache, PR_TRUE);
-				if (!NS_SUCCEEDED(rv))
+				if (NS_FAILED(rv))
 					break;
 			}
 		}
 		rv = aEnumerator->Next();
-		if (!NS_SUCCEEDED(rv))
+		if (NS_FAILED(rv))
 		{
 			rv = NS_OK;
 			break;
diff --git a/mozilla/mailnews/base/util/nsMsgFolder.cpp b/mozilla/mailnews/base/util/nsMsgFolder.cpp
index 8519e93ec2f..47037f85903 100644
--- a/mozilla/mailnews/base/util/nsMsgFolder.cpp
+++ b/mozilla/mailnews/base/util/nsMsgFolder.cpp
@@ -938,7 +938,7 @@ NS_IMETHODIMP nsMsgFolder::GetChildWithURI(const char *uri, PRBool deep, PRBool
 	nsCOMPtr<nsISupports> aItem;
 
 	rv = aEnumerator->First();
-	if (!NS_SUCCEEDED(rv))
+	if (NS_FAILED(rv))
 		return NS_OK;	// it's OK, there are no sub-folders.
 
 	while(NS_SUCCEEDED(rv))
@@ -974,7 +974,7 @@ NS_IMETHODIMP nsMsgFolder::GetChildWithURI(const char *uri, PRBool deep, PRBool
 			}
 		}
 		rv = aEnumerator->Next();
-		if (!NS_SUCCEEDED(rv))
+		if (NS_FAILED(rv))
 		{
 			rv = NS_OK;
 			break;
@@ -1544,7 +1544,7 @@ NS_IMETHODIMP nsMsgFolder::SetFlag(PRUint32 flag)
 	PRBool flagSet;
 	nsresult rv;
 
-	if(!NS_SUCCEEDED(rv = GetFlag(flag, &flagSet)))
+	if(NS_FAILED(rv = GetFlag(flag, &flagSet)))
 		return rv;
 
 	if (!flagSet)
@@ -1562,7 +1562,7 @@ NS_IMETHODIMP nsMsgFolder::ClearFlag(PRUint32 flag)
 	PRBool flagSet;
 	nsresult rv;
 
-	if(!NS_SUCCEEDED(rv = GetFlag(flag, &flagSet)))
+	if(NS_FAILED(rv = GetFlag(flag, &flagSet)))
 		return rv;
 
 	if (flagSet)
diff --git a/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp b/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp
index beface9913a..7056f3c22d2 100644
--- a/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp
+++ b/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp
@@ -371,7 +371,7 @@ char * nsMsgLineStreamBuffer::ReadNextLine(nsIInputStream * aInputStream, PRUint
         // try growing buffer by twice as much as we need.
         nsresult rv = GrowBuffer(m_dataBufferSize + growBy);
         // if we can't grow the buffer, we have to bail.
-        if (!NS_SUCCEEDED(rv))
+        if (NS_FAILED(rv))
           return nsnull;
         startOfLine = m_dataBuffer;
         numFreeBytesInBuffer += growBy;
diff --git a/mozilla/mailnews/compose/src/nsMsgSend.cpp b/mozilla/mailnews/compose/src/nsMsgSend.cpp
index 2d59a448a76..6f50a55a326 100644
--- a/mozilla/mailnews/compose/src/nsMsgSend.cpp
+++ b/mozilla/mailnews/compose/src/nsMsgSend.cpp
@@ -3139,7 +3139,7 @@ nsMsgComposeAndSend::DeliverFileAsMail()
   nsCOMPtr<nsIAbAddressCollecter> addressCollecter = 
            do_GetService(kCAddressCollecter, &rv);
 
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
     addressCollecter = nsnull;
 
   PRBool collectAddresses = (collectOutgoingAddresses && addressCollecter);
diff --git a/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp
index 58af53b666e..7f0d1e987b9 100644
--- a/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp
@@ -843,7 +843,7 @@ nsresult nsMsgOfflineOpEnumerator::PrefetchNext()
   if (!mRowCursor)
   {
     rv = GetRowCursor();
-    if (!NS_SUCCEEDED(rv))
+    if (NS_FAILED(rv))
       return rv;
   }
 
diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
index 52b43b14014..a8370b66090 100644
--- a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
+++ b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp
@@ -2288,7 +2288,7 @@ nsresult nsMsgDBEnumerator::PrefetchNext()
 	if (!mRowCursor)
 	{
 		rv = GetRowCursor();
-		if (!NS_SUCCEEDED(rv))
+		if (NS_FAILED(rv))
 			return rv;
 	}
 
@@ -2473,7 +2473,7 @@ nsresult nsMsgDBThreadEnumerator::PrefetchNext()
 	if (!mTableCursor)
 	{
 		rv = GetTableCursor();
-		if (!NS_SUCCEEDED(rv))
+		if (NS_FAILED(rv))
 			return rv;
 	}
     while (PR_TRUE) 
@@ -2903,7 +2903,7 @@ nsIMsgHeaderParser *nsMsgDatabase::GetHeaderParser()
 													NULL, 
 													NS_GET_IID(nsIMsgHeaderParser), 
 													(void **) &m_HeaderParser);
-		if (!NS_SUCCEEDED(rv))
+		if (NS_FAILED(rv))
 			m_HeaderParser = nsnull;
 	}
 	return m_HeaderParser;
diff --git a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
index 9898a463b1b..4dde235d256 100644
--- a/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
+++ b/mozilla/mailnews/imap/src/nsImapIncomingServer.cpp
@@ -504,7 +504,7 @@ nsImapIncomingServer::LoadNextQueuedUrl(PRBool *aResult)
         if (!request)
           return NS_ERROR_FAILURE;
         request->GetStatus(&rv);
-        if (!NS_SUCCEEDED(rv))
+        if (NS_FAILED(rv))
         {
           nsresult res;
           removeUrlFromQueue = PR_TRUE;
@@ -2180,7 +2180,7 @@ nsresult nsImapIncomingServer::GetUnverifiedSubFolders(nsIFolder *parentFolder,
 				if (NS_SUCCEEDED(rv) && childFolder)
 				{
 					rv = GetUnverifiedSubFolders(childFolder, aFoldersArray, aNumUnverifiedFolders);
-					if (!NS_SUCCEEDED(rv))
+					if (NS_FAILED(rv))
 						break;
 				}
 			}
diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
index c4a9c45f51c..04fb15de1f8 100644
--- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
+++ b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp
@@ -542,7 +542,7 @@ NS_IMETHODIMP nsImapMailFolder::GetSubFolders(nsIEnumerator* *result)
       nsCOMPtr <nsIMsgFolder> inboxFolder;
 
       rv = GetFoldersWithFlag(MSG_FOLDER_FLAG_INBOX, 1, &numFolders, getter_AddRefs(inboxFolder));
-      if (!NS_SUCCEEDED(rv) || numFolders == 0 || !inboxFolder)
+      if (NS_FAILED(rv) || numFolders == 0 || !inboxFolder)
       {
         // create an inbox if we don't have one.
         CreateClientSubfolderInfo("INBOX", kOnlineHierarchySeparatorUnknown,0);
@@ -3596,7 +3596,7 @@ nsImapMailFolder::NotifyMessageFlags(PRUint32 flags, nsMsgKey msgKey)
 		rv = mDatabase->ContainsKey(msgKey , &containsKey);
 		// if we don't have the header, don't diddle the flags.
 		// GetMsgHdrForKey will create the header if it doesn't exist.
-		if (!NS_SUCCEEDED(rv) || !containsKey)
+		if (NS_FAILED(rv) || !containsKey)
 			return rv;
 
 		rv = mDatabase->GetMsgHdrForKey(msgKey, getter_AddRefs(dbHdr));
@@ -4232,7 +4232,7 @@ nsImapMailFolder::NotifySearchHit(nsIMsgMailNewsUrl * aUrl,
                                   const char* searchHitLine)
 {
   nsresult rv = GetDatabase(nsnull /* don't need msg window, that's more for local mbox parsing */);
-  if (!mDatabase || !NS_SUCCEEDED(rv))
+  if (!mDatabase || NS_FAILED(rv))
     return rv;
   // expect search results in the form of "* SEARCH <hit> <hit> ..."
                 // expect search results in the form of "* SEARCH <hit> <hit> ..."
@@ -5076,7 +5076,7 @@ nsresult nsImapMailFolder::CopyMessagesOffline(nsIMsgFolder* srcFolder,
           nsCOMPtr <nsIMsgDBHdr> newMailHdr;
           rv = mDatabase->CopyHdrFromExistingHdr(fakeBase + sourceKeyIndex, mailHdr,
             PR_TRUE, getter_AddRefs(newMailHdr));
-          if (!newMailHdr || !NS_SUCCEEDED(rv))
+          if (!newMailHdr || NS_FAILED(rv))
           {
             NS_ASSERTION(PR_FALSE, "failed to copy hdr");
             stopit = rv;
diff --git a/mozilla/mailnews/imap/src/nsImapOfflineSync.cpp b/mozilla/mailnews/imap/src/nsImapOfflineSync.cpp
index 08b8387972b..abd716d7b53 100644
--- a/mozilla/mailnews/imap/src/nsImapOfflineSync.cpp
+++ b/mozilla/mailnews/imap/src/nsImapOfflineSync.cpp
@@ -178,7 +178,7 @@ nsresult nsImapOfflineSync::AdvanceToNextFolder()
      rv = AdvanceToNextServer();
   else
     rv = m_serverEnumerator->Next();
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
     rv = AdvanceToNextServer();
 
   if (NS_SUCCEEDED(rv) && m_serverEnumerator)
diff --git a/mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp b/mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp
index 86e9f80d072..af1d406dc2a 100644
--- a/mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp
+++ b/mozilla/mailnews/imap/src/nsImapServerResponseParser.cpp
@@ -1866,7 +1866,7 @@ void nsImapServerResponseParser::msg_fetch_content(PRBool chunk, PRInt32 origin,
 	if ((!chunk || (origin == 0)) && !GetDownloadingHeaders() &&
 		(GetFillingInShell() ? m_shell->GetGeneratingWholeMessage() : PR_TRUE))
 	{
-    if (!NS_SUCCEEDED(BeginMessageDownload(content_type)))
+    if (NS_FAILED(BeginMessageDownload(content_type)))
       return;
 	}
 
diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp
index 32b4565d2f7..05012159a08 100644
--- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp
+++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp
@@ -529,7 +529,7 @@ nsresult nsMsgLocalMailFolder::GetDatabase(nsIMsgWindow *aMsgWindow)
 		if (NS_SUCCEEDED(rv) && mailDBFactory)
 		{
 			folderOpen = mailDBFactory->OpenFolderDB(this, PR_TRUE, PR_FALSE, getter_AddRefs(mDatabase));
-			if(!NS_SUCCEEDED(folderOpen) &&
+			if(NS_FAILED(folderOpen) &&
 				folderOpen == NS_MSG_ERROR_FOLDER_SUMMARY_OUT_OF_DATE || folderOpen == NS_MSG_ERROR_FOLDER_SUMMARY_MISSING )
 			{
         nsCOMPtr <nsIDBFolderInfo> dbFolderInfo;
@@ -546,7 +546,7 @@ nsresult nsMsgLocalMailFolder::GetDatabase(nsIMsgWindow *aMsgWindow)
           dbFolderInfo = nsnull;
         }
 				// if it's out of date then reopen with upgrade.
-				if(!NS_SUCCEEDED(rv = mailDBFactory->OpenFolderDB(this, PR_TRUE, PR_TRUE, getter_AddRefs(mDatabase))))
+				if(NS_FAILED(rv = mailDBFactory->OpenFolderDB(this, PR_TRUE, PR_TRUE, getter_AddRefs(mDatabase))))
 				{
 					return rv;
 				}
@@ -1839,7 +1839,7 @@ nsMsgLocalMailFolder::CopyMessages(nsIMsgFolder* srcFolder, nsISupportsArray*
 		if (msgSupport)
 		{
 			rv = CopyMessageTo(msgSupport, this, msgWindow, isMove);
-		  if (!NS_SUCCEEDED(rv))
+		  if (NS_FAILED(rv))
       {
         NS_ASSERTION(PR_FALSE, "copy message failed");
 			  ClearCopyState(PR_FALSE);
diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp
index 99041e76f5b..07ce89a1504 100644
--- a/mozilla/mailnews/local/src/nsParseMailbox.cpp
+++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp
@@ -1838,7 +1838,7 @@ nsresult nsParseNewMailState::MoveIncorporatedMessage(nsIMsgDBHdr *mailHdr,
   destIFolder->GetPath(getter_AddRefs(destIFolderSpec));
   err = destIFolderSpec->GetFileSpec(&destFolderSpec);
   
-  if (!NS_SUCCEEDED(err))
+  if (NS_FAILED(err))
     return err;
   
   nsCOMPtr <nsISupports> myISupports = do_QueryInterface(NS_STATIC_CAST(nsIMsgParseMailMsgState*, this));
diff --git a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp
index 6630ecd1c01..1c2b9fec33b 100644
--- a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp
+++ b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp
@@ -3474,7 +3474,7 @@ PRInt32 nsNNTPProtocol::FigureNextChunk()
 	}
 
     /* convert nsresult->status */
-    status = !NS_SUCCEEDED(rv);
+    status = NS_FAILED(rv);
 
 	if (status < 0) 
 	  return status;
@@ -3664,7 +3664,7 @@ PRInt32 nsNNTPProtocol::ReadNewsgroupResponse()
 	  /* Give the message number to the header parser. */
       rv = m_newsgroupList->ProcessNonXOVER(m_responseText);
       /* convert nsresult->status */
-      return !NS_SUCCEEDED(rv);
+      return NS_FAILED(rv);
   }
   else
   {
@@ -3711,7 +3711,7 @@ PRInt32 nsNNTPProtocol::ReadNewsgroupBody(nsIInputStream * inputStream, PRUint32
   rv = m_newsgroupList->ProcessNonXOVER(line);
   /* convert nsresult->status */
   PR_FREEIF(line);
-  return !NS_SUCCEEDED(rv);
+  return NS_FAILED(rv);
 }
 
 
diff --git a/mozilla/mailnews/news/src/nsNewsDownloader.cpp b/mozilla/mailnews/news/src/nsNewsDownloader.cpp
index d3e47de1488..c56e590e138 100644
--- a/mozilla/mailnews/news/src/nsNewsDownloader.cpp
+++ b/mozilla/mailnews/news/src/nsNewsDownloader.cpp
@@ -303,7 +303,7 @@ NS_IMETHODIMP nsNewsDownloader::OnSearchDone(nsresult status)
       return m_listener->OnStopRunningUrl(nsnull, NS_OK);
   }
   nsresult rv = DownloadArticles(m_window, m_folder, &m_keysToDownload);
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
     if (m_listener)
       m_listener->OnStopRunningUrl(nsnull, rv);
 
@@ -463,7 +463,7 @@ nsresult nsMsgDownloadAllNewsgroups::AdvanceToNextGroup(PRBool *done)
      rv = AdvanceToNextServer(done);
   else
     rv = m_serverEnumerator->Next();
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
     rv = AdvanceToNextServer(done);
 
   if (NS_SUCCEEDED(rv) && !*done && m_serverEnumerator)
@@ -508,7 +508,7 @@ nsresult nsMsgDownloadAllNewsgroups::ProcessNextGroup()
         break;
     }
   }
-  if (!NS_SUCCEEDED(rv) || done)
+  if (NS_FAILED(rv) || done)
   {
     if (m_listener)
       return m_listener->OnStopRunningUrl(nsnull, NS_OK);
diff --git a/mozilla/modules/libpr0n/src/imgContainer.cpp b/mozilla/modules/libpr0n/src/imgContainer.cpp
index db7bf301073..3a446a1e8b3 100644
--- a/mozilla/modules/libpr0n/src/imgContainer.cpp
+++ b/mozilla/modules/libpr0n/src/imgContainer.cpp
@@ -703,7 +703,7 @@ void imgContainer::BuildCompositeMask(gfxIImageFrame *aCompositingFrame, gfxIIma
   PRUint32 compositingAlphaDataLength;
   aCompositingFrame->LockAlphaData();
   res = aCompositingFrame->GetAlphaData(&compositingAlphaData, &compositingAlphaDataLength);
-  if(!compositingAlphaData || !compositingAlphaDataLength || !NS_SUCCEEDED(res)) {
+  if(!compositingAlphaData || !compositingAlphaDataLength || NS_FAILED(res)) {
     aCompositingFrame->UnlockAlphaData();
     return;
   }
@@ -711,7 +711,7 @@ void imgContainer::BuildCompositeMask(gfxIImageFrame *aCompositingFrame, gfxIIma
   // The current frame of the animation (overlay frame) is what
   // determines the transparent color.
   gfx_color color;
-  if(!NS_SUCCEEDED(aOverlayFrame->GetTransparentColor(&color))) {
+  if(NS_FAILED(aOverlayFrame->GetTransparentColor(&color))) {
     //XXX setting the entire mask on here is probably the wrong thing
     //we should probably just set the region of the overlay frame
     //to 255, but for the moment I can't find a case where this gives
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 096a5fed77c..17be237bee0 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -5491,7 +5491,7 @@ nsPluginHostImpl::StopPluginInstance(nsIPluginInstance* aInstance)
       nsresult rv;
       nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
       if (prefs) rv = prefs->GetIntPref(NS_PREF_MAX_NUM_CACHED_PLUGINS,(int *)&max_num);
-      if (!NS_SUCCEEDED(rv)) max_num = DEFAULT_NUMBER_OF_STOPPED_PLUGINS;
+      if (NS_FAILED(rv)) max_num = DEFAULT_NUMBER_OF_STOPPED_PLUGINS;
 
       if(mActivePluginList.getStoppedCount() >= max_num)
       {
diff --git a/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp b/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
index 69b0ddc7d46..f30618316aa 100644
--- a/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
+++ b/mozilla/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp
@@ -193,7 +193,7 @@ nsSanePluginInstance::Initialize( nsIPluginInstancePeer* peer )
     result = peer->QueryInterface( nsIPluginTagInfo::GetIID(),
                                    ( void ** )&taginfo );
 
-    if ( !NS_FAILED( result ) )
+    if ( NS_SUCCEEDED( result ) )
     {
         taginfo->GetAttributes( count, names, values );
         NS_IF_RELEASE( taginfo );
diff --git a/mozilla/modules/plugin/samples/simple/npsimple.cpp b/mozilla/modules/plugin/samples/simple/npsimple.cpp
index 24679cabac0..1ae1bd5b08f 100644
--- a/mozilla/modules/plugin/samples/simple/npsimple.cpp
+++ b/mozilla/modules/plugin/samples/simple/npsimple.cpp
@@ -554,7 +554,7 @@ SimplePluginInstance::Initialize(nsIPluginInstancePeer* peer)
 
    result = peer->QueryInterface(NS_GET_IID(nsIPluginTagInfo), (void **)&taginfo);
 
-    if (!NS_FAILED(result))
+    if (NS_SUCCEEDED(result))
     {
         taginfo->GetAttributes(count, names, values);
         NS_IF_RELEASE(taginfo);
diff --git a/mozilla/modules/plugin/samples/testevents/npevents.cpp b/mozilla/modules/plugin/samples/testevents/npevents.cpp
index 1ec60d98135..e9fd7d5ba14 100644
--- a/mozilla/modules/plugin/samples/testevents/npevents.cpp
+++ b/mozilla/modules/plugin/samples/testevents/npevents.cpp
@@ -364,7 +364,7 @@ NS_METHOD EventsPluginInstance::Initialize(nsIPluginInstancePeer *peer) {
 	if (NS_FAILED(result)) return result;
 
 	taginfo = do_QueryInterface(peer, &result);
-	if (!NS_FAILED(result)) {
+	if (NS_SUCCEEDED(result)) {
 		taginfo->GetAttributes(count, names, values);
 	}
 
diff --git a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
index c49e5707ffd..eb4006ea5a6 100644
--- a/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
+++ b/mozilla/netwerk/base/src/nsProtocolProxyService.cpp
@@ -141,7 +141,7 @@ nsProtocolProxyService::PrefsChanged(const char* pref) {
     {
         rv = mPrefs->CopyCharPref("network.proxy.http", 
                 getter_Copies(mHTTPProxyHost));
-        if (!NS_SUCCEEDED(rv))
+        if (NS_FAILED(rv))
             mHTTPProxyHost.Adopt(nsCRT::strdup(""));
     }
 
@@ -158,7 +158,7 @@ nsProtocolProxyService::PrefsChanged(const char* pref) {
     {
         rv = mPrefs->CopyCharPref("network.proxy.ssl", 
                 getter_Copies(mHTTPSProxyHost));
-        if (!NS_SUCCEEDED(rv))
+        if (NS_FAILED(rv))
             mHTTPSProxyHost.Adopt(nsCRT::strdup(""));
     }
 
@@ -175,7 +175,7 @@ nsProtocolProxyService::PrefsChanged(const char* pref) {
     {
         rv = mPrefs->CopyCharPref("network.proxy.ftp", 
                 getter_Copies(mFTPProxyHost));
-        if (!NS_SUCCEEDED(rv))
+        if (NS_FAILED(rv))
             mFTPProxyHost.Adopt(nsCRT::strdup(""));
     }
 
@@ -192,7 +192,7 @@ nsProtocolProxyService::PrefsChanged(const char* pref) {
     {
         rv = mPrefs->CopyCharPref("network.proxy.gopher", 
                                       getter_Copies(mGopherProxyHost));
-        if (!NS_SUCCEEDED(rv) || !mGopherProxyHost)
+        if (NS_FAILED(rv) || !mGopherProxyHost)
             mGopherProxyHost.Adopt(nsCRT::strdup(""));
     }
 
@@ -209,7 +209,7 @@ nsProtocolProxyService::PrefsChanged(const char* pref) {
     {
         rv = mPrefs->CopyCharPref("network.proxy.socks", 
                                   getter_Copies(mSOCKSProxyHost));
-        if (!NS_SUCCEEDED(rv))
+        if (NS_FAILED(rv))
             mSOCKSProxyHost.Adopt(nsCRT::strdup(""));
     }
     
diff --git a/mozilla/netwerk/base/src/nsSocketTransport.cpp b/mozilla/netwerk/base/src/nsSocketTransport.cpp
index 2d72b2af931..e8d09d8990e 100644
--- a/mozilla/netwerk/base/src/nsSocketTransport.cpp
+++ b/mozilla/netwerk/base/src/nsSocketTransport.cpp
@@ -746,7 +746,7 @@ nsresult nsSocketTransport::doConnection(PRInt16 aSelectFlags)
                     rv = pProviderService->GetSocketProvider(mSocketTypes[type], 
                                                            getter_AddRefs(pProvider));
               
-                if (!NS_SUCCEEDED(rv)) break;
+                if (NS_FAILED(rv)) break;
               
                 nsCOMPtr<nsISupports> socketInfo;
               
@@ -772,7 +772,7 @@ nsresult nsSocketTransport::doConnection(PRInt16 aSelectFlags)
                                                 getter_AddRefs(socketInfo));
                 }
               
-                if (!NS_SUCCEEDED(rv) || !mSocketFD) break;
+                if (NS_FAILED(rv) || !mSocketFD) break;
 
                 // if the service was ssl or tlsstepup, we want to hold onto the socket info
                 if (nsCRT::strcmp(mSocketTypes[type], "ssl") == 0 ||
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
index b1eca1755df..4edbf89d379 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokenizer.cpp
@@ -793,7 +793,7 @@ nsresult nsHTMLTokenizer::ConsumeStartTag(PRUnichar aChar,CToken*& aToken,nsScan
       //tag but ran out of data (not in the stream, but in this *part* of the stream.
       //For simplicity, we have to unwind our input. Therefore, we pop and discard
       //any new tokens we've cued this round. Later we can get smarter about this.
-      if(!NS_SUCCEEDED(result)) {
+      if(NS_FAILED(result)) {
         while(mTokenDeque.GetSize()>theDequeSize) {
           CToken* theToken=(CToken*)mTokenDeque.Pop();
           IF_FREE(theToken, mTokenAllocator);
@@ -942,7 +942,7 @@ nsresult nsHTMLTokenizer::ConsumeText(CToken*& aToken,nsScanner& aScanner){
   if(theToken) {
     PRUnichar ch=0;
     result=theToken->Consume(ch,aScanner,mFlags);
-    if(!NS_SUCCEEDED(result)) {
+    if(NS_FAILED(result)) {
       if(0==theToken->GetTextLength()){
         IF_FREE(aToken, mTokenAllocator);
         aToken = nsnull;
diff --git a/mozilla/webshell/embed/xlib/gtk/nsEmbedXlibIntoGtk.cpp b/mozilla/webshell/embed/xlib/gtk/nsEmbedXlibIntoGtk.cpp
index 18eb71bed03..be4aaaa659a 100644
--- a/mozilla/webshell/embed/xlib/gtk/nsEmbedXlibIntoGtk.cpp
+++ b/mozilla/webshell/embed/xlib/gtk/nsEmbedXlibIntoGtk.cpp
@@ -147,7 +147,7 @@ int main(int argc, char **argv)
   
   NS_ASSERTION(NS_SUCCEEDED(rv),"Cannot obtain unix toolkit service.");
 
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
 	return 1;
 
   // Force the toolkit into "xlib" mode regardless of MOZ_TOOLKIT
@@ -180,21 +180,21 @@ int main(int argc, char **argv)
   
   NS_ASSERTION(NS_SUCCEEDED(rv),"Could not obtain the event queue service.");
 
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
 	return 1;
 
   rv = eventQueueService->CreateThreadEventQueue();
   
   NS_ASSERTION(NS_SUCCEEDED(rv),"Could not create the event queue for the the thread.");
   
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
 	return 1;
   
   rv = eventQueueService->GetThreadEventQueue(NS_CURRENT_THREAD, &eventQueue);
   
   NS_ASSERTION(NS_SUCCEEDED(rv),"Could not get the newly created thread event queue.\n");
   
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
 	return 1;
   
   NS_RELEASE(eventQueueService);
@@ -205,7 +205,7 @@ int main(int argc, char **argv)
 
   NS_ASSERTION(NS_SUCCEEDED(rv),"Couldn't obtain window service\n");
 
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
 	return 1;
 
   gsWindowService->SetWindowCreateCallback(WindowCreateCallback);
@@ -224,7 +224,7 @@ int main(int argc, char **argv)
 
   NS_ASSERTION(NS_SUCCEEDED(rv),"Cannot create WebShell.\n");
 
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
 	return 1;
 
   // XXX - fix me!
diff --git a/mozilla/webshell/embed/xlib/qt/QMozillaContainer.cpp b/mozilla/webshell/embed/xlib/qt/QMozillaContainer.cpp
index 73b552d62bb..f7debd29b21 100644
--- a/mozilla/webshell/embed/xlib/qt/QMozillaContainer.cpp
+++ b/mozilla/webshell/embed/xlib/qt/QMozillaContainer.cpp
@@ -255,7 +255,7 @@ int QMozillaContainer::init()
   
   NS_ASSERTION(NS_SUCCEEDED(rv),"Cannot obtain unix toolkit service.");
 
-	if (!NS_SUCCEEDED(rv))
+	if (NS_FAILED(rv))
 		return 1;
 
   // Force the toolkit into "xlib" mode regardless of MOZ_TOOLKIT
@@ -288,21 +288,21 @@ int QMozillaContainer::init()
   
   NS_ASSERTION(NS_SUCCEEDED(rv),"Could not obtain the event queue service.");
 
-	if (!NS_SUCCEEDED(rv))
+	if (NS_FAILED(rv))
 		return 1;
 
   rv = eventQueueService->CreateThreadEventQueue();
   
   NS_ASSERTION(NS_SUCCEEDED(rv),"Could not create the event queue for the the thread.");
   
-	if (!NS_SUCCEEDED(rv))
+	if (NS_FAILED(rv))
 		return 1;
   
   rv = eventQueueService->GetThreadEventQueue(NS_CURRENT_THREAD, &eventQueue);
   
   NS_ASSERTION(NS_SUCCEEDED(rv),"Could not get the newly created thread event queue.\n");
   
-	if (!NS_SUCCEEDED(rv))
+	if (NS_FAILED(rv))
 		return 1;
   
   NS_RELEASE(eventQueueService);
@@ -313,7 +313,7 @@ int QMozillaContainer::init()
 
   NS_ASSERTION(NS_SUCCEEDED(rv),"Couldn't obtain window service\n");
 
-  if (!NS_SUCCEEDED(rv))
+  if (NS_FAILED(rv))
 		return 1;
 
   m_WindowService->SetWindowCreateCallback(WindowCreateCallback);
@@ -331,7 +331,7 @@ int QMozillaContainer::init()
 
   NS_ASSERTION(NS_SUCCEEDED(rv),"Cannot create WebShell.\n");
 
-	if (!NS_SUCCEEDED(rv))
+	if (NS_FAILED(rv))
 		return 1;
 
 	printf("initializing webshell...\n");
diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
index 755e6cca25c..34bd88a4483 100644
--- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
+++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
@@ -1020,7 +1020,7 @@ nsBrowserWindow::DispatchMenuItem(PRInt32 aID)
 
     res = uri->QueryInterface(NS_GET_IID(nsIURI), (void**)&url);
     NS_RELEASE(uri);
-    if (!NS_FAILED(res)) {
+    if (NS_SUCCEEDED(res)) {
 //      res = walletservice->WALLET_PreEdit(url);
       NS_RELEASE(walletservice);
     }
diff --git a/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp b/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp
index 9c12f25d7e5..aafddfd3ada 100644
--- a/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp
+++ b/mozilla/widget/src/gtk/nsGtkIMEHelper.cpp
@@ -1197,7 +1197,7 @@ nsIMEGtkIC::GetInputStyle() {
 #endif
 
   nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID, &rv));
-  if (!NS_FAILED(rv) && (prefs)) {
+  if (NS_SUCCEEDED(rv) && (prefs)) {
     char *input_style;
     rv = prefs->CopyCharPref(PREF_XIM_INPUTSTYLE, &input_style);
     if (NS_SUCCEEDED(rv) && input_style[0]) {
diff --git a/mozilla/widget/src/gtk/nsWidget.cpp b/mozilla/widget/src/gtk/nsWidget.cpp
index 8df7887efca..930e8998caf 100644
--- a/mozilla/widget/src/gtk/nsWidget.cpp
+++ b/mozilla/widget/src/gtk/nsWidget.cpp
@@ -2629,9 +2629,9 @@ static void      debugSetupWindow   (void)
   
   debugCheckedDebugWindow = PR_TRUE;
   nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID, &rv));
-  if (!NS_FAILED(rv) && (prefs)) {
+  if (NS_SUCCEEDED(rv) && (prefs)) {
     rv = prefs->GetBoolPref(debugPrefName, &enable_window);
-    if (!NS_FAILED(rv) && enable_window) {
+    if (NS_SUCCEEDED(rv) && enable_window) {
       debugTopLevel = gtk_window_new(GTK_WINDOW_TOPLEVEL);
       gtk_signal_connect(GTK_OBJECT(debugTopLevel),
                          "delete_event",
@@ -2666,16 +2666,16 @@ static int debugWindowPrefChanged (const char *newpref, void *data)
   PRBool enable_window;
   nsresult rv;
   nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID, &rv));
-  if (!NS_FAILED(rv) && (prefs)) {
+  if (NS_SUCCEEDED(rv) && (prefs)) {
     rv = prefs->GetBoolPref(debugPrefName, &enable_window);
-    if (!NS_FAILED(rv) && enable_window) {
+    if (NS_SUCCEEDED(rv) && enable_window) {
       if (!debugTopLevel) {
         // this will trigger the creation of the window
         debugCheckedDebugWindow = PR_FALSE;
         debugSetupWindow();
       }
     }
-    else if (!NS_FAILED(rv) && (!enable_window)) {
+    else if (NS_SUCCEEDED(rv) && (!enable_window)) {
       if (debugTopLevel) {
         debugDestroyWindow();
       }
@@ -2691,7 +2691,7 @@ static void      debugRegisterCallback  (void)
   // make sure we don't call in here again
   debugCallbackRegistered = PR_TRUE;
   nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID, &rv));
-  if (!NS_FAILED(rv)) {
+  if (NS_SUCCEEDED(rv)) {
     rv = prefs->RegisterCallback(debugPrefName, debugWindowPrefChanged, NULL);
   }
 }
diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp
index 5f23a58e60f..8b5ba381cdd 100644
--- a/mozilla/widget/src/windows/nsWindow.cpp
+++ b/mozilla/widget/src/windows/nsWindow.cpp
@@ -3089,7 +3089,7 @@ PRBool nsWindow::ProcessMessage(UINT msg, WPARAM wParam, LPARAM lParam, LRESULT
           nsresult rv;
           nsCOMPtr<nsITimerQueue> queue = 
                    do_GetService(kTimerManagerCID, &rv);
-          if (!NS_FAILED(rv)) {
+          if (NS_SUCCEEDED(rv)) {
 
             if (queue->HasReadyTimers(NS_PRIORITY_LOWEST)) {
 
diff --git a/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp b/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp
index 376e97ec280..d7a40f438b8 100644
--- a/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp
+++ b/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp
@@ -68,7 +68,7 @@ nsBaseDragService::nsBaseDragService() :
 {
   NS_INIT_REFCNT();
   nsresult result = NS_NewISupportsArray(getter_AddRefs(mTransArray));
-  if ( !NS_SUCCEEDED(result) ) {
+  if ( NS_FAILED(result) ) {
     //what do we do? we can't throw!
     ;
   }
diff --git a/mozilla/xpcom/base/nsIInterfaceRequestor.cpp b/mozilla/xpcom/base/nsIInterfaceRequestor.cpp
index f28ed2f33bb..97ba14244e3 100644
--- a/mozilla/xpcom/base/nsIInterfaceRequestor.cpp
+++ b/mozilla/xpcom/base/nsIInterfaceRequestor.cpp
@@ -52,7 +52,7 @@ nsGetInterface::operator()( const nsIID& aIID, void** aInstancePtr ) const
 			if ( factoryPtr )
 				status = factoryPtr->GetInterface(aIID, aInstancePtr);
 
-			if ( !NS_SUCCEEDED(status) )
+			if ( NS_FAILED(status) )
 				*aInstancePtr = 0;
 		}
 	else
diff --git a/mozilla/xpcom/base/nsWeakReference.cpp b/mozilla/xpcom/base/nsWeakReference.cpp
index 859be8e23cc..438055790b4 100644
--- a/mozilla/xpcom/base/nsWeakReference.cpp
+++ b/mozilla/xpcom/base/nsWeakReference.cpp
@@ -32,7 +32,7 @@ nsQueryReferent::operator()( const nsIID& aIID, void** answer ) const
     nsresult status;
     if ( mWeakPtr )
       {
-        if ( !NS_SUCCEEDED(status = mWeakPtr->QueryReferent(aIID, answer)) )
+        if ( NS_FAILED(status = mWeakPtr->QueryReferent(aIID, answer)) )
           *answer = 0;
       }
     else
diff --git a/mozilla/xpcom/components/nsCategoryManager.cpp b/mozilla/xpcom/components/nsCategoryManager.cpp
index c41f8554bbb..3be59510ecf 100644
--- a/mozilla/xpcom/components/nsCategoryManager.cpp
+++ b/mozilla/xpcom/components/nsCategoryManager.cpp
@@ -468,7 +468,7 @@ nsCategoryManager::EnumerateCategory( const char *aCategoryName,
       }
 
       // If you couldn't find the category, or had trouble creating an enumerator...
-    if ( !NS_SUCCEEDED(status) )
+    if ( NS_FAILED(status) )
       {
         NS_IF_RELEASE(*_retval);
         status = NS_NewEmptyEnumerator(_retval);
diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp
index 714b6245e7d..4b8bda794da 100644
--- a/mozilla/xpcom/components/nsComponentManager.cpp
+++ b/mozilla/xpcom/components/nsComponentManager.cpp
@@ -136,7 +136,7 @@ nsresult
 nsCreateInstanceByCID::operator()( const nsIID& aIID, void** aInstancePtr ) const
     {
         nsresult status = nsComponentManager::CreateInstance(mCID, mOuter, aIID, aInstancePtr);
-        if ( !NS_SUCCEEDED(status) )
+        if ( NS_FAILED(status) )
             *aInstancePtr = 0;
 
         if ( mErrorPtr )
@@ -150,7 +150,7 @@ nsCreateInstanceByContractID::operator()( const nsIID& aIID, void** aInstancePtr
         nsresult status;
         if ( mContractID )
             {
-              if ( !NS_SUCCEEDED(status = nsComponentManager::CreateInstance(mContractID, mOuter, aIID, aInstancePtr)) )
+              if ( NS_FAILED(status = nsComponentManager::CreateInstance(mContractID, mOuter, aIID, aInstancePtr)) )
                   *aInstancePtr = 0;
           }
         else
@@ -215,7 +215,7 @@ nsGetServiceByCID::operator()( const nsIID& aIID, void** aInstancePtr ) const
         if (mgr)
             status = mgr->GetService(mCID, aIID, (void**)aInstancePtr);
     }
-    if ( !NS_SUCCEEDED(status) )
+    if ( NS_FAILED(status) )
         *aInstancePtr = 0;
 
     if ( mErrorPtr )
@@ -236,7 +236,7 @@ nsGetServiceByContractID::operator()( const nsIID& aIID, void** aInstancePtr ) c
             status = mgr->GetServiceByContractID(mContractID, aIID, (void**)aInstancePtr);
     }
  
-    if ( !NS_SUCCEEDED(status) )
+    if ( NS_FAILED(status) )
         *aInstancePtr = 0;
 
     if ( mErrorPtr )
diff --git a/mozilla/xpcom/ds/nsHashtableEnumerator.cpp b/mozilla/xpcom/ds/nsHashtableEnumerator.cpp
index 0521e3266c8..a67b6d67635 100644
--- a/mozilla/xpcom/ds/nsHashtableEnumerator.cpp
+++ b/mozilla/xpcom/ds/nsHashtableEnumerator.cpp
@@ -117,7 +117,7 @@ hash_enumerator (nsHashKey *aKey, void *aObject, void *closure)
     rv = c->Converter (aKey, (void *)aObject, (void *)c->Data,
                        &c->Elements[c->Current]);
 
-    if (!NS_FAILED(rv))
+    if (NS_SUCCEEDED(rv))
         c->Current++;
     
     return PR_TRUE;
diff --git a/mozilla/xpcom/ds/nsTimelineService.cpp b/mozilla/xpcom/ds/nsTimelineService.cpp
index 2e79c5fb1b4..07889a424b9 100644
--- a/mozilla/xpcom/ds/nsTimelineService.cpp
+++ b/mozilla/xpcom/ds/nsTimelineService.cpp
@@ -395,7 +395,7 @@ PR_IMPLEMENT(nsresult) NS_TimelineOutdent()
 PR_IMPLEMENT(nsresult) NS_TimelineEnter(const char *text)
 {
     nsresult rv = NS_TimelineMark("%s...", text);
-    if (!NS_SUCCEEDED(rv)) {
+    if (NS_FAILED(rv)) {
         return rv;
     }
     return NS_TimelineIndent();
@@ -404,7 +404,7 @@ PR_IMPLEMENT(nsresult) NS_TimelineEnter(const char *text)
 PR_IMPLEMENT(nsresult) NS_TimelineLeave(const char *text)
 {
     nsresult rv = NS_TimelineOutdent();
-    if (!NS_SUCCEEDED(rv)) {
+    if (NS_FAILED(rv)) {
         return rv;
     }
     return NS_TimelineMark("...%s", text);
diff --git a/mozilla/xpcom/glue/nsCOMPtr.cpp b/mozilla/xpcom/glue/nsCOMPtr.cpp
index 7f63586b25c..adc2ee70472 100644
--- a/mozilla/xpcom/glue/nsCOMPtr.cpp
+++ b/mozilla/xpcom/glue/nsCOMPtr.cpp
@@ -77,7 +77,7 @@ void
 nsCOMPtr_base::assign_from_helper( const nsCOMPtr_helper& helper, const nsIID& iid )
 	{
 		nsISupports* newRawPtr;
-		if ( !NS_SUCCEEDED( helper(iid, NS_REINTERPRET_CAST(void**, &newRawPtr)) ) )
+		if ( NS_FAILED( helper(iid, NS_REINTERPRET_CAST(void**, &newRawPtr)) ) )
 			newRawPtr = 0;
     assign_assuming_AddRef(newRawPtr);
 	}
diff --git a/mozilla/xpcom/glue/nsWeakReference.cpp b/mozilla/xpcom/glue/nsWeakReference.cpp
index 859be8e23cc..438055790b4 100644
--- a/mozilla/xpcom/glue/nsWeakReference.cpp
+++ b/mozilla/xpcom/glue/nsWeakReference.cpp
@@ -32,7 +32,7 @@ nsQueryReferent::operator()( const nsIID& aIID, void** answer ) const
     nsresult status;
     if ( mWeakPtr )
       {
-        if ( !NS_SUCCEEDED(status = mWeakPtr->QueryReferent(aIID, answer)) )
+        if ( NS_FAILED(status = mWeakPtr->QueryReferent(aIID, answer)) )
           *answer = 0;
       }
     else
diff --git a/mozilla/xpfe/components/shistory/src/nsSHistory.cpp b/mozilla/xpfe/components/shistory/src/nsSHistory.cpp
index 900e512271d..3eef2f4813d 100644
--- a/mozilla/xpfe/components/shistory/src/nsSHistory.cpp
+++ b/mozilla/xpfe/components/shistory/src/nsSHistory.cpp
@@ -231,7 +231,7 @@ nsSHistory::GetTransactionAtIndex(PRInt32 aIndex, nsISHTransaction ** aResult)
 	 nsCOMPtr<nsISHTransaction>  tempPtr;
        
        rv = GetRootTransaction(getter_AddRefs(tempPtr));
-       if (!NS_SUCCEEDED(rv) || !tempPtr)
+       if (NS_FAILED(rv) || !tempPtr)
                return NS_ERROR_FAILURE;
 
      while(1) {
@@ -274,7 +274,7 @@ nsSHistory::PrintHistory()
 			     break;
               nsCOMPtr<nsISHEntry>  entry;
               rv = txn->GetSHEntry(getter_AddRefs(entry));
-              if (!NS_SUCCEEDED(rv) && !entry)
+              if (NS_FAILED(rv) && !entry)
                       return NS_ERROR_FAILURE;
 
               nsCOMPtr<nsILayoutHistoryState> layoutHistoryState;
@@ -826,7 +826,7 @@ nsSHistory::GetSHistoryEnumerator(nsISimpleEnumerator** aEnumerator)
 
   NS_ENSURE_ARG_POINTER(aEnumerator);
   nsSHEnumerator * iterator = new nsSHEnumerator(this);
-  if (iterator && !NS_SUCCEEDED(status = CallQueryInterface(iterator, aEnumerator)))
+  if (iterator && NS_FAILED(status = CallQueryInterface(iterator, aEnumerator)))
     delete iterator;
   return status;
 }
diff --git a/mozilla/xpinstall/src/nsInstallFileOpItem.cpp b/mozilla/xpinstall/src/nsInstallFileOpItem.cpp
index 4645c35afdb..3fded9f3737 100644
--- a/mozilla/xpinstall/src/nsInstallFileOpItem.cpp
+++ b/mozilla/xpinstall/src/nsInstallFileOpItem.cpp
@@ -1372,11 +1372,11 @@ nsInstallFileOpItem::NativeFileOpMacAliasPrepare()
   char          *aliasLeaf;  
    
   rv = sourceFile->GetResolvedFSSpec(&fsSource);
-  if (!NS_SUCCEEDED(rv)) return rv;
+  if (NS_FAILED(rv)) return rv;
   rv = targetFile->GetFSSpec(&fsAliasParent); 
-  if (!NS_SUCCEEDED(rv)) return rv;
+  if (NS_FAILED(rv)) return rv;
   rv = targetFile->GetAppendedPath(&aliasLeaf);
-  if (!NS_SUCCEEDED(rv)) return rv;
+  if (NS_FAILED(rv)) return rv;
 
   // check if source file exists
   err = FSMakeFSSpec(fsSource.vRefNum, fsSource.parID, fsSource.name, &fsCheckSource);
@@ -1433,11 +1433,11 @@ nsInstallFileOpItem::NativeFileOpMacAliasComplete()
   
   // nsIFile sucks so we have to do special hackery here
   rv = localFileMacSrc->GetResolvedFSSpec(&fsSource);
-  if (!NS_SUCCEEDED(rv)) return rv;
+  if (NS_FAILED(rv)) return rv;
   rv = localFileMacTarget->GetFSSpec(&fsAliasParent); 
-  if (!NS_SUCCEEDED(rv)) return rv;
+  if (NS_FAILED(rv)) return rv;
   rv = localFileMacTarget->GetAppendedPath(&aliasLeaf);
-  if (!NS_SUCCEEDED(rv)) return rv;
+  if (NS_FAILED(rv)) return rv;
   
   // check if source file exists
   err = FSMakeFSSpec(fsSource.vRefNum, fsSource.parID, fsSource.name, &fsCheckSource);
diff --git a/mozilla/xpinstall/src/nsJSFile.cpp b/mozilla/xpinstall/src/nsJSFile.cpp
index c2259953132..a9bc447abaf 100644
--- a/mozilla/xpinstall/src/nsJSFile.cpp
+++ b/mozilla/xpinstall/src/nsJSFile.cpp
@@ -1266,7 +1266,7 @@ InstallFileOpFileMacAlias(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
     nsCOMPtr<nsIFile> iFileAlias;
     rv1 = iFileSourceOrig->Clone(getter_AddRefs(iFileSource));
     rv2 = iFileAliasOrig->Clone(getter_AddRefs(iFileAlias));
-    if (!NS_SUCCEEDED(rv1) || !NS_SUCCEEDED(rv2))
+    if (NS_FAILED(rv1) || NS_FAILED(rv2))
     {
         *rval = INT_TO_JSVAL(nsInstall::UNEXPECTED_ERROR);
         return JS_TRUE;
@@ -1299,7 +1299,7 @@ InstallFileOpFileMacAlias(JSContext *cx, JSObject *obj, uintN argc, jsval *argv,
     }
     
     rv2 = iFileAlias->Append(NS_LossyConvertUCS2toASCII(aliasLeaf).get());
-	if (!NS_SUCCEEDED(rv1) || !NS_SUCCEEDED(rv2))
+	if (NS_FAILED(rv1) || NS_FAILED(rv2))
 	{
 		*rval = INT_TO_JSVAL(nsInstall::UNEXPECTED_ERROR);
 		return JS_TRUE;
diff --git a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
index c4b91311dd1..ae694895b74 100644
--- a/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
+++ b/mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp
@@ -126,7 +126,7 @@ XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report
     nsCOMPtr<nsISoftwareUpdate> softwareUpdate = 
              do_GetService(kSoftwareUpdateCID, &rv);
 
-    if (!NS_SUCCEEDED(rv))
+    if (NS_FAILED(rv))
 
     {
         NS_WARNING("shouldn't have RunInstall() if we can't get SoftwareUpdate");
@@ -382,7 +382,7 @@ extern "C" void RunInstallOnThread(void *data)
     nsCOMPtr<nsISoftwareUpdate> softwareUpdate = 
              do_GetService(kSoftwareUpdateCID, &rv);
 
-    if (!NS_SUCCEEDED(rv))
+    if (NS_FAILED(rv))
     {
         NS_WARNING("shouldn't have RunInstall() if we can't get SoftwareUpdate");
         return;
diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp
index 86d3ad3f39a..78961708967 100644
--- a/mozilla/xpinstall/src/nsXPInstallManager.cpp
+++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp
@@ -233,7 +233,7 @@ nsXPInstallManager::InitManager(nsIScriptGlobalObject* aGlobalObject, nsXPITrigg
     PRInt32 cbstatus = 0;  // callback status
     if (NS_SUCCEEDED(rv) && !OKtoInstall )
         cbstatus = nsInstall::USER_CANCELLED;
-    else if (!NS_SUCCEEDED(rv))
+    else if (NS_FAILED(rv))
         cbstatus = nsInstall::UNEXPECTED_ERROR;
 
     if ( cbstatus != 0 )
@@ -748,7 +748,7 @@ nsXPInstallManager::OnStopRequest(nsIRequest *request, nsISupports *ctxt,
         mItem->mOutStream = nsnull;
     }
 
-    if (!NS_SUCCEEDED(rv))
+    if (NS_FAILED(rv))
     {
         if ( mItem->mFile )
         {
diff --git a/mozilla/xpinstall/stub/xpistub.cpp b/mozilla/xpinstall/stub/xpistub.cpp
index 2ec11447ff4..ac8a40174e7 100644
--- a/mozilla/xpinstall/stub/xpistub.cpp
+++ b/mozilla/xpinstall/stub/xpistub.cpp
@@ -151,7 +151,7 @@ PR_PUBLIC_API(nsresult) XPI_Init(
 
 #endif
 
-    if (!NS_SUCCEEDED(rv))
+    if (NS_FAILED(rv))
         return rv;
 
 #if defined(XP_UNIX) || defined(XP_MAC)
@@ -161,7 +161,7 @@ PR_PUBLIC_API(nsresult) XPI_Init(
     rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup, 
                                           nsnull);
 #endif
-    if (!NS_SUCCEEDED(rv))
+    if (NS_FAILED(rv))
         return rv;
 
 
@@ -176,7 +176,7 @@ PR_PUBLIC_API(nsresult) XPI_Init(
                                             nsnull,
                                             NS_GET_IID(nsISoftwareUpdate),
                                             (void**) &gXPI);
-    if (!NS_SUCCEEDED(rv))
+    if (NS_FAILED(rv))
         return rv;
 
 
diff --git a/mozilla/xpinstall/wizard/unix/src2/nsXIEngine.cpp b/mozilla/xpinstall/wizard/unix/src2/nsXIEngine.cpp
index 877eca19182..96023cfc77c 100644
--- a/mozilla/xpinstall/wizard/unix/src2/nsXIEngine.cpp
+++ b/mozilla/xpinstall/wizard/unix/src2/nsXIEngine.cpp
@@ -685,7 +685,7 @@ nsXIEngine::InstallXPI(nsComponent *aXPI, xpistub_t *aStub)
 printf("DEBUG: XPI_Install %s returned %d\n", aXPI->GetArchive(), rv);
 #endif
 
-    if (!NS_SUCCEEDED(rv))
+    if (NS_FAILED(rv))
         err = E_INSTALL;
 
     return err;