From 8310b2caa2d0ea1dba769d434d5f8bbd25de6f58 Mon Sep 17 00:00:00 2001
From: "beard%netscape.com"
 <beard%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 9 Jan 2002 02:15:50 +0000
Subject: [PATCH] bug #118649, r=peterl, sr=sfraser

git-svn-id: svn://10.0.0.236/trunk@111626 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/build/mac/build_scripts/MozillaBuildList.pm       | 5 +++--
 .../modules/plugin/base/public/nsIClassicPluginFactory.h  | 3 ++-
 mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp | 8 +++++---
 mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp      | 1 +
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/mozilla/build/mac/build_scripts/MozillaBuildList.pm b/mozilla/build/mac/build_scripts/MozillaBuildList.pm
index 1fae07fd54e..cd576a605f6 100644
--- a/mozilla/build/mac/build_scripts/MozillaBuildList.pm
+++ b/mozilla/build/mac/build_scripts/MozillaBuildList.pm
@@ -1606,8 +1606,9 @@ sub BuildLayoutProjects()
     BuildOneProjectWithOutput(":mozilla:gfx:macbuild:gfxComponent.xml",         "gfxComponent$C$dbg.$S", "gfxComponent$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
 
     BuildOneProject(":mozilla:dom:macbuild:dom.xml",                            "dom$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
-    BuildOneProject(":mozilla:modules:plugin:base:macbuild:plugin.xml",          "plugin$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
-
+    BuildOneProject(":mozilla:modules:plugin:base:macbuild:plugin.xml",         "plugin$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
+    BuildOneProject(":mozilla:modules:plugin:base:macbuild:pluginClassic.xml",  "pluginClassic$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
+    
     # Static library shared between different content- and layout-related libraries
     BuildProject(":mozilla:content:macbuild:contentshared.xml",                 "contentshared$D.o");
     MakeAlias(":mozilla:content:macbuild:contentshared$D.o",                    ":mozilla:dist:content:");
diff --git a/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h b/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h
index 42d2eb0bd5b..ec8931f6eea 100644
--- a/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h
+++ b/mozilla/modules/plugin/base/public/nsIClassicPluginFactory.h
@@ -64,7 +64,8 @@ public:
     * and initializes an ns4xPlugin object, and returns it in
     * <b>result</b>.
     */
-    NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName,
+    NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr,
+                            const char* aFileName, const char* aFullPath,
                             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..31b38ed2dbd 100644
--- a/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp
@@ -48,7 +48,8 @@ public:
     
     static nsresult Create(nsISupports* aOuter, REFNSIID aIID, void** aResult);
 
-    NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr, const char* aFileName,
+    NS_IMETHOD CreatePlugin(nsIServiceManagerObsolete* aServiceMgr,
+                            const char* aFileName, const char* aFullPath,
                             PRLibrary* aLibrary, nsIPlugin** aResult);
 };
 
@@ -72,10 +73,11 @@ 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(nsIServiceManagerObsolete* aServiceMgr,
+                                               const char* aFileName, const char* aFullPath,
                                                PRLibrary* aLibrary, nsIPlugin** aResult)
 {
-    return ns4xPlugin::CreatePlugin(aServiceMgr, aFileName, aLibrary, aResult);
+    return ns4xPlugin::CreatePlugin(aServiceMgr, aFileName, aFullPath, aLibrary, aResult);
 }
 
 static nsModuleComponentInfo gComponentInfo[] = {
diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
index 73dd21d6076..523bb21e3e5 100644
--- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
+++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
@@ -4353,6 +4353,7 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
           if (NS_SUCCEEDED(rv)) 
             rv = factory->CreatePlugin(serviceManager, 
                                        pluginTag->mFileName, 
+                                       pluginTag->mFullPath,
                                        pluginTag->mLibrary, 
                                        &pluginTag->mEntryPoint);
           if (!pluginTag->mEntryPoint)  // plugin wasn't found