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

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

Aug. 22, 2011

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

Michael Stefaniuc : amstream: Avoid the forward declaration of the DirectDrawMediaStream_Vtbl.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 2b55b5b6632a40d1eee63720b7439cd568bdea09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b55b5b6632a40d1eee63720b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 16 10:13:31 2011 +0200 amstream: Avoid the forward declaration of the DirectDrawMediaStream_Vtbl. --- dlls/amstream/mediastream.c | 52 +++++++++++++++++++++--------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 0444cc2..f41b944 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -52,7 +52,6 @@ typedef struct { } IDirectDrawMediaStreamImpl; static const struct IMediaStreamVtbl MediaStream_Vtbl; -static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl; HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) { @@ -194,31 +193,6 @@ static const struct IMediaStreamVtbl MediaStream_Vtbl = IMediaStreamImpl_SendEndOfStream }; -HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) -{ - IDirectDrawMediaStreamImpl* object; - - TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl)); - if (!object) - { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; - } - - object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStream_Vtbl; - object->ref = 1; - - object->Parent = Parent; - object->PurposeId = *pPurposeId; - object->StreamType = StreamType; - - *ppMediaStream = (IMediaStream*)&object->IDirectDrawMediaStream_iface; - - return S_OK; -} - static inline IDirectDrawMediaStreamImpl *impl_from_IDirectDrawMediaStream(IDirectDrawMediaStream *iface) { return CONTAINING_RECORD(iface, IDirectDrawMediaStreamImpl, IDirectDrawMediaStream_iface); @@ -322,3 +296,29 @@ static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl = IDirectDrawMediaStreamImpl_GetTimePerFrame }; #undef XCAST + +HRESULT DirectDrawMediaStream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, + STREAM_TYPE StreamType, IMediaStream **ppMediaStream) +{ + IDirectDrawMediaStreamImpl *object; + + TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStream_Vtbl; + object->ref = 1; + + object->Parent = Parent; + object->PurposeId = *pPurposeId; + object->StreamType = StreamType; + + *ppMediaStream = (IMediaStream*)&object->IDirectDrawMediaStream_iface; + + return S_OK; +}

1 0

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

Aug. 22, 2011

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

Aug. 22, 2011

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

André Hentschel : gdi32/tests: Consistently print out all infos about non-equal rects.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 8134b93516912e080e8057d13e2e98b7f7e7fe1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8134b93516912e080e8057d13… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 9 19:17:12 2011 +0200 gdi32/tests: Consistently print out all infos about non-equal rects. --- dlls/gdi32/tests/dc.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 5017583..c173cef 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -107,7 +107,10 @@ todo_wine ret = GetClipBox(hdc, &rc_clip); ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); SetRect(&rc, 0, 0, 50, 50); - ok(EqualRect(&rc, &rc_clip), "rects are not equal\n"); + ok(EqualRect(&rc, &rc_clip), + "rects are not equal: (%d,%d-%d,%d) - (%d,%d-%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom, + rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); ret = RestoreDC(hdc, 1); ok(ret, "ret = %d\n", ret); @@ -115,7 +118,10 @@ todo_wine ret = GetClipBox(hdc, &rc_clip); ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); SetRect(&rc, 0, 0, 100, 100); - ok(EqualRect(&rc, &rc_clip), "rects are not equal\n"); + ok(EqualRect(&rc, &rc_clip), + "rects are not equal: (%d,%d-%d,%d) - (%d,%d-%d,%d)\n", + rc.left, rc.top, rc.right, rc.bottom, + rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); DeleteObject(hrgn); ReleaseDC(hwnd, hdc);

1 0

Bruno Jesus : ws2_32/tests: Add MSG_PEEK tests on recv().
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: a1d177c6b61fe7fc846ad890b83cec5fad7b7142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d177c6b61fe7fc846ad890b… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Aug 7 21:33:09 2011 -0300 ws2_32/tests: Add MSG_PEEK tests on recv(). --- dlls/ws2_32/tests/sock.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 24799cf..a171c85 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2324,6 +2324,7 @@ static void test_select(void) fd_set readfds, writefds, exceptfds; unsigned int maxfd; int ret; + char buffer; struct timeval select_timeout; select_thread_params thread_params; HANDLE thread_handle; @@ -2379,6 +2380,8 @@ static void test_select(void) ok ( (thread_params.ReadKilled) || broken(thread_params.ReadKilled == 0), /*Win98*/ "closesocket did not wakeup select\n"); + ret = recv(fdRead, &buffer, 1, MSG_PEEK); + ok( (ret == -1), "peek at closed socket expected -1 got %d\n", ret); /* Test selecting invalid handles */ FD_ZERO(&readfds); @@ -3627,6 +3630,10 @@ static void test_events(int useMessages) ok(ret == 100, "Failed to send buffer %d err %d\n", ret, GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0); + ret = recv(src, buffer, 1, MSG_PEEK); + ok(ret == 1, "Failed to peek at recv buffer %d err %d\n", ret, GetLastError()); + ok_event_seq(src, hEvent, read_seq, NULL, 0); + ret = recv(src, buffer, 50, 0); ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError()); ok_event_seq(src, hEvent, read_seq, NULL, 0);

