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

mshtml: COM cleanup for the IUnknown iface.

This commit is contained in:
Michael Stefaniuc 2010-12-31 11:10:43 +01:00 committed by Alexandre Julliard
parent 1412b471d0
commit cc43c46fd5
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/mshtml/dispex.c
View File

@ -59,13 +59,11 @@ typedef struct {
typedef struct { typedef struct {
DispatchEx dispex; DispatchEx dispex;
const IUnknownVtbl *lpIUnknownVtbl; IUnknown IUnknown_iface;
DispatchEx *obj; DispatchEx *obj;
func_info_t *info; func_info_t *info;
} func_disp_t; } func_disp_t;
#define FUNCUNKNOWN(x) ((IUnknown*) &(x)->lpIUnknownVtbl)
struct dispex_dynamic_data_t { struct dispex_dynamic_data_t {
DWORD buf_size; DWORD buf_size;
DWORD prop_cnt; DWORD prop_cnt;
@ -488,15 +486,18 @@ static HRESULT typeinfo_invoke(DispatchEx *This, func_info_t *func, WORD flags,
return hres; return hres;
} }
#define FUNCTION_THIS(iface) DEFINE_THIS(func_disp_t, IUnknown, iface) static inline func_disp_t *impl_from_IUnknown(IUnknown *iface)
{
return CONTAINING_RECORD(iface, func_disp_t, IUnknown_iface);
}
static HRESULT WINAPI Function_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) static HRESULT WINAPI Function_QueryInterface(IUnknown *iface, REFIID riid, void **ppv)
{ {
func_disp_t *This = FUNCTION_THIS(iface); func_disp_t *This = impl_from_IUnknown(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 = FUNCUNKNOWN(This); *ppv = &This->IUnknown_iface;
}else if(dispex_query_interface(&This->dispex, riid, ppv)) { }else if(dispex_query_interface(&This->dispex, riid, ppv)) {
return *ppv ? S_OK : E_NOINTERFACE; return *ppv ? S_OK : E_NOINTERFACE;
}else { }else {
@ -510,7 +511,7 @@ static HRESULT WINAPI Function_QueryInterface(IUnknown *iface, REFIID riid, void
static ULONG WINAPI Function_AddRef(IUnknown *iface) static ULONG WINAPI Function_AddRef(IUnknown *iface)
{ {
func_disp_t *This = FUNCTION_THIS(iface); func_disp_t *This = impl_from_IUnknown(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
@ -519,15 +520,13 @@ static ULONG WINAPI Function_AddRef(IUnknown *iface)
static ULONG WINAPI Function_Release(IUnknown *iface) static ULONG WINAPI Function_Release(IUnknown *iface)
{ {
func_disp_t *This = FUNCTION_THIS(iface); func_disp_t *This = impl_from_IUnknown(iface);
TRACE("(%p)\n", This); TRACE("(%p)\n", This);
return IDispatchEx_Release(&This->obj->IDispatchEx_iface); return IDispatchEx_Release(&This->obj->IDispatchEx_iface);
} }
#undef FUNCTION_THIS
static const IUnknownVtbl FunctionUnkVtbl = { static const IUnknownVtbl FunctionUnkVtbl = {
Function_QueryInterface, Function_QueryInterface,
Function_AddRef, Function_AddRef,
@ -583,8 +582,8 @@ static func_disp_t *create_func_disp(DispatchEx *obj, func_info_t *info)
if(!ret) if(!ret)
return NULL; return NULL;
ret->lpIUnknownVtbl = &FunctionUnkVtbl; ret->IUnknown_iface.lpVtbl = &FunctionUnkVtbl;
init_dispex(&ret->dispex, FUNCUNKNOWN(ret), &function_dispex); init_dispex(&ret->dispex, &ret->IUnknown_iface, &function_dispex);
ret->obj = obj; ret->obj = obj;
ret->info = info; ret->info = info;