Fix a logic error caught by the MSVC compiler and an initializer error, bug 316416

xpcom/components/nsComponentManager.cpp

@@ -329,7 +329,7 @@ PR_STATIC_CALLBACK(void)
 contractID_ClearEntry(PLDHashTable *aTable, PLDHashEntryHdr *aHdr)
 {
     nsContractIDTableEntry* entry = NS_STATIC_CAST(nsContractIDTableEntry*, aHdr);
-    if (!entry->mFactoryEntry->mLoaderType == NS_LOADER_TYPE_INVALID &&
+    if (entry->mFactoryEntry->mLoaderType == NS_LOADER_TYPE_INVALID &&
         entry->mFactoryEntry->mCid.Equals(kEmptyCID)) {
         // this object is owned by the hash.
         // nsFactoryEntry is arena allocated. So we don't delete it.

xpcom/components/nsNativeComponentLoader.cpp

@@ -117,7 +117,7 @@ nsNativeModuleLoader::LoadModule(nsILocalFile* aFile, nsIModule* *aResult)
         return NS_NOINTERFACE;
     }
 
-    NativeLoadData data = { nsnull, nsnull };
+    NativeLoadData data;
 
     if (mLibraries.Get(hashedFile, &data)) {
         NS_ASSERTION(data.module, "Corrupt mLibraries hash");

xpcom/components/nsNativeComponentLoader.h

@@ -61,6 +61,8 @@ class nsNativeModuleLoader : public nsIModuleLoader
  private:
     struct NativeLoadData
     {
+        NativeLoadData() : library(nsnull) { }
+
         nsCOMPtr<nsIModule>  module;
         PRLibrary           *library;
     };