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

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

Aug. 22, 2011

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 : amstream: Avoid a forward declaration of the IMediaStreamFilter vtbl.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

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

André Hentschel : winex11: Fix function header for building without xrender headers.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 0dba66c05b8d1686924f00bb8fb7b902069fa88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dba66c05b8d1686924f00bb8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 9 19:16:58 2011 +0200 winex11: Fix function header for building without xrender headers. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index ad8e08b..a8d6329 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2440,8 +2440,8 @@ void X11DRV_XRender_UpdateDrawable(X11DRV_PDEVICE *physDev) return; } -BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, X11DRV_PDEVICE *devSrc, - struct bitblt_coords *dst, struct bitblt_coords *src, BLENDFUNCTION blendfn ) +BOOL XRender_AlphaBlend( X11DRV_PDEVICE *devDst, struct bitblt_coords *dst, + X11DRV_PDEVICE *devSrc, struct bitblt_coords *src, BLENDFUNCTION blendfn ) { FIXME("not supported - XRENDER headers were missing at compile time\n"); return FALSE;

1 0

Jörg Höhle : kernel32/tests: WaitForMultipleObjects returns lowest signaled handle first.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: a52e160c68bf170074e6f7810646d3ad0b962ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a52e160c68bf170074e6f7810… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sat Jul 23 22:02:19 2011 +0200 kernel32/tests: WaitForMultipleObjects returns lowest signaled handle first. --- dlls/kernel32/tests/sync.c | 48 ++++++++++++++++++++++++++++------------- dlls/kernel32/tests/thread.c | 3 +- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 94b2963..72f33ae 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -41,8 +41,7 @@ static void test_signalandwait(void) DWORD (WINAPI *pSignalObjectAndWait)(HANDLE, HANDLE, DWORD, BOOL); HMODULE kernel32; DWORD r; - int i; - HANDLE event[2], maxevents[MAXIMUM_WAIT_OBJECTS], semaphore[2], file; + HANDLE event[2], semaphore[2], file; kernel32 = GetModuleHandle("kernel32"); pSignalObjectAndWait = (void*) GetProcAddress(kernel32, "SignalObjectAndWait"); @@ -94,19 +93,6 @@ static void test_signalandwait(void) CloseHandle(event[0]); CloseHandle(event[1]); - /* create the maximum number of events and make sure - * we can wait on that many */ - for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) - { - maxevents[i] = CreateEvent(NULL, 1, 1, NULL); - ok( maxevents[i] != 0, "should create enough events\n"); - } - r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); - ok( r != WAIT_FAILED && r != WAIT_TIMEOUT, "should succeed\n"); - - for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) - if (maxevents[i]) CloseHandle(maxevents[i]); - /* semaphores */ semaphore[0] = CreateSemaphore( NULL, 0, 1, NULL ); semaphore[1] = CreateSemaphore( NULL, 1, 1, NULL ); @@ -1027,6 +1013,37 @@ static void test_WaitForSingleObject(void) CloseHandle(nonsignaled); } +static void test_WaitForMultipleObjects(void) +{ + DWORD r; + int i; + HANDLE maxevents[MAXIMUM_WAIT_OBJECTS]; + + /* create the maximum number of events and make sure + * we can wait on that many */ + for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) + { + maxevents[i] = CreateEvent(NULL, i==0, TRUE, NULL); + ok( maxevents[i] != 0, "should create enough events\n"); + } + + /* a manual-reset event remains signaled, an auto-reset event is cleared */ + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + ok( r == WAIT_OBJECT_0, "should signal lowest handle first, got %d\n", r); + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + ok( r == WAIT_OBJECT_0, "should signal handle #0 first, got %d\n", r); + ok(ResetEvent(maxevents[0]), "ResetEvent\n"); + for (i=1; i<MAXIMUM_WAIT_OBJECTS; i++) + { + /* the lowest index is checked first and remaining events are untouched */ + r = WaitForMultipleObjects(MAXIMUM_WAIT_OBJECTS, maxevents, 0, 0); + ok( r == WAIT_OBJECT_0+i, "should signal handle #%d first, got %d\n", i, r); + } + + for (i=0; i<MAXIMUM_WAIT_OBJECTS; i++) + if (maxevents[i]) CloseHandle(maxevents[i]); +} + START_TEST(sync) { HMODULE hdll = GetModuleHandle("kernel32"); @@ -1047,4 +1064,5 @@ START_TEST(sync) test_iocp_callback(); test_timer_queue(); test_WaitForSingleObject(); + test_WaitForMultipleObjects(); } diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 03983f5..19726af 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -288,6 +288,7 @@ static VOID test_CreateRemoteThread(void) skip("child process wasn't mapped at same address, so can't do CreateRemoteThread tests.\n"); return; } + ok(ret == WAIT_OBJECT_0 || broken(ret == WAIT_OBJECT_0+1 /* nt4,w2k */), "WaitForAllObjects 2 events %d\n", ret); hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); ok(hEvent != NULL, "Can't create event, err=%u\n", GetLastError()); @@ -1248,7 +1249,7 @@ static void test_TLS(void) } ret = WaitForMultipleObjects(2, threads, TRUE, 60000); - ok(ret == WAIT_OBJECT_0 || ret == WAIT_OBJECT_0+1 /* nt4 */, "WaitForMultipleObjects failed %u\n",ret); + ok(ret == WAIT_OBJECT_0 || broken(ret == WAIT_OBJECT_0+1 /* nt4,w2k */), "WaitForAllObjects 2 threads %d\n",ret); for (i = 0; i < 2; ++i) CloseHandle(threads[i]);

1 0

Michael Stefaniuc : gameux: COM cleanup in gameexplorer.c.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

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 : qcap: COM cleanup in capturegraph.c.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

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

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

Aug. 22, 2011

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 : ole2.dll16: void functions should not return a value.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 3fe447f58ec9e0545e2b72196168ad40fe57507c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fe447f58ec9e0545e2b72196… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 6 12:51:17 2011 +0100 ole2.dll16: void functions should not return a value. --- dlls/ole2.dll16/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 275e9ff..25fb141 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -81,7 +81,7 @@ HRESULT WINAPI OleInitialize16(LPVOID reserved) */ void WINAPI OleUninitialize16(void) { - return OleUninitialize(); + OleUninitialize(); } /***********************************************************************

1 0

Andrew Talbot : openal32: void functions should not return a value.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: e3ff452f394e22c24e29c98f0f476c90d669a2f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3ff452f394e22c24e29c98f0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Aug 6 12:51:19 2011 +0100 openal32: void functions should not return a value. --- dlls/openal32/openal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 15206f3..9e0a8f2 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -269,7 +269,7 @@ const ALCchar* CDECL wine_alcGetString(ALCdevice *device, ALCenum param) ALvoid CDECL wine_alcGetIntegerv(ALCdevice *device, ALCenum param, ALCsizei size, ALCint *dest) { - return alcGetIntegerv(device, param, size, dest); + alcGetIntegerv(device, param, size, dest); }

1 0

André Hentschel : ntdll: Accept double-digit CPU families.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: abcdcd9eeaaf60e084819b98eb79dcf0d455b019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abcdcd9eeaaf60e084819b98e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 7 13:45:48 2011 +0200 ntdll: Accept double-digit CPU families. --- dlls/ntdll/nt.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index f9302c1..bc7ef86 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -995,7 +995,6 @@ void fill_cpu_info(void) { if (isdigit(value[0])) { - value[1] = '\0'; /* Make sure we only get one character */ cached_sci.Level = atoi(value); } continue;

1 0