1 0

Andrew Talbot : shell32: Remove redundant function declaration.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 8032d3ea214157f76d7483abcb9043a8c80b43a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8032d3ea214157f76d7483abc… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Aug 7 21:11:35 2011 +0100 shell32: Remove redundant function declaration. --- dlls/shell32/shfldr.h | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shfldr.h b/dlls/shell32/shfldr.h index 7d33d27..052b040 100644 --- a/dlls/shell32/shfldr.h +++ b/dlls/shell32/shfldr.h @@ -75,9 +75,5 @@ static inline int SHELL32_GUIDToStringW (REFGUID guid, LPWSTR str) void SHELL_FS_ProcessDisplayFilename(LPWSTR szPath, DWORD dwFlags) DECLSPEC_HIDDEN; BOOL SHELL_FS_HideExtension(LPCWSTR pwszPath) DECLSPEC_HIDDEN; -HRESULT SHELL_CreateContextMenu(HWND hwnd, IContextMenu* system_menu, - IShellFolder *folder, LPCITEMIDLIST folder_pidl, - LPCITEMIDLIST *apidl, UINT cidl, const HKEY *aKeys, - UINT cKeys,REFIID riid, void** ppv) DECLSPEC_HIDDEN; DEFINE_GUID( CLSID_UnixFolder, 0xcc702eb2, 0x7dc5, 0x11d9, 0xc6, 0x87, 0x00, 0x04, 0x23, 0x8a, 0x01, 0xcd ); DEFINE_GUID( CLSID_UnixDosFolder, 0x9d20aae8, 0x0625, 0x44b0, 0x9c, 0xa7, 0x71, 0x88, 0x9c, 0x22, 0x54, 0xd9 );

1 0

Andrew Talbot : comctl32: Remove redundant function declaration.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 072ca07de9b4039931104a179d8ec7fe80860427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072ca07de9b4039931104a179… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Aug 7 21:11:32 2011 +0100 comctl32: Remove redundant function declaration. --- dlls/comctl32/datetime.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index abfef58..785769a 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -135,7 +135,6 @@ extern int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace); static BOOL DATETIME_SendSimpleNotify (const DATETIME_INFO *infoPtr, UINT code); static BOOL DATETIME_SendDateTimeChangeNotify (const DATETIME_INFO *infoPtr); -extern void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to); static const WCHAR allowedformatchars[] = {'d', 'h', 'H', 'm', 'M', 's', 't', 'y', 'X', 0}; static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1};

1 0

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

Aug. 22, 2011

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 : dxdiagn: COM cleanup for the IDxDiagContainer iface.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

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