Check in for Ron Guilmette. r=shaver, sr=waterson. For intl r=nhotta. Changes for NS_IMPL_NSGETMODULE. bug #46775.

accessible/build/nsAccessibilityFactory.cpp

@@ -56,5 +56,5 @@ static nsModuleComponentInfo components[] =
     },
 };
 
-NS_IMPL_NSGETMODULE("nsAccessibilityModule", components);
+NS_IMPL_NSGETMODULE(nsAccessibilityModule, components);
 

caps/src/nsSecurityManagerFactory.cpp

@@ -64,6 +64,6 @@ static nsModuleComponentInfo components[] =
 };
 
 
-NS_IMPL_NSGETMODULE("nsSecurityManagerModule", components);
+NS_IMPL_NSGETMODULE(nsSecurityManagerModule, components);
 
 

chrome/src/nsChromeFactory.cpp

@@ -51,5 +51,5 @@ static nsModuleComponentInfo components[] =
     },
 };
 
-NS_IMPL_NSGETMODULE("nsChromeModule", components);
+NS_IMPL_NSGETMODULE(nsChromeModule, components);
 

db/mork/build/nsMorkFactory.cpp

@@ -51,7 +51,7 @@ static nsModuleComponentInfo components[] =
     }
 };
 
-NS_IMPL_NSGETMODULE("nsMorkModule", components);
+NS_IMPL_NSGETMODULE(nsMorkModule, components);
 
 
 

directory/xpcom/base/src/nsLDAPProtocolModule.cpp

@@ -87,7 +87,7 @@ static nsModuleComponentInfo components[] =
 
 // implement the NSGetModule() exported function
 //
-NS_IMPL_NSGETMODULE("nsLDAPProtocolModule", components);
+NS_IMPL_NSGETMODULE(nsLDAPProtocolModule, components);
 
 #ifdef PR_LOGGING
 PRLogModuleInfo *gLDAPLogModule = 0;

docshell/build/nsDocShellModule.cpp

@@ -50,5 +50,5 @@ static nsModuleComponentInfo gDocShellModuleInfo[] = {
 
 // "docshell provider" to illustrate that this thing really *should*
 // be dispensing docshells rather than webshells.
-NS_IMPL_NSGETMODULE("docshell provider", gDocShellModuleInfo)
+NS_IMPL_NSGETMODULE(docshell_provider, gDocShellModuleInfo)
 

dom/src/build/nsDOMFactory.cpp

@@ -38,6 +38,7 @@
 
 #include "nsJSEnvironment.h"
 #include "nsIScriptGlobalObject.h"
+#include "nsIGenericFactory.h"
 #include "nsDOMCID.h"
 #include "nsIDOMScriptObjectFactory.h"
 #include "nsIDOMNativeObjectRegistry.h"
@@ -700,109 +701,20 @@ nsDOMScriptObjectFactory::NewScriptPkcs11(nsIScriptContext *aContext,
 //////////////////////////////////////////////////////////////////////
 
 
-static NS_DEFINE_CID(kCDOMScriptObjectFactory, NS_DOM_SCRIPT_OBJECT_FACTORY_CID);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsDOMScriptObjectFactory);
-static NS_DEFINE_CID(kCDOMNativeObjectRegistry, NS_DOM_NATIVE_OBJECT_REGISTRY_CID);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsDOMNativeObjectRegistry);
-static NS_DEFINE_CID(kCScriptNameSetRegistry, NS_SCRIPT_NAMESET_REGISTRY_CID);
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptNameSetRegistry);
 
