ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: COM cleanup for the IServiceProvider iface.

This commit is contained in:
Michael Stefaniuc 2011-01-16 21:32:07 +01:00 committed by Alexandre Julliard
parent 3b1d9d43de
commit 568b0d5c08
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/jscript/jscript.c
View File

@ -154,27 +154,28 @@ static HRESULT set_ctx_site(JScript *This)
} }
typedef struct { typedef struct {
const IServiceProviderVtbl *lpIServiceProviderVtbl; IServiceProvider IServiceProvider_iface;
LONG ref; LONG ref;
IServiceProvider *sp; IServiceProvider *sp;
} AXSite; } AXSite;
#define SERVPROV(x) ((IServiceProvider*) &(x)->lpIServiceProviderVtbl) static inline AXSite *impl_from_IServiceProvider(IServiceProvider *iface)
{
#define SERVPROV_THIS(iface) DEFINE_THIS(AXSite, IServiceProvider, iface) return CONTAINING_RECORD(iface, AXSite, IServiceProvider_iface);
}
static HRESULT WINAPI AXSite_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) static HRESULT WINAPI AXSite_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv)
{ {
AXSite *This = SERVPROV_THIS(iface); AXSite *This = impl_from_IServiceProvider(iface);
if(IsEqualGUID(&IID_IUnknown, riid)) { if(IsEqualGUID(&IID_IUnknown, riid)) {
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
*ppv = SERVPROV(This); *ppv = &This->IServiceProvider_iface;
}else if(IsEqualGUID(&IID_IServiceProvider, riid)) { }else if(IsEqualGUID(&IID_IServiceProvider, riid)) {
TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv);
*ppv = SERVPROV(This); *ppv = &This->IServiceProvider_iface;
}else { }else {
TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
*ppv = NULL; *ppv = NULL;
@ -187,7 +188,7 @@ static HRESULT WINAPI AXSite_QueryInterface(IServiceProvider *iface, REFIID riid
static ULONG WINAPI AXSite_AddRef(IServiceProvider *iface) static ULONG WINAPI AXSite_AddRef(IServiceProvider *iface)
{ {
AXSite *This = SERVPROV_THIS(iface); AXSite *This = impl_from_IServiceProvider(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
@ -197,7 +198,7 @@ static ULONG WINAPI AXSite_AddRef(IServiceProvider *iface)
static ULONG WINAPI AXSite_Release(IServiceProvider *iface) static ULONG WINAPI AXSite_Release(IServiceProvider *iface)
{ {
AXSite *This = SERVPROV_THIS(iface); AXSite *This = impl_from_IServiceProvider(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
@ -211,15 +212,13 @@ static ULONG WINAPI AXSite_Release(IServiceProvider *iface)
static HRESULT WINAPI AXSite_QueryService(IServiceProvider *iface, static HRESULT WINAPI AXSite_QueryService(IServiceProvider *iface,
REFGUID guidService, REFIID riid, void **ppv) REFGUID guidService, REFIID riid, void **ppv)
{ {
AXSite *This = SERVPROV_THIS(iface); AXSite *This = impl_from_IServiceProvider(iface);
TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv);
return IServiceProvider_QueryService(This->sp, guidService, riid, ppv); return IServiceProvider_QueryService(This->sp, guidService, riid, ppv);
} }
#undef SERVPROV_THIS
static IServiceProviderVtbl AXSiteVtbl = { static IServiceProviderVtbl AXSiteVtbl = {
AXSite_QueryInterface, AXSite_QueryInterface,
AXSite_AddRef, AXSite_AddRef,
@ -245,11 +244,11 @@ IUnknown *create_ax_site(script_ctx_t *ctx)
return NULL; return NULL;
} }
ret->lpIServiceProviderVtbl = &AXSiteVtbl; ret->IServiceProvider_iface.lpVtbl = &AXSiteVtbl;
ret->ref = 1; ret->ref = 1;
ret->sp = sp; ret->sp = sp;
return (IUnknown*)SERVPROV(ret); return (IUnknown*)&ret->IServiceProvider_iface;
} }
static inline JScript *impl_from_IActiveScript(IActiveScript *iface) static inline JScript *impl_from_IActiveScript(IActiveScript *iface)

2
dlls/jscript/jscript.h
View File

@ -525,5 +525,3 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)
return ret; return ret;
} }
#define DEFINE_THIS(cls,ifc,iface) ((cls*)((BYTE*)(iface)-offsetof(cls,lp ## ifc ## Vtbl)))