March 2014 - Wine-commits - list.winehq.org

Francois Gouget : testbot/TestAgent: Track the current RPC and argument name and include them in error messages.
by Alexandre Julliard 12 Mar '14

12 Mar '14

Module: tools Branch: master Commit: 428d39c238140d5bca3fa7a9d65c6c09a8c4163c URL: http://source.winehq.org/git/tools.git/?a=commit;h=428d39c238140d5bca3fa7a9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 12 14:52:42 2014 +0100 testbot/TestAgent: Track the current RPC and argument name and include them in error messages. Also keep track of how many bytes were written/read before the error occurred. This helps diagnose errors. In particular, should a 'network read timeout' occur, it helps knowing where it happened. --- testbot/lib/WineTestBot/TestAgent.pm | 360 ++++++++++++++++++---------------- 1 file changed, 189 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=428d39c238140d5bca3f…

1 0

Sebastian Lackner : ntdll: Fix possible race-condition in iocp poller code.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 9277fcfdb4ff787bbf63e640bb7ed67567ed330d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9277fcfdb4ff787bbf63e640b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Mar 10 18:51:21 2014 +0100 ntdll: Fix possible race-condition in iocp poller code. --- dlls/ntdll/threadpool.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 5bf3385..e2fc6a5 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -235,12 +235,14 @@ NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE Function, PVOID Context, */ static DWORD CALLBACK iocp_poller(LPVOID Arg) { + HANDLE cport = Arg; + while( TRUE ) { PRTL_OVERLAPPED_COMPLETION_ROUTINE callback; LPVOID overlapped; IO_STATUS_BLOCK iosb; - NTSTATUS res = NtRemoveIoCompletion( compl_port, (PULONG_PTR)&callback, (PULONG_PTR)&overlapped, &iosb, NULL ); + NTSTATUS res = NtRemoveIoCompletion( cport, (PULONG_PTR)&callback, (PULONG_PTR)&overlapped, &iosb, NULL ); if (res) { ERR("NtRemoveIoCompletion failed: 0x%x\n", res); @@ -297,7 +299,7 @@ NTSTATUS WINAPI RtlSetIoCompletionCallback(HANDLE FileHandle, PRTL_OVERLAPPED_CO if (!res) { /* FIXME native can start additional threads in case of e.g. hung callback function. */ - res = RtlQueueWorkItem( iocp_poller, NULL, WT_EXECUTEDEFAULT ); + res = RtlQueueWorkItem( iocp_poller, cport, WT_EXECUTEDEFAULT ); if (!res) compl_port = cport; else

1 0

Stefan Dösinger : wined3d: Don' t modify existing data if set_private_data fails.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: ab6368b6e8a6aa202f7c2aa34eef5c3307b54d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab6368b6e8a6aa202f7c2aa34… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 23:43:08 2014 +0100 wined3d: Don't modify existing data if set_private_data fails. --- dlls/wined3d/resource.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 177d23e..04c3af4 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -211,7 +211,11 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc TRACE("resource %p, riid %s, data %p, data_size %u, flags %#x.\n", resource, debugstr_guid(guid), data, data_size, flags); - wined3d_resource_free_private_data(resource, guid); + if (flags & WINED3DSPD_IUNKNOWN && data_size != sizeof(IUnknown *)) + { + WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); + return WINED3DERR_INVALIDCALL; + } d = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*d)); if (!d) return E_OUTOFMEMORY; @@ -221,12 +225,6 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc if (flags & WINED3DSPD_IUNKNOWN) { - if (data_size != sizeof(IUnknown *)) - { - WARN("IUnknown data with size %u, returning WINED3DERR_INVALIDCALL.\n", data_size); - HeapFree(GetProcessHeap(), 0, d); - return WINED3DERR_INVALIDCALL; - } d->ptr.object = (IUnknown *)data; d->size = sizeof(IUnknown *); IUnknown_AddRef(d->ptr.object); @@ -242,6 +240,7 @@ HRESULT CDECL wined3d_resource_set_private_data(struct wined3d_resource *resourc d->size = data_size; memcpy(d->ptr.data, data, data_size); } + wined3d_resource_free_private_data(resource, guid); list_add_tail(&resource->privateData, &d->entry); return WINED3D_OK;

1 0

Stefan Dösinger : d3d9/tests: Show that a failing SetPrivateData call does not clear the old contents.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: 379c6564dbb024c45f6cc7ce1063885988cdd7ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=379c6564dbb024c45f6cc7ce1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 23:43:09 2014 +0100 d3d9/tests: Show that a failing SetPrivateData call does not clear the old contents. --- dlls/d3d9/tests/device.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 08a5be4..93f43fa 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5109,6 +5109,20 @@ static void test_private_data(void) device, sizeof(IUnknown *) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + /* A failing SetPrivateData call does not clear the old data with the same tag. */ + hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, device, + sizeof(device), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DVertexBuffer9, device, + sizeof(device) * 2, D3DSPD_IUNKNOWN); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr); + hr = IDirect3DSurface9_GetPrivateData(surface, &IID_IDirect3DVertexBuffer9, &ptr, &size); + ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); + IUnknown_Release(ptr); + hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DVertexBuffer9); + ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); hr = IDirect3DSurface9_SetPrivateData(surface, &IID_IDirect3DSurface9 /* Abuse this tag */, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN); @@ -5176,6 +5190,7 @@ static void test_private_data(void) ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); hr = IDirect3DSurface9_GetPrivateData(surface2, &IID_IDirect3DVertexBuffer9, data, &size); ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DSurface9_FreePrivateData(surface, &IID_IDirect3DVertexBuffer9); ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr);

