May 2021 - Wine-devel - list.winehq.org

[PATCH 3/6] msvcrt: Import nextafter implementation from musl.
by Piotr Caban 14 May '21

14 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 45 ++++++++++++++++++++++++++++++++++++------- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 38 insertions(+), 17 deletions(-)

1 0

[PATCH 2/6] msvcrt: Import neabyint implementation from musl.
by Piotr Caban 14 May '21

14 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 13 +++++++++++-- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 11 insertions(+), 17 deletions(-)

1 0

[PATCH 1/6] msvcrt: Import neabyintf implementation from musl.
by Piotr Caban 14 May '21

14 May '21

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- configure.ac | 1 - dlls/msvcrt/math.c | 13 +++++++++++-- dlls/msvcrt/unixlib.c | 13 ------------- dlls/msvcrt/unixlib.h | 1 - 4 files changed, 11 insertions(+), 17 deletions(-)

1 0

[PATCH 1/4] user32/tests: Recreate the window to make it more likely to have focus.
by Rémi Bernon 14 May '21

14 May '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- * PATCH 1/4 should help with these spurious failures: input.c:2789: Test failed: 15: expected WM_INPUT message input.c:2792: Test failed: 15: expected RIM_INPUT message The root cause is the desktop window getting foreground when we try to change focus from the thread window back to the main window that is created topmost. X11 focus out / focus in events receiving order sometimes make winex11.drv decide to give the desktop window focus and this ends up with the WM_INPUT messages not being delivered. * PATCH 2/4 just skips the recurrent failure on Chinese:China locale. * PATCH 3/4 and PATCH 4/4 which also (Superseding 205693) are trying to fix the following spurious failures: input.c:2162: Test failed: GetRawInputBuffer returned 4 input.c:2157: Test failed: GetRawInputBuffer returned unexpected size: 0 input.c:2162: Test failed: GetRawInputBuffer returned 0 input.c:2163: Test failed: GetRawInputBuffer returned unexpected size: 0 input.c:2164: Test failed: Unexpected rawinput data: 0 input.c:2165: Test failed: Unexpected rawinput data: 0 input.c:2166: Test failed: Unexpected rawinput data: 0 input.c:2224: Test failed: GetRawInputData succeeded input.c:2225: Test failed: GetRawInputData returned deadbeef input.c:2338: Test failed: Spurious WM_INPUT messages I've got no idea if they really do, as I'm not yet able to reproduce them consistently when submitting the patches manually. Submitting patches from the M-L seem to trigger the failures more reliably. So if they don't I guess they could just be ignored. dlls/user32/tests/input.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3d4f0d03d0d..8c67fc67cb3 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2758,6 +2758,10 @@ static void test_rawinput(const char* argv0) { case 14: case 15: + DestroyWindow(hwnd); + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, + pt.x - 50, pt.y - 50, 100, 100, 0, NULL, NULL, NULL); + ok(hwnd != 0, "CreateWindow failed\n"); SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); SetForegroundWindow(hwnd); empty_message_queue(); -- 2.31.0

2 9

[PATCH 1/3] reg/tests: Add missing return code checks
by Hugh McMaster 14 May '21

14 May '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/export.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 27d70b6a663..d2598dd8d48 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -335,6 +335,7 @@ static void test_export(void) "\"Wine2a\"=hex(1):\n" "\"Wine2b\"=hex(3):\n" "\"Wine2c\"=hex(4):\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine2a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine2b", REG_BINARY, NULL, 0, 0); @@ -351,6 +352,7 @@ static void test_export(void) "\"Wine3a\"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" "\"Wine3b\"=hex(3):12,34,56,78\n" "\"Wine3c\"=hex(4):40,30,20,10\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine3a", REG_SZ, "Value", 6, 0); memcpy(hex, "\x12\x34\x56\x78", 4); -- 2.31.1

1 2

[PATCH] include: Add more PROPERTYKEY declarations in propkey.h.
by Biswapriyo Nath 14 May '21

14 May '21

1 0

[tools] winetest/build-patterns: Add a testdesc CSS class.
by Francois Gouget 14 May '21

14 May '21

