August 2011 - Wine-commits - list.winehq.org

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 : 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 : 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 : 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 : 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

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

Andrew Talbot : comctl32: void functions should not return a value.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 8a4b7f9f22ac74605384784b507b5c8f2a9e3274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a4b7f9f22ac74605384784b5… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 6 12:51:11 2011 +0100 comctl32: void functions should not return a value. --- dlls/comctl32/monthcal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 27d2cf0..2ad4812 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -481,13 +481,13 @@ static inline void MONTHCAL_GetMonth(SYSTEMTIME *date, INT months) /* properly updates date to point on next month */ static inline void MONTHCAL_GetNextMonth(SYSTEMTIME *date) { - return MONTHCAL_GetMonth(date, 1); + MONTHCAL_GetMonth(date, 1); } /* properly updates date to point on prev month */ static inline void MONTHCAL_GetPrevMonth(SYSTEMTIME *date) { - return MONTHCAL_GetMonth(date, -1); + MONTHCAL_GetMonth(date, -1); } /* Returns full date for a first currently visible day */

1 0

Andrew Talbot : compobj.dll16: void functions should not return a value.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 268226b658e7120993c2fc6e8e8abf64f4c1c807 URL: http://source.winehq.org/git/wine.git/?a=commit;h=268226b658e7120993c2fc6e8… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 6 12:51:13 2011 +0100 compobj.dll16: void functions should not return a value. --- dlls/compobj.dll16/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/compobj.dll16/compobj.c b/dlls/compobj.dll16/compobj.c index f4b5d5d..ed36564 100644 --- a/dlls/compobj.dll16/compobj.c +++ b/dlls/compobj.dll16/compobj.c @@ -306,7 +306,7 @@ void WINAPI CoUninitialize16(void) */ void WINAPI CoFreeUnusedLibraries16(void) { - return CoFreeUnusedLibraries(); + CoFreeUnusedLibraries(); } /***********************************************************************

1 0

Andrew Talbot : msvcp90: void functions should not return a value.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: e7064e08acbc8611a11c315df3d99f30f3f31030 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7064e08acbc8611a11c315df… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 6 12:51:14 2011 +0100 msvcp90: void functions should not return a value. --- dlls/msvcp90/ios.c | 4 ++-- dlls/msvcp90/string.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index df68ccf..ffef7e7 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -362,7 +362,7 @@ void __thiscall ios_base_clear_reraise(ios_base *this, IOSB_iostate state, MSVCP DEFINE_THISCALL_WRAPPER(ios_base_clear, 8) void __thiscall ios_base_clear(ios_base *this, IOSB_iostate state) { - return ios_base_clear_reraise(this, state, FALSE); + ios_base_clear_reraise(this, state, FALSE); } /* ?clear(a)ios_base@std@@QAEXI(a)Z */ @@ -370,7 +370,7 @@ void __thiscall ios_base_clear(ios_base *this, IOSB_iostate state) DEFINE_THISCALL_WRAPPER(ios_base_clear_unsigned, 8) void __thiscall ios_base_clear_unsigned(ios_base *this, unsigned int state) { - return ios_base_clear_reraise(this, (IOSB_iostate)state, FALSE); + ios_base_clear_reraise(this, (IOSB_iostate)state, FALSE); } /* ?copyfmt(a)ios_base@std@@QAEAAV12(a)ABV12@@Z */ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 87d5e5a..049659e 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -566,7 +566,7 @@ void __thiscall basic_string_char_tidy(basic_string_char *this, DEFINE_THISCALL_WRAPPER(basic_string_char_tidy_built, 8) void __thiscall basic_string_char_tidy_built(basic_string_char *this, MSVCP_bool built) { - return basic_string_char_tidy(this, built, 0); + basic_string_char_tidy(this, built, 0); } /* ?_Grow@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@IAE_NI_N(a)Z */

1 0

Andrew Talbot : msvcrt: void functions should not return a value.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: fb3b28f0131690bd0a6f73a42a955c56ae9543f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb3b28f0131690bd0a6f73a42… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 6 12:51:16 2011 +0100 msvcrt: void functions should not return a value. --- dlls/msvcrt/exit.c | 2 +- dlls/msvcrt/time.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 6c6b55f..19b9fb4 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -139,7 +139,7 @@ static void DoMessageBox(const char *lead, const char *message) MSVCRT_mbstowcs(leadW, lead, 1024); MSVCRT_mbstowcs(messageW, message, 1024); - return DoMessageBoxW(leadW, messageW); + DoMessageBoxW(leadW, messageW); } /********************************************************************* diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 5ff1467..bf87711 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -655,12 +655,12 @@ int CDECL MSVCRT__ftime32_s(struct MSVCRT___timeb32 *buf) #ifdef _WIN64 void CDECL MSVCRT__ftime(struct MSVCRT___timeb64 *buf) { - return MSVCRT__ftime64( buf ); + MSVCRT__ftime64( buf ); } #else void CDECL MSVCRT__ftime(struct MSVCRT___timeb32 *buf) { - return MSVCRT__ftime32( buf ); + MSVCRT__ftime32( buf ); } #endif

1 0