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

ole32: COM cleanup in antimoniker.c.

This commit is contained in:
Michael Stefaniuc 2011-08-23 10:14:42 +02:00 committed by Alexandre Julliard
parent 573db9ef63
commit cd3f8a8078
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dlls/ole32/antimoniker.c
View File

@ -37,22 +37,20 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
/* AntiMoniker data structure */ /* AntiMoniker data structure */
typedef struct AntiMonikerImpl{ typedef struct AntiMonikerImpl{
IMoniker IMoniker_iface;
const IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ IROTData IROTData_iface;
LONG ref;
/* The ROT (RunningObjectTable implementation) uses the IROTData interface to test whether
* two monikers are equal. That's whay IROTData interface is implemented by monikers.
*/
const IROTDataVtbl* lpvtbl2; /* VTable relative to the IROTData interface.*/
LONG ref; /* reference counter for this object */
IUnknown *pMarshal; /* custom marshaler */ IUnknown *pMarshal; /* custom marshaler */
} AntiMonikerImpl; } AntiMonikerImpl;
static inline IMoniker *impl_from_IROTData( IROTData *iface ) static inline AntiMonikerImpl *impl_from_IMoniker(IMoniker *iface)
{ {
return (IMoniker *)((char*)iface - FIELD_OFFSET(AntiMonikerImpl, lpvtbl2)); return CONTAINING_RECORD(iface, AntiMonikerImpl, IMoniker_iface);
}
static inline AntiMonikerImpl *impl_from_IROTData(IROTData *iface)
{
return CONTAINING_RECORD(iface, AntiMonikerImpl, IROTData_iface);
} }
@ -62,7 +60,7 @@ static inline IMoniker *impl_from_IROTData( IROTData *iface )
static HRESULT WINAPI static HRESULT WINAPI
AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject)
{ {
AntiMonikerImpl *This = (AntiMonikerImpl *)iface; AntiMonikerImpl *This = impl_from_IMoniker(iface);
TRACE("(%p,%p,%p)\n",This,riid,ppvObject); TRACE("(%p,%p,%p)\n",This,riid,ppvObject);
@ -80,7 +78,7 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject)
IsEqualIID(&IID_IMoniker, riid)) IsEqualIID(&IID_IMoniker, riid))
*ppvObject = iface; *ppvObject = iface;
else if (IsEqualIID(&IID_IROTData, riid)) else if (IsEqualIID(&IID_IROTData, riid))
*ppvObject = &This->lpvtbl2; *ppvObject = &This->IROTData_iface;
else if (IsEqualIID(&IID_IMarshal, riid)) else if (IsEqualIID(&IID_IMarshal, riid))
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;
@ -107,7 +105,7 @@ AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject)
static ULONG WINAPI static ULONG WINAPI
AntiMonikerImpl_AddRef(IMoniker* iface) AntiMonikerImpl_AddRef(IMoniker* iface)
{ {
AntiMonikerImpl *This = (AntiMonikerImpl *)iface; AntiMonikerImpl *This = impl_from_IMoniker(iface);
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -120,7 +118,7 @@ AntiMonikerImpl_AddRef(IMoniker* iface)
static ULONG WINAPI static ULONG WINAPI
AntiMonikerImpl_Release(IMoniker* iface) AntiMonikerImpl_Release(IMoniker* iface)
{ {
AntiMonikerImpl *This = (AntiMonikerImpl *)iface; AntiMonikerImpl *This = impl_from_IMoniker(iface);
ULONG ref; ULONG ref;
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
@ -496,11 +494,11 @@ AntiMonikerImpl_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys)
static HRESULT WINAPI static HRESULT WINAPI
AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject)
{ {
IMoniker *This = impl_from_IROTData(iface); AntiMonikerImpl *This = impl_from_IROTData(iface);
TRACE("(%p,%p,%p)\n",iface,riid,ppvObject); TRACE("(%p,%p,%p)\n",iface,riid,ppvObject);
return AntiMonikerImpl_QueryInterface(This, riid, ppvObject); return AntiMonikerImpl_QueryInterface(&This->IMoniker_iface, riid, ppvObject);
} }
/*********************************************************************** /***********************************************************************
@ -508,11 +506,11 @@ AntiMonikerROTDataImpl_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObje
*/ */
static ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData *iface) static ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData *iface)
{ {
IMoniker *This = impl_from_IROTData(iface); AntiMonikerImpl *This = impl_from_IROTData(iface);
TRACE("(%p)\n",iface); TRACE("(%p)\n",iface);
return AntiMonikerImpl_AddRef(This); return AntiMonikerImpl_AddRef(&This->IMoniker_iface);
} }
/*********************************************************************** /***********************************************************************
@ -520,11 +518,11 @@ static ULONG WINAPI AntiMonikerROTDataImpl_AddRef(IROTData *iface)
*/ */
static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface) static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface)
{ {
IMoniker *This = impl_from_IROTData(iface); AntiMonikerImpl *This = impl_from_IROTData(iface);
TRACE("(%p)\n",iface); TRACE("(%p)\n",iface);
return AntiMonikerImpl_Release(This); return AntiMonikerImpl_Release(&This->IMoniker_iface);
} }
/****************************************************************************** /******************************************************************************
@ -597,8 +595,8 @@ static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This)
TRACE("(%p)\n",This); TRACE("(%p)\n",This);
/* Initialize the virtual function table. */ /* Initialize the virtual function table. */
This->lpvtbl1 = &VT_AntiMonikerImpl; This->IMoniker_iface.lpVtbl = &VT_AntiMonikerImpl;
This->lpvtbl2 = &VT_ROTDataImpl; This->IROTData_iface.lpVtbl = &VT_ROTDataImpl;
This->ref = 0; This->ref = 0;
This->pMarshal = NULL; This->pMarshal = NULL;
@ -608,7 +606,7 @@ static HRESULT AntiMonikerImpl_Construct(AntiMonikerImpl* This)
/****************************************************************************** /******************************************************************************
* CreateAntiMoniker [OLE32.@] * CreateAntiMoniker [OLE32.@]
******************************************************************************/ ******************************************************************************/
HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk) HRESULT WINAPI CreateAntiMoniker(IMoniker **ppmk)
{ {
AntiMonikerImpl* newAntiMoniker; AntiMonikerImpl* newAntiMoniker;
HRESULT hr; HRESULT hr;
@ -627,7 +625,8 @@ HRESULT WINAPI CreateAntiMoniker(LPMONIKER * ppmk)
return hr; return hr;
} }
return AntiMonikerImpl_QueryInterface((IMoniker*)newAntiMoniker,&IID_IMoniker,(void**)ppmk); return AntiMonikerImpl_QueryInterface(&newAntiMoniker->IMoniker_iface, &IID_IMoniker,
(void**)ppmk);
} }
static HRESULT WINAPI AntiMonikerCF_QueryInterface(LPCLASSFACTORY iface, static HRESULT WINAPI AntiMonikerCF_QueryInterface(LPCLASSFACTORY iface,