-class nsDOMFactory : public nsIFactory
+static nsModuleComponentInfo components[] = {
-{   
+  { "Script Object Factory", NS_DOM_SCRIPT_OBJECT_FACTORY_CID, nsnull,
-  public:   
+    nsDOMScriptObjectFactoryConstructor },
-    NS_DECL_ISUPPORTS
+  { "Native Object Registry", NS_DOM_NATIVE_OBJECT_REGISTRY_CID, nsnull,
-
+    nsDOMNativeObjectRegistryConstructor },
-    NS_DECL_NSIFACTORY
+  { "Script Name Set Registry", NS_SCRIPT_NAMESET_REGISTRY_CID, nsnull,
-
+    nsScriptNameSetRegistryConstructor }
-    nsDOMFactory(const nsCID &aClass);   
+};
-
-  protected:
-    virtual ~nsDOMFactory();   
-
-  private:   
-    nsCID     mClassID;
-};   
-
-nsDOMFactory::nsDOMFactory(const nsCID &aClass)   
-{   
-  NS_INIT_ISUPPORTS();
-  mClassID = aClass;
-}   
-
-nsDOMFactory::~nsDOMFactory()   
-{   
-}   
-
-NS_IMPL_ISUPPORTS(nsDOMFactory, NS_GET_IID(nsIFactory))
-
-nsresult nsDOMFactory::CreateInstance(nsISupports *aOuter,  
-                                      const nsIID &aIID,  
-                                      void **aResult)  
-{  
-  if (aResult == NULL) {  
-    return NS_ERROR_NULL_POINTER;  
-  }  
-
-  *aResult = NULL;  
-  
-  nsISupports *inst = nsnull;
-
-  if (mClassID.Equals(kCDOMScriptObjectFactory)) {
-    inst = (nsISupports *)new nsDOMScriptObjectFactory();
-  }
-  else if (mClassID.Equals(kCDOMNativeObjectRegistry)) {
-    inst = (nsISupports *)new nsDOMNativeObjectRegistry();
-  }
-  else if (mClassID.Equals(kCScriptNameSetRegistry)) {
-    inst = (nsISupports *)new nsScriptNameSetRegistry();
-  }
-
-  if (inst == NULL) {  
-    return NS_ERROR_OUT_OF_MEMORY;  
-  }  
-
-  NS_ADDREF(inst);  // Stabilize
-  
-  nsresult res = inst->QueryInterface(aIID, aResult);
-
-  NS_RELEASE(inst); // Destabilize and avoid leaks. Avoid calling delete <interface pointer>    
-
-  return res;  
-}  
-
-nsresult nsDOMFactory::LockFactory(PRBool aLock)  
-{  
-  // Not implemented in simplest case.  
-  return NS_OK;
-}  
-
-// return the proper factory to the caller
-#if defined(XP_MAC) && defined(MAC_STATIC)
-extern "C" NS_DOM nsresult
-NSGetFactory_DOM_DLL(nsISupports* servMgr,
-                     const nsCID &aClass, 
-                     const char *aClassName,
-                     const char *aContractID,
-                     nsIFactory **aFactory)
-#else
-extern "C" NS_DOM nsresult
-NSGetFactory(nsISupports* servMgr,
-             const nsCID &aClass, 
-             const char *aClassName,
-             const char *aContractID,
-             nsIFactory **aFactory)
-#endif
-{
-  if (nsnull == aFactory) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  *aFactory = new nsDOMFactory(aClass);
-
-  if (nsnull == aFactory) {
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  return (*aFactory)->QueryInterface(NS_GET_IID(nsIFactory), (void**)aFactory);
-}
 
+NS_IMPL_NSGETMODULE(DOM_components, components);
 
 void XXXDomNeverCalled();
 void XXXDomNeverCalled()

dom/src/jsurl/nsJSProtocolHandler.cpp

@@ -517,6 +517,6 @@ static nsModuleComponentInfo gJSModuleInfo[] = {
       nsJSProtocolHandler::Create }
 };
 
-NS_IMPL_NSGETMODULE("javascript: protocol", gJSModuleInfo)
+NS_IMPL_NSGETMODULE(javascript__protocol, gJSModuleInfo)
 
 ////////////////////////////////////////////////////////////////////////////////

editor/base/nsEditorRegistration.cpp

@@ -101,4 +101,4 @@ static nsModuleComponentInfo components[] = {
 // Implement the NSGetModule() exported function for your module
 // and the entire implementation of the module object.
 //
-NS_IMPL_NSGETMODULE("nsEditorModule", components)
+NS_IMPL_NSGETMODULE(nsEditorModule, components)

editor/base/nsTextEditorReg.cpp

@@ -55,4 +55,4 @@ static nsModuleComponentInfo components[] = {
 // Implement the NSGetModule() exported function for your module
 // and the entire implementation of the module object.
 //
-NS_IMPL_NSGETMODULE("nsEditorModule", components)
+NS_IMPL_NSGETMODULE(nsEditorModule, components)

editor/libeditor/build/nsEditorRegistration.cpp

@@ -101,4 +101,4 @@ static nsModuleComponentInfo components[] = {
 // Implement the NSGetModule() exported function for your module
 // and the entire implementation of the module object.
 //
-NS_IMPL_NSGETMODULE("nsEditorModule", components)
+NS_IMPL_NSGETMODULE(nsEditorModule, components)

editor/libeditor/build/nsTextEditorReg.cpp

@@ -55,4 +55,4 @@ static nsModuleComponentInfo components[] = {
 // Implement the NSGetModule() exported function for your module
 // and the entire implementation of the module object.
 //
-NS_IMPL_NSGETMODULE("nsEditorModule", components)
+NS_IMPL_NSGETMODULE(nsEditorModule, components)

editor/libeditor/txtsvc/nsTextServicesFactory.cpp

@@ -54,4 +54,4 @@ static nsModuleComponentInfo components[] = {
 // Implement the NSGetModule() exported function for your module
 // and the entire implementation of the module object.
 //
-NS_IMPL_NSGETMODULE("nsTextServicesModule", components)
+NS_IMPL_NSGETMODULE(nsTextServicesModule, components)

editor/txmgr/src/nsTransactionManagerFactory.cpp

@@ -46,4 +46,4 @@ static nsModuleComponentInfo components[] = {
 // Implement the NSGetModule() exported function for your module
 // and the entire implementation of the module object.
 //
-NS_IMPL_NSGETMODULE("nsTransactionManagerModule", components)
+NS_IMPL_NSGETMODULE(nsTransactionManagerModule, components)

editor/txtsvc/src/nsTextServicesFactory.cpp

@@ -54,4 +54,4 @@ static nsModuleComponentInfo components[] = {
 // Implement the NSGetModule() exported function for your module
 // and the entire implementation of the module object.
 //
-NS_IMPL_NSGETMODULE("nsTextServicesModule", components)
+NS_IMPL_NSGETMODULE(nsTextServicesModule, components)

embedding/browser/build/nsWebBrowserModule.cpp

@@ -49,7 +49,7 @@ static nsModuleComponentInfo components[] =
 
 // NSGetModule implementation.
 
-NS_IMPL_NSGETMODULE("Browser Embedding Module", components)
+NS_IMPL_NSGETMODULE(Browser_Embedding_Module, components)
 
 
 

embedding/components/build/nsModule.cpp

@@ -42,4 +42,4 @@ static nsModuleComponentInfo gComponents[] = {
   { NS_APPSTARTUPNOTIFIER_CLASSNAME, NS_APPSTARTUPNOTIFIER_CID, NS_APPSTARTUPNOTIFIER_CONTRACTID, nsAppStartupNotifierConstructor }
 };
 
-NS_IMPL_NSGETMODULE("embedcomponents", gComponents)
+NS_IMPL_NSGETMODULE(embedcomponents, gComponents)

extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp

@@ -87,7 +87,7 @@ static nsModuleComponentInfo components[] =
   }
 };
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsAccessProxy", components, AccessProxyModuleDtor)
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsAccessProxy, components, AccessProxyModuleDtor)
 
 
 

extensions/cookie/nsModuleFactory.cpp

@@ -81,4 +81,4 @@ static nsModuleComponentInfo components[] = {
     },
 };
 
-NS_IMPL_NSGETMODULE("nsCookieModule", components)
+NS_IMPL_NSGETMODULE(nsCookieModule, components)

extensions/datetime/nsDateTimeModule.cpp

@@ -31,4 +31,4 @@ static nsModuleComponentInfo gResComponents[] = {
     }
 };
 
-NS_IMPL_NSGETMODULE("datetime", gResComponents)
+NS_IMPL_NSGETMODULE(datetime, gResComponents)

extensions/finger/nsFingerModule.cpp

@@ -31,4 +31,4 @@ static nsModuleComponentInfo gResComponents[] = {
     }
 };
 
-NS_IMPL_NSGETMODULE("finger", gResComponents)
+NS_IMPL_NSGETMODULE(finger, gResComponents)

extensions/inspector/build/src/nsInspectorModule.cpp

@@ -53,4 +53,4 @@ static nsModuleComponentInfo components[] =
 };
 
 
