January 2020 - Wine-devel - list.winehq.org

[PATCH v4 1/2] gdi32/tests: Separate and expand tests for GetClipBox().
by Zebediah Figura 05 Jan '20

05 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/gdi32/tests/dc.c | 102 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 9739b8f61d..cc95bd3abb 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -429,9 +429,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale } else ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); - type = GetClipBox( hdc, &rect ); - todo_wine_if (GetObjectType( hdc ) == OBJ_ENHMETADC) - ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); type = GetBoundsRect( hdc, &rect, 0 ); ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */, @@ -1569,6 +1566,104 @@ static void test_pscript_printer_dc(void) DeleteDC(hdc); } +static void test_clip_box(void) +{ + HBITMAP bitmap = CreateBitmap(10, 10, 1, 1, NULL); + HDC dc, desktop_dc, printer_dc; + RECT rect, expect, screen_rect; + int type, screen_type; + DEVMODEA scale_mode; + + EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &scale_mode); + scale_mode.dmFields |= DM_SCALE; + scale_mode.u1.s1.dmScale = 200; + + SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), + GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); + screen_type = GetSystemMetrics(SM_CMONITORS) > 1 ? COMPLEXREGION : SIMPLEREGION; + + dc = CreateDCA("DISPLAY", NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateDCA("DISPLAY", NULL, NULL, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + ResetDCA(dc, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateCompatibleDC(NULL); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + SelectObject(dc, bitmap); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 10, 10); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + desktop_dc = GetDC(0); + type = GetClipBox(desktop_dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + + dc = CreateEnhMetaFileA(desktop_dc, NULL, NULL, NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + if (type != ERROR) + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + ReleaseDC(0, desktop_dc); + + dc = CreateMetaFileA(NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + ok(type == ERROR, "wrong region type %d\n", type); + DeleteMetaFile(CloseMetaFile(dc)); + + if ((printer_dc = create_printer_dc(100, FALSE))) + { + type = GetClipBox(printer_dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + + dc = CreateCompatibleDC(printer_dc); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateEnhMetaFileA(printer_dc, NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + DeleteDC(printer_dc); + } + + DeleteObject(bitmap); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1585,4 +1680,5 @@ START_TEST(dc) test_gamma(); test_printer_dc(); test_pscript_printer_dc(); + test_clip_box(); } -- 2.24.1

2 2

[PATCH] ddraw/tests: Fix some test failures.
by Zebediah Figura 05 Jan '20

05 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48150 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ddraw/tests/ddraw2.c | 11 ++++++++--- dlls/ddraw/tests/ddraw4.c | 6 ++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 541362c748..06054736f1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -978,6 +978,8 @@ static void test_coop_level_d3d_state(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = restore_surfaces(ddraw); ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(rt); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); memset(&material, 0, sizeof(material)); material.dwSize = sizeof(material); @@ -1010,9 +1012,12 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); - ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); - color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + ok(hr == DD_OK || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); + if (hr == DD_OK) + { + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + } destroy_viewport(device, viewport); destroy_material(background); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 8cadfae52a..77cf6f4511 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1171,7 +1171,6 @@ static void test_coop_level_d3d_state(void) ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); hr = IDirectDraw4_RestoreAllSurfaces(ddraw); ok(SUCCEEDED(hr), "Failed to restore surfaces, hr %#x.\n", hr); - IDirectDraw4_Release(ddraw); hr = IDirect3DDevice3_GetRenderTarget(device, &surface); ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); @@ -1197,12 +1196,15 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice3_EndScene(device); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff80, 1) + || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), + "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); IDirectDrawSurface4_Release(surface); IDirectDrawSurface4_Release(rt); IDirect3DDevice3_Release(device); + IDirectDraw4_Release(ddraw); DestroyWindow(window); } -- 2.24.1

2 1

[PATCH 5/5] ws2_32/tests: SIOCATMARK is only broken on Linux
by Damjan Jovanovic 05 Jan '20

05 Jan '20

It works on FreeBSD. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

2 1

[PATCH 3/5] ws2_32/tests: getsockopt(SO_SNDBUF/SO_RCVBUF) only breaks on Linux
by Damjan Jovanovic 05 Jan '20

05 Jan '20

