From b01e0f7cd71dddc5781bdc3c6353d912b54766ed Mon Sep 17 00:00:00 2001 From: "dougt%netscape.com" Date: Tue, 16 Oct 2001 21:03:54 +0000 Subject: [PATCH] backing out dbarons change to the nsIPluginClassicModule interface. Attempting to fix the fizilla bustage. r=beard, b=105072 git-svn-id: svn://10.0.0.236/trunk@105527 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h | 2 +- mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp | 4 ++-- mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h b/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h index e34db1d3668..2707a56ffed 100644 --- a/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h +++ b/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h @@ -63,7 +63,7 @@ public: * and initializes an ns4xPlugin object, and returns it in * result. */ - NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName, + NS_IMETHOD CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName, PRLibrary* aLibrary, nsIPlugin** aResult) = 0; }; diff --git a/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp b/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp index 88b7976b4dc..40ac8e66c66 100644 --- a/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp @@ -48,7 +48,7 @@ public: static nsresult Create(nsISupports* aOuter, REFNSIID aIID, void** aResult); - NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName, + NS_IMETHOD CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName, PRLibrary* aLibrary, nsIPlugin** aResult); }; @@ -72,7 +72,7 @@ nsresult nsClassicPluginFactory::Create(nsISupports* aOuter, REFNSIID aIID, void return factory->QueryInterface(aIID, aResult); } -NS_METHOD nsClassicPluginFactory::CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName, +NS_METHOD nsClassicPluginFactory::CreatePlugin(nsIServiceManager* aServiceMgr, const char* aFileName, PRLibrary* aLibrary, nsIPlugin** aResult) { return ns4xPlugin::CreatePlugin(aServiceMgr, aFileName, aLibrary, aResult); diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index adab607e4c4..73678dc6f0d 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -4220,7 +4220,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi nsCOMPtr factory = do_GetService(NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv); if (NS_SUCCEEDED(rv)) - rv = factory->CreatePlugin(serviceManager, + rv = factory->CreatePlugin((nsIServiceManager*)serviceManager, pluginTag->mFileName, pluginTag->mLibrary, &pluginTag->mEntryPoint);