-NS_IMPL_NSGETMODULE("nsInspectorModule", components)
+NS_IMPL_NSGETMODULE(nsInspectorModule, components)

extensions/pics/src/nsPICS.cpp

@@ -1403,4 +1403,4 @@ static nsModuleComponentInfo components[] = {
 // Implement the NSGetModule() exported function for your module
 // and the entire implementation of the module object.
 //
-NS_IMPL_NSGETMODULE("nsPICSModule", components)
+NS_IMPL_NSGETMODULE(nsPICSModule, components)

extensions/psm-glue/src/nsPSMModule.cpp

@@ -175,4 +175,4 @@ static nsModuleComponentInfo components[] =
     }
 };
 
-NS_IMPL_NSGETMODULE("PSMComponent", components);
+NS_IMPL_NSGETMODULE(PSMComponent, components);

extensions/transformiix/build/XSLTProcessorModule.cpp

@@ -195,4 +195,4 @@ static nsModuleComponentInfo components[] = {
       nsSyncLoaderConstructor }
 };
 
-NS_IMPL_NSGETMODULE("TransformiixModule", components)
+NS_IMPL_NSGETMODULE(TransformiixModule, components)

extensions/vixen/build/src/nsVixenModule.cpp

@@ -33,4 +33,4 @@ static nsModuleComponentInfo components[] =
   }
 };
 
-NS_IMPL_NSGETMODULE("nsVixenModule", components)
+NS_IMPL_NSGETMODULE(nsVixenModule, components)

extensions/wallet/build/nsWalletViewerFactory.cpp

@@ -42,5 +42,5 @@ static nsModuleComponentInfo components[] = {
       "@mozilla.org/walleteditor/walleteditor-world;1", WalletEditorImplConstructor },
 };
 
-NS_IMPL_NSGETMODULE("nsWalletViewerModule", components)
+NS_IMPL_NSGETMODULE(nsWalletViewerModule, components)
 

extensions/wallet/src/nsWalletFactory.cpp

@@ -42,4 +42,4 @@ static nsModuleComponentInfo components[] = {
       NS_SINGLESIGNONPROMPT_CONTRACTID, nsSingleSignOnPromptConstructor }
 };
 
-NS_IMPL_NSGETMODULE("nsWalletModule", components)
+NS_IMPL_NSGETMODULE(nsWalletModule, components)

extensions/xmlextras/build/src/nsXMLExtrasModule.cpp

@@ -231,4 +231,4 @@ static nsModuleComponentInfo components[] = {
 #endif  
 };
 
-NS_IMPL_NSGETMODULE("nsXMLExtrasModule", components)
+NS_IMPL_NSGETMODULE(nsXMLExtrasModule, components)

gfx/src/beos/nsGfxFactoryBeOS.cpp

@@ -173,4 +173,4 @@ static nsModuleComponentInfo components[] =
     nsScreenManagerBeOSConstructor } 
 };   
 