Wine bug 8606, where getsockopt(SO_SNDBUF/SO_RCVBUF) returns double the value set by setsockopt(SO_SNDBUF/SO_RCVBUF), is Linux-specific. FreeBSD works perfectly. Make its unit test a todo_wine for Linux only. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

2 1

[PATCH 1/5] server: revert b4a1d80ae35d35f5c170e101922bf1563488be18 for now
by Damjan Jovanovic 05 Jan '20

05 Jan '20

That commit regressed at least 3 applications: 48375 48388 48411 and I won't have time to investigate and fix what is wrong before Wine 5.0 is released. I also believe our time now is better spent on cleaning up the winsock tests and then doing these riskier changes later on, when they can be tested properly. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 5 +++-- server/sock.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)

2 1

[PATCH 2/5] server: return WSAESOCKTNOSUPPORT when appropriate for socket() failure on FreeBSD
by Damjan Jovanovic 05 Jan '20

05 Jan '20

These tests fail on FreeBSD: sock.c:2509: Test failed: Expected 10044, received 10041 sock.c:2549: Test failed: Expected 10044, received 10041 That's because: WSASocketA(AF_INET, -1, 0, NULL, 0, 0) WSASocketA(AF_INET, 0xdead, 0, NULL, 0, 0) are supposed to fail with WSAESOCKTNOSUPPORT. Translate the return codes like we do on Linux. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- server/sock.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH] user32/tests: Make the DDE tests less verbose by default.
by Zebediah Figura 05 Jan '20