1 0

Stefan Dösinger : d3d8/tests: Show that a failing SetPrivateData call does not clear the old contents.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: b71c4f000b4d7356c0118b981492b5ba241ba013 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b71c4f000b4d7356c0118b981… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 23:43:10 2014 +0100 d3d8/tests: Show that a failing SetPrivateData call does not clear the old contents. --- dlls/d3d8/tests/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index fa370b0..2bac6fd 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3915,6 +3915,20 @@ static void test_private_data(void) device, sizeof(IUnknown *) * 2, D3DSPD_IUNKNOWN); ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + /* A failing SetPrivateData call does not clear the old data with the same tag. */ + hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DVertexBuffer8, device, + sizeof(device), D3DSPD_IUNKNOWN); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DVertexBuffer8, device, + sizeof(device) * 2, D3DSPD_IUNKNOWN); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr); + hr = IDirect3DSurface8_GetPrivateData(surface, &IID_IDirect3DVertexBuffer8, &ptr, &size); + ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); + IUnknown_Release(ptr); + hr = IDirect3DSurface8_FreePrivateData(surface, &IID_IDirect3DVertexBuffer8); + ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)device); hr = IDirect3DSurface8_SetPrivateData(surface, &IID_IDirect3DSurface8 /* Abuse this tag */, device, sizeof(IUnknown *), D3DSPD_IUNKNOWN);

1 0

