Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 86734: Remove NS_WITH_SERVICE. r=dbaron, rs=scc, a=asa

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@99906 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jaggernaut%netscape.com
2001-07-25 07:54:28 +00:00
parent 5457c9aeca
commit 2b3b3b2586
477 changed files with 1976 additions and 1454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/modules/plugin/base/src/ns4xPlugin.cpp
View File

@@ -1089,7 +1089,7 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
{
*(NPBool*)result = PR_TRUE;
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);
nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID, &res));
if(NS_SUCCEEDED(res) && (nsnull != prefs))
{
PRBool js;

22
mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp
View File

@@ -2875,7 +2875,8 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
// notify Java DOM component
nsresult res;
NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "@mozilla.org/blackwood/java-dom;1", &res);
nsCOMPtr<nsIPluginInstanceOwner> javaDOM =
do_GetService("@mozilla.org/blackwood/java-dom;1", &res);
if (NS_SUCCEEDED(res) && javaDOM)
javaDOM->SetInstance(instance);
@@ -2961,7 +2962,8 @@ NS_IMETHODIMP nsPluginHostImpl::InstantiateEmbededPlugin(const char *aMimeType,
// notify Java DOM component
nsresult res;
NS_WITH_SERVICE(nsIPluginInstanceOwner, javaDOM, "@mozilla.org/blackwood/java-dom;1", &res);
nsCOMPtr<nsIPluginInstanceOwner> javaDOM =
do_GetService("@mozilla.org/blackwood/java-dom;1", &res);
if (NS_SUCCEEDED(res) && javaDOM)
javaDOM->SetInstance(instance);
@@ -3262,7 +3264,8 @@ NS_IMETHODIMP nsPluginHostImpl::SetUpPluginInstance(const char *aMimeType,
}
if (NS_FAILED(result))
{
NS_WITH_SERVICE(nsIPlugin, bwPlugin, "@mozilla.org/blackwood/pluglet-engine;1",&result);
nsCOMPtr<nsIPlugin> bwPlugin =
do_GetService("@mozilla.org/blackwood/pluglet-engine;1", &result);
if (NS_SUCCEEDED(result))
{
result = bwPlugin->CreatePluginInstance(NULL,
@@ -3763,7 +3766,8 @@ NS_IMETHODIMP nsPluginHostImpl::GetPluginFactory(const char *aMimeType, nsIPlugi
// should we also look for a 'carb' resource?
if (PR_FindSymbol(pluginTag->mLibrary, "mainRD") != NULL)
{
NS_WITH_SERVICE(nsIClassicPluginFactory, factory, NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv);
nsCOMPtr<nsIClassicPluginFactory> factory =
do_GetService(NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, &rv);
if (NS_SUCCEEDED(rv))
rv = factory->CreatePlugin(serviceManager,
pluginTag->mFileName,
@@ -4826,13 +4830,14 @@ NS_IMETHODIMP nsPluginHostImpl::GetCookie(const char* inCookieURL, void* inOutCo
return NS_ERROR_INVALID_ARG;
}
NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv);
nsCOMPtr<nsIIOService> ioService(do_GetService(kIOServiceCID, &rv));
if (NS_FAILED(rv) || (nsnull == ioService)) {
return rv;
}
NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv);
nsCOMPtr<nsICookieService> cookieService =
do_GetService(kCookieServiceCID, &rv);
if (NS_FAILED(rv) || (nsnull == cookieService)) {
return NS_ERROR_INVALID_ARG;
@@ -4868,13 +4873,14 @@ NS_IMETHODIMP nsPluginHostImpl::SetCookie(const char* inCookieURL, const void* i
return NS_ERROR_INVALID_ARG;
}
NS_WITH_SERVICE(nsIIOService, ioService, kIOServiceCID, &rv);
nsCOMPtr<nsIIOService> ioService(do_GetService(kIOServiceCID, &rv));
if (NS_FAILED(rv) || (nsnull == ioService)) {
return rv;
}
NS_WITH_SERVICE(nsICookieService, cookieService, kCookieServiceCID, &rv);
nsCOMPtr<nsICookieService> cookieService =
do_GetService(kCookieServiceCID, &rv);
if (NS_FAILED(rv) || (nsnull == cookieService)) {
return NS_ERROR_FAILURE;

8
mozilla/modules/plugin/base/src/nsPluginSafety.h
View File

@@ -33,7 +33,7 @@
PR_BEGIN_MACRO \
nsresult res; \
PRBool dontdoit = PR_FALSE; \
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);\
nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID, &res));\
if(NS_SUCCEEDED(res) && (prefs != nsnull)) \
{ \
res = prefs->GetBoolPref("plugin.dont_try_safe_calls", &dontdoit);\
@@ -50,7 +50,7 @@ PR_BEGIN_MACRO \
} \
catch(...) \
{ \
NS_WITH_SERVICE(nsIPluginHost, host, kCPluginManagerCID, &res);\
nsCOMPtr<nsIPluginHost> host(do_GetService(kCPluginManagerCID, &res));\
if(NS_SUCCEEDED(res) && (host != nsnull)) \
host->HandleBadPlugin(library); \
ret = (NPError)NS_ERROR_FAILURE; \
@@ -62,7 +62,7 @@ PR_END_MACRO
PR_BEGIN_MACRO \
nsresult res; \
PRBool dontdoit = PR_FALSE; \
NS_WITH_SERVICE(nsIPref, prefs, kPrefServiceCID, &res);\
nsCOMPtr<nsIPref> prefs(do_GetService(kPrefServiceCID, &res));\
if(NS_SUCCEEDED(res) && (prefs != nsnull))\
{ \
res = prefs->GetBoolPref("plugin.dont_try_safe_calls", &dontdoit);\
@@ -79,7 +79,7 @@ PR_BEGIN_MACRO \
} \
catch(...) \
{ \
NS_WITH_SERVICE(nsIPluginHost, host, kCPluginManagerCID, &res);\
nsCOMPtr<nsIPluginHost> host(do_GetService(kCPluginManagerCID, &res));\
if(NS_SUCCEEDED(res) && (host != nsnull))\
host->HandleBadPlugin(library); \
} \