-NS_IMPL_NSGETMODULE("nsGfxBeOSModule", components) 
+NS_IMPL_NSGETMODULE(nsGfxBeOSModule, components) 

gfx/src/gtk/nsGfxFactoryGTK.cpp

@@ -186,5 +186,5 @@ nsGfxGTKModuleDtor(nsIModule *self)
   nsRenderingContextGTK::Shutdown();
 }
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsGfxGTKModule", components, nsGfxGTKModuleDtor)
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsGfxGTKModule, components, nsGfxGTKModuleDtor)
 

gfx/src/os2/nsGfxFactoryOS2.cpp

@@ -186,5 +186,5 @@ nsGfxOS2ModuleDtor(nsIModule *self)
 //  nsRenderingContextOS2::Shutdown();
 }
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsGfxOS2Module", components, nsGfxOS2ModuleDtor)
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsGfxOS2Module, components, nsGfxOS2ModuleDtor)
 

gfx/src/photon/nsGfxFactoryPh.cpp

@@ -161,5 +161,5 @@ static nsModuleComponentInfo components[] =
     nsScreenManagerPhConstructor }
 };
 
-NS_IMPL_NSGETMODULE("nsGfxPhModule", components)
+NS_IMPL_NSGETMODULE(nsGfxPhModule, components)
 

gfx/src/ps/nsGfxFactoryPS.cpp

@@ -38,5 +38,5 @@ static nsModuleComponentInfo components[] =
     nsDeviceContextPSConstructor }  
 };
 
-NS_IMPL_NSGETMODULE("nsGfxPSModule", components)
+NS_IMPL_NSGETMODULE(nsGfxPSModule, components)
 

gfx/src/qt/nsGfxFactoryQT.cpp

@@ -154,5 +154,5 @@ static nsModuleComponentInfo components[] =
     nsScreenManagerQTConstructor }
 };
 
-NS_IMPL_NSGETMODULE("nsGfxQTModule", components)
+NS_IMPL_NSGETMODULE(nsGfxQTModule, components)
 

gfx/src/xlib/nsGfxFactoryXlib.cpp

@@ -175,5 +175,5 @@ static nsModuleComponentInfo components[] =
     nsScreenManagerXlibConstructor }
 };
 
-NS_IMPL_NSGETMODULE("nsGfxXlibModule", components)
+NS_IMPL_NSGETMODULE(nsGfxXlibModule, components)
 

gfx/src/xprint/nsGfxFactoryXP.cpp

@@ -42,4 +42,4 @@ static nsModuleComponentInfo components[] =
     nsDeviceContextXPConstructor }  
 };
 
-NS_IMPL_NSGETMODULE("nsGfxXPModule", components)
+NS_IMPL_NSGETMODULE(nsGfxXPModule, components)

gfx2/src/nsGfxFactory.cpp

@@ -38,5 +38,5 @@ static nsModuleComponentInfo components[] =
     gfxImageFrameConstructor, },
 };
 
-NS_IMPL_NSGETMODULE("nsGfx2Module", components)
+NS_IMPL_NSGETMODULE(nsGfx2Module, components)
 

intl/chardet/src/nsCharDetDll.h

@@ -30,6 +30,9 @@
 #include "nsIStringCharsetDetector.h"
 #include "nsICharsetDetectionAdaptor.h"
 
+#define g_InstanceCount nsCharDetModule_g_InstanceCount
+#define g_LockCount nsCharDetModule_g_LockCount
+
 extern "C" PRInt32 g_InstanceCount;
 extern "C" PRInt32 g_LockCount;
 

intl/chardet/src/nsCharDetModule.cpp

@@ -469,5 +469,5 @@ static nsModuleComponentInfo components[] =
 #endif /* INCLUDE_DBGDETECTOR */
 };
 
-NS_IMPL_NSGETMODULE("nsCharDetModule", components)
+NS_IMPL_NSGETMODULE(nsCharDetModule, components)
 

intl/compatibility/src/nsI18nCompatibility.cpp

@@ -69,4 +69,4 @@ static nsModuleComponentInfo components[] =
     NS_I18NCOMPATIBILITY_CONTRACTID, nsI18nCompatibilityConstructor}
 };
 
-NS_IMPL_NSGETMODULE("I18nCompatibility", components)
+NS_IMPL_NSGETMODULE(I18nCompatibility, components)

intl/lwbrk/src/nsLWBRKDll.h

@@ -25,6 +25,9 @@
 
 #include "prtypes.h"
 
+#define g_InstanceCount lwbrk_g_InstanceCount
+#define g_LockCount lwbrk_g_LockCount
+
 extern "C" PRInt32 g_InstanceCount;
 extern "C" PRInt32 g_LockCount;
 

intl/lwbrk/src/nsLWBrkModule.cpp

@@ -37,4 +37,4 @@ static nsModuleComponentInfo components[] = {
      NS_LWBRK_CONTRACTID, nsLWBreakerFImpConstructor}
 };
 
-NS_IMPL_NSGETMODULE("nsLWBrkModule", components);
+NS_IMPL_NSGETMODULE(nsLWBrkModule, components);

intl/strres/src/nsStringBundle.cpp

