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
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user