Stefan Dösinger : ddraw/tests: Show that a failing SetPrivateData call does not clear the old contents.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: f6e0e1815b8be1ba502550f3ccdfca1dbf20573c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6e0e1815b8be1ba502550f3c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 10 23:43:11 2014 +0100 ddraw/tests: Show that a failing SetPrivateData call does not clear the old contents. --- dlls/ddraw/tests/ddraw4.c | 17 +++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 5a2dba1..3b1f8d4 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -6072,6 +6072,23 @@ static void test_private_data(void) sizeof(ddraw) * 2, DDSPD_IUNKNOWNPOINTER); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + /* Note that with a size != 0 and size != sizeof(IUnknown *) and + * DDSPD_IUNKNOWNPOINTER set SetPrivateData in ddraw4 and ddraw7 + * erases the old content and returns an error. This behavior has + * been fixed in d3d8 and d3d9. Unless an application is found + * that depends on this we don't care about this behavior. */ + hr = IDirectDrawSurface4_SetPrivateData(surface, &IID_IDirect3D, ddraw, + sizeof(ddraw), DDSPD_IUNKNOWNPOINTER); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + hr = IDirectDrawSurface4_SetPrivateData(surface, &IID_IDirect3D, ddraw, + 0, DDSPD_IUNKNOWNPOINTER); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr); + hr = IDirectDrawSurface4_GetPrivateData(surface, &IID_IDirect3D, &ptr, &size); + ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); + hr = IDirectDrawSurface4_FreePrivateData(surface, &IID_IDirect3D); + ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)ddraw); hr = IDirectDrawSurface4_SetPrivateData(surface, &IID_IDirect3D, ddraw, sizeof(ddraw), DDSPD_IUNKNOWNPOINTER); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 1218a21..b4570af 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -5927,6 +5927,23 @@ static void test_private_data(void) sizeof(ddraw) * 2, DDSPD_IUNKNOWNPOINTER); ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + /* Note that with a size != 0 and size != sizeof(IUnknown *) and + * DDSPD_IUNKNOWNPOINTER set SetPrivateData in ddraw4 and ddraw7 + * erases the old content and returns an error. This behavior has + * been fixed in d3d8 and d3d9. Unless an application is found + * that depends on this we don't care about this behavior. */ + hr = IDirectDrawSurface7_SetPrivateData(surface, &IID_IDirect3D, ddraw, + sizeof(ddraw), DDSPD_IUNKNOWNPOINTER); + ok(SUCCEEDED(hr), "Failed to set private data, hr %#x.\n", hr); + hr = IDirectDrawSurface7_SetPrivateData(surface, &IID_IDirect3D, ddraw, + 0, DDSPD_IUNKNOWNPOINTER); + ok(hr == DDERR_INVALIDPARAMS, "Got unexpected hr %#x.\n", hr); + size = sizeof(ptr); + hr = IDirectDrawSurface7_GetPrivateData(surface, &IID_IDirect3D, &ptr, &size); + ok(SUCCEEDED(hr), "Failed to get private data, hr %#x.\n", hr); + hr = IDirectDrawSurface7_FreePrivateData(surface, &IID_IDirect3D); + ok(SUCCEEDED(hr), "Failed to free private data, hr %#x.\n", hr); + refcount = get_refcount((IUnknown *)ddraw); hr = IDirectDrawSurface7_SetPrivateData(surface, &IID_IDirect3D, ddraw, sizeof(ddraw), DDSPD_IUNKNOWNPOINTER);

1 0

Jacek Caban : mshtml: Removed test failing on Windows 8.1.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: cbfeef4b8b09ed30312ed888d82f2d5ffbd01c64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbfeef4b8b09ed30312ed888d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 11 16:01:00 2014 +0100 mshtml: Removed test failing on Windows 8.1. --- dlls/mshtml/tests/dom.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 892e812..cf78450 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -6014,7 +6014,6 @@ static void test_stylesheets(IHTMLDocument2 *doc) hres = IHTMLStyleSheetsCollection_item(col, &idx, &res); ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); ok(V_VT(&res) == VT_EMPTY, "V_VT(res) = %d\n", V_VT(&res)); - ok(V_DISPATCH(&res) != NULL, "V_DISPATCH(&res) == NULL\n"); VariantClear(&res); IHTMLStyleSheetsCollection_Release(col);

1 0