@@ -1092,5 +1092,5 @@ static nsModuleComponentInfo components[] =
   { "Accept Language", NS_ACCEPTLANG_CID, NS_ACCEPTLANG_CONTRACTID, nsAcceptLangConstructor}
 };
 
-NS_IMPL_NSGETMODULE("nsStringBundleModule", components)
+NS_IMPL_NSGETMODULE(nsStringBundleModule, components)
 

intl/uconv/ucvcn/nsUCvCnDll.h

@@ -28,4 +28,5 @@
 extern "C" PRInt32 g_InstanceCount;
 extern "C" PRInt32 g_LockCount;
 
+#define g_AsciiMapping ucvcn_g_AsciiMapping
 #endif /* nsUCvCnDll_h___ */

intl/uconv/ucvcn/nsUCvCnModule.cpp

@@ -161,4 +161,4 @@ static nsModuleComponentInfo components[] =
   }
 };
 
-NS_IMPL_NSGETMODULE("nsUCvCnModule", components);
+NS_IMPL_NSGETMODULE(nsUCvCnModule, components);

intl/uconv/ucvibm/nsUCvIBMModule.cpp

@@ -194,5 +194,5 @@ static nsModuleComponentInfo components[] =
   }
 };
 
-NS_IMPL_NSGETMODULE("nsUCvIBMModule", components);
+NS_IMPL_NSGETMODULE(nsUCvIBMModule, components);
 

intl/uconv/ucvja/nsUCvJaModule.cpp

@@ -152,5 +152,5 @@ static nsModuleComponentInfo components[] =
   }
 };
 
-NS_IMPL_NSGETMODULE("nsUCvJAModule", components);
+NS_IMPL_NSGETMODULE(nsUCvJAModule, components);
 

intl/uconv/ucvko/nsUCvKODll.h

@@ -31,6 +31,7 @@ extern "C" PRInt32 g_LockCount;
 
 extern "C" PRUint16 g_utKSC5601Mapping[];
 extern "C" PRUint16 g_ufKSC5601Mapping[];
+#define g_AsciiMapping ucvko_g_AsciiMapping
 extern "C" PRUint16 g_AsciiMapping[];
 extern "C" PRUint16 g_HangulNullMapping[];
 

intl/uconv/ucvko/nsUCvKoModule.cpp

@@ -117,5 +117,5 @@ static nsModuleComponentInfo components[] =
   }
 };
 
-NS_IMPL_NSGETMODULE("nsUCvKoModule", components);
+NS_IMPL_NSGETMODULE(nsUCvKoModule, components);
 

intl/uconv/ucvlatin/nsUCvLatinDll.h

@@ -25,6 +25,9 @@
 
 #include "prtypes.h"
 
+#define g_InstanceCount ucvlatin_g_InstanceCount
+#define g_LockCount ucvlatin_g_LockCount
+
 extern PRInt32 g_InstanceCount;
 extern PRInt32 g_LockCount;
 

intl/uconv/ucvlatin/nsUCvLatinModule.cpp

@@ -1103,5 +1103,5 @@ static nsModuleComponentInfo components[] =
   }
 };
 
-NS_IMPL_NSGETMODULE("nsUCvLatinModule", components);
+NS_IMPL_NSGETMODULE(nsUCvLatinModule, components);
 

intl/uconv/ucvmath/nsUCvMathModule.cpp

@@ -204,5 +204,5 @@ static nsModuleComponentInfo components[] =
   }
 };
 
-NS_IMPL_NSGETMODULE("nsUCvMathModule", components);
+NS_IMPL_NSGETMODULE(nsUCvMathModule, components);
 

intl/uconv/ucvtw/nsUCvTwModule.cpp

@@ -119,5 +119,5 @@ static nsModuleComponentInfo components[] =
   }
 };
 
-NS_IMPL_NSGETMODULE("nsUCvTWModule", components);
+NS_IMPL_NSGETMODULE(nsUCvTWModule, components);
 

intl/uconv/ucvtw2/nsUCvTw2Module.cpp

@@ -198,4 +198,4 @@ static nsModuleComponentInfo components[] =
   }
 };
 
-NS_IMPL_NSGETMODULE("nsUCvTW2Module", components);
+NS_IMPL_NSGETMODULE(nsUCvTW2Module, components);

intl/unicharutil/src/nsUUDll.h

@@ -25,6 +25,9 @@
 
 #include "prtypes.h"
 
+#define g_InstanceCount nsUcharUtilModule_g_InstanceCount
+#define g_LockCount nsUcharUtilModule_g_LockCount
+
 extern "C" PRInt32 g_InstanceCount;
 extern "C" PRInt32 g_LockCount;
 

intl/unicharutil/src/nsUcharUtilModule.cpp

@@ -101,5 +101,5 @@ static nsModuleComponentInfo components[] =
 #endif // IBMBIDI
 };
 
-NS_IMPL_NSGETMODULE("UcharUtil", components)
+NS_IMPL_NSGETMODULE(UcharUtil, components)
 

js/src/xpconnect/loader/mozJSComponentLoader.cpp

@@ -1324,4 +1324,4 @@ static nsModuleComponentInfo components[] = {
 #endif
 };
 
