October 2019 - Wine-devel - list.winehq.org

ddraw/tests: Port the test that RGB device is enumerated
by David Adam 28 Oct '19

28 Oct '19

2 1

[PATCH 1/2] testbot: Add a function to check the TestAgentd version.
by Francois Gouget 28 Oct '19

28 Oct '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 3 +-- testbot/lib/WineTestBot/TestAgent.pm | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 127c15c5c..bc45533d2 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -392,8 +392,7 @@ sub SetupTestAgentd($$$$) # We want 'TestAgentd --detach --show-restarts' on Windows but this was # not supported before this version and changing how the server is started # is too complex. - $Version = sprintf("%02d.%02d", $1, $2); - if ($Version lt "01.07") + if (!$TA->HasMinVersion(1, 7)) { FatalError("The TestAgent server is too old to be upgraded: $Version\n"); } diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index a4d32ec27..6c4e6444d 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1081,16 +1081,27 @@ sub GetVersion($) { my ($self) = @_; - if (!$self->{agentversion}) - { - # Retrieve the server version - $self->_Connect(); - } + # Retrieve the server version + $self->_Connect() if (!$self->{agentversion}); + # And return the version we got. # If the connection failed it will be undef as expected. return $self->{agentversion}; } +sub HasMinVersion($$$) +{ + my ($self, $MinMajor, $MinMinor) = @_; + + # Retrieve the server version + $self->_Connect() if (!$self->{agentversion}); + + return undef if (!$self->{agentversion}); + return undef if ($self->{agentversion} !~ / ([0-9]+)\.([0-9]+)$/); + my ($Major, $Minor) = ($1, $2); + return (($Major > $MinMajor) or ($Major == $MinMajor and $Minor >= $MinMinor)); +} + our $SENDFILE_EXE = 1; sub _SendStringOrFile($$$$$$) -- 2.20.1

1 1

[PATCH] testbot: Highlight undefined symbol link errors.
by Francois Gouget 28 Oct '19

28 Oct '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index a6a10a5a5..acb87a42e 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -156,6 +156,7 @@ sub GetLogLineCategory($) $Line =~ /^error: corrupt patch / or # Build errors $Line =~ /: error: / or + $Line =~ /: undefined reference to `/ or $Line =~ /^make: [*]{3} No rule to make target / or $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^Task: / or -- 2.20.1

1 0

[PATCH v2] user32: WM_MOUSEACTIVATE should return MA_NOACTIVATE for WM_LBUTTONDOWN/HTCAPTION message.
by Alistair Leslie-Hughes 28 Oct '19

28 Oct '19

