From 9cb9d63be8ae65291f1e5f1ac2614dc4a2c2ff83 Mon Sep 17 00:00:00 2001 From: "peterlubczynski%netscape.com" Date: Mon, 9 Jul 2001 19:40:52 +0000 Subject: [PATCH] Fix for Quicktime not working on Classic MacOS bug 89662 r=sfraser sr=attinasi git-svn-id: svn://10.0.0.236/trunk@98891 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/ns4xPlugin.cpp | 4 +--- mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp index 0173223b0e6..b76abcc64ae 100644 --- a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp +++ b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp @@ -427,20 +427,18 @@ ns4xPlugin::CreatePlugin(nsIServiceManager* aServiceMgr, if(error != NPERR_NO_ERROR) return NS_ERROR_FAILURE; - ::UseResFile(appRefNum); - if ((callbacks.version >> 8) < NP_VERSION_MAJOR) return NS_ERROR_FAILURE; // create the new plugin handler ns4xPlugin* plugin = new ns4xPlugin(&callbacks, aLibrary, (NP_PLUGINSHUTDOWN)pfnShutdown, aServiceMgr); #else // not carbon - ::UseResFile(appRefNum); ns4xPlugin* plugin = new ns4xPlugin(nsnull, aLibrary, nsnull, aServiceMgr); #endif if(plugin == NULL) return NS_ERROR_OUT_OF_MEMORY; + ::UseResFile(appRefNum); *aResult = plugin; NS_ADDREF(*aResult); diff --git a/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp b/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp index 0173223b0e6..b76abcc64ae 100644 --- a/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp +++ b/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp @@ -427,20 +427,18 @@ ns4xPlugin::CreatePlugin(nsIServiceManager* aServiceMgr, if(error != NPERR_NO_ERROR) return NS_ERROR_FAILURE; - ::UseResFile(appRefNum); - if ((callbacks.version >> 8) < NP_VERSION_MAJOR) return NS_ERROR_FAILURE; // create the new plugin handler ns4xPlugin* plugin = new ns4xPlugin(&callbacks, aLibrary, (NP_PLUGINSHUTDOWN)pfnShutdown, aServiceMgr); #else // not carbon - ::UseResFile(appRefNum); ns4xPlugin* plugin = new ns4xPlugin(nsnull, aLibrary, nsnull, aServiceMgr); #endif if(plugin == NULL) return NS_ERROR_OUT_OF_MEMORY; + ::UseResFile(appRefNum); *aResult = plugin; NS_ADDREF(*aResult);