-NS_IMPL_NSGETMODULE("JS component loader", components);
+NS_IMPL_NSGETMODULE(JS_component_loader, components);

js/src/xpconnect/sample/xpcsample1.cpp

@@ -332,5 +332,5 @@ static nsModuleComponentInfo components[] = {
   nsXPCSample_HookerUpperConstructor }
 };
 
-NS_IMPL_NSGETMODULE("xpconnect samples", components)
+NS_IMPL_NSGETMODULE(xpconnect_samples, components)
 

js/src/xpconnect/src/xpcmodule.cpp

@@ -65,4 +65,4 @@ xpcModuleDtor(nsIModule* self)
     nsJSRuntimeServiceImpl::FreeSingleton();
 }
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("xpconnect", components, xpcModuleDtor)
+NS_IMPL_NSGETMODULE_WITH_DTOR(xpconnect, components, xpcModuleDtor)

js/src/xpconnect/tests/components/xpctest_module.cpp

@@ -68,5 +68,5 @@ static nsModuleComponentInfo components[] = {
   {nsnull, NS_XPCTESTDOMSTRING_CID,       "@mozilla.org/js/xpc/test/DOMString;1",       xpctest::ConstructXPCTestDOMString      }
 };
                                                                
-NS_IMPL_NSGETMODULE("xpconnect test", components)
+NS_IMPL_NSGETMODULE(xpconnect_test, components)
 

js/src/xpconnect/tools/src/nsXPCToolsModule.cpp

@@ -57,4 +57,4 @@ static nsModuleComponentInfo components[] = {
  {nsnull, PROFILER_CID, XPCTOOLS_PROFILER_CONTRACTID, nsXPCToolsProfilerConstructor}
 };
 
-NS_IMPL_NSGETMODULE("xpctools", components)
+NS_IMPL_NSGETMODULE(xpctools, components)

mailnews/absync/build/nsAbSyncFactory.cpp

@@ -61,4 +61,4 @@ static nsModuleComponentInfo components[] =
     nsAbSyncDriverConstructor }    
 };
 
-NS_IMPL_NSGETMODULE("nsAbSyncModule", components)
+NS_IMPL_NSGETMODULE(nsAbSyncModule, components)

mailnews/addrbook/build/nsAbFactory.cpp

@@ -154,4 +154,4 @@ static nsModuleComponentInfo components[] =
     nsAddbookProtocolHandler::Create }
 };
 
-NS_IMPL_NSGETMODULE("nsAbModule", components)
+NS_IMPL_NSGETMODULE(nsAbModule, components)

mailnews/base/build/nsMsgFactory.cpp

@@ -294,5 +294,5 @@ static nsModuleComponentInfo gComponents[] = {
 
 };
 
-NS_IMPL_NSGETMODULE("nsMsgBaseModule", gComponents)
+NS_IMPL_NSGETMODULE(nsMsgBaseModule, gComponents)
   

mailnews/compose/build/nsMsgCompFactory.cpp

@@ -184,4 +184,4 @@ static nsModuleComponentInfo components[] =
 };
 
   
-NS_IMPL_NSGETMODULE("nsMsgComposeModule", components)
+NS_IMPL_NSGETMODULE(nsMsgComposeModule, components)

mailnews/imap/build/nsImapFactory.cpp

@@ -79,4 +79,4 @@ static nsModuleComponentInfo gComponents[] = {
       NS_IMAPPROTOCOLINFO_CONTRACTID, nsImapServiceConstructor }
 };
 
-NS_IMPL_NSGETMODULE("IMAP factory", gComponents);
+NS_IMPL_NSGETMODULE(IMAP_factory, gComponents);

mailnews/import/eudora/src/nsEudoraFactory.cpp

@@ -79,5 +79,5 @@ eudoraModuleDtor(nsIModule* self)
 }
 
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsEudoraImportModule", components, eudoraModuleDtor)
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsEudoraImportModule, components, eudoraModuleDtor)
 

mailnews/import/oexpress/nsOEFactory.cpp

@@ -82,7 +82,7 @@ oeModuleDtor(nsIModule* self)
 	nsOEStringBundle::Cleanup();
 }
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsOEImport", components, oeModuleDtor)
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsOEImport, components, oeModuleDtor)
 
 
 

mailnews/import/outlook/src/nsOutlookFactory.cpp

@@ -83,5 +83,5 @@ outlookModuleDtor(nsIModule* self)
 }
 
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsOutlookImport", components, outlookModuleDtor)
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsOutlookImport, components, outlookModuleDtor)
 

mailnews/import/src/nsImportFactory.cpp

@@ -53,6 +53,6 @@ importModuleDtor(nsIModule* self)
 	nsImportStringBundle::Cleanup();
 }
 
-NS_IMPL_NSGETMODULE_WITH_DTOR( "nsImportServiceModule", components, importModuleDtor)
+NS_IMPL_NSGETMODULE_WITH_DTOR( nsImportServiceModule, components, importModuleDtor)
 
 

mailnews/import/text/src/nsTextFactory.cpp

@@ -79,6 +79,6 @@ textModuleDtor(nsIModule* self)
 }
 
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsTextImportModule", components, textModuleDtor)
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsTextImportModule, components, textModuleDtor)
 
 

mailnews/local/build/nsMsgLocalFactory.cpp

