wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Michael Stefaniuc : amstream: Basic COM cleanup for the IDirectDrawMediaStream iface.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: aba87e0fe5bbd0fa9d8dea6074ebe3ef36fb7802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba87e0fe5bbd0fa9d8dea607… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 16 10:11:54 2011 +0200 amstream: Basic COM cleanup for the IDirectDrawMediaStream iface. --- dlls/amstream/mediastream.c | 48 ++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 39c28c9..0444cc2 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -44,7 +44,7 @@ typedef struct { } IMediaStreamImpl; typedef struct { - const IDirectDrawMediaStreamVtbl *lpVtbl; + IDirectDrawMediaStream IDirectDrawMediaStream_iface; LONG ref; IMultiMediaStream* Parent; MSPID PurposeId; @@ -207,77 +207,89 @@ HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPu return E_OUTOFMEMORY; } - object->lpVtbl = &DirectDrawMediaStream_Vtbl; + object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStream_Vtbl; object->ref = 1; object->Parent = Parent; object->PurposeId = *pPurposeId; object->StreamType = StreamType; - *ppMediaStream = (IMediaStream*)object; + *ppMediaStream = (IMediaStream*)&object->IDirectDrawMediaStream_iface; return S_OK; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMediaStream* iface, REFIID riid, void** ppvObject) +static inline IDirectDrawMediaStreamImpl *impl_from_IDirectDrawMediaStream(IDirectDrawMediaStream *iface) { - IMediaStreamImpl *This = (IMediaStreamImpl *)iface; + return CONTAINING_RECORD(iface, IDirectDrawMediaStreamImpl, IDirectDrawMediaStream_iface); +} - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); +static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMediaStream *iface, + REFIID riid, void **ppv) +{ + IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); + + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppv); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IMediaStream) || IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) { IUnknown_AddRef(iface); - *ppvObject = This; + *ppv = This; return S_OK; } - ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); + ERR("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream* iface, DDSURFACEDESC *pDDSDCurrent, - IDirectDrawPalette **ppDirectDrawPalette, DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream *iface, + DDSURFACEDESC *pDDSDCurrent, IDirectDrawPalette **ppDirectDrawPalette, + DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags) { - FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, pDDSDCurrent, ppDirectDrawPalette, pDDSDDesired, pdwFlags); + FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, pDDSDCurrent, ppDirectDrawPalette, pDDSDDesired, + pdwFlags); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetFormat(IDirectDrawMediaStream* iface, const DDSURFACEDESC *pDDSurfaceDesc, - IDirectDrawPalette *pDirectDrawPalette) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetFormat(IDirectDrawMediaStream *iface, + const DDSURFACEDESC *pDDSurfaceDesc, IDirectDrawPalette *pDirectDrawPalette) { FIXME("(%p)->(%p,%p) stub!\n", iface, pDDSurfaceDesc, pDirectDrawPalette); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetDirectDraw(IDirectDrawMediaStream* iface, IDirectDraw **ppDirectDraw) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetDirectDraw(IDirectDrawMediaStream *iface, + IDirectDraw **ppDirectDraw) { FIXME("(%p)->(%p) stub!\n", iface, ppDirectDraw); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetDirectDraw(IDirectDrawMediaStream* iface, IDirectDraw *pDirectDraw) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetDirectDraw(IDirectDrawMediaStream *iface, + IDirectDraw *pDirectDraw) { FIXME("(%p)->(%p) stub!\n", iface, pDirectDraw); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_CreateSample(IDirectDrawMediaStream* iface, IDirectDrawSurface *pSurface, const RECT *pRect, - DWORD dwFlags, IDirectDrawStreamSample **ppSample) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_CreateSample(IDirectDrawMediaStream *iface, + IDirectDrawSurface *pSurface, const RECT *pRect, DWORD dwFlags, + IDirectDrawStreamSample **ppSample) { FIXME("(%p)->(%p,%p,%x,%p) stub!\n", iface, pSurface, pRect, dwFlags, ppSample); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetTimePerFrame(IDirectDrawMediaStream* iface, STREAM_TIME *pFrameTime) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetTimePerFrame(IDirectDrawMediaStream *iface, + STREAM_TIME *pFrameTime) { FIXME("(%p)->(%p) stub!\n", iface, pFrameTime);

1 0

Jörg Höhle : wineoss.drv: Fix AudioRenderClient write pointer calculation.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: ea47c12ebe105823d6810dac99e26bd7fcd68e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea47c12ebe105823d6810dac9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 9 23:34:11 2011 +0200 wineoss.drv: Fix AudioRenderClient write pointer calculation. --- dlls/wineoss.drv/mmdevdrv.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 1e69a22..f962f8a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1611,8 +1611,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, *data = This->tmp_buffer; This->buf_state = LOCKED_WRAPPED; }else{ - *data = This->local_buffer + - This->lcl_offs_frames * This->fmt->nBlockAlign; + *data = This->local_buffer + write_pos * This->fmt->nBlockAlign; This->buf_state = LOCKED_NORMAL; } @@ -1656,8 +1655,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( } if(This->buf_state == LOCKED_NORMAL) - buffer = This->local_buffer + - This->lcl_offs_frames * This->fmt->nBlockAlign; + buffer = This->local_buffer + This->fmt->nBlockAlign * + ((This->lcl_offs_frames + This->held_frames) % This->bufsize_frames); else buffer = This->tmp_buffer;