Supercedes: 171968 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47945 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- Fix failed in in msg.c dlls/user32/defwnd.c | 2 +- dlls/user32/tests/msg.c | 2 +- dlls/user32/tests/win.c | 35 ++++++++++++++++++++++++++++++++--- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index c0d1190710..9cd1298923 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -409,7 +409,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } /* Caption clicks are handled by NC_HandleNCLButtonDown() */ - return MA_ACTIVATE; + return ( HIWORD(lParam) == WM_LBUTTONDOWN && LOWORD(lParam) == HTCAPTION ? MA_NOACTIVATE : MA_ACTIVATE ); case WM_ACTIVATE: /* The default action in Windows is to set the keyboard focus to diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 477661ab62..d2342c8b14 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5163,7 +5163,7 @@ static void test_messages(void) ShowWindow(hwnd, SW_MINIMIZE); flush_events(); - ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", TRUE); + ok_sequence(WmShowMinOverlappedSeq, "ShowWindow(SW_SHOWMINIMIZED):overlapped", FALSE); flush_sequence(); if (GetWindowLongW( hwnd, GWL_STYLE ) & WS_MINIMIZE) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 784849b2ba..367d7300a1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2717,7 +2717,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_SHOWWINDOW); ok(ret, "Got %d\n", ret); flush_events( TRUE ); - todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd_child); } @@ -3371,8 +3371,8 @@ static void test_SetForegroundWindow(HWND hwnd) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); if (0) check_wnd_state(hwnd2, hwnd2, hwnd2, 0); - todo_wine ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow()); - todo_wine ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus()); + ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow()); + ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus()); SetForegroundWindow(hwnd); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3965,6 +3965,35 @@ static void test_mouse_input(HWND hwnd) TEST_MOUSEACTIVATE(HTCLOSE,MA_ACTIVATE); TEST_MOUSEACTIVATE(HTHELP,MA_ACTIVATE); +#define TEST_MOUSEACTIVATE2(A,B) \ + res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ + ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); + + TEST_MOUSEACTIVATE2(HTERROR,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTTRANSPARENT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTNOWHERE,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTCLIENT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTCAPTION,MA_NOACTIVATE); + TEST_MOUSEACTIVATE2(HTSYSMENU,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTSIZE,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTMENU,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTHSCROLL,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTVSCROLL,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTMINBUTTON,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTMAXBUTTON,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTLEFT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTRIGHT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTTOP,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTTOPLEFT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTTOPRIGHT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTBOTTOM,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTBOTTOMLEFT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTBOTTOMRIGHT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTBORDER,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTOBJECT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTCLOSE,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTHELP,MA_ACTIVATE); + ShowWindow(popup, SW_HIDE); /* Test sending double click to the non-client area, while capturing the window after -- 2.17.1

2 1

[PATCH 1/3] xmllite: Qualified and Local names match for xml declaration.
by Jeff Smith 28 Oct '19

28 Oct '19

--- dlls/xmllite/reader.c | 5 ++++- dlls/xmllite/tests/reader.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e813ca37fe..02097d0789 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1415,7 +1415,6 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) reader->nodetype = XmlNodeType_XmlDeclaration; reader->empty_element.position = position; reader_set_strvalue(reader, StringValue_LocalName, &strval_xml); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_xml); return S_OK; } @@ -3184,6 +3183,10 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam *len = attribute->localname.len; } break; + case XmlNodeType_XmlDeclaration: + *name = This->strvalues[StringValue_LocalName].str; + *len = This->strvalues[StringValue_LocalName].len; + break; default: *name = This->strvalues[StringValue_QualifiedName].str; *len = This->strvalues[StringValue_QualifiedName].len; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 41adad1598..64ae6191a6 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2537,7 +2537,8 @@ static void test_string_pointers(void) ok(empty == reader_value(reader, ""), "empty != value\n"); ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); xml = reader_name(reader, "xml"); - ptr = reader_qname(reader, "xml"); todo_wine ok(xml == ptr, "xml != qname\n"); + ptr = reader_qname(reader, "xml"); + ok(xml == ptr, "xml != qname\n"); ok(empty == reader_namespace(reader, ""), "empty != namespace\n"); next_attribute(reader); -- 2.21.0

1 2

[PATCH] ntoskrnl.exe: quiet a verbose FIXME
by Austin English 28 Oct '19

28 Oct '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=11908 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 009b0dda81..7d5ede0948 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3786,7 +3786,8 @@ NTSTATUS WINAPI FsRtlRegisterFileSystemFilterCallbacks( DRIVER_OBJECT *object, P */ BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode) { - FIXME("stub: %08x%08x %u\n", privilege.HighPart, privilege.LowPart, mode); + static int once; + if (!once++) FIXME("stub: %08x%08x %u\n", privilege.HighPart, privilege.LowPart, mode); return TRUE; } -- 2.21.0

1 0

[PATCH] user32: WM_MOUSEACTIVATE should return MA_NOACTIVATE for WM_LBUTTONDOWN/HTCAPTION message.
by Alistair Leslie-Hughes 28 Oct '19

28 Oct '19