@@ -136,5 +136,5 @@ static nsModuleComponentInfo gComponents[] = {
       NS_MSG_POPSTRINGSERVICE_CONTRACTID, nsLocalStringServiceConstructor },
 };
 
-NS_IMPL_NSGETMODULE("local mail services", gComponents);
+NS_IMPL_NSGETMODULE(local_mail_services, gComponents);
 

mailnews/mime/build/nsMimeModule.cpp

@@ -76,4 +76,4 @@ static nsModuleComponentInfo gComponents[] = {
       nsnull, nsMimeHeadersConstructor }
 };
 
-NS_IMPL_NSGETMODULE("mime services", gComponents)
+NS_IMPL_NSGETMODULE(mime_services, gComponents)

mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp

@@ -51,5 +51,5 @@ static nsModuleComponentInfo components[] =
 // Implement the NSGetModule() exported function for your module
 // and the entire implementation of the module object.
 //
-NS_IMPL_NSGETMODULE("nsVCardModule", components)
+NS_IMPL_NSGETMODULE(nsVCardModule, components)
 

mailnews/mime/emitters/build/nsEmitterFactory.cpp

@@ -62,4 +62,4 @@ static nsModuleComponentInfo components[] =
     nsMimeXULEmitterConstructor }
 };
 
-NS_IMPL_NSGETMODULE("nsMimeEmitterModule", components)
+NS_IMPL_NSGETMODULE(nsMimeEmitterModule, components)

mailnews/news/build/nsMsgNewsFactory.cpp

@@ -125,6 +125,6 @@ static nsModuleComponentInfo components[] =
     nsNewsDownloadDialogArgsConstructor }
 };
 
-NS_IMPL_NSGETMODULE("nsMsgNewsModule", components)
+NS_IMPL_NSGETMODULE(nsMsgNewsModule, components)
 
 

modules/libimg/gifcom/nsGIFModule.cpp

@@ -36,5 +36,5 @@ static nsModuleComponentInfo components[] =
      GIFDecoder::Create }
 };
 
-NS_IMPL_NSGETMODULE("nsGIFModule", components)
+NS_IMPL_NSGETMODULE(nsGIFModule, components)
 

modules/libimg/jpgcom/nsJPGModule.cpp

@@ -37,4 +37,4 @@ static nsModuleComponentInfo components[] =
      JPGDecoder::Create }
 };
 
-NS_IMPL_NSGETMODULE("nsJPGModule", components)
+NS_IMPL_NSGETMODULE(nsJPGModule, components)

modules/libimg/mngcom/nsMNGModule.cpp

@@ -41,4 +41,4 @@ static nsModuleComponentInfo components[] =
      MNGDecoder::Create }
 };
 
-NS_IMPL_NSGETMODULE("nsMNGModule", components)
+NS_IMPL_NSGETMODULE(nsMNGModule, components)

modules/libimg/pngcom/nsPNGModule.cpp

@@ -36,5 +36,5 @@ static nsModuleComponentInfo components[] =
      PNGDecoder::Create }
 };
 
-NS_IMPL_NSGETMODULE("nsPNGModule", components)
+NS_IMPL_NSGETMODULE(nsPNGModule, components)
 

modules/libjar/nsJARFactory.cpp

@@ -55,7 +55,7 @@ static nsModuleComponentInfo components[] =
     }
 };
 
-NS_IMPL_NSGETMODULE("nsJarModule", components);
+NS_IMPL_NSGETMODULE(nsJarModule, components);
 
 
 

modules/libjar/nsJARProtocolModule.cpp

@@ -33,6 +33,6 @@ static nsModuleComponentInfo components[] =
     },
 };
 
-NS_IMPL_NSGETMODULE("nsJarProtocolModule", components);
+NS_IMPL_NSGETMODULE(nsJarProtocolModule, components);
 
 

modules/libpr0n/decoders/gif/nsGIFModule.cpp

@@ -37,5 +37,5 @@ static nsModuleComponentInfo components[] =
      nsGIFDecoder2Constructor, },
 };
 
-NS_IMPL_NSGETMODULE("nsGIFModule2", components)
+NS_IMPL_NSGETMODULE(nsGIFModule2, components)
 

modules/libpr0n/decoders/jpeg/nsJPEGFactory.cpp

@@ -38,5 +38,5 @@ static nsModuleComponentInfo components[] =
     nsJPEGDecoderConstructor, },
 };
 
-NS_IMPL_NSGETMODULE("nsJPEGDecoderModule", components)
+NS_IMPL_NSGETMODULE(nsJPEGDecoderModule, components)
 

modules/libpr0n/decoders/png/nsPNGFactory.cpp

@@ -42,5 +42,5 @@ static nsModuleComponentInfo components[] =
     nsPNGDecoderConstructor, },
 };
 
-NS_IMPL_NSGETMODULE("nsPNGDecoderModule", components)
+NS_IMPL_NSGETMODULE(nsPNGDecoderModule, components)
 

modules/libpr0n/decoders/ppm/nsPPMFactory.cpp

@@ -38,5 +38,5 @@ static nsModuleComponentInfo components[] =
     nsPPMDecoderConstructor, },
 };
 