It is needed to maintain a 4 pixel space between the description and the englobing testfile box. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- winetest/build-patterns | 2 +- winetest/report.css | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index c9fcb6638..06d527f50 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -1074,7 +1074,7 @@ sub write_pattern($$$) compute_set_colors($test->{colors}); - print $html $test->{desc} if (defined $test->{desc}); + print $html "<div class='testtext'>$test->{desc}</div>\n" if (defined $test->{desc}); print $html "<div class='test'>\n"; write_newmodes_line($html, $test) if (%{$test->{newmodes}}); diff --git a/winetest/report.css b/winetest/report.css index 4c9197250..f78980830 100644 --- a/winetest/report.css +++ b/winetest/report.css @@ -28,6 +28,12 @@ div.output, div.test { margin: 0; } +div.testtext { + text-align: left; + padding: 0 0 0 4px; + margin: 0; +} + div.updownbar { padding: 4px; margin-bottom: 5px; -- 2.20.1

1 0

[PATCH 1/6] server: Poll for FD_CLOSE even if we cannot receive more data.
by Zebediah Figura 13 May '21

13 May '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 6 +++--- server/sock.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 266ddc14451..9116c2b169d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4455,12 +4455,12 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) - check_events_todo_msg(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 200); check_events(ctx, 0, 0, 0); select_events(ctx, server, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) - check_events_todo_msg(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 200); check_events(ctx, 0, 0, 0); ret = recv(server, buffer, 5, 0); @@ -4553,7 +4553,7 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); - check_events_todo_event(ctx, FD_CLOSE, 0, 200); + check_events_todo(ctx, FD_CLOSE, 0, 200); closesocket(server); } diff --git a/server/sock.c b/server/sock.c index c8cd603149b..92202d317c4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -786,8 +786,7 @@ static int sock_get_poll_events( struct fd *fd ) else if (smask & FD_READ || (sock->state & FD_WINE_LISTENING && mask & FD_ACCEPT)) ev |= POLLIN | POLLPRI; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ - else if (sock->type == WS_SOCK_STREAM && (sock->state & FD_READ) && (mask & FD_CLOSE) && - !(sock->reported_events & FD_READ)) + else if (sock->type == WS_SOCK_STREAM && (mask & FD_CLOSE) && !(sock->reported_events & FD_READ)) ev |= POLLIN; if (async_queued( &sock->write_q )) -- 2.30.2

1 5

[PATCH] kernel32/tests: Use sizeof(STARTUPINFOEX) for STARTUPINFOEX.STARTUPINFO.cb in process tests.
by Paul Gofman 13 May '21

13 May '21

Fixes some test failures on a few Testbot machines when the process attributes are just ignored. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f960efb05a8..7d5d2ead75b 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -4073,7 +4073,7 @@ static void test_parent_process_attribute(unsigned int level, HANDLE read_pipe) } memset(&si, 0, sizeof(si)); - si.StartupInfo.cb = sizeof(si.StartupInfo); + si.StartupInfo.cb = sizeof(si); if (level) { @@ -4221,7 +4221,7 @@ static void test_handle_list_attribute(BOOL child, HANDLE handle1, HANDLE handle "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); memset(&si, 0, sizeof(si)); - si.StartupInfo.cb = sizeof(si.StartupInfo); + si.StartupInfo.cb = sizeof(si); si.lpAttributeList = heap_alloc(size); ret = pInitializeProcThreadAttributeList(si.lpAttributeList, 1, 0, &size); ok(ret, "Got unexpected ret %#x, GetLastError() %u.\n", ret, GetLastError()); -- 2.31.1

1 0

[PATCH 1/4] slc: Return a non-zero handle from SLOpen.
by Esme Povirk 13 May '21

13 May '21

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/slc/slc.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/slc/slc.c b/dlls/slc/slc.c index b246a7dfc1a..d36ce88c4fd 100644 --- a/dlls/slc/slc.c +++ b/dlls/slc/slc.c @@ -74,5 +74,10 @@ HRESULT WINAPI SLOpen(HSLC *handle) { FIXME("(%p) stub\n", handle ); + if (!handle) + return E_INVALIDARG; + + *handle = (HSLC)0xdeadbeef; + return S_OK; } -- 2.25.1

3 6