Supercedes: 171968 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47945 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/defwnd.c | 2 +- dlls/user32/tests/win.c | 35 ++++++++++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index c0d1190710..9cd1298923 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -409,7 +409,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } /* Caption clicks are handled by NC_HandleNCLButtonDown() */ - return MA_ACTIVATE; + return ( HIWORD(lParam) == WM_LBUTTONDOWN && LOWORD(lParam) == HTCAPTION ? MA_NOACTIVATE : MA_ACTIVATE ); case WM_ACTIVATE: /* The default action in Windows is to set the keyboard focus to diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 784849b2ba..367d7300a1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2717,7 +2717,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_SHOWWINDOW); ok(ret, "Got %d\n", ret); flush_events( TRUE ); - todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd_child); } @@ -3371,8 +3371,8 @@ static void test_SetForegroundWindow(HWND hwnd) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); if (0) check_wnd_state(hwnd2, hwnd2, hwnd2, 0); - todo_wine ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow()); - todo_wine ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus()); + ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow()); + ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus()); SetForegroundWindow(hwnd); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3965,6 +3965,35 @@ static void test_mouse_input(HWND hwnd) TEST_MOUSEACTIVATE(HTCLOSE,MA_ACTIVATE); TEST_MOUSEACTIVATE(HTHELP,MA_ACTIVATE); +#define TEST_MOUSEACTIVATE2(A,B) \ + res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ + ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); + + TEST_MOUSEACTIVATE2(HTERROR,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTTRANSPARENT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTNOWHERE,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTCLIENT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTCAPTION,MA_NOACTIVATE); + TEST_MOUSEACTIVATE2(HTSYSMENU,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTSIZE,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTMENU,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTHSCROLL,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTVSCROLL,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTMINBUTTON,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTMAXBUTTON,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTLEFT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTRIGHT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTTOP,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTTOPLEFT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTTOPRIGHT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTBOTTOM,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTBOTTOMLEFT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTBOTTOMRIGHT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTBORDER,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTOBJECT,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTCLOSE,MA_ACTIVATE); + TEST_MOUSEACTIVATE2(HTHELP,MA_ACTIVATE); + ShowWindow(popup, SW_HIDE); /* Test sending double click to the non-client area, while capturing the window after -- 2.17.1

2 1

[PATCH 1/7] ddraw: Give exact name for devices in Enumdevices
by David Adam 28 Oct '19

28 Oct '19

This patch allows the game Donald Duck couak attack to start. Bug was spotted by Andrew D'Addesio in bug 19153

1 0

[PATCH v2] gdi32/tests: Update expected ExtCreateRegion behavior to represent newer Windows.
by Sven Baars 27 Oct '19

27 Oct '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- v2: Don't change the actual implementation, because the parameter is unused in Wine. dlls/gdi32/tests/clipping.c | 45 ++++++++----------------------------- 1 file changed, 9 insertions(+), 36 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index d04ef77ca3..015157522d 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -182,13 +182,10 @@ static void test_ExtCreateRegion(void) HRGN hrgn; XFORM xform; - if (0) /* crashes under Win9x */ - { - SetLastError(0xdeadbeef); - hrgn = ExtCreateRegion(NULL, 0, NULL); - ok(!hrgn, "ExtCreateRegion should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); - } + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, 0, NULL); + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); rgn.data.rdh.dwSize = 0; rgn.data.rdh.iType = 0; @@ -225,7 +222,9 @@ static void test_ExtCreateRegion(void) hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) - 1, &rgn.data); todo_wine ok(!hrgn, "ExtCreateRegion should fail\n"); - ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %u\n", GetLastError()); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER || + broken(GetLastError() == 0xdeadbeef), "0xdeadbeef, got %u\n", GetLastError()); SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); @@ -237,32 +236,12 @@ static void test_ExtCreateRegion(void) SetRectEmpty(&rgn.data.rdh.rcBound); memcpy(rgn.data.Buffer, &rc, sizeof(rc)); - /* With a single rect this seems to work... */ - SetLastError(0xdeadbeef); - hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) + sizeof(RECT) - 1, &rgn.data); - ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); - verify_region(hrgn, &rc); - DeleteObject(hrgn); - SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data); ok(hrgn != 0, "ExtCreateRegion error %u\n", GetLastError()); verify_region(hrgn, &rc); DeleteObject(hrgn); - rgn.data.rdh.dwSize = sizeof(rgn.data.rdh) + 1; - - SetLastError(0xdeadbeef); - hrgn = ExtCreateRegion(NULL, 1, &rgn.data); - ok(hrgn != 0 || - broken(GetLastError() == 0xdeadbeef), /* NT4 */ - "ExtCreateRegion error %u\n", GetLastError()); - if(hrgn) - { - verify_region(hrgn, &rc); - DeleteObject(hrgn); - } - xform.eM11 = 0.5; /* 50% width */ xform.eM12 = 0.0; xform.eM21 = 0.0; @@ -270,8 +249,6 @@ static void test_ExtCreateRegion(void) xform.eDx = 20.0; xform.eDy = 40.0; - rgn.data.rdh.dwSize = sizeof(rgn.data.rdh); - SetLastError(0xdeadbeef); hrgn = ExtCreateRegion(&xform, sizeof(rgn), &rgn.data); ok(hrgn != 0, "ExtCreateRegion error %u/%x\n", GetLastError(), GetLastError()); @@ -306,9 +283,7 @@ static void test_GetClipRgn(void) /* Test calling GetClipRgn with a valid device context and NULL region. */ ret = GetClipRgn(hdc, NULL); - ok(ret == 0 || - ret == -1 /* Win9x */, - "Expected GetClipRgn to return 0, got %d\n", ret); + ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret); /* Initialize the test regions. */ hrgn = CreateRectRgn(100, 100, 100, 100); @@ -360,9 +335,7 @@ static void test_GetClipRgn(void) "Expected SelectClipRgn to return SIMPLEREGION, got %d\n", ret); ret = GetClipRgn(hdc, NULL); - ok(ret == 0 || - ret == -1 /* Win9x */, - "Expected GetClipRgn to return 0, got %d\n", ret); + ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret); ret = GetClipRgn(hdc, hrgn3); ok(ret == 0, "Expected GetClipRgn to return 0, got %d\n", ret); -- 2.17.1

