From 29be954fa3d62e239bda042ffb4fe9f7ee0bdf06 Mon Sep 17 00:00:00 2001 From: "serge%netscape.com" Date: Sat, 1 Jun 2002 01:41:07 +0000 Subject: [PATCH] fixing bustage checking in missing file bug #44160 git-svn-id: svn://10.0.0.236/trunk@122470 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/nsPluginSafety.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/modules/plugin/base/src/nsPluginSafety.h b/mozilla/modules/plugin/base/src/nsPluginSafety.h index c80d076de09..00a38c73d90 100644 --- a/mozilla/modules/plugin/base/src/nsPluginSafety.h +++ b/mozilla/modules/plugin/base/src/nsPluginSafety.h @@ -54,7 +54,7 @@ PR_BEGIN_MACRO \ res = pref->GetBoolPref("plugin.dont_try_safe_calls", &gSkipPluginSafeCalls);\ PR_END_MACRO -#define NS_TRY_SAFE_CALL_RETURN(ret, fun, library) \ +#define NS_TRY_SAFE_CALL_RETURN(ret, fun, library, pluginInst) \ PR_BEGIN_MACRO \ if(gSkipPluginSafeCalls) \ ret = fun; \ @@ -69,13 +69,13 @@ PR_BEGIN_MACRO \ nsresult res; \ nsCOMPtr host(do_GetService(kCPluginManagerCID, &res));\ if(NS_SUCCEEDED(res) && (host != nsnull)) \ - host->HandleBadPlugin(library); \ + host->HandleBadPlugin(library, pluginInst);\ ret = (NPError)NS_ERROR_FAILURE; \ } \ } \ PR_END_MACRO -#define NS_TRY_SAFE_CALL_VOID(fun, library) \ +#define NS_TRY_SAFE_CALL_VOID(fun, library, pluginInst) \ PR_BEGIN_MACRO \ if(gSkipPluginSafeCalls) \ fun; \ @@ -90,19 +90,19 @@ PR_BEGIN_MACRO \ nsresult res; \ nsCOMPtr host(do_GetService(kCPluginManagerCID, &res));\ if(NS_SUCCEEDED(res) && (host != nsnull))\ - host->HandleBadPlugin(library); \ + host->HandleBadPlugin(library, pluginInst);\ } \ } \ PR_END_MACRO #else // vanilla calls -#define NS_TRY_SAFE_CALL_RETURN(ret, fun, library) \ +#define NS_TRY_SAFE_CALL_RETURN(ret, fun, library, pluginInst) \ PR_BEGIN_MACRO \ ret = fun; \ PR_END_MACRO -#define NS_TRY_SAFE_CALL_VOID(fun, library) \ +#define NS_TRY_SAFE_CALL_VOID(fun, library, pluginInst) \ PR_BEGIN_MACRO \ fun; \ PR_END_MACRO