05 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/dde.c | 54 +++++++++++++++-------------------------- 1 file changed, 19 insertions(+), 35 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index 54fec3914d5..96cf210d542 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1182,13 +1182,13 @@ static LRESULT WINAPI hook_dde_client_wndprocA(HWND hwnd, UINT msg, WPARAM wpara { UINT_PTR lo, hi; - trace("hook_dde_client_wndprocA: %p %04x %08lx %08lx\n", hwnd, msg, wparam, lparam); + if (winetest_debug > 1) trace("hook_dde_client_wndprocA: %p %04x %08lx %08lx\n", hwnd, msg, wparam, lparam); switch (msg) { case WM_DDE_ACK: UnpackDDElParam(WM_DDE_ACK, lparam, &lo, &hi); - trace("WM_DDE_ACK: status %04lx hglobal %p\n", lo, (HGLOBAL)hi); + if (winetest_debug > 1) trace("WM_DDE_ACK: status %04lx hglobal %p\n", lo, (HGLOBAL)hi); break; default: @@ -1201,13 +1201,13 @@ static LRESULT WINAPI hook_dde_client_wndprocW(HWND hwnd, UINT msg, WPARAM wpara { UINT_PTR lo, hi; - trace("hook_dde_client_wndprocW: %p %04x %08lx %08lx\n", hwnd, msg, wparam, lparam); + if (winetest_debug > 1) trace("hook_dde_client_wndprocW: %p %04x %08lx %08lx\n", hwnd, msg, wparam, lparam); switch (msg) { case WM_DDE_ACK: UnpackDDElParam(WM_DDE_ACK, lparam, &lo, &hi); - trace("WM_DDE_ACK: status %04lx hglobal %p\n", lo, (HGLOBAL)hi); + if (winetest_debug > 1) trace("WM_DDE_ACK: status %04lx hglobal %p\n", lo, (HGLOBAL)hi); break; default: @@ -1227,7 +1227,7 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP { ATOM aService = GlobalAddAtomW(TEST_DDE_SERVICE); - trace("server A: got WM_DDE_INITIATE from %p (%s) with %08lx\n", + if (winetest_debug > 1) trace("server A: got WM_DDE_INITIATE from %p (%s) with %08lx\n", (HWND)wparam, client_unicode ? "Unicode" : "ANSI", lparam); if (LOWORD(lparam) == aService) @@ -1242,7 +1242,6 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP else old_dde_client_wndproc = (WNDPROC)SetWindowLongPtrA((HWND)wparam, GWLP_WNDPROC, (ULONG_PTR)hook_dde_client_wndprocA); - trace("server: sending WM_DDE_ACK to %p\n", (HWND)wparam); SendMessageW((HWND)wparam, WM_DDE_ACK, (WPARAM)hwnd, PackDDElParam(WM_DDE_ACK, aService, 0)); } else @@ -1257,10 +1256,10 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP LPCSTR cmd; UINT_PTR lo, hi; - trace("server A: got WM_DDE_EXECUTE from %p with %08lx\n", (HWND)wparam, lparam); + if (winetest_debug > 1) trace("server A: got WM_DDE_EXECUTE from %p with %08lx\n", (HWND)wparam, lparam); UnpackDDElParam(WM_DDE_EXECUTE, lparam, &lo, &hi); - trace("%08lx => lo %04lx hi %04lx\n", lparam, lo, hi); + if (winetest_debug > 1) trace("%08lx => lo %04lx hi %04lx\n", lparam, lo, hi); ack.bAppReturnCode = 0; ack.reserved = 0; @@ -1279,7 +1278,6 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP switch (step % 5) { case 0: /* bad command */ - trace( "server A got unhandled command\n" ); break; case 1: /* ANSI command */ @@ -1315,7 +1313,6 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP else ok( 0, "bad command data %lx\n", hi ); step++; - trace("server A: posting %s WM_DDE_ACK to %p\n", ack.fAck ? "POSITIVE" : "NEGATIVE", (HWND)wparam); status = *((WORD *)&ack); lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, status, hi); @@ -1329,15 +1326,13 @@ static LRESULT WINAPI dde_server_wndprocA(HWND hwnd, UINT msg, WPARAM wparam, LP DDEACK ack; WORD status; - trace("server A: got WM_DDE_TERMINATE from %p with %08lx\n", (HWND)wparam, lparam); + if (winetest_debug > 1) trace("server A: got WM_DDE_TERMINATE from %#lx with %08lx\n", wparam, lparam); ack.bAppReturnCode = 0; ack.reserved = 0; ack.fBusy = 0; ack.fAck = 1; - trace("server A: posting %s WM_DDE_ACK to %p\n", ack.fAck ? "POSITIVE" : "NEGATIVE", (HWND)wparam); - status = *((WORD *)&ack); lparam = PackDDElParam(WM_DDE_ACK, status, 0); @@ -1375,14 +1370,14 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP else old_dde_client_wndproc = (WNDPROC)SetWindowLongPtrA((HWND)wparam, GWLP_WNDPROC, (ULONG_PTR)hook_dde_client_wndprocA); - trace("server W: sending WM_DDE_ACK to %p\n", (HWND)wparam); SendMessageW((HWND)wparam, WM_DDE_ACK, (WPARAM)hwnd, PackDDElParam(WM_DDE_ACK, aService, 0)); } else GlobalDeleteAtom(aService); - trace("server W: got WM_DDE_INITIATE from %p with %08lx (client %s conv %s)\n", (HWND)wparam, - lparam, client_unicode ? "Unicode" : "ANSI", conv_unicode ? "Unicode" : "ANSI" ); + if (winetest_debug > 1) + trace("server W: got WM_DDE_INITIATE from %p with %08lx (client %s conv %s)\n", (HWND)wparam, + lparam, client_unicode ? "Unicode" : "ANSI", conv_unicode ? "Unicode" : "ANSI" ); return 0; } @@ -1394,10 +1389,10 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP LPCSTR cmd; UINT_PTR lo, hi; - trace("server W: got WM_DDE_EXECUTE from %p with %08lx\n", (HWND)wparam, lparam); + if (winetest_debug > 1) trace("server W: got WM_DDE_EXECUTE from %#lx with %08lx\n", wparam, lparam); UnpackDDElParam(WM_DDE_EXECUTE, lparam, &lo, &hi); - trace("%08lx => lo %04lx hi %04lx\n", lparam, lo, hi); + if (winetest_debug > 1) trace("%08lx => lo %04lx hi %04lx\n", lparam, lo, hi); ack.bAppReturnCode = 0; ack.reserved = 0; @@ -1416,7 +1411,6 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP switch (step % 5) { case 0: /* bad command */ - trace( "server W got unhandled command\n" ); break; case 1: /* ANSI command */ @@ -1460,7 +1454,6 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP else ok( 0, "bad command data %lx\n", hi ); step++; - trace("server W: posting %s WM_DDE_ACK to %p\n", ack.fAck ? "POSITIVE" : "NEGATIVE", (HWND)wparam); status = *((WORD *)&ack); lparam = ReuseDDElParam(lparam, WM_DDE_EXECUTE, WM_DDE_ACK, status, hi); @@ -1474,15 +1467,13 @@ static LRESULT WINAPI dde_server_wndprocW(HWND hwnd, UINT msg, WPARAM wparam, LP DDEACK ack; WORD status; - trace("server W: got WM_DDE_TERMINATE from %p with %08lx\n", (HWND)wparam, lparam); + if (winetest_debug > 1) trace("server W: got WM_DDE_TERMINATE from %#lx with %08lx\n", wparam, lparam); ack.bAppReturnCode = 0; ack.reserved = 0; ack.fBusy = 0; ack.fAck = 1; - trace("server W: posting %s WM_DDE_ACK to %p\n", ack.fAck ? "POSITIVE" : "NEGATIVE", (HWND)wparam); - status = *((WORD *)&ack); lparam = PackDDElParam(WM_DDE_ACK, status, 0); @@ -1548,8 +1539,9 @@ static HDDEDATA CALLBACK client_dde_callback(UINT uType, UINT uFmt, HCONV hconv, type = (uType & XTYP_MASK) >> XTYP_SHIFT; cmd_name = (type <= 14) ? cmd_type[type] : "unknown"; - trace("client_dde_callback: %04x (%s) %d %p %p %p %p %08lx %08lx\n", - uType, cmd_name, uFmt, hconv, hsz1, hsz2, hdata, dwData1, dwData2); + if (winetest_debug > 1) + trace("client_dde_callback: %04x (%s) %d %p %p %p %p %08lx %08lx\n", + uType, cmd_name, uFmt, hconv, hsz1, hsz2, hdata, dwData1, dwData2); return 0; } @@ -1601,9 +1593,7 @@ todo_wine { ok(info.wType == 0, "unexpected info.wType: %04x\n", info.wType); client_unicode = IsWindowUnicode( info.hwnd ); - trace("hwnd %p, hwndPartner %p, unicode %u\n", info.hwnd, info.hwndPartner, client_unicode); - trace("sending test client transaction command\n"); ret = 0xdeadbeef; hdata = DdeClientTransaction((LPBYTE)test_cmd, strlen(test_cmd) + 1, hconv, (HSZ)0xdead, 0xbeef, XTYP_EXECUTE, 1000, &ret); ok(!hdata, "DdeClientTransaction succeeded\n"); @@ -1611,7 +1601,6 @@ todo_wine { err = DdeGetLastError(dde_inst); ok(err == DMLERR_NOTPROCESSED, "wrong dde error %x\n", err); - trace("sending ANSI client transaction command\n"); ret = 0xdeadbeef; hdata = DdeClientTransaction((LPBYTE)exec_cmdA, lstrlenA(exec_cmdA) + 1, hconv, 0, 0, XTYP_EXECUTE, 1000, &ret); err = DdeGetLastError(dde_inst); @@ -1634,7 +1623,6 @@ todo_wine { ok(err == DMLERR_NO_ERROR, "wrong dde error %x\n", err); } - trace("sending ANSI-as-Unicode client transaction command\n"); ret = 0xdeadbeef; hdata = DdeClientTransaction((LPBYTE)exec_cmdAW, (lstrlenW(exec_cmdAW) + 1) * sizeof(WCHAR), hconv, 0, 0, XTYP_EXECUTE, 1000, &ret); @@ -1658,7 +1646,6 @@ todo_wine { ok(err == DMLERR_NOTPROCESSED, "DdeClientTransaction returned error %x\n", err); } - trace("sending unicode client transaction command\n"); ret = 0xdeadbeef; hdata = DdeClientTransaction((LPBYTE)exec_cmdW, (lstrlenW(exec_cmdW) + 1) * sizeof(WCHAR), hconv, 0, 0, XTYP_EXECUTE, 1000, &ret); err = DdeGetLastError(dde_inst); @@ -1681,7 +1668,6 @@ todo_wine { ok(err == DMLERR_NO_ERROR, "wrong dde error %x\n", err); } - trace("sending Unicode-as-ANSI client transaction command\n"); ret = 0xdeadbeef; hdata = DdeClientTransaction((LPBYTE)exec_cmdWA, lstrlenA(exec_cmdWA) + 1, hconv, 0, 0, XTYP_EXECUTE, 1000, &ret); err = DdeGetLastError(dde_inst); @@ -2375,7 +2361,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV static const char test_service [] = "TestDDEService"; static const char test_topic [] = "TestDDETopic"; - trace("type %#x, fmt %#x\n", uType, uFmt); + if (winetest_debug > 1) trace("type %#x, fmt %#x\n", uType, uFmt); ok(msg_index < 5 + ARRAY_SIZE(test_cmd_w_to_w), "Got unexpected message type %#x.\n", uType); msg_index++; @@ -2440,7 +2426,7 @@ static HDDEDATA CALLBACK server_end_to_end_callback(UINT uType, UINT uFmt, HCONV rsize = DdeGetData(hdata, buffer, size, 0); ok(rsize == size, "Incorrect size returned, expected %d got %d, msg_index=%d\n", size, rsize, msg_index); - trace("msg %u strA \"%s\" strW %s\n", msg_index, buffer, wine_dbgstr_w((WCHAR*)buffer)); + if (winetest_debug > 1) trace("msg %u strA \"%s\" strW %s\n", msg_index, buffer, wine_dbgstr_w((WCHAR*)buffer)); str_index = msg_index - 4; cmd_w = test_cmd_w_to_w[str_index - 1]; @@ -2597,8 +2583,6 @@ static void test_end_to_end_client(BOOL type_a) static const char test_topic[] = "TestDDETopic"; static const WCHAR test_topic_w[] = {'T','e','s','t','D','D','E','T','o','p','i','c',0}; - trace("Start end to end client %s\n", type_a ? "ASCII" : "UNICODE"); - if (type_a) ret = DdeInitializeA(&client_pid, client_end_to_end_callback, APPCMD_CLIENTONLY, 0); else -- 2.24.1

2 1

[PATCH] ntdll/tests: Fix expected RtlIpv6StringToAddress terminator output
by Alex Henrie 04 Jan '20

04 Jan '20

The "broken" function was applied to the wrong condition in the "ok" statement (RtlIpv6StringToAddress is supposed to set the terminator to the first character after the address, not the second-to-last character of the address). However, since this test is already being skipped on XP and Vista and we really don't need a test for how exactly XP and Vista are broken, we can just delete it. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/ntdll/tests/rtl.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index b7822d370d..20b7f162c2 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1487,7 +1487,7 @@ static const struct NTSTATUS res; int terminator_offset; int ip[8]; - /* win_broken: older versions of windows do not handle this correctly + /* win_broken: XP and Vista do not handle this correctly ex_fail: Ex function does need the string to be terminated, non-Ex does not. ex_skip: test doesn't make sense for Ex (f.e. it's invalid for non-Ex but valid for Ex) */ enum { normal_6, win_broken_6 = 1, ex_fail_6 = 2, ex_skip_6 = 4 } flags; @@ -1501,7 +1501,7 @@ static const struct { 0, 0, 0, 0, 0, 0, 0, 0 } }, { "0:0:0:0:0:0:0:1", STATUS_SUCCESS, 15, { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, - { "0:0:0:0:0:0:0::", STATUS_SUCCESS, 13, + { "0:0:0:0:0:0:0::", STATUS_SUCCESS, 15, { 0, 0, 0, 0, 0, 0, 0, 0 }, win_broken_6 }, { "0:0:0:0:0:0:13.1.68.3", STATUS_SUCCESS, 21, { 0, 0, 0, 0, 0, 0, 0x10d, 0x344 } }, @@ -1517,7 +1517,7 @@ static const struct { 0, 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700 } }, { "1080:0:0:0:8:800:200c:417a", STATUS_SUCCESS, 26, { 0x8010, 0, 0, 0, 0x800, 0x8, 0x0c20, 0x7a41 } }, - { "0:a:b:c:d:e:f::", STATUS_SUCCESS, 13, + { "0:a:b:c:d:e:f::", STATUS_SUCCESS, 15, { 0, 0xa00, 0xb00, 0xc00, 0xd00, 0xe00, 0xf00, 0 }, win_broken_6 }, { "1111:2222:3333:4444:5555:6666:123.123.123.123", STATUS_SUCCESS, 45, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7b7b, 0x7b7b } }, @@ -1531,7 +1531,7 @@ static const struct { 0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab } }, { "1111:2222:3333:4444:r5555:6666:7777:8888", STATUS_INVALID_PARAMETER, 20, { 0x1111, 0x2222, 0x3333, 0x4444, 0xabab, 0xabab, 0xabab, 0xabab } }, - { "1111:2222:3333:4444:5555:6666:7777::", STATUS_SUCCESS, 34, + { "1111:2222:3333:4444:5555:6666:7777::", STATUS_SUCCESS, 36, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0x7777, 0 }, win_broken_6 }, { "1111:2222:3333:4444:5555:6666::", STATUS_SUCCESS, 31, { 0x1111, 0x2222, 0x3333, 0x4444, 0x5555, 0x6666, 0, 0 } }, @@ -2120,13 +2120,6 @@ static void test_RtlIpv6StringToAddress(void) "[%s] terminator = %p, expected it not to change\n", ipv6_tests[i].address, terminator); } - else if (ipv6_tests[i].flags & win_broken_6) - { - PCSTR expected = ipv6_tests[i].address + ipv6_tests[i].terminator_offset; - ok(terminator == expected || broken(terminator == expected + 2), - "[%s] terminator = %p, expected %p\n", - ipv6_tests[i].address, terminator, expected); - } else { ok(terminator == ipv6_tests[i].address + ipv6_tests[i].terminator_offset, -- 2.24.1

2 2

[PATCH] ntdll: Fix a typo in get_current_directory().
by Zebediah Figura 04 Jan '20

04 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48415 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index 116a57a8e7c..de3ada01a08 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -622,7 +622,7 @@ static void get_current_directory( UNICODE_STRING *dir ) if (!wine_unix_to_nt_file_name( &unix_name, &nt_name )) { /* skip the \??\ prefix */ - if (nt_name.Length > 6 * sizeof(WCHAR*) && nt_name.Buffer[5] == ':') + if (nt_name.Length > 6 * sizeof(WCHAR) && nt_name.Buffer[5] == ':') { dir->Length = nt_name.Length - 4 * sizeof(WCHAR); memcpy( dir->Buffer, nt_name.Buffer + 4, dir->Length ); -- 2.24.1

1 0

[PATCH] kernel32/tests: Fix some codepage test failures with Windows 10.
by Zebediah Figura 04 Jan '20

04 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- It seems that Windows is finally moving towards UTF-8; a new configurable option in Control Panel causes UTF-8 to be returned from this function for all locales. dlls/kernel32/tests/codepage.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8fcc575a29e..bc172eacf3b 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1057,7 +1057,7 @@ static void test_threadcp(void) static const LCID JAPANESE = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), SORT_DEFAULT); static const LCID CHINESE = MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT); - BOOL islead, islead_acp; + BOOL islead, islead_default; CPINFOEXA cpi; UINT cp, acp; int i, num; @@ -1152,8 +1152,8 @@ static void test_threadcp(void) ok(cpi.CodePage == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, lcids[i].threadcp); else - ok(cpi.CodePage == acp, "wrong codepage %u for lcid %04x, should be %u\n", - cpi.CodePage, lcids[i].lcid, acp); + ok(cpi.CodePage == acp || cpi.CodePage == CP_UTF8 /* Win10 1809+ */, + "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, acp); /* WideCharToMultiByte - CP_THREAD_ACP */ num = WideCharToMultiByte(CP_THREAD_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); @@ -1169,11 +1169,12 @@ static void test_threadcp(void) { SetThreadLocale(isleads_nocp[i].lcid); - islead_acp = IsDBCSLeadByteEx(CP_ACP, isleads_nocp[i].testchar); - islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads_nocp[i].testchar); + GetCPInfoExA(CP_THREAD_ACP, 0, &cpi); + islead_default = IsDBCSLeadByteEx(cpi.CodePage, isleads_nocp[i].testchar); + islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads_nocp[i].testchar); - ok(islead == islead_acp, "wrong islead %i for test char %x in lcid %04x. should be %i\n", - islead, isleads_nocp[i].testchar, isleads_nocp[i].lcid, islead_acp); + ok(islead == islead_default, "wrong islead %i for test char %x in lcid %04x. should be %i\n", + islead, isleads_nocp[i].testchar, isleads_nocp[i].lcid, islead_default); } /* IsDBCSLeadByteEx - locales with codepage */ -- 2.24.1

1 0