Henri Verbeet : user32: Fix TEXT_WordBreak() when no characters fit.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: ec66785f02ff5fba9ec7a18a8697c19140059ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec66785f02ff5fba9ec7a18a8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 11 18:41:43 2014 +0100 user32: Fix TEXT_WordBreak() when no characters fit. --- dlls/user32/tests/text.c | 16 ++++++++++++++++ dlls/user32/text.c | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 217baab..19bcd72 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -42,6 +42,8 @@ static void test_DrawTextCalcRect(void) 's','t','r','i','n','g','\0'}; static CHAR emptystring[] = ""; static WCHAR emptystringW[] = { 0 }; + static CHAR wordbreak_text[] = "line1 line2"; + static WCHAR wordbreak_textW[] = {'l','i','n','e','1',' ','l','i','n','e','2',0}; INT textlen, textheight, heightcheck; RECT rect = { 0, 0, 100, 0 }; BOOL ret; @@ -556,6 +558,20 @@ static void test_DrawTextCalcRect(void) ok(rect.bottom, "rect.bottom should not be 0\n"); } + SetRect(&rect, 0, 0, 1, 1); + heightcheck = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT); + SetRect(&rect, 0, 0, 1, 1); + textheight = DrawTextA(hdc, wordbreak_text, -1, &rect, DT_CALCRECT | DT_WORDBREAK); + ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", + textheight, heightcheck * 2); + + SetRect(&rect, 0, 0, 1, 1); + heightcheck = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT); + SetRect(&rect, 0, 0, 1, 1); + textheight = DrawTextW(hdc, wordbreak_textW, -1, &rect, DT_CALCRECT | DT_WORDBREAK); + ok(textheight == heightcheck * 2, "Got unexpected textheight %d, expected %d.\n", + textheight, heightcheck * 2); + SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %u\n", GetLastError()); diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 7bef476..fdc3554 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -379,7 +379,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, i = chars_fit; word_fits = TRUE; if (!chars_fit) - ; /* we pretend that it fits anyway */ + word_fits = FALSE; else if (sla[i].fSoftBreak) /* chars_fit < *len_str so this is valid */ { /* the word just fitted */ @@ -392,7 +392,7 @@ static void TEXT_WordBreak (HDC hdc, WCHAR *str, unsigned int max_str, word_fits = (i != 0 || sla[i+1].fSoftBreak ); } - /* If there was one or the first character didn't fit then */ + /* If there was one. */ if (word_fits) { BOOL next_is_space;

1 0

Henri Verbeet : gdi32/tests: Fix test_window_dc_clipping() when the virtual screen origin is not (0, 0).
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: d8ec2b5d952b3d240da866e1332ca44486c9aa04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ec2b5d952b3d240da866e13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 11 18:41:44 2014 +0100 gdi32/tests: Fix test_window_dc_clipping() when the virtual screen origin is not (0, 0). --- dlls/gdi32/tests/clipping.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 6257c17..e90f2f4 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -438,7 +438,7 @@ static void test_window_dc_clipping(void) HDC hdc; HRGN hrgn, hrgn_empty; HWND hwnd; - RECT rc; + RECT rc, virtual_rect; int ret, screen_width, screen_height; /* Windows versions earlier than Win2k do not support the virtual screen metrics, @@ -447,6 +447,8 @@ static void test_window_dc_clipping(void) if(!screen_width) screen_width = GetSystemMetrics(SM_CXSCREEN); screen_height = GetSystemMetrics(SM_CYVIRTUALSCREEN); if(!screen_height) screen_height = GetSystemMetrics(SM_CYSCREEN); + SetRect(&virtual_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_XVIRTUALSCREEN) + screen_width, GetSystemMetrics(SM_YVIRTUALSCREEN) + screen_height); trace("screen resolution %d x %d\n", screen_width, screen_height); @@ -474,9 +476,9 @@ static void test_window_dc_clipping(void) ret = GetRgnBox(hrgn, &rc); ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); - ok(rc.left == 0 && rc.top == 0 && rc.right == screen_width && rc.bottom == screen_height, - "expected 0,0-%d,%d, got %d,%d-%d,%d\n", screen_width, screen_height, - rc.left, rc.top, rc.right, rc.bottom); + ok(EqualRect(&rc, &virtual_rect), "expected %d,%d-%d,%d, got %d,%d-%d,%d\n", + virtual_rect.left, virtual_rect.top, virtual_rect.right, virtual_rect.bottom, + rc.left, rc.top, rc.right, rc.bottom); SetRect( &rc, 10, 10, 20, 20 ); ret = RectVisible( hdc, &rc ); @@ -494,9 +496,9 @@ static void test_window_dc_clipping(void) ret = GetRgnBox(hrgn, &rc); ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); - ok(rc.left == 0 && rc.top == 0 && rc.right == screen_width && rc.bottom == screen_height, - "expected 0,0-%d,%d, got %d,%d-%d,%d\n", screen_width, screen_height, - rc.left, rc.top, rc.right, rc.bottom); + ok(EqualRect(&rc, &virtual_rect), "expected %d,%d-%d,%d, got %d,%d-%d,%d\n", + virtual_rect.left, virtual_rect.top, virtual_rect.right, virtual_rect.bottom, + rc.left, rc.top, rc.right, rc.bottom); ret = ExtSelectClipRgn(hdc, 0, RGN_COPY); ok(ret == SIMPLEREGION || (ret == COMPLEXREGION && GetSystemMetrics(SM_CMONITORS) > 1),

1 0

Henri Verbeet : gdi32/tests: Fix test_device_caps() on multihead setups.
by Alexandre Julliard 11 Mar '14

11 Mar '14

Module: wine Branch: master Commit: cf5023bfffa28973406527761ad2447dc48096e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5023bfffa28973406527761… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 11 18:41:45 2014 +0100 gdi32/tests: Fix test_device_caps() on multihead setups. Unfortunately this currently mostly fails on Wine. --- dlls/gdi32/tests/dc.c | 44 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 10e194a..d215d9c 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -457,12 +457,46 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale type = GetClipBox( ref_dc, &rect ); if (type != COMPLEXREGION && type != ERROR) /* region can be complex on multi-monitor setups */ { + RECT ref_rect; + ok( type == SIMPLEREGION, "GetClipBox returned %d on %s\n", type, descr ); - ok( rect.left == 0 && rect.top == 0 && - rect.right == GetDeviceCaps( ref_dc, DESKTOPHORZRES ) && - rect.bottom == GetDeviceCaps( ref_dc, DESKTOPVERTRES ), - "GetClipBox returned %d,%d,%d,%d on %s\n", - rect.left, rect.top, rect.right, rect.bottom, descr ); + if (GetDeviceCaps( ref_dc, TECHNOLOGY ) == DT_RASDISPLAY) + { + if (GetSystemMetrics( SM_CXSCREEN ) != GetSystemMetrics( SM_CXVIRTUALSCREEN )) + todo_wine ok( GetDeviceCaps( ref_dc, DESKTOPHORZRES ) == GetSystemMetrics( SM_CXSCREEN ), + "Got DESKTOPHORZRES %d on %s, expected %d\n", + GetDeviceCaps( ref_dc, DESKTOPHORZRES ), descr, GetSystemMetrics( SM_CXSCREEN ) ); + else + ok( GetDeviceCaps( ref_dc, DESKTOPHORZRES ) == GetSystemMetrics( SM_CXSCREEN ), + "Got DESKTOPHORZRES %d on %s, expected %d\n", + GetDeviceCaps( ref_dc, DESKTOPHORZRES ), descr, GetSystemMetrics( SM_CXSCREEN ) ); + + if (GetSystemMetrics( SM_CYSCREEN ) != GetSystemMetrics( SM_CYVIRTUALSCREEN )) + todo_wine ok( GetDeviceCaps( ref_dc, DESKTOPVERTRES ) == GetSystemMetrics( SM_CYSCREEN ), + "Got DESKTOPVERTRES %d on %s, expected %d\n", + GetDeviceCaps( ref_dc, DESKTOPVERTRES ), descr, GetSystemMetrics( SM_CYSCREEN ) ); + else + ok( GetDeviceCaps( ref_dc, DESKTOPVERTRES ) == GetSystemMetrics( SM_CYSCREEN ), + "Got DESKTOPVERTRES %d on %s, expected %d\n", + GetDeviceCaps( ref_dc, DESKTOPVERTRES ), descr, GetSystemMetrics( SM_CYSCREEN ) ); + + SetRect( &ref_rect, GetSystemMetrics( SM_XVIRTUALSCREEN ), GetSystemMetrics( SM_YVIRTUALSCREEN ), + GetSystemMetrics( SM_XVIRTUALSCREEN ) + GetSystemMetrics( SM_CXVIRTUALSCREEN ), + GetSystemMetrics( SM_YVIRTUALSCREEN ) + GetSystemMetrics( SM_CYVIRTUALSCREEN ) ); + } + else + { + SetRect( &ref_rect, 0, 0, GetDeviceCaps( ref_dc, DESKTOPHORZRES ), + GetDeviceCaps( ref_dc, DESKTOPVERTRES ) ); + } + + if (GetDeviceCaps( ref_dc, TECHNOLOGY ) == DT_RASDISPLAY && GetObjectType( hdc ) != OBJ_ENHMETADC && + (GetSystemMetrics( SM_XVIRTUALSCREEN ) || GetSystemMetrics( SM_YVIRTUALSCREEN ))) + todo_wine ok( EqualRect( &rect, &ref_rect ), "GetClipBox returned %d,%d,%d,%d on %s\n", + rect.left, rect.top, rect.right, rect.bottom, descr ); + else + ok( EqualRect( &rect, &ref_rect ), "GetClipBox returned %d,%d,%d,%d on %s\n", + rect.left, rect.top, rect.right, rect.bottom, descr ); } SetBoundsRect( ref_dc, NULL, DCB_RESET | DCB_ACCUMULATE );

1 0