-NS_IMPL_NSGETMODULE("nsPPMDecoderModule", components)
+NS_IMPL_NSGETMODULE(nsPPMDecoderModule, components)
 

modules/libpr0n/src/ImageFactory.cpp

@@ -68,4 +68,4 @@ ImageModuleDestructor(nsIModule *self)
   imgCache::Shutdown();
 }
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsImageLib2Module", components, ImageModuleDestructor)
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsImageLib2Module, components, ImageModuleDestructor)

modules/oji/src/nsCJVMManagerFactory.cpp

@@ -37,7 +37,7 @@ static nsModuleComponentInfo components[] =
     },
 };
 
-NS_IMPL_NSGETMODULE("nsCJVMManagerModule", components);
+NS_IMPL_NSGETMODULE(nsCJVMManagerModule, components);
 
 #else
 

modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp

@@ -47,7 +47,7 @@ static nsModuleComponentInfo components[] =
     },
 };
 
-NS_IMPL_NSGETMODULE("OJITestLoader", components);
+NS_IMPL_NSGETMODULE(OJITestLoader, components);
 
 extern "C" NS_EXPORT nsresult NSRegisterSelf(nsISupports* aServMgr, 
                                              const char *path)

modules/plugin/base/src/nsPluginClassicModule.cpp

@@ -76,5 +76,5 @@ nsPluginModuleDtor(nsIModule *self)
   ns4xPlugin::ReleaseStatics();
 }
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsClassicPluginModule", gComponentInfo,
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsClassicPluginModule, gComponentInfo,
                               nsPluginModuleDtor);

modules/plugin/base/src/nsPluginModule.cpp

@@ -51,5 +51,5 @@ nsPluginModuleDtor(nsIModule *self)
   ns4xPlugin::ReleaseStatics();
 }
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsPluginModule", gComponentInfo,
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsPluginModule, gComponentInfo,
                               nsPluginModuleDtor);

modules/plugin/nglsrc/nsPluginClassicModule.cpp

@@ -76,5 +76,5 @@ nsPluginModuleDtor(nsIModule *self)
   ns4xPlugin::ReleaseStatics();
 }
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsClassicPluginModule", gComponentInfo,
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsClassicPluginModule, gComponentInfo,
                               nsPluginModuleDtor);

modules/plugin/nglsrc/nsPluginModule.cpp

@@ -51,5 +51,5 @@ nsPluginModuleDtor(nsIModule *self)
   ns4xPlugin::ReleaseStatics();
 }
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("nsPluginModule", gComponentInfo,
+NS_IMPL_NSGETMODULE_WITH_DTOR(nsPluginModule, gComponentInfo,
                               nsPluginModuleDtor);

modules/plugin/samples/simple/npsimple.cpp

@@ -371,7 +371,7 @@ static nsModuleComponentInfo gComponentInfo[] = {
       SimplePluginInstance::UnregisterSelf },
 };
 
-NS_IMPL_NSGETMODULE("SimplePlugin", gComponentInfo);
+NS_IMPL_NSGETMODULE(SimplePlugin, gComponentInfo);
 
 
 

modules/plugin/samples/testevents/npevents.cpp

@@ -253,7 +253,7 @@ static nsModuleComponentInfo gComponentInfo[] = {
       EventsPluginInstance::UnregisterSelf },
 };
 
-NS_IMPL_NSGETMODULE("EventsPlugin", gComponentInfo);
+NS_IMPL_NSGETMODULE(EventsPlugin, gComponentInfo);
 
 
 ////////////////////////////////////////////////////////////////////////////////

modules/plugin/test/npsimple.cpp

@@ -371,7 +371,7 @@ static nsModuleComponentInfo gComponentInfo[] = {
       SimplePluginInstance::UnregisterSelf },
 };
 
-NS_IMPL_NSGETMODULE("SimplePlugin", gComponentInfo);
+NS_IMPL_NSGETMODULE(SimplePlugin, gComponentInfo);
 
 
 

modules/plugin/testevents/npevents.cpp

@@ -253,7 +253,7 @@ static nsModuleComponentInfo gComponentInfo[] = {
       EventsPluginInstance::UnregisterSelf },
 };
 
-NS_IMPL_NSGETMODULE("EventsPlugin", gComponentInfo);
+NS_IMPL_NSGETMODULE(EventsPlugin, gComponentInfo);
 
 
 ////////////////////////////////////////////////////////////////////////////////

netwerk/build/nsNetModule.cpp

@@ -880,5 +880,5 @@ static nsModuleComponentInfo gNetModuleInfo[] = {
 
 };
 
-NS_IMPL_NSGETMODULE_WITH_DTOR("necko core and primary protocols", gNetModuleInfo,
+NS_IMPL_NSGETMODULE_WITH_DTOR(necko_core_and_primary_protocols, gNetModuleInfo,
                               nsNeckoShutdown)

netwerk/build2/nsNetModule2.cpp

@@ -70,4 +70,4 @@ static nsModuleComponentInfo gNetModuleInfo[] = {
     }
 };
 
-NS_IMPL_NSGETMODULE("necko secondary protocols", gNetModuleInfo)
+NS_IMPL_NSGETMODULE(necko_secondary_protocols, gNetModuleInfo)