add componentType to nsIModule::RegisterSelf
git-svn-id: svn://10.0.0.236/trunk@48763 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -425,7 +425,8 @@ mozJSComponentLoader::AutoRegisterComponent(PRInt32 when,
|
||||
|
||||
module = ModuleForLocation(registryLocation, component);
|
||||
|
||||
rv = module->RegisterSelf(mCompMgr, component, registryLocation);
|
||||
rv = module->RegisterSelf(mCompMgr, component, registryLocation,
|
||||
jsComponentTypeName);
|
||||
if (NS_FAILED(rv)) {
|
||||
fprintf(stderr, "module->RegisterSelf failed(%x)\n", rv);
|
||||
goto out;
|
||||
|
||||
@@ -165,7 +165,8 @@ nsGIFModule::GetClassObject(nsIComponentManager *aCompMgr, const nsCID & aClass,
|
||||
NS_IMETHODIMP
|
||||
nsGIFModule::RegisterSelf(nsIComponentManager *aCompMgr,
|
||||
nsIFileSpec *location,
|
||||
const char *registryLocation)
|
||||
const char *registryLocation,
|
||||
const char *componentType)
|
||||
{
|
||||
nsresult rv;
|
||||
rv = aCompMgr->RegisterComponentSpec(kGIFDecoderCID,
|
||||
|
||||
@@ -176,5 +176,6 @@ extern const char xpcomBaseName[];
|
||||
extern const char xpcomKeyName[];
|
||||
extern const char lastModValueName[];
|
||||
extern const char fileSizeValueName[];
|
||||
extern const char nativeComponentType[];
|
||||
|
||||
#endif /* nsComponentManagerUtils_h__ */
|
||||
|
||||
@@ -35,7 +35,8 @@ interface nsIModule : nsISupports
|
||||
|
||||
// Component registration
|
||||
void RegisterSelf(in nsIComponentManager aCompMgr, in nsIFileSpec location,
|
||||
in string registryLocation);
|
||||
in string registryLocation, in string componentType);
|
||||
|
||||
void UnregisterSelf(in nsIComponentManager aCompMgr, in nsIFileSpec location,
|
||||
in string registryLocation);
|
||||
|
||||
|
||||
@@ -462,7 +462,8 @@ nsNativeComponentLoader::SelfRegisterDll(nsDll *dll, const char *registryLocatio
|
||||
nsCOMPtr<nsIFileSpec> fs;
|
||||
res = dll->GetDllSpec(getter_AddRefs(fs));
|
||||
if (NS_SUCCEEDED(res))
|
||||
res = mobj->RegisterSelf(mCompMgr, fs, registryLocation);
|
||||
res = mobj->RegisterSelf(mCompMgr, fs, registryLocation,
|
||||
nativeComponentType);
|
||||
else
|
||||
{
|
||||
PR_LOG(nsComponentManagerLog, PR_LOG_ERROR,
|
||||
|
||||
@@ -176,5 +176,6 @@ extern const char xpcomBaseName[];
|
||||
extern const char xpcomKeyName[];
|
||||
extern const char lastModValueName[];
|
||||
extern const char fileSizeValueName[];
|
||||
extern const char nativeComponentType[];
|
||||
|
||||
#endif /* nsComponentManagerUtils_h__ */
|
||||
|
||||
Reference in New Issue
Block a user