December 2010 - Wine-commits

Michael Stefaniuc : ole32: Use an iface instead of a vtbl pointer in PointerMonikerImpl.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: adbcfb7e5c55abbf3a1188437510e6bdb83d2a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adbcfb7e5c55abbf3a1188437… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:47 2010 +0100 ole32: Use an iface instead of a vtbl pointer in PointerMonikerImpl. --- dlls/ole32/pointermoniker.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/pointermoniker.c b/dlls/ole32/pointermoniker.c index 299b44e..d79afd2 100644 --- a/dlls/ole32/pointermoniker.c +++ b/dlls/ole32/pointermoniker.c @@ -40,17 +40,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /* PointerMoniker data structure */ typedef struct PointerMonikerImpl{ - const IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/ + IMoniker IMoniker_iface; LONG ref; /* reference counter for this object */ IUnknown *pObject; /* custom marshaler */ } PointerMonikerImpl; +static inline PointerMonikerImpl *impl_from_IMoniker(IMoniker *iface) +{ +return CONTAINING_RECORD(iface, PointerMonikerImpl, IMoniker_iface); +} + static HRESULT WINAPI PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { - PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + PointerMonikerImpl *This = impl_from_IMoniker(iface); TRACE("(%p,%p,%p)\n",This,riid,ppvObject); @@ -84,7 +89,7 @@ PointerMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) static ULONG WINAPI PointerMonikerImpl_AddRef(IMoniker* iface) { - PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + PointerMonikerImpl *This = impl_from_IMoniker(iface); TRACE("(%p)\n",This); @@ -97,7 +102,7 @@ PointerMonikerImpl_AddRef(IMoniker* iface) static ULONG WINAPI PointerMonikerImpl_Release(IMoniker* iface) { - PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + PointerMonikerImpl *This = impl_from_IMoniker(iface); ULONG ref; TRACE("(%p)\n",This); @@ -194,7 +199,7 @@ static HRESULT WINAPI PointerMonikerImpl_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult) { - PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + PointerMonikerImpl *This = impl_from_IMoniker(iface); TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); @@ -211,7 +216,7 @@ static HRESULT WINAPI PointerMonikerImpl_BindToStorage(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, REFIID riid, VOID** ppvResult) { - PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + PointerMonikerImpl *This = impl_from_IMoniker(iface); TRACE("(%p,%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,riid,ppvResult); @@ -336,7 +341,7 @@ PointerMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoni static HRESULT WINAPI PointerMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) { - PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + PointerMonikerImpl *This = impl_from_IMoniker(iface); DWORD mkSys; TRACE("(%p,%p)\n",iface,pmkOtherMoniker); @@ -348,7 +353,7 @@ PointerMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) if (mkSys==MKSYS_POINTERMONIKER) { - PointerMonikerImpl *pOtherMoniker = (PointerMonikerImpl *)pmkOtherMoniker; + PointerMonikerImpl *pOtherMoniker = impl_from_IMoniker(pmkOtherMoniker); return This->pObject == pOtherMoniker->pObject ? S_OK : S_FALSE; } else @@ -360,7 +365,7 @@ PointerMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) ******************************************************************************/ static HRESULT WINAPI PointerMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) { - PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + PointerMonikerImpl *This = impl_from_IMoniker(iface); if (pdwHash==NULL) return E_POINTER; @@ -467,7 +472,7 @@ PointerMonikerImpl_ParseDisplayName(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, LPOLESTR pszDisplayName, ULONG* pchEaten, IMoniker** ppmkOut) { - PointerMonikerImpl *This = (PointerMonikerImpl *)iface; + PointerMonikerImpl *This = impl_from_IMoniker(iface); HRESULT hr; IParseDisplayName *pPDN; @@ -543,8 +548,8 @@ static void PointerMonikerImpl_Construct(PointerMonikerImpl* This, IUnknown *pun TRACE("(%p)\n",This); /* Initialize the virtual function table. */ - This->lpvtbl = &VT_PointerMonikerImpl; - This->ref = 1; + This->IMoniker_iface.lpVtbl = &VT_PointerMonikerImpl; + This->ref = 1; if (punk) IUnknown_AddRef(punk); This->pObject = punk; @@ -580,7 +585,7 @@ HRESULT WINAPI CreatePointerMoniker(LPUNKNOWN punk, LPMONIKER *ppmk) } PointerMonikerImpl_Construct(This, punk); - *ppmk = (IMoniker *)&This->lpvtbl; + *ppmk = &This->IMoniker_iface; return S_OK; }

1 0

Michael Stefaniuc : rpcrt4: Use an iface instead of a vtbl pointer in RpcStreamImpl.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: c38d6fed39e62f7fc4984e471ae5b55534e6ba42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38d6fed39e62f7fc4984e471… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:42 2010 +0100 rpcrt4: Use an iface instead of a vtbl pointer in RpcStreamImpl. --- dlls/rpcrt4/ndr_ole.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 090be05..c3ab529 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -78,7 +78,7 @@ static HMODULE LoadCOM(void) * (which also implements the MInterfacePointer structure) */ typedef struct RpcStreamImpl { - const IStreamVtbl *lpVtbl; + IStream IStream_iface; LONG RefCount; PMIDL_STUB_MESSAGE pMsg; LPDWORD size; @@ -86,11 +86,16 @@ typedef struct RpcStreamImpl DWORD pos; } RpcStreamImpl; +static inline RpcStreamImpl *impl_from_IStream(IStream *iface) +{ + return CONTAINING_RECORD(iface, RpcStreamImpl, IStream_iface); +} + static HRESULT WINAPI RpcStream_QueryInterface(LPSTREAM iface, REFIID riid, LPVOID *obj) { - RpcStreamImpl *This = (RpcStreamImpl *)iface; + RpcStreamImpl *This = impl_from_IStream(iface); if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ISequentialStream, riid) || IsEqualGUID(&IID_IStream, riid)) { @@ -103,13 +108,13 @@ static HRESULT WINAPI RpcStream_QueryInterface(LPSTREAM iface, static ULONG WINAPI RpcStream_AddRef(LPSTREAM iface) { - RpcStreamImpl *This = (RpcStreamImpl *)iface; + RpcStreamImpl *This = impl_from_IStream(iface); return InterlockedIncrement( &This->RefCount ); } static ULONG WINAPI RpcStream_Release(LPSTREAM iface) { - RpcStreamImpl *This = (RpcStreamImpl *)iface; + RpcStreamImpl *This = impl_from_IStream(iface); ULONG ref = InterlockedDecrement( &This->RefCount ); if (!ref) { TRACE("size=%d\n", *This->size); @@ -125,7 +130,7 @@ static HRESULT WINAPI RpcStream_Read(LPSTREAM iface, ULONG cb, ULONG *pcbRead) { - RpcStreamImpl *This = (RpcStreamImpl *)iface; + RpcStreamImpl *This = impl_from_IStream(iface); HRESULT hr = S_OK; if (This->pos + cb > *This->size) { @@ -145,7 +150,7 @@ static HRESULT WINAPI RpcStream_Write(LPSTREAM iface, ULONG cb, ULONG *pcbWritten) { - RpcStreamImpl *This = (RpcStreamImpl *)iface; + RpcStreamImpl *This = impl_from_IStream(iface); if (This->data + cb > (unsigned char *)This->pMsg->RpcMsg->Buffer + This->pMsg->BufferLength) return STG_E_MEDIUMFULL; memcpy(This->data + This->pos, pv, cb); @@ -160,7 +165,7 @@ static HRESULT WINAPI RpcStream_Seek(LPSTREAM iface, DWORD origin, ULARGE_INTEGER *newPos) { - RpcStreamImpl *This = (RpcStreamImpl *)iface; + RpcStreamImpl *This = impl_from_IStream(iface); switch (origin) { case STREAM_SEEK_SET: This->pos = move.u.LowPart; @@ -184,7 +189,7 @@ static HRESULT WINAPI RpcStream_Seek(LPSTREAM iface, static HRESULT WINAPI RpcStream_SetSize(LPSTREAM iface, ULARGE_INTEGER newSize) { - RpcStreamImpl *This = (RpcStreamImpl *)iface; + RpcStreamImpl *This = impl_from_IStream(iface); *This->size = newSize.u.LowPart; return S_OK; } @@ -212,7 +217,7 @@ static LPSTREAM RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init) RpcStreamImpl *This; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(RpcStreamImpl)); if (!This) return NULL; - This->lpVtbl = &RpcStream_Vtbl; + This->IStream_iface.lpVtbl = &RpcStream_Vtbl; This->RefCount = 1; This->pMsg = pStubMsg; This->size = (LPDWORD)pStubMsg->Buffer;

1 0

Michael Stefaniuc : strmbase: Use an iface instead of a vtbl pointer in IEnumMediaTypesImpl.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: adfc457234b5c1d852a59816832e3f5e611ff426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adfc457234b5c1d852a598168… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:24 2010 +0100 strmbase: Use an iface instead of a vtbl pointer in IEnumMediaTypesImpl. --- dlls/strmbase/mediatype.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/strmbase/mediatype.c b/dlls/strmbase/mediatype.c index b9255c3..0093435 100644 --- a/dlls/strmbase/mediatype.c +++ b/dlls/strmbase/mediatype.c @@ -85,7 +85,7 @@ typedef struct tagENUMEDIADETAILS typedef struct IEnumMediaTypesImpl { - const IEnumMediaTypesVtbl * lpVtbl; + IEnumMediaTypes IEnumMediaTypes_iface; LONG refCount; BasePin *basePin; BasePin_GetMediaType enumMediaFunction; @@ -95,6 +95,11 @@ typedef struct IEnumMediaTypesImpl ULONG uIndex; } IEnumMediaTypesImpl; +static inline IEnumMediaTypesImpl *impl_from_IEnumMediaTypes(IEnumMediaTypes *iface) +{ + return CONTAINING_RECORD(iface, IEnumMediaTypesImpl, IEnumMediaTypes_iface); +} + static const struct IEnumMediaTypesVtbl IEnumMediaTypesImpl_Vtbl; HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum) @@ -108,7 +113,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e *ppEnum = NULL; return E_OUTOFMEMORY; } - pEnumMediaTypes->lpVtbl = &IEnumMediaTypesImpl_Vtbl; + pEnumMediaTypes->IEnumMediaTypes_iface.lpVtbl = &IEnumMediaTypesImpl_Vtbl; pEnumMediaTypes->refCount = 1; pEnumMediaTypes->uIndex = 0; pEnumMediaTypes->enumMediaFunction = enumFunc; @@ -132,7 +137,7 @@ HRESULT WINAPI EnumMediaTypes_Construct(BasePin *basePin, BasePin_GetMediaType e return E_OUTOFMEMORY; } } - *ppEnum = (IEnumMediaTypes *)(&pEnumMediaTypes->lpVtbl); + *ppEnum = &pEnumMediaTypes->IEnumMediaTypes_iface; pEnumMediaTypes->currentVersion = versionFunc(basePin); return S_OK; } @@ -161,7 +166,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface static ULONG WINAPI IEnumMediaTypesImpl_AddRef(IEnumMediaTypes * iface) { - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); @@ -171,7 +176,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_AddRef(IEnumMediaTypes * iface) static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) { - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p)->() Release from %d\n", iface, refCount + 1); @@ -192,7 +197,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cMediaTypes, AM_MEDIA_TYPE ** ppMediaTypes, ULONG * pcFetched) { ULONG cFetched; - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex; @@ -227,7 +232,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cM static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cMediaTypes) { - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); TRACE("(%u)\n", cMediaTypes); if (This->currentVersion != This->mediaVersionFunction(This->basePin)) @@ -245,7 +250,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) { ULONG i; AM_MEDIA_TYPE amt; - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); TRACE("()\n"); @@ -280,7 +285,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) static HRESULT WINAPI IEnumMediaTypesImpl_Clone(IEnumMediaTypes * iface, IEnumMediaTypes ** ppEnum) { HRESULT hr; - IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; + IEnumMediaTypesImpl *This = impl_from_IEnumMediaTypes(iface); TRACE("(%p)\n", ppEnum);

1 0

Michael Stefaniuc : quartz: Use an iface instead of a vtbl pointer in SystemClockImpl.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 9a0f38e21111821941d02f8416cf71ed37cb51b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0f38e21111821941d02f841… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:35 2010 +0100 quartz: Use an iface instead of a vtbl pointer in SystemClockImpl. --- dlls/quartz/systemclock.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index e48dbe4..842541b 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -37,7 +37,7 @@ struct SystemClockAdviseEntry { }; typedef struct SystemClockImpl { - const IReferenceClockVtbl *lpVtbl; + IReferenceClock IReferenceClock_iface; LONG ref; /** IReferenceClock */ @@ -52,6 +52,11 @@ typedef struct SystemClockImpl { SystemClockAdviseEntry* pPeriodicAdvise; } SystemClockImpl; +static inline SystemClockImpl *impl_from_IReferenceClock(IReferenceClock *iface) +{ + return CONTAINING_RECORD(iface, SystemClockImpl, IReferenceClock_iface); +} + static void QUARTZ_RemoveAviseEntryFromQueue(SystemClockImpl* This, SystemClockAdviseEntry* pEntry) { if (pEntry->prev) pEntry->prev->next = pEntry->next; @@ -104,7 +109,7 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { EnterCriticalSection(&This->safe); /*timeOut = IReferenceClock_OnTimerUpdated(This); */ - hr = IReferenceClock_GetTime((IReferenceClock*) This, &curTime); + hr = IReferenceClock_GetTime(&This->IReferenceClock_iface, &curTime); if (FAILED(hr)) { timeOut = INFINITE; goto outrefresh; @@ -191,7 +196,7 @@ static BOOL SystemClockPostMessageToAdviseThread(SystemClockImpl* This, UINT iMs } static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock* iface) { - SystemClockImpl *This = (SystemClockImpl *)iface; + SystemClockImpl *This = impl_from_IReferenceClock(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p): AddRef from %d\n", This, ref - 1); @@ -200,7 +205,7 @@ static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock* iface) { } static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REFIID riid, void** ppobj) { - SystemClockImpl *This = (SystemClockImpl *)iface; + SystemClockImpl *This = impl_from_IReferenceClock(iface); TRACE("(%p, %s,%p)\n", This, debugstr_guid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown) || @@ -216,7 +221,7 @@ static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REF } static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { - SystemClockImpl *This = (SystemClockImpl *)iface; + SystemClockImpl *This = impl_from_IReferenceClock(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { @@ -232,7 +237,7 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { } static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock* iface, REFERENCE_TIME* pTime) { - SystemClockImpl *This = (SystemClockImpl *)iface; + SystemClockImpl *This = impl_from_IReferenceClock(iface); DWORD curTimeTickCount; HRESULT hr = S_OK; @@ -254,7 +259,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock* iface, REFERENCE_ } static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock* iface, REFERENCE_TIME rtBaseTime, REFERENCE_TIME rtStreamTime, HEVENT hEvent, DWORD_PTR* pdwAdviseCookie) { - SystemClockImpl *This = (SystemClockImpl *)iface; + SystemClockImpl *This = impl_from_IReferenceClock(iface); SystemClockAdviseEntry* pEntry = NULL; TRACE("(%p, 0x%s, 0x%s, %ld, %p)\n", This, wine_dbgstr_longlong(rtBaseTime), @@ -290,7 +295,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock* iface, REFEREN } static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REFERENCE_TIME rtStartTime, REFERENCE_TIME rtPeriodTime, HSEMAPHORE hSemaphore, DWORD_PTR* pdwAdviseCookie) { - SystemClockImpl *This = (SystemClockImpl *)iface; + SystemClockImpl *This = impl_from_IReferenceClock(iface); SystemClockAdviseEntry* pEntry = NULL; TRACE("(%p, 0x%s, 0x%s, %ld, %p)\n", This, wine_dbgstr_longlong(rtStartTime), @@ -326,7 +331,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REF } static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock* iface, DWORD_PTR dwAdviseCookie) { - SystemClockImpl *This = (SystemClockImpl *)iface; + SystemClockImpl *This = impl_from_IReferenceClock(iface); SystemClockAdviseEntry* pEntry = NULL; SystemClockAdviseEntry* it = NULL; HRESULT ret = S_OK; @@ -377,12 +382,12 @@ HRESULT QUARTZ_CreateSystemClock(IUnknown * pUnkOuter, LPVOID * ppv) { } ZeroMemory(obj, sizeof(SystemClockImpl)); - obj->lpVtbl = &SystemClock_Vtbl; + obj->IReferenceClock_iface.lpVtbl = &SystemClock_Vtbl; obj->ref = 0; /* will be inited by QueryInterface */ obj->lastTimeTickCount = GetTickCount(); InitializeCriticalSection(&obj->safe); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.safe"); - return SystemClockImpl_QueryInterface((IReferenceClock*) obj, &IID_IReferenceClock, ppv); + return SystemClockImpl_QueryInterface(&obj->IReferenceClock_iface, &IID_IReferenceClock, ppv); }

1 0

Michael Stefaniuc : browseui: Use an iface instead of a vtbl pointer in ACLShellSource.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 40213ae2816cb32f41abc5d8f0de59be6ba11956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40213ae2816cb32f41abc5d8f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:26 2010 +0100 browseui: Use an iface instead of a vtbl pointer in ACLShellSource. --- dlls/browseui/aclsource.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 4788ad6..c151878 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -43,11 +43,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); typedef struct tagACLMulti { - const IACList2Vtbl *acl2Vtbl; + IACList2 IACList2_iface; LONG refCount; DWORD dwOptions; } ACLShellSource; +static inline ACLShellSource *impl_from_IACList2(IACList2 *iface) +{ + return CONTAINING_RECORD(iface, ACLShellSource, IACList2_iface); +} + static void ACLShellSource_Destructor(ACLShellSource *This) { TRACE("destroying %p\n", This); @@ -56,7 +61,7 @@ static void ACLShellSource_Destructor(ACLShellSource *This) static HRESULT WINAPI ACLShellSource_QueryInterface(IACList2 *iface, REFIID iid, LPVOID *ppvOut) { - ACLShellSource *This = (ACLShellSource *)iface; + ACLShellSource *This = impl_from_IACList2(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IACList2) || @@ -77,13 +82,13 @@ static HRESULT WINAPI ACLShellSource_QueryInterface(IACList2 *iface, REFIID iid, static ULONG WINAPI ACLShellSource_AddRef(IACList2 *iface) { - ACLShellSource *This = (ACLShellSource *)iface; + ACLShellSource *This = impl_from_IACList2(iface); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI ACLShellSource_Release(IACList2 *iface) { - ACLShellSource *This = (ACLShellSource *)iface; + ACLShellSource *This = impl_from_IACList2(iface); ULONG ret; ret = InterlockedDecrement(&This->refCount); @@ -94,7 +99,7 @@ static ULONG WINAPI ACLShellSource_Release(IACList2 *iface) static HRESULT WINAPI ACLShellSource_Expand(IACList2 *iface, LPCWSTR wstr) { - ACLShellSource *This = (ACLShellSource *)iface; + ACLShellSource *This = impl_from_IACList2(iface); FIXME("STUB:(%p) %s\n",This,debugstr_w(wstr)); return E_NOTIMPL; } @@ -103,7 +108,7 @@ static HRESULT WINAPI ACLShellSource_Expand(IACList2 *iface, LPCWSTR wstr) static HRESULT WINAPI ACLShellSource_GetOptions(IACList2 *iface, DWORD *pdwFlag) { - ACLShellSource *This = (ACLShellSource *)iface; + ACLShellSource *This = impl_from_IACList2(iface); *pdwFlag = This->dwOptions; return S_OK; } @@ -111,7 +116,7 @@ static HRESULT WINAPI ACLShellSource_GetOptions(IACList2 *iface, static HRESULT WINAPI ACLShellSource_SetOptions(IACList2 *iface, DWORD dwFlag) { - ACLShellSource *This = (ACLShellSource *)iface; + ACLShellSource *This = impl_from_IACList2(iface); This->dwOptions = dwFlag; return S_OK; } @@ -138,7 +143,7 @@ HRESULT ACLShellSource_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (This == NULL) return E_OUTOFMEMORY; - This->acl2Vtbl = &ACLMulti_ACList2Vtbl; + This->IACList2_iface.lpVtbl = &ACLMulti_ACList2Vtbl; This->refCount = 1; TRACE("returning %p\n", This);

1 0

Michael Stefaniuc : browseui: Use an iface instead of a vtbl pointer in CompCatCacheDaemon.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 3942f4d60db97c907b5d240e661ce0c2387afc3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3942f4d60db97c907b5d240e6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:29 2010 +0100 browseui: Use an iface instead of a vtbl pointer in CompCatCacheDaemon. --- dlls/browseui/compcatcachedaemon.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index 2cf15e4..f480d35 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -44,11 +44,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); typedef struct tagCCCD { - const IRunnableTaskVtbl *vtbl; + IRunnableTask IRunnableTask_iface; LONG refCount; CRITICAL_SECTION cs; } CompCatCacheDaemon; +static inline CompCatCacheDaemon *impl_from_IRunnableTask(IRunnableTask *iface) +{ + return CONTAINING_RECORD(iface, CompCatCacheDaemon, IRunnableTask_iface); +} + static void CompCatCacheDaemon_Destructor(CompCatCacheDaemon *This) { TRACE("destroying %p\n", This); @@ -59,7 +64,7 @@ static void CompCatCacheDaemon_Destructor(CompCatCacheDaemon *This) static HRESULT WINAPI CompCatCacheDaemon_QueryInterface(IRunnableTask *iface, REFIID iid, LPVOID *ppvOut) { - CompCatCacheDaemon *This = (CompCatCacheDaemon *)iface; + CompCatCacheDaemon *This = impl_from_IRunnableTask(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IRunnableTask) || IsEqualIID(iid, &IID_IUnknown)) @@ -79,13 +84,13 @@ static HRESULT WINAPI CompCatCacheDaemon_QueryInterface(IRunnableTask *iface, RE static ULONG WINAPI CompCatCacheDaemon_AddRef(IRunnableTask *iface) { - CompCatCacheDaemon *This = (CompCatCacheDaemon *)iface; + CompCatCacheDaemon *This = impl_from_IRunnableTask(iface); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI CompCatCacheDaemon_Release(IRunnableTask *iface) { - CompCatCacheDaemon *This = (CompCatCacheDaemon *)iface; + CompCatCacheDaemon *This = impl_from_IRunnableTask(iface); ULONG ret; ret = InterlockedDecrement(&This->refCount); @@ -146,7 +151,7 @@ HRESULT CompCatCacheDaemon_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (This == NULL) return E_OUTOFMEMORY; - This->vtbl = &CompCatCacheDaemonVtbl; + This->IRunnableTask_iface.lpVtbl = &CompCatCacheDaemonVtbl; This->refCount = 1; InitializeCriticalSection(&This->cs);

1 0

Michael Stefaniuc : browseui: Use an iface instead of a vtbl pointer in ClassFactory.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: 0d61c7ba161dfbd658c60207102e1c974dae0ca6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d61c7ba161dfbd658c602071… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:27 2010 +0100 browseui: Use an iface instead of a vtbl pointer in ClassFactory. --- dlls/browseui/browseui_main.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 52226e4..18af461 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -60,11 +60,16 @@ static const struct { typedef struct tagClassFactory { - const IClassFactoryVtbl *vtbl; + IClassFactory IClassFactory_iface; LONG ref; LPFNCONSTRUCTOR ctor; } ClassFactory; +static inline ClassFactory *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactory, IClassFactory_iface); +} + static void ClassFactory_Destructor(ClassFactory *This) { TRACE("Destroying class factory %p\n", This); @@ -87,13 +92,13 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - ClassFactory *This = (ClassFactory *)iface; + ClassFactory *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - ClassFactory *This = (ClassFactory *)iface; + ClassFactory *This = impl_from_IClassFactory(iface); ULONG ret = InterlockedDecrement(&This->ref); if (ret == 0) @@ -103,7 +108,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *punkOuter, REFIID iid, LPVOID *ppvOut) { - ClassFactory *This = (ClassFactory *)iface; + ClassFactory *This = impl_from_IClassFactory(iface); HRESULT ret; IUnknown *obj; @@ -118,7 +123,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) { - ClassFactory *This = (ClassFactory *)iface; + ClassFactory *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%x)\n", This, fLock); @@ -144,7 +149,7 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) { ClassFactory *This = heap_alloc(sizeof(ClassFactory)); - This->vtbl = &ClassFactoryVtbl; + This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl; This->ref = 1; This->ctor = ctor; *ppvOut = This;

1 0

Michael Stefaniuc : browseui: Use an iface instead of a vtbl pointer in ProgressDialog.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: f4a0e3491e77a082df0c783fb0e17547d11223aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4a0e3491e77a082df0c783fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:30 2010 +0100 browseui: Use an iface instead of a vtbl pointer in ProgressDialog. --- dlls/browseui/progressdlg.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 42e7322..11ebb7b 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -59,7 +59,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui); #define WM_DLG_DESTROY (WM_APP+2) /* DestroyWindow must be called from the owning thread */ typedef struct tagProgressDialog { - const IProgressDialogVtbl *vtbl; + IProgressDialog IProgressDialog_iface; LONG refCount; CRITICAL_SECTION cs; HWND hwnd; @@ -74,6 +74,11 @@ typedef struct tagProgressDialog { HWND hwndDisabledParent; /* For modal dialog: the parent that need to be re-enabled when the dialog ends */ } ProgressDialog; +static inline ProgressDialog *impl_from_IProgressDialog(IProgressDialog *iface) +{ + return CONTAINING_RECORD(iface, ProgressDialog, IProgressDialog_iface); +} + static void set_buffer(LPWSTR *buffer, LPCWSTR string) { static const WCHAR empty_string[] = {0}; @@ -260,7 +265,7 @@ static void ProgressDialog_Destructor(ProgressDialog *This) static HRESULT WINAPI ProgressDialog_QueryInterface(IProgressDialog *iface, REFIID iid, LPVOID *ppvOut) { - ProgressDialog *This = (ProgressDialog *)iface; + ProgressDialog *This = impl_from_IProgressDialog(iface); *ppvOut = NULL; if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IProgressDialog)) @@ -280,13 +285,13 @@ static HRESULT WINAPI ProgressDialog_QueryInterface(IProgressDialog *iface, REFI static ULONG WINAPI ProgressDialog_AddRef(IProgressDialog *iface) { - ProgressDialog *This = (ProgressDialog *)iface; + ProgressDialog *This = impl_from_IProgressDialog(iface); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI ProgressDialog_Release(IProgressDialog *iface) { - ProgressDialog *This = (ProgressDialog *)iface; + ProgressDialog *This = impl_from_IProgressDialog(iface); ULONG ret; ret = InterlockedDecrement(&This->refCount); @@ -297,7 +302,7 @@ static ULONG WINAPI ProgressDialog_Release(IProgressDialog *iface) static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, HWND hwndParent, IUnknown *punkEnableModeless, DWORD dwFlags, LPCVOID reserved) { - ProgressDialog *This = (ProgressDialog *)iface; + ProgressDialog *This = impl_from_IProgressDialog(iface); struct create_params params; HANDLE hThread; @@ -341,7 +346,7 @@ static HRESULT WINAPI ProgressDialog_StartProgressDialog(IProgressDialog *iface, static HRESULT WINAPI ProgressDialog_StopProgressDialog(IProgressDialog *iface) { - ProgressDialog *This = (ProgressDialog *)iface; + ProgressDialog *This = impl_from_IProgressDialog(iface); EnterCriticalSection(&This->cs); if (This->hwnd) @@ -353,7 +358,7 @@ static HRESULT WINAPI ProgressDialog_StopProgressDialog(IProgressDialog *iface) static HRESULT WINAPI ProgressDialog_SetTitle(IProgressDialog *iface, LPCWSTR pwzTitle) { - ProgressDialog *This = (ProgressDialog *)iface; + ProgressDialog *This = impl_from_IProgressDialog(iface); HWND hwnd; TRACE("(%p, %s)\n", This, wine_dbgstr_w(pwzTitle)); @@ -378,13 +383,13 @@ static HRESULT WINAPI ProgressDialog_SetAnimation(IProgressDialog *iface, HINSTA static BOOL WINAPI ProgressDialog_HasUserCancelled(IProgressDialog *iface) { - ProgressDialog *This = (ProgressDialog *)iface; + ProgressDialog *This = impl_from_IProgressDialog(iface); return This->isCancelled; } static HRESULT WINAPI ProgressDialog_SetProgress64(IProgressDialog *iface, ULONGLONG ullCompleted, ULONGLONG ullTotal) { - ProgressDialog *This = (ProgressDialog *)iface; + ProgressDialog *This = impl_from_IProgressDialog(iface); HWND hwnd; TRACE("(%p, 0x%s, 0x%s)\n", This, wine_dbgstr_longlong(ullCompleted), wine_dbgstr_longlong(ullTotal)); @@ -409,7 +414,7 @@ static HRESULT WINAPI ProgressDialog_SetProgress(IProgressDialog *iface, DWORD d static HRESULT WINAPI ProgressDialog_SetLine(IProgressDialog *iface, DWORD dwLineNum, LPCWSTR pwzLine, BOOL bPath, LPCVOID reserved) { - ProgressDialog *This = (ProgressDialog *)iface; + ProgressDialog *This = impl_from_IProgressDialog(iface); HWND hwnd; TRACE("(%p, %d, %s, %d)\n", This, dwLineNum, wine_dbgstr_w(pwzLine), bPath); @@ -435,7 +440,7 @@ static HRESULT WINAPI ProgressDialog_SetLine(IProgressDialog *iface, DWORD dwLin static HRESULT WINAPI ProgressDialog_SetCancelMsg(IProgressDialog *iface, LPCWSTR pwzMsg, LPCVOID reserved) { - ProgressDialog *This = (ProgressDialog *)iface; + ProgressDialog *This = impl_from_IProgressDialog(iface); HWND hwnd; TRACE("(%p, %s)\n", This, wine_dbgstr_w(pwzMsg)); @@ -457,7 +462,7 @@ static HRESULT WINAPI ProgressDialog_SetCancelMsg(IProgressDialog *iface, LPCWST static HRESULT WINAPI ProgressDialog_Timer(IProgressDialog *iface, DWORD dwTimerAction, LPCVOID reserved) { - ProgressDialog *This = (ProgressDialog *)iface; + ProgressDialog *This = impl_from_IProgressDialog(iface); FIXME("(%p, %d, %p) - stub\n", This, dwTimerAction, reserved); @@ -495,7 +500,7 @@ HRESULT ProgressDialog_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) if (This == NULL) return E_OUTOFMEMORY; - This->vtbl = &ProgressDialogVtbl; + This->IProgressDialog_iface.lpVtbl = &ProgressDialogVtbl; This->refCount = 1; InitializeCriticalSection(&This->cs);

1 0

Michael Stefaniuc : ole32: Use an iface instead of a vtbl pointer in RemUnknown.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: f27f7544fe1971ee6c7911db348824a405d9cdd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f27f7544fe1971ee6c7911db3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:55 2010 +0100 ole32: Use an iface instead of a vtbl pointer in RemUnknown. --- dlls/ole32/stubmanager.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index f6b8bfa..f5a6ee8 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -578,12 +578,17 @@ BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) typedef struct rem_unknown { - const IRemUnknownVtbl *lpVtbl; + IRemUnknown IRemUnknown_iface; LONG refs; } RemUnknown; static const IRemUnknownVtbl RemUnknown_Vtbl; +static inline RemUnknown *impl_from_IRemUnknown(IRemUnknown *iface) +{ + return CONTAINING_RECORD(iface, RemUnknown, IRemUnknown_iface); +} + /* construct an IRemUnknown object with one outstanding reference */ static HRESULT RemUnknown_Construct(IRemUnknown **ppRemUnknown) @@ -592,10 +597,10 @@ static HRESULT RemUnknown_Construct(IRemUnknown **ppRemUnknown) if (!This) return E_OUTOFMEMORY; - This->lpVtbl = &RemUnknown_Vtbl; + This->IRemUnknown_iface.lpVtbl = &RemUnknown_Vtbl; This->refs = 1; - *ppRemUnknown = (IRemUnknown *)This; + *ppRemUnknown = &This->IRemUnknown_iface; return S_OK; } @@ -620,7 +625,7 @@ static HRESULT WINAPI RemUnknown_QueryInterface(IRemUnknown *iface, REFIID riid, static ULONG WINAPI RemUnknown_AddRef(IRemUnknown *iface) { ULONG refs; - RemUnknown *This = (RemUnknown *)iface; + RemUnknown *This = impl_from_IRemUnknown(iface); refs = InterlockedIncrement(&This->refs); @@ -631,7 +636,7 @@ static ULONG WINAPI RemUnknown_AddRef(IRemUnknown *iface) static ULONG WINAPI RemUnknown_Release(IRemUnknown *iface) { ULONG refs; - RemUnknown *This = (RemUnknown *)iface; + RemUnknown *This = impl_from_IRemUnknown(iface); refs = InterlockedDecrement(&This->refs); if (!refs)

1 0

Michael Stefaniuc : strmbase: Use an iface instead of a vtbl pointer in IEnumPinsImpl.
by Alexandre Julliard 09 Dec '10

09 Dec '10

Module: wine Branch: master Commit: f25a867c8780043de1f0ad182b2ffa6b2ed5c0d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f25a867c8780043de1f0ad182… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 8 22:59:21 2010 +0100 strmbase: Use an iface instead of a vtbl pointer in IEnumPinsImpl. --- dlls/strmbase/enumpins.c | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index bff1d90..13c7c6e 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); typedef struct IEnumPinsImpl { - const IEnumPinsVtbl * lpVtbl; + IEnumPins IEnumPins_iface; LONG refCount; ULONG uIndex; BaseFilter *base; @@ -39,6 +39,11 @@ typedef struct IEnumPinsImpl DWORD Version; } IEnumPinsImpl; +static inline IEnumPinsImpl *impl_from_IEnumPins(IEnumPins *iface) +{ + return CONTAINING_RECORD(iface, IEnumPinsImpl, IEnumPins_iface); +} + static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl; HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_pin, BaseFilter_GetPinCount receive_pincount, BaseFilter_GetPinVersion receive_version, IEnumPins ** ppEnum) @@ -54,7 +59,7 @@ HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_p *ppEnum = NULL; return E_OUTOFMEMORY; } - pEnumPins->lpVtbl = &IEnumPinsImpl_Vtbl; + pEnumPins->IEnumPins_iface.lpVtbl = &IEnumPinsImpl_Vtbl; pEnumPins->refCount = 1; pEnumPins->uIndex = 0; pEnumPins->receive_pin = receive_pin; @@ -62,7 +67,7 @@ HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_p pEnumPins->receive_version = receive_version; pEnumPins->base = base; IBaseFilter_AddRef((IBaseFilter*)base); - *ppEnum = (IEnumPins *)(&pEnumPins->lpVtbl); + *ppEnum = &pEnumPins->IEnumPins_iface; pEnumPins->Version = receive_version(base); TRACE("Created new enumerator (%p)\n", *ppEnum); @@ -93,7 +98,7 @@ static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID rii static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); @@ -103,7 +108,7 @@ static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -120,7 +125,7 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); HRESULT hr = S_OK; ULONG i = 0; @@ -161,7 +166,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); TRACE("(%u)\n", cPins); @@ -177,7 +182,7 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) { - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); TRACE("IEnumPinsImpl::Reset()\n"); This->Version = This->receive_version(This->base); @@ -189,7 +194,7 @@ static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins * iface, IEnumPins ** ppEnum) { HRESULT hr; - IEnumPinsImpl *This = (IEnumPinsImpl *)iface; + IEnumPinsImpl *This = impl_from_IEnumPins(iface); TRACE("(%p)\n", ppEnum);

1 0