1 0

[PATCH] gdi32/tests: Fix some test failures on Win7+.
by Sven Baars 27 Oct '19

27 Oct '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/gdi32/tests/bitmap.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index d651765006..289d37104c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -5532,14 +5532,18 @@ static void test_SetDIBitsToDevice_RLE8(void) info->bmiHeader.biWidth = 2; ret = SetDIBitsToDevice( hdc, 0, 0, 8, 8, 0, 0, 0, 8, rle8_data, info, DIB_RGB_COLORS ); ok( ret == 8, "got %d\n", ret ); - for (i = 0; i < 64; i++) ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] ); + for (i = 0; i < 64; i += 8) + { + ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] ); + ok( dib_bits[i+1] == bottom_up[i+1], "%d: got %08x\n", i+1, dib_bits[i+1] ); + } memset( dib_bits, 0xaa, 64 * 4 ); info->bmiHeader.biWidth = 8; info->bmiHeader.biHeight = 2; ret = SetDIBitsToDevice( hdc, 0, 0, 8, 8, 0, 0, 0, 8, rle8_data, info, DIB_RGB_COLORS ); ok( ret == 2, "got %d\n", ret ); - for (i = 0; i < 64; i++) ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] ); + for (i = 0; i < 16; i++) ok( dib_bits[i] == bottom_up[i], "%d: got %08x\n", i, dib_bits[i] ); memset( dib_bits, 0xaa, 64 * 4 ); info->bmiHeader.biHeight = 9; @@ -5772,7 +5776,8 @@ static void test_D3DKMTCreateDCFromMemory( void ) create_desc.Height = 7; create_desc.Width = 0; status = pD3DKMTCreateDCFromMemory( &create_desc ); - ok(status == test_data[i].status, "%s: Got unexpected status %#x, expected %#x.\n", + ok(status == test_data[i].status || broken(status == STATUS_INVALID_PARAMETER) /* Win7+ */, + "%s: Got unexpected status %#x, expected %#x.\n", test_data[i].name, status, test_data[i].status); if (status == STATUS_SUCCESS) { -- 2.17.1

1 0