1 0

Jörg Höhle : winealsa.drv: Fix AudioRenderClient write pointer calculation.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 47bc6223e9135bd168c982b6a03ef240eedcae55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47bc6223e9135bd168c982b6a… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 9 23:27:51 2011 +0200 winealsa.drv: Fix AudioRenderClient write pointer calculation. --- dlls/winealsa.drv/mmdevdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6c902f5..8ea2f09 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -2028,8 +2028,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( } if(This->buf_state == LOCKED_NORMAL) - buffer = This->local_buffer + - (This->lcl_offs_frames + This->held_frames) * This->fmt->nBlockAlign; + buffer = This->local_buffer + This->fmt->nBlockAlign * + ((This->lcl_offs_frames + This->held_frames) % This->bufsize_frames); else buffer = This->tmp_buffer;

1 0

Michael Stefaniuc : amstream: Avoid a forward declaration of the IMediaStreamFilter vtbl.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 8d8843e563172cb6521188cb7543d6540558ddcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8843e563172cb6521188cb7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 00:14:30 2011 +0200 amstream: Avoid a forward declaration of the IMediaStreamFilter vtbl. --- dlls/amstream/mediastreamfilter.c | 50 +++++++++++++++++------------------- 1 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 725278e..8874136 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -50,32 +50,6 @@ static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamF return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, IMediaStreamFilter_iface); } -static const struct IMediaStreamFilterVtbl MediaStreamFilter_Vtbl; - -HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) -{ - IMediaStreamFilterImpl* object; - - TRACE("(%p,%p)\n", pUnkOuter, ppObj); - - if( pUnkOuter ) - return CLASS_E_NOAGGREGATION; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamFilterImpl)); - if (!object) - { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; - } - - object->IMediaStreamFilter_iface.lpVtbl = &MediaStreamFilter_Vtbl; - object->ref = 1; - - *ppObj = object; - - return S_OK; -} - /*** IUnknown methods ***/ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, @@ -314,3 +288,27 @@ static const IMediaStreamFilterVtbl MediaStreamFilter_Vtbl = MediaStreamFilterImpl_Flush, MediaStreamFilterImpl_EndOfStream }; + +HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, void **ppObj) +{ + IMediaStreamFilterImpl* object; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + if( pUnkOuter ) + return CLASS_E_NOAGGREGATION; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamFilterImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IMediaStreamFilter_iface.lpVtbl = &MediaStreamFilter_Vtbl; + object->ref = 1; + + *ppObj = object; + + return S_OK; +}

1 0

Michael Stefaniuc : amstream: COM cleanup for the IMediaStreamFilter iface.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: beada9ca4243b4f9dc12537a9036aec4b64cc0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beada9ca4243b4f9dc12537a9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 00:13:17 2011 +0200 amstream: COM cleanup for the IMediaStreamFilter iface. --- dlls/amstream/mediastreamfilter.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index 4a4d712..725278e 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); typedef struct { - const IMediaStreamFilterVtbl *lpVtbl; + IMediaStreamFilter IMediaStreamFilter_iface; LONG ref; CRITICAL_SECTION csFilter; FILTER_STATE state; @@ -45,6 +45,11 @@ typedef struct { FILTER_INFO filterInfo; } IMediaStreamFilterImpl; +static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) +{ + return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, IMediaStreamFilter_iface); +} + static const struct IMediaStreamFilterVtbl MediaStreamFilter_Vtbl; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) @@ -63,7 +68,7 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) return E_OUTOFMEMORY; } - object->lpVtbl = &MediaStreamFilter_Vtbl; + object->IMediaStreamFilter_iface.lpVtbl = &MediaStreamFilter_Vtbl; object->ref = 1; *ppObj = object; @@ -73,9 +78,10 @@ HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) /*** IUnknown methods ***/ -static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, + void **ppv) { - IMediaStreamFilterImpl *This = (IMediaStreamFilterImpl *)iface; + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); @@ -101,9 +107,9 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter * return E_NOINTERFACE; } -static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter * iface) +static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface) { - IMediaStreamFilterImpl *This = (IMediaStreamFilterImpl *)iface; + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->() AddRef from %d\n", iface, refCount - 1); @@ -111,18 +117,15 @@ static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter * iface) return refCount; } -static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter * iface) +static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { - IMediaStreamFilterImpl *This = (IMediaStreamFilterImpl *)iface; + IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->() Release from %d\n", iface, refCount + 1); if (!refCount) - { - This->lpVtbl = NULL; HeapFree(GetProcessHeap(), 0, This); - } return refCount; }

