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

ole32: Use an iface instead of a vtbl pointer in BindCtxImpl.

This commit is contained in:
Michael Stefaniuc 2010-12-08 22:59:43 +01:00 committed by Alexandre Julliard
parent 2605b76c6e
commit e362c67ad1
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/ole32/bindctx.c
View File

@ -49,7 +49,7 @@ typedef struct BindCtxObject{
/* BindCtx data structure */ /* BindCtx data structure */
typedef struct BindCtxImpl{ typedef struct BindCtxImpl{
const IBindCtxVtbl *lpVtbl; /* VTable relative to the IBindCtx interface.*/ IBindCtx IBindCtx_iface;
LONG ref; /* reference counter for this object */ LONG ref; /* reference counter for this object */
@ -66,13 +66,18 @@ static HRESULT WINAPI BindCtxImpl_ReleaseBoundObjects(IBindCtx*);
static HRESULT BindCtxImpl_GetObjectIndex(BindCtxImpl*, IUnknown*, LPOLESTR, DWORD *); static HRESULT BindCtxImpl_GetObjectIndex(BindCtxImpl*, IUnknown*, LPOLESTR, DWORD *);
static HRESULT BindCtxImpl_ExpandTable(BindCtxImpl *); static HRESULT BindCtxImpl_ExpandTable(BindCtxImpl *);
static inline BindCtxImpl *impl_from_IBindCtx(IBindCtx *iface)
{
return CONTAINING_RECORD(iface, BindCtxImpl, IBindCtx_iface);
}
/******************************************************************************* /*******************************************************************************
* BindCtx_QueryInterface * BindCtx_QueryInterface
*******************************************************************************/ *******************************************************************************/
static HRESULT WINAPI static HRESULT WINAPI
BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppvObject) BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppvObject)
{ {
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
TRACE("(%p %s %p)\n",This, debugstr_guid(riid), ppvObject); TRACE("(%p %s %p)\n",This, debugstr_guid(riid), ppvObject);
@ -100,7 +105,7 @@ BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppvObject)
******************************************************************************/ ******************************************************************************/
static ULONG WINAPI BindCtxImpl_AddRef(IBindCtx* iface) static ULONG WINAPI BindCtxImpl_AddRef(IBindCtx* iface)
{ {
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -128,7 +133,7 @@ static HRESULT BindCtxImpl_Destroy(BindCtxImpl* This)
******************************************************************************/ ******************************************************************************/
static ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface) static ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface)
{ {
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
ULONG ref; ULONG ref;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -137,7 +142,7 @@ static ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface)
if (ref == 0) if (ref == 0)
{ {
/* release all registered objects */ /* release all registered objects */
BindCtxImpl_ReleaseBoundObjects((IBindCtx*)This); BindCtxImpl_ReleaseBoundObjects(&This->IBindCtx_iface);
BindCtxImpl_Destroy(This); BindCtxImpl_Destroy(This);
} }
@ -151,7 +156,7 @@ static ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface)
static HRESULT WINAPI static HRESULT WINAPI
BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk) BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk)
{ {
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
DWORD lastIndex=This->bindCtxTableLastIndex; DWORD lastIndex=This->bindCtxTableLastIndex;
TRACE("(%p,%p)\n",This,punk); TRACE("(%p,%p)\n",This,punk);
@ -185,7 +190,7 @@ BindCtxImpl_RevokeObjectBound(IBindCtx* iface, IUnknown* punk)
{ {
DWORD index,j; DWORD index,j;
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
TRACE("(%p,%p)\n",This,punk); TRACE("(%p,%p)\n",This,punk);
@ -217,7 +222,7 @@ BindCtxImpl_ReleaseBoundObjects(IBindCtx* iface)
{ {
DWORD i; DWORD i;
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -239,7 +244,7 @@ BindCtxImpl_ReleaseBoundObjects(IBindCtx* iface)
static HRESULT WINAPI static HRESULT WINAPI
BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts)
{ {
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
TRACE("(%p,%p)\n",This,pbindopts); TRACE("(%p,%p)\n",This,pbindopts);
@ -261,7 +266,7 @@ BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts)
static HRESULT WINAPI static HRESULT WINAPI
BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts)
{ {
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
ULONG cbStruct; ULONG cbStruct;
TRACE("(%p,%p)\n",This,pbindopts); TRACE("(%p,%p)\n",This,pbindopts);
@ -285,7 +290,7 @@ BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts)
static HRESULT WINAPI static HRESULT WINAPI
BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectTable** pprot) BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectTable** pprot)
{ {
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
TRACE("(%p,%p)\n",This,pprot); TRACE("(%p,%p)\n",This,pprot);
@ -302,7 +307,7 @@ static HRESULT WINAPI
BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk) BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk)
{ {
DWORD index=0; DWORD index=0;
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
TRACE("(%p,%s,%p)\n",This,debugstr_w(pszkey),punk); TRACE("(%p,%s,%p)\n",This,debugstr_w(pszkey),punk);
@ -357,7 +362,7 @@ static HRESULT WINAPI
BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown** punk) BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown** punk)
{ {
DWORD index; DWORD index;
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
TRACE("(%p,%s,%p)\n",This,debugstr_w(pszkey),punk); TRACE("(%p,%s,%p)\n",This,debugstr_w(pszkey),punk);
@ -384,7 +389,7 @@ BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR ppenum)
{ {
DWORD index,j; DWORD index,j;
BindCtxImpl *This = (BindCtxImpl *)iface; BindCtxImpl *This = impl_from_IBindCtx(iface);
TRACE("(%p,%s)\n",This,debugstr_w(ppenum)); TRACE("(%p,%s)\n",This,debugstr_w(ppenum));
@ -513,7 +518,7 @@ static HRESULT BindCtxImpl_Construct(BindCtxImpl* This)
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
/* Initialize the virtual function table.*/ /* Initialize the virtual function table.*/
This->lpVtbl = &VT_BindCtxImpl; This->IBindCtx_iface.lpVtbl = &VT_BindCtxImpl;
This->ref = 0; This->ref = 0;
/* Initialize the BIND_OPTS2 structure */ /* Initialize the BIND_OPTS2 structure */
@ -577,7 +582,7 @@ HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc)
return hr; return hr;
} }
return BindCtxImpl_QueryInterface((IBindCtx*)newBindCtx,&IID_IBindCtx,(void**)ppbc); return BindCtxImpl_QueryInterface(&newBindCtx->IBindCtx_iface,&IID_IBindCtx,(void**)ppbc);
} }
/****************************************************************************** /******************************************************************************