system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 05:26:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

mshtml: COM cleanup for the nsIFactory iface.

Browse source
This commit is contained in:
Michael Stefaniuc 2011-01-04 01:46:39 +01:00 committed by Alexandre Julliard
parent 95d8566a83
commit a59cc1a630
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
dlls/mshtml/nsservice.c
View file

@ -377,27 +377,28 @@ static const nsITooltipTextProviderVtbl nsTooltipTextProviderVtbl = {
static nsITooltipTextProvider nsTooltipTextProvider = { &nsTooltipTextProviderVtbl }; static nsITooltipTextProvider nsTooltipTextProvider = { &nsTooltipTextProviderVtbl };
typedef struct { typedef struct {
const nsIFactoryVtbl *lpFactoryVtbl; nsIFactory nsIFactory_iface;
nsISupports *service; nsISupports *service;
} nsServiceFactory; } nsServiceFactory;
#define NSFACTORY(x) ((nsIFactory*) &(x)->lpFactoryVtbl) static inline nsServiceFactory *impl_from_nsIFactory(nsIFactory *iface)
{
#define NSFACTORY_THIS(iface) DEFINE_THIS(nsServiceFactory, Factory, iface) return CONTAINING_RECORD(iface, nsServiceFactory, nsIFactory_iface);
}
static nsresult NSAPI nsServiceFactory_QueryInterface(nsIFactory *iface, nsIIDRef riid, static nsresult NSAPI nsServiceFactory_QueryInterface(nsIFactory *iface, nsIIDRef riid,
void **result) void **result)
{ {
nsServiceFactory *This = NSFACTORY_THIS(iface); nsServiceFactory *This = impl_from_nsIFactory(iface);
*result = NULL; *result = NULL;
if(IsEqualGUID(&IID_nsISupports, riid)) { if(IsEqualGUID(&IID_nsISupports, riid)) {
TRACE("(%p)->(IID_nsISupports %p)\n", This, result); TRACE("(%p)->(IID_nsISupports %p)\n", This, result);
*result = NSFACTORY(This); *result = &This->nsIFactory_iface;
}else if(IsEqualGUID(&IID_nsIFactory, riid)) { }else if(IsEqualGUID(&IID_nsIFactory, riid)) {
TRACE("(%p)->(IID_nsIFactory %p)\n", This, result); TRACE("(%p)->(IID_nsIFactory %p)\n", This, result);
*result = NSFACTORY(This); *result = &This->nsIFactory_iface;
} }
if(*result) if(*result)
@ -420,7 +421,7 @@ static nsrefcnt NSAPI nsServiceFactory_Release(nsIFactory *iface)
static nsresult NSAPI nsServiceFactory_CreateInstance(nsIFactory *iface, static nsresult NSAPI nsServiceFactory_CreateInstance(nsIFactory *iface,
nsISupports *aOuter, const nsIID *iid, void **result) nsISupports *aOuter, const nsIID *iid, void **result)
{ {
nsServiceFactory *This = NSFACTORY_THIS(iface); nsServiceFactory *This = impl_from_nsIFactory(iface);
TRACE("(%p)->(%p %s %p)\n", This, aOuter, debugstr_guid(iid), result); TRACE("(%p)->(%p %s %p)\n", This, aOuter, debugstr_guid(iid), result);
@ -429,13 +430,11 @@ static nsresult NSAPI nsServiceFactory_CreateInstance(nsIFactory *iface,
static nsresult NSAPI nsServiceFactory_LockFactory(nsIFactory *iface, PRBool lock) static nsresult NSAPI nsServiceFactory_LockFactory(nsIFactory *iface, PRBool lock)
{ {
nsServiceFactory *This = NSFACTORY_THIS(iface); nsServiceFactory *This = impl_from_nsIFactory(iface);
WARN("(%p)->(%x)\n", This, lock); WARN("(%p)->(%x)\n", This, lock);
return NS_OK; return NS_OK;
} }
#undef NSFACTORY_THIS
static const nsIFactoryVtbl nsServiceFactoryVtbl = { static const nsIFactoryVtbl nsServiceFactoryVtbl = {
nsServiceFactory_QueryInterface, nsServiceFactory_QueryInterface,
nsServiceFactory_AddRef, nsServiceFactory_AddRef,
@ -445,12 +444,12 @@ static const nsIFactoryVtbl nsServiceFactoryVtbl = {
}; };
static nsServiceFactory nsPromptServiceFactory = { static nsServiceFactory nsPromptServiceFactory = {
&nsServiceFactoryVtbl, { &nsServiceFactoryVtbl },
(nsISupports*)&nsPromptService (nsISupports*)&nsPromptService
}; };
static nsServiceFactory nsTooltipTextFactory = { static nsServiceFactory nsTooltipTextFactory = {
&nsServiceFactoryVtbl, { &nsServiceFactoryVtbl },
(nsISupports*)&nsTooltipTextProvider (nsISupports*)&nsTooltipTextProvider
}; };
@ -460,7 +459,7 @@ void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *ser
nsresult nsres; nsresult nsres;
nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_PROMPTSERVICE_CID, nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_PROMPTSERVICE_CID,
"Prompt Service", NS_PROMPTSERVICE_CONTRACTID, NSFACTORY(&nsPromptServiceFactory)); "Prompt Service", NS_PROMPTSERVICE_CONTRACTID, &nsPromptServiceFactory.nsIFactory_iface);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("RegisterFactory failed: %08x\n", nsres); ERR("RegisterFactory failed: %08x\n", nsres);
@ -478,7 +477,7 @@ void register_nsservice(nsIComponentRegistrar *registrar, nsIServiceManager *ser
nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_TOOLTIPTEXTPROVIDER_CID, nsres = nsIComponentRegistrar_RegisterFactory(registrar, &NS_TOOLTIPTEXTPROVIDER_CID,
NS_TOOLTIPTEXTPROVIDER_CLASSNAME, NS_TOOLTIPTEXTPROVIDER_CONTRACTID, NS_TOOLTIPTEXTPROVIDER_CLASSNAME, NS_TOOLTIPTEXTPROVIDER_CONTRACTID,
NSFACTORY(&nsTooltipTextFactory)); &nsTooltipTextFactory.nsIFactory_iface);
if(NS_FAILED(nsres)) if(NS_FAILED(nsres))
ERR("RegisterFactory failed: %08x\n", nsres); ERR("RegisterFactory failed: %08x\n", nsres);
} }