1 0

Michael Stefaniuc : gameux: COM cleanup in gamestatistics.c.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: ce9546f26801ba5be54269dd6588d2509c154d35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce9546f26801ba5be54269dd6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 00:11:07 2011 +0200 gameux: COM cleanup in gamestatistics.c. --- dlls/gameux/gamestatistics.c | 23 +++++++++-------------- 1 files changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 87df886..2e6e21c 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -651,20 +651,15 @@ static HRESULT GAMEUX_loadGameStatistics(struct GAMEUX_STATS *pStats, */ typedef struct _GameStatisticsImpl { - const struct IGameStatisticsVtbl *lpVtbl; + IGameStatistics IGameStatistics_iface; LONG ref; struct GAMEUX_STATS stats; } GameStatisticsImpl; static inline GameStatisticsImpl *impl_from_IGameStatistics( IGameStatistics *iface ) { - return (GameStatisticsImpl *)((char*)iface - FIELD_OFFSET(GameStatisticsImpl, lpVtbl)); + return CONTAINING_RECORD(iface, GameStatisticsImpl, IGameStatistics_iface); } -static inline IGameStatistics *IGameStatistics_from_impl( GameStatisticsImpl* This ) -{ - return (struct IGameStatistics*)&This->lpVtbl; -} - static HRESULT WINAPI GameStatisticsImpl_QueryInterface( IGameStatistics *iface, @@ -1003,7 +998,7 @@ static HRESULT create_IGameStatistics(GameStatisticsImpl** ppStats) if(!(*ppStats)) return E_OUTOFMEMORY; - (*ppStats)->lpVtbl = &GameStatisticsImplVtbl; + (*ppStats)->IGameStatistics_iface.lpVtbl = &GameStatisticsImplVtbl; (*ppStats)->ref = 1; TRACE("returning coclass: %p\n", *ppStats); @@ -1015,13 +1010,13 @@ static HRESULT create_IGameStatistics(GameStatisticsImpl** ppStats) */ typedef struct _GameStatisticsMgrImpl { - const struct IGameStatisticsMgrVtbl *lpVtbl; + IGameStatisticsMgr IGameStatisticsMgr_iface; LONG ref; } GameStatisticsMgrImpl; static inline GameStatisticsMgrImpl *impl_from_IGameStatisticsMgr( IGameStatisticsMgr *iface ) { - return (GameStatisticsMgrImpl *)((char*)iface - FIELD_OFFSET(GameStatisticsMgrImpl, lpVtbl)); + return CONTAINING_RECORD(iface, GameStatisticsMgrImpl, IGameStatisticsMgr_iface); } @@ -1088,7 +1083,7 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( { HRESULT hr; WCHAR lpApplicationId[49]; - GameStatisticsImpl *statisticsImpl = NULL; + GameStatisticsImpl *statisticsImpl; IGameStatistics *output_iface; TRACE("(%p, %s, 0x%x, %p, %p)\n", iface, debugstr_w(GDFBinaryPath), openType, pOpenResult, ppiStats); @@ -1100,7 +1095,7 @@ static HRESULT STDMETHODCALLTYPE GameStatisticsMgrImpl_GetGameStatistics( if(SUCCEEDED(hr)) { - output_iface = IGameStatistics_from_impl(statisticsImpl); + output_iface = &statisticsImpl->IGameStatistics_iface; hr = GAMEUX_buildStatisticsFilePath(lpApplicationId, statisticsImpl->stats.sStatsFile); } @@ -1161,10 +1156,10 @@ HRESULT GameStatistics_create( if( !pGameStatistics ) return E_OUTOFMEMORY; - pGameStatistics->lpVtbl = &GameStatisticsMgrImplVtbl; + pGameStatistics->IGameStatisticsMgr_iface.lpVtbl = &GameStatisticsMgrImplVtbl; pGameStatistics->ref = 1; - *ppObj = (IUnknown*)(&pGameStatistics->lpVtbl); + *ppObj = (IUnknown*)&pGameStatistics->IGameStatisticsMgr_iface; TRACE("returning iface %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : gameux: COM cleanup in gameexplorer.c.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 75ba717967b5943631d1f1538f589f69889b402b URL: http://source.winehq.org/git/wine.git/?a=commit;h=75ba717967b5943631d1f1538… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 00:06:47 2011 +0200 gameux: COM cleanup in gameexplorer.c. --- dlls/gameux/gameexplorer.c | 34 ++++++++++++---------------------- 1 files changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 8b57247..322dd7a 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -774,29 +774,19 @@ HRESULT GAMEUX_FindGameInstanceId( typedef struct _GameExplorerImpl { - const struct IGameExplorerVtbl *lpGameExplorerVtbl; - const struct IGameExplorer2Vtbl *lpGameExplorer2Vtbl; + IGameExplorer IGameExplorer_iface; + IGameExplorer2 IGameExplorer2_iface; LONG ref; } GameExplorerImpl; static inline GameExplorerImpl *impl_from_IGameExplorer(IGameExplorer *iface) { - return (GameExplorerImpl*)((char*)iface - FIELD_OFFSET(GameExplorerImpl, lpGameExplorerVtbl)); -} - -static inline IGameExplorer* IGameExplorer_from_impl(GameExplorerImpl* This) -{ - return (struct IGameExplorer*)&This->lpGameExplorerVtbl; + return CONTAINING_RECORD(iface, GameExplorerImpl, IGameExplorer_iface); } static inline GameExplorerImpl *impl_from_IGameExplorer2(IGameExplorer2 *iface) { - return (GameExplorerImpl*)((char*)iface - FIELD_OFFSET(GameExplorerImpl, lpGameExplorer2Vtbl)); -} - -static inline IGameExplorer2* IGameExplorer2_from_impl(GameExplorerImpl* This) -{ - return (struct IGameExplorer2*)&This->lpGameExplorer2Vtbl; + return CONTAINING_RECORD(iface, GameExplorerImpl, IGameExplorer2_iface); } static HRESULT WINAPI GameExplorerImpl_QueryInterface( @@ -813,11 +803,11 @@ static HRESULT WINAPI GameExplorerImpl_QueryInterface( if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IGameExplorer)) { - *ppvObject = IGameExplorer_from_impl(This); + *ppvObject = &This->IGameExplorer_iface; } else if(IsEqualGUID(riid, &IID_IGameExplorer2)) { - *ppvObject = IGameExplorer2_from_impl(This); + *ppvObject = &This->IGameExplorer2_iface; } else { @@ -919,19 +909,19 @@ static HRESULT WINAPI GameExplorer2Impl_QueryInterface( void **ppvObject) { GameExplorerImpl *This = impl_from_IGameExplorer2(iface); - return GameExplorerImpl_QueryInterface(IGameExplorer_from_impl(This), riid, ppvObject); + return GameExplorerImpl_QueryInterface(&This->IGameExplorer_iface, riid, ppvObject); } static ULONG WINAPI GameExplorer2Impl_AddRef(IGameExplorer2 *iface) { GameExplorerImpl *This = impl_from_IGameExplorer2(iface); - return GameExplorerImpl_AddRef(IGameExplorer_from_impl(This)); + return GameExplorerImpl_AddRef(&This->IGameExplorer_iface); } static ULONG WINAPI GameExplorer2Impl_Release(IGameExplorer2 *iface) { GameExplorerImpl *This = impl_from_IGameExplorer2(iface); - return GameExplorerImpl_Release(IGameExplorer_from_impl(This)); + return GameExplorerImpl_Release(&This->IGameExplorer_iface); } static HRESULT WINAPI GameExplorer2Impl_CheckAccess( @@ -1026,11 +1016,11 @@ HRESULT GameExplorer_create( if(!pGameExplorer) return E_OUTOFMEMORY; - pGameExplorer->lpGameExplorerVtbl = &GameExplorerImplVtbl; - pGameExplorer->lpGameExplorer2Vtbl = &GameExplorer2ImplVtbl; + pGameExplorer->IGameExplorer_iface.lpVtbl = &GameExplorerImplVtbl; + pGameExplorer->IGameExplorer2_iface.lpVtbl = &GameExplorer2ImplVtbl; pGameExplorer->ref = 1; - *ppObj = (IUnknown*)(&pGameExplorer->lpGameExplorerVtbl); + *ppObj = (IUnknown*)&pGameExplorer->IGameExplorer_iface; TRACE("returning iface: %p\n", *ppObj); return S_OK;

1 0

Michael Stefaniuc : dxdiagn: COM cleanup for the IDxDiagContainer iface.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: fd513acf2e84549ce8b31866a6c57f13f2f87348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd513acf2e84549ce8b31866a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 10 23:59:30 2011 +0200 dxdiagn: COM cleanup for the IDxDiagContainer iface. --- dlls/dxdiagn/container.c | 62 +++++++++++++++++++++++++++------------- dlls/dxdiagn/dxdiag_private.h | 6 +-- 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 6de641f..7501d98 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -28,10 +28,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxdiag); +static inline IDxDiagContainerImpl *impl_from_IDxDiagContainer(IDxDiagContainer *iface) +{ + return CONTAINING_RECORD(iface, IDxDiagContainerImpl, IDxDiagContainer_iface); +} + /* IDxDiagContainer IUnknown parts follow: */ -static HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(IDxDiagContainer *iface, REFIID riid, + void **ppobj) { - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; + IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); if (!ppobj) return E_INVALIDARG; @@ -47,8 +53,9 @@ static HRESULT WINAPI IDxDiagContainerImpl_QueryInterface(PDXDIAGCONTAINER iface return E_NOINTERFACE; } -static ULONG WINAPI IDxDiagContainerImpl_AddRef(PDXDIAGCONTAINER iface) { - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; +static ULONG WINAPI IDxDiagContainerImpl_AddRef(IDxDiagContainer *iface) +{ + IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); @@ -58,8 +65,9 @@ static ULONG WINAPI IDxDiagContainerImpl_AddRef(PDXDIAGCONTAINER iface) { return refCount; } -static ULONG WINAPI IDxDiagContainerImpl_Release(PDXDIAGCONTAINER iface) { - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; +static ULONG WINAPI IDxDiagContainerImpl_Release(IDxDiagContainer *iface) +{ + IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); @@ -75,8 +83,11 @@ static ULONG WINAPI IDxDiagContainerImpl_Release(PDXDIAGCONTAINER iface) { } /* IDxDiagContainer Interface follow: */ -static HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(PDXDIAGCONTAINER iface, DWORD* pdwCount) { - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; +static HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(IDxDiagContainer *iface, + DWORD *pdwCount) +{ + IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); + TRACE("(%p)\n", iface); if (NULL == pdwCount) { return E_INVALIDARG; @@ -85,8 +96,10 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfChildContainers(PDXDIAGCON return S_OK; } -static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) { - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; +static HRESULT WINAPI IDxDiagContainerImpl_EnumChildContainerNames(IDxDiagContainer *iface, + DWORD dwIndex, LPWSTR pwszContainer, DWORD cchContainer) +{ + IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); IDxDiagContainerImpl_Container *p; DWORD i = 0; @@ -126,8 +139,10 @@ static HRESULT IDxDiagContainerImpl_GetChildContainerInternal(IDxDiagContainerIm return E_INVALIDARG; } -static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(PDXDIAGCONTAINER iface, LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) { - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; +static HRESULT WINAPI IDxDiagContainerImpl_GetChildContainer(IDxDiagContainer *iface, + LPCWSTR pwszContainer, IDxDiagContainer **ppInstance) +{ + IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); IDxDiagContainerImpl_Container *pContainer = This->cont; LPWSTR tmp, orig_tmp; INT tmp_len; @@ -173,8 +188,11 @@ on_error: return hr; } -static HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER iface, DWORD* pdwCount) { - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; +static HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(IDxDiagContainer *iface, + DWORD *pdwCount) +{ + IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); + TRACE("(%p)\n", iface); if (NULL == pdwCount) { return E_INVALIDARG; @@ -183,8 +201,10 @@ static HRESULT WINAPI IDxDiagContainerImpl_GetNumberOfProps(PDXDIAGCONTAINER ifa return S_OK; } -static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, DWORD dwIndex, LPWSTR pwszPropName, DWORD cchPropName) { - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; +static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(IDxDiagContainer *iface, DWORD dwIndex, + LPWSTR pwszPropName, DWORD cchPropName) +{ + IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); IDxDiagContainerImpl_Property *p; DWORD i = 0; @@ -209,8 +229,10 @@ static HRESULT WINAPI IDxDiagContainerImpl_EnumPropNames(PDXDIAGCONTAINER iface, return E_INVALIDARG; } -static HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwszPropName, VARIANT* pvarProp) { - IDxDiagContainerImpl *This = (IDxDiagContainerImpl *)iface; +static HRESULT WINAPI IDxDiagContainerImpl_GetProp(IDxDiagContainer *iface, LPCWSTR pwszPropName, + VARIANT *pvarProp) +{ + IDxDiagContainerImpl *This = impl_from_IDxDiagContainer(iface); IDxDiagContainerImpl_Property *p; TRACE("(%p, %s, %p)\n", iface, debugstr_w(pwszPropName), pvarProp); @@ -254,10 +276,10 @@ HRESULT DXDiag_CreateDXDiagContainer(REFIID riid, IDxDiagContainerImpl_Container *ppobj = NULL; return E_OUTOFMEMORY; } - container->lpVtbl = &DxDiagContainer_Vtbl; + container->IDxDiagContainer_iface.lpVtbl = &DxDiagContainer_Vtbl; container->ref = 0; /* will be inited with QueryInterface */ container->cont = cont; container->pProv = pProv; IDxDiagProvider_AddRef(pProv); - return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)container, riid, ppobj); + return IDxDiagContainerImpl_QueryInterface(&container->IDxDiagContainer_iface, riid, ppobj); } diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index cfcae40..7c32a85 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -61,10 +61,8 @@ typedef struct IDxDiagContainerImpl_Property { * IDxDiagContainer implementation structure */ struct IDxDiagContainerImpl { - /* IUnknown fields */ - const IDxDiagContainerVtbl *lpVtbl; - LONG ref; - /* IDxDiagContainer fields */ + IDxDiagContainer IDxDiagContainer_iface; + LONG ref; IDxDiagContainerImpl_Container *cont; IDxDiagProvider *pProv; };

1 0

Michael Stefaniuc : dxdiagn: COM cleanup for the IDxDiagProvider iface.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: a7f02040459cd3e9a2ed3b67c7856ddd4c93f20b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f02040459cd3e9a2ed3b67c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 10 23:58:23 2011 +0200 dxdiagn: COM cleanup for the IDxDiagProvider iface. --- dlls/dxdiagn/dxdiag_private.h | 17 -------------- dlls/dxdiagn/provider.c | 47 +++++++++++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 30 deletions(-) diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index 31d3e6c..cfcae40 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -37,23 +37,6 @@ typedef struct IDxDiagContainerImpl IDxDiagContainerImpl; typedef struct IDxDiagContainerImpl_Container IDxDiagContainerImpl_Container; /* ---------------- */ -/* IDxDiagProvider */ -/* ---------------- */ - -/***************************************************************************** - * IDxDiagProvider implementation structure - */ -struct IDxDiagProviderImpl { - /* IUnknown fields */ - const IDxDiagProviderVtbl *lpVtbl; - LONG ref; - /* IDxDiagProvider fields */ - BOOL init; - DXDIAG_INIT_PARAMS params; - IDxDiagContainerImpl_Container *info_root; -}; - -/* ---------------- */ /* IDxDiagContainer */ /* ---------------- */ diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 2a48b2e..a881ea7 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -67,10 +67,25 @@ static const WCHAR szRevisionId[] = {'s','z','R','e','v','i','s','i','o','n','I' static const WCHAR dwRefreshRate[] = {'d','w','R','e','f','r','e','s','h','R','a','t','e',0}; static const WCHAR szManufacturer[] = {'s','z','M','a','n','u','f','a','c','t','u','r','e','r',0}; +struct IDxDiagProviderImpl +{ + IDxDiagProvider IDxDiagProvider_iface; + LONG ref; + BOOL init; + DXDIAG_INIT_PARAMS params; + IDxDiagContainerImpl_Container *info_root; +}; + +static inline IDxDiagProviderImpl *impl_from_IDxDiagProvider(IDxDiagProvider *iface) +{ + return CONTAINING_RECORD(iface, IDxDiagProviderImpl, IDxDiagProvider_iface); +} + /* IDxDiagProvider IUnknown parts follow: */ -static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(IDxDiagProvider *iface, REFIID riid, + void **ppobj) { - IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; + IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface); if (!ppobj) return E_INVALIDARG; @@ -86,8 +101,9 @@ static HRESULT WINAPI IDxDiagProviderImpl_QueryInterface(PDXDIAGPROVIDER iface, return E_NOINTERFACE; } -static ULONG WINAPI IDxDiagProviderImpl_AddRef(PDXDIAGPROVIDER iface) { - IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; +static ULONG WINAPI IDxDiagProviderImpl_AddRef(IDxDiagProvider *iface) +{ + IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount - 1); @@ -97,8 +113,9 @@ static ULONG WINAPI IDxDiagProviderImpl_AddRef(PDXDIAGPROVIDER iface) { return refCount; } -static ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) { - IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; +static ULONG WINAPI IDxDiagProviderImpl_Release(IDxDiagProvider *iface) +{ + IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); @@ -114,8 +131,10 @@ static ULONG WINAPI IDxDiagProviderImpl_Release(PDXDIAGPROVIDER iface) { } /* IDxDiagProvider Interface follow: */ -static HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDIAG_INIT_PARAMS* pParams) { - IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; +static HRESULT WINAPI IDxDiagProviderImpl_Initialize(IDxDiagProvider *iface, + DXDIAG_INIT_PARAMS *pParams) +{ + IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface); HRESULT hr; TRACE("(%p,%p)\n", iface, pParams); @@ -140,8 +159,10 @@ static HRESULT WINAPI IDxDiagProviderImpl_Initialize(PDXDIAGPROVIDER iface, DXDI return S_OK; } -static HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface, IDxDiagContainer** ppInstance) { - IDxDiagProviderImpl *This = (IDxDiagProviderImpl *)iface; +static HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(IDxDiagProvider *iface, + IDxDiagContainer **ppInstance) +{ + IDxDiagProviderImpl *This = impl_from_IDxDiagProvider(iface); TRACE("(%p,%p)\n", iface, ppInstance); @@ -150,7 +171,7 @@ static HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface } return DXDiag_CreateDXDiagContainer(&IID_IDxDiagContainer, This->info_root, - (IDxDiagProvider *)This, (void **)ppInstance); + &This->IDxDiagProvider_iface, (void **)ppInstance); } static const IDxDiagProviderVtbl DxDiagProvider_Vtbl = @@ -172,9 +193,9 @@ HRESULT DXDiag_CreateDXDiagProvider(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, R provider = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDxDiagProviderImpl)); if (NULL == provider) return E_OUTOFMEMORY; - provider->lpVtbl = &DxDiagProvider_Vtbl; + provider->IDxDiagProvider_iface.lpVtbl = &DxDiagProvider_Vtbl; provider->ref = 0; /* will be inited with QueryInterface */ - return IDxDiagProviderImpl_QueryInterface ((PDXDIAGPROVIDER)provider, riid, ppobj); + return IDxDiagProviderImpl_QueryInterface(&provider->IDxDiagProvider_iface, riid, ppobj); } static void free_property_information(IDxDiagContainerImpl_Property *prop)

1 0

Michael Stefaniuc : qcap: COM cleanup in capturegraph.c.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 5f77ad406e13ceed646df6f56b2bc53708681a86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f77ad406e13ceed646df6f56… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 10 23:57:01 2011 +0200 qcap: COM cleanup in capturegraph.c. --- dlls/qcap/capturegraph.c | 69 ++++++++++++++++++--------------------------- 1 files changed, 28 insertions(+), 41 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 7294d5d..aa5c0a4 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -54,8 +54,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(qcap); */ typedef struct CaptureGraphImpl { - const ICaptureGraphBuilder2Vtbl * lpVtbl2; - const ICaptureGraphBuilderVtbl * lpVtbl; + ICaptureGraphBuilder2 ICaptureGraphBuilder2_iface; + ICaptureGraphBuilder ICaptureGraphBuilder_iface; LONG ref; IGraphBuilder *mygraph; @@ -65,23 +65,16 @@ typedef struct CaptureGraphImpl static const ICaptureGraphBuilderVtbl builder_Vtbl; static const ICaptureGraphBuilder2Vtbl builder2_Vtbl; -static inline CaptureGraphImpl *impl_from_ICaptureGraphBuilder( ICaptureGraphBuilder *iface ) +static inline CaptureGraphImpl *impl_from_ICaptureGraphBuilder(ICaptureGraphBuilder *iface) { - return (CaptureGraphImpl *)((char*)iface - FIELD_OFFSET(CaptureGraphImpl, lpVtbl)); + return CONTAINING_RECORD(iface, CaptureGraphImpl, ICaptureGraphBuilder_iface); } -static inline CaptureGraphImpl *impl_from_ICaptureGraphBuilder2( ICaptureGraphBuilder2 *iface ) +static inline CaptureGraphImpl *impl_from_ICaptureGraphBuilder2(ICaptureGraphBuilder2 *iface) { - return (CaptureGraphImpl *)((char*)iface - FIELD_OFFSET(CaptureGraphImpl, lpVtbl2)); + return CONTAINING_RECORD(iface, CaptureGraphImpl, ICaptureGraphBuilder2_iface); } -/* - converts This to an interface pointer -*/ -#define _IUnknown_(This) (&(This)->lpVtbl2) -#define _ICaptureGraphBuilder_(This) (&(This)->lpVtbl) -#define _ICaptureGraphBuilder2_(This) ((ICaptureGraphBuilder2*)&(This)->lpVtbl2) - IUnknown * CALLBACK QCAP_createCaptureGraphBuilder2(IUnknown *pUnkOuter, HRESULT *phr) @@ -100,8 +93,8 @@ IUnknown * CALLBACK QCAP_createCaptureGraphBuilder2(IUnknown *pUnkOuter, pCapture = CoTaskMemAlloc(sizeof(CaptureGraphImpl)); if (pCapture) { - pCapture->lpVtbl2 = &builder2_Vtbl; - pCapture->lpVtbl = &builder_Vtbl; + pCapture->ICaptureGraphBuilder2_iface.lpVtbl = &builder2_Vtbl; + pCapture->ICaptureGraphBuilder_iface.lpVtbl = &builder_Vtbl; pCapture->ref = 1; pCapture->mygraph = NULL; InitializeCriticalSection(&pCapture->csFilter); @@ -109,7 +102,7 @@ IUnknown * CALLBACK QCAP_createCaptureGraphBuilder2(IUnknown *pUnkOuter, *phr = S_OK; ObjectRefCount(TRUE); } - return (IUnknown *)pCapture; + return (IUnknown *)&pCapture->ICaptureGraphBuilder_iface; } static HRESULT WINAPI @@ -123,11 +116,11 @@ fnCaptureGraphBuilder2_QueryInterface(ICaptureGraphBuilder2 * iface, *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = _IUnknown_(This); + *ppv = &This->ICaptureGraphBuilder2_iface; else if (IsEqualIID(riid, &IID_ICaptureGraphBuilder)) - *ppv = _ICaptureGraphBuilder_(This); + *ppv = &This->ICaptureGraphBuilder_iface; else if (IsEqualIID(riid, &IID_ICaptureGraphBuilder2)) - *ppv = _ICaptureGraphBuilder2_(This); + *ppv = &This->ICaptureGraphBuilder2_iface; if (*ppv) { @@ -163,8 +156,6 @@ fnCaptureGraphBuilder2_Release(ICaptureGraphBuilder2 * iface) FIXME("Release IGraphFilter or w/e\n"); This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); - This->lpVtbl = NULL; - This->lpVtbl2 = NULL; if (This->mygraph != NULL) IGraphBuilder_Release(This->mygraph); CoTaskMemFree(This); @@ -483,7 +474,7 @@ fnCaptureGraphBuilder_QueryInterface(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_QueryInterface(_ICaptureGraphBuilder2_(This), riid, ppv); + return IUnknown_QueryInterface(&This->ICaptureGraphBuilder2_iface, riid, ppv); } static ULONG WINAPI @@ -491,7 +482,7 @@ fnCaptureGraphBuilder_AddRef(ICaptureGraphBuilder * iface) { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_AddRef(_ICaptureGraphBuilder2_(This)); + return IUnknown_AddRef(&This->ICaptureGraphBuilder2_iface); } static ULONG WINAPI @@ -499,7 +490,7 @@ fnCaptureGraphBuilder_Release(ICaptureGraphBuilder * iface) { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_Release(_ICaptureGraphBuilder2_(This)); + return IUnknown_Release(&This->ICaptureGraphBuilder2_iface); } static HRESULT WINAPI @@ -508,7 +499,7 @@ fnCaptureGraphBuilder_SetFiltergraph(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return ICaptureGraphBuilder2_SetFiltergraph(_ICaptureGraphBuilder2_(This), pfg); + return ICaptureGraphBuilder2_SetFiltergraph(&This->ICaptureGraphBuilder2_iface, pfg); } static HRESULT WINAPI @@ -517,7 +508,7 @@ fnCaptureGraphBuilder_GetFiltergraph(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return ICaptureGraphBuilder2_GetFiltergraph(_ICaptureGraphBuilder2_(This), pfg); + return ICaptureGraphBuilder2_GetFiltergraph(&This->ICaptureGraphBuilder2_iface, pfg); } static HRESULT WINAPI @@ -527,8 +518,8 @@ fnCaptureGraphBuilder_SetOutputFileName(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return ICaptureGraphBuilder2_SetOutputFileName(_ICaptureGraphBuilder2_(This), - pType, lpstrFile, ppf, ppSink); + return ICaptureGraphBuilder2_SetOutputFileName(&This->ICaptureGraphBuilder2_iface, pType, + lpstrFile, ppf, ppSink); } static HRESULT WINAPI @@ -538,8 +529,8 @@ fnCaptureGraphBuilder_FindInterface(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return ICaptureGraphBuilder2_FindInterface(_ICaptureGraphBuilder2_(This), - pCategory, NULL, pf, riid, ppint); + return ICaptureGraphBuilder2_FindInterface(&This->ICaptureGraphBuilder2_iface, pCategory, NULL, + pf, riid, ppint); } static HRESULT WINAPI @@ -549,9 +540,8 @@ fnCaptureGraphBuilder_RenderStream(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return ICaptureGraphBuilder2_RenderStream(_ICaptureGraphBuilder2_(This), - pCategory, NULL, pSource, - pfCompressor, pfRenderer); + return ICaptureGraphBuilder2_RenderStream(&This->ICaptureGraphBuilder2_iface, pCategory, NULL, + pSource, pfCompressor, pfRenderer); } static HRESULT WINAPI @@ -562,9 +552,8 @@ fnCaptureGraphBuilder_ControlStream(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return ICaptureGraphBuilder2_ControlStream(_ICaptureGraphBuilder2_(This), - pCategory, NULL, pFilter, pstart, - pstop, wStartCookie, wStopCookie); + return ICaptureGraphBuilder2_ControlStream(&This->ICaptureGraphBuilder2_iface, pCategory, NULL, + pFilter, pstart, pstop, wStartCookie, wStopCookie); } static HRESULT WINAPI @@ -573,8 +562,7 @@ fnCaptureGraphBuilder_AllocCapFile(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return ICaptureGraphBuilder2_AllocCapFile(_ICaptureGraphBuilder2_(This), - lpstr, dwlSize); + return ICaptureGraphBuilder2_AllocCapFile(&This->ICaptureGraphBuilder2_iface, lpstr, dwlSize); } static HRESULT WINAPI @@ -585,9 +573,8 @@ fnCaptureGraphBuilder_CopyCaptureFile(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return ICaptureGraphBuilder2_CopyCaptureFile(_ICaptureGraphBuilder2_(This), - lpwstrOld, lpwstrNew, - fAllowEscAbort, pCallback); + return ICaptureGraphBuilder2_CopyCaptureFile(&This->ICaptureGraphBuilder2_iface, lpwstrOld, + lpwstrNew, fAllowEscAbort, pCallback); } static const ICaptureGraphBuilderVtbl builder_Vtbl =

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011