Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

This will fix 27558

Browse Source
This commit is contained in:
av%netscape.com 2000-05-09 00:56:29 +00:00
parent 16403a2e19
commit f55128b4ee
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modules/plugin/base/src/ns4xPluginInstance.cpp
View File

@ -465,6 +465,27 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
#if !TARGET_CARBON
// pinkerton
// relies on routine descriptors, not present in carbon. We need to fix this.
#ifdef XP_PC
// some really weird thing causes crash on
// http://www.vw.com/autoshow/index_flash.html for optimized build
// try/catch construction misteriously prevent it
try
{
error = CallNPP_NewProc(fCallbacks->newp,
(char *)mimetype,
&fNPP,
(PRUint16)mode,
count,
(char**)names,
(char**)values,
NULL); // saved data
}
catch(...)
{
}
#else // XP_PC
error = CallNPP_NewProc(fCallbacks->newp,
(char *)mimetype,
&fNPP,
@ -473,7 +494,9 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
(char**)names,
(char**)values,
NULL); // saved data
#endif
#endif // XP_PC
#endif //!TARGET_CARBON
if(error != NPERR_NO_ERROR)
rv = NS_ERROR_FAILURE;

25
modules/plugin/nglsrc/ns4xPluginInstance.cpp
View File

@ -465,6 +465,27 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
#if !TARGET_CARBON
// pinkerton
// relies on routine descriptors, not present in carbon. We need to fix this.
#ifdef XP_PC
// some really weird thing causes crash on
// http://www.vw.com/autoshow/index_flash.html for optimized build
// try/catch construction misteriously prevent it
try
{
error = CallNPP_NewProc(fCallbacks->newp,
(char *)mimetype,
&fNPP,
(PRUint16)mode,
count,
(char**)names,
(char**)values,
NULL); // saved data
}
catch(...)
{
}
#else // XP_PC
error = CallNPP_NewProc(fCallbacks->newp,
(char *)mimetype,
&fNPP,
@ -473,7 +494,9 @@ nsresult ns4xPluginInstance::InitializePlugin(nsIPluginInstancePeer* peer)
(char**)names,
(char**)values,
NULL); // saved data
#endif
#endif // XP_PC
#endif //!TARGET_CARBON
if(error != NPERR_NO_ERROR)
rv = NS_ERROR_FAILURE;