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

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

22 Aug '11

Module: wine Branch: master Commit: c8fcf420c2dbe50d3555fe904935935e448bb5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8fcf420c2dbe50d3555fe904… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 19 00:43:17 2011 +0200 mscoree: COM cleanup for the ICLRRuntimeInfo iface. --- dlls/mscoree/metahost.c | 28 +++++++++++++++++----------- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 8fb846c..895d7f3 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -51,9 +51,9 @@ static const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl; #define NUM_RUNTIMES 3 static struct CLRRuntimeInfo runtimes[NUM_RUNTIMES] = { - {&CLRRuntimeInfoVtbl, net_11_subdir, 1, 1, 4322, 0}, - {&CLRRuntimeInfoVtbl, net_20_subdir, 2, 0, 50727, 0}, - {&CLRRuntimeInfoVtbl, net_40_subdir, 4, 0, 30319, 0} + {{&CLRRuntimeInfoVtbl}, net_11_subdir, 1, 1, 4322, 0}, + {{&CLRRuntimeInfoVtbl}, net_20_subdir, 2, 0, 50727, 0}, + {{&CLRRuntimeInfoVtbl}, net_40_subdir, 4, 0, 30319, 0} }; static int runtimes_initialized; @@ -311,6 +311,11 @@ void expect_no_runtimes(void) } } +static inline CLRRuntimeInfo *impl_from_ICLRRuntimeInfo(ICLRRuntimeInfo *iface) +{ + return CONTAINING_RECORD(iface, CLRRuntimeInfo, ICLRRuntimeInfo_iface); +} + static HRESULT WINAPI CLRRuntimeInfo_QueryInterface(ICLRRuntimeInfo* iface, REFIID riid, void **ppvObject) @@ -346,7 +351,7 @@ static ULONG WINAPI CLRRuntimeInfo_Release(ICLRRuntimeInfo* iface) static HRESULT WINAPI CLRRuntimeInfo_GetVersionString(ICLRRuntimeInfo* iface, LPWSTR pwzBuffer, DWORD *pcchBuffer) { - struct CLRRuntimeInfo *This = (struct CLRRuntimeInfo*)iface; + struct CLRRuntimeInfo *This = impl_from_ICLRRuntimeInfo(iface); DWORD buffer_size = *pcchBuffer; HRESULT hr = S_OK; char version[11]; @@ -475,7 +480,7 @@ static HRESULT WINAPI CLRRuntimeInfo_GetProcAddress(ICLRRuntimeInfo* iface, static HRESULT WINAPI CLRRuntimeInfo_GetInterface(ICLRRuntimeInfo* iface, REFCLSID rclsid, REFIID riid, LPVOID *ppUnk) { - struct CLRRuntimeInfo *This = (struct CLRRuntimeInfo*)iface; + struct CLRRuntimeInfo *This = impl_from_ICLRRuntimeInfo(iface); RuntimeHost *host; HRESULT hr; @@ -548,9 +553,9 @@ static const struct ICLRRuntimeInfoVtbl CLRRuntimeInfoVtbl = { HRESULT ICLRRuntimeInfo_GetRuntimeHost(ICLRRuntimeInfo *iface, RuntimeHost **result) { - struct CLRRuntimeInfo *This = (struct CLRRuntimeInfo*)iface; + struct CLRRuntimeInfo *This = impl_from_ICLRRuntimeInfo(iface); - assert(This->ICLRRuntimeInfo_vtbl == &CLRRuntimeInfoVtbl); + assert(This->ICLRRuntimeInfo_iface.lpVtbl == &CLRRuntimeInfoVtbl); return CLRRuntimeInfo_GetRuntimeHost(This, result); } @@ -839,7 +844,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, } if (runtimes[This->pos].mono_abi_version) { - item = (IUnknown*)&runtimes[This->pos]; + item = (IUnknown*)&runtimes[This->pos].ICLRRuntimeInfo_iface; IUnknown_AddRef(item); rgelt[num_fetched] = item; num_fetched++; @@ -1022,7 +1027,8 @@ static HRESULT WINAPI CLRMetaHost_GetRuntime(ICLRMetaHost* iface, runtimes[i].build == build) { if (runtimes[i].mono_abi_version) - return IUnknown_QueryInterface((IUnknown*)&runtimes[i], iid, ppRuntime); + return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, iid, + ppRuntime); else { missing_runtime_message(&runtimes[i]); @@ -1315,8 +1321,8 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, while (i--) { if (runtimes[i].mono_abi_version) - return IUnknown_QueryInterface((IUnknown*)&runtimes[i], - &IID_ICLRRuntimeInfo, (void**)result); + return ICLRRuntimeInfo_QueryInterface(&runtimes[i].ICLRRuntimeInfo_iface, + &IID_ICLRRuntimeInfo, (void **)result); } if (legacy) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 1b583c6..5cbf8df 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -37,7 +37,7 @@ typedef struct RuntimeHost RuntimeHost; typedef struct CLRRuntimeInfo { - const struct ICLRRuntimeInfoVtbl *ICLRRuntimeInfo_vtbl; + ICLRRuntimeInfo ICLRRuntimeInfo_iface; LPCWSTR mono_libdir; DWORD major; DWORD minor;

1 0

Huw Davies : wineps: Don't write a PostScript trailer if we haven' t written a header.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 39f14b68bf1d70c5d1424f06fd3e19994d3e08fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f14b68bf1d70c5d1424f06f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:22:10 2011 +0100 wineps: Don't write a PostScript trailer if we haven't written a header. --- dlls/wineps.drv/escape.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/escape.c b/dlls/wineps.drv/escape.c index 0f76973..d869164 100644 --- a/dlls/wineps.drv/escape.c +++ b/dlls/wineps.drv/escape.c @@ -528,7 +528,9 @@ INT PSDRV_EndDoc( PHYSDEV dev ) WARN("Somebody forgot an EndPage\n"); PSDRV_EndPage( dev ); } - PSDRV_WriteFooter( dev ); + + if (physDev->job.PageNo) + PSDRV_WriteFooter( dev ); ret = EndDocPrinter(physDev->job.hprinter); ClosePrinter(physDev->job.hprinter);

1 0

Andrew Talbot : comctl32: Remove redundant function declaration.
by Alexandre Julliard 22 Aug '11

22 Aug '11

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

Andrew Talbot : shell32: Remove redundant function declaration.
by Alexandre Julliard 22 Aug '11

22 Aug '11

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

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

22 Aug '11

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

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

22 Aug '11

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

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

22 Aug '11

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

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

22 Aug '11

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

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

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