fixing bustage checking in missing file bug #44160
git-svn-id: svn://10.0.0.236/trunk@122470 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -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<nsIPluginHost> 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<nsIPluginHost> 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
|
||||
|
||||
Reference in New Issue
Block a user