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

[PATCH 2/9] winepulse: Move pulse_stop to unix lib.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 34 ++--------------------- dlls/winepulse.drv/pulse.c | 52 +++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 56 insertions(+), 31 deletions(-)

2 1

[PATCH 1/9] winepulse: Move pulse_read to unix lib.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 92 +------------------------------ dlls/winepulse.drv/pulse.c | 101 ++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 103 insertions(+), 91 deletions(-)

2 1

[PATCH 1/6] server: Also clear pending events in set_socket_event.
by Zebediah Figura 17 May '21

17 May '21

In particular, prevent FD_CONNECT from being reported when not selected for. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/sock.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 945895b51a4..565fb4c5a2c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1809,7 +1809,10 @@ DECL_HANDLER(set_socket_event) old_event = sock->event; sock->mask = req->mask; if (req->window) - sock->reported_events &= ~req->mask; /* re-enable held events */ + { + sock->pending_events &= ~req->mask; + sock->reported_events &= ~req->mask; + } sock->event = NULL; sock->window = req->window; sock->message = req->msg; -- 2.30.2

2 6

[PATCH] msvcrt: Add sincos to importlib.
by Jacek Caban 17 May '21

17 May '21

Fixes cross compilation with GCC 11, which may optimize a pair or sin(), cos() calls to a single sincos() call, which is not exported by any msvcrt version. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/mathf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

1 0

[PATCH] configure: Try using pure clang as a cross compiler when mingw is not available.
by Jacek Caban 17 May '21

17 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- aclocal.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 4/4] quartz: Notify EC_USERABORT event when closing video window.
by Akihiro Sagawa 17 May '21

17 May '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/window.c | 11 +++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-)

3 2

[PATCH 3/4] quartz: Hide video window on WM_CLOSE.
by Akihiro Sagawa 17 May '21

17 May '21

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr7.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/window.c | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-)

3 2

[PATCH 2/4] quartz: Use own destory message in video window.
by Akihiro Sagawa 17 May '21

17 May '21

Preparation for the next commit. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/window.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

3 2

[PATCH v2 1/2] quartz/tests: Avoid testing the result of GetQueueStatus().
by Zebediah Figura 17 May '21

17 May '21

It's very unreliable; our window can receive messages not related to the ones we're trying to test. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 44 ++++++++++++++++++++++--------- dlls/quartz/tests/vmr7.c | 44 ++++++++++++++++++++++--------- dlls/quartz/tests/vmr9.c | 44 ++++++++++++++++++++++--------- 3 files changed, 93 insertions(+), 39 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f4d9660316c..797ea7acc7c 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -2109,37 +2109,55 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our flush_events(); + /* Demonstrate that messages should be sent, not posted, and that only some + * messages should be forwarded. A previous implementation unconditionally + * posted all messages. */ + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SYSCOLORCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } - hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, - (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_FONTCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } params.window = window; params.hwnd = our_hwnd; params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(ret == ((QS_SENDMESSAGE << 16) | QS_SENDMESSAGE), "Got unexpected status %#x.\n", ret); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + while ((ret = MsgWaitForMultipleObjects(1, &thread, FALSE, 1000, QS_ALLINPUT)) == 1) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } + } + ok(!ret, "Wait timed out.\n"); CloseHandle(thread); - params.message = WM_SETCURSOR; + params.message = WM_FONTCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(!WaitForSingleObject(thread, 1000), "Thread should not block.\n"); CloseHandle(thread); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 212ce213e89..02b5a626d74 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -2094,37 +2094,55 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our flush_events(); + /* Demonstrate that messages should be sent, not posted, and that only some + * messages should be forwarded. A previous implementation unconditionally + * posted all messages. */ + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SYSCOLORCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } - hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, - (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_FONTCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } params.window = window; params.hwnd = our_hwnd; params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); - ok(!ret, "Did not find a sent message.\n"); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + while ((ret = MsgWaitForMultipleObjects(1, &thread, FALSE, 1000, QS_ALLINPUT)) == 1) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } + } + ok(!ret, "Wait timed out.\n"); CloseHandle(thread); - params.message = WM_SETCURSOR; + params.message = WM_FONTCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(!WaitForSingleObject(thread, 1000), "Thread should not block.\n"); CloseHandle(thread); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 44b9a453305..1697a321915 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2333,37 +2333,55 @@ static void test_video_window_messages(IVideoWindow *window, HWND hwnd, HWND our flush_events(); + /* Demonstrate that messages should be sent, not posted, and that only some + * messages should be forwarded. A previous implementation unconditionally + * posted all messages. */ + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SYSCOLORCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } - hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_SETCURSOR, - (WPARAM)hwnd, MAKELONG(HTCLIENT, WM_MOUSEMOVE)); + hr = IVideoWindow_NotifyOwnerMessage(window, (OAHWND)our_hwnd, WM_FONTCHANGE, 0, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } params.window = window; params.hwnd = our_hwnd; params.message = WM_SYSCOLORCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block.\n"); - ret = MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_SENDMESSAGE); - ok(!ret, "Did not find a sent message.\n"); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - ok(!WaitForSingleObject(thread, 1000), "Wait timed out.\n"); + while ((ret = MsgWaitForMultipleObjects(1, &thread, FALSE, 1000, QS_ALLINPUT)) == 1) + { + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_SYSCOLORCHANGE, "WM_SYSCOLORCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } + } + ok(!ret, "Wait timed out.\n"); CloseHandle(thread); - params.message = WM_SETCURSOR; + params.message = WM_FONTCHANGE; thread = CreateThread(NULL, 0, notify_message_proc, &params, 0, NULL); ok(!WaitForSingleObject(thread, 1000), "Thread should not block.\n"); CloseHandle(thread); - ret = GetQueueStatus(QS_SENDMESSAGE | QS_POSTMESSAGE); - ok(!ret, "Got unexpected status %#x.\n", ret); + + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + { + ok(msg.message != WM_FONTCHANGE, "WM_FONTCHANGE should not be posted.\n"); + DispatchMessageA(&msg); + } hr = IVideoWindow_put_Owner(window, 0); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.30.2

2 2

[PATCH] d3d11/tests: Trace the name of the tests in single threaded mode.
by Francois Gouget 17 May '21

17 May '21

This allows figuring out which function the crash happens in when there is no backtrace. Just set WINETEST_NO_MT_D3D=1 WINETEST_DEBUG=2. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- The patch decodes the feature level before printing it but maybe that's presuming too much and a simple %04x would be better. --- dlls/d3d11/tests/d3d11.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d412f430b60..29f8c7ce831 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -49,6 +49,7 @@ static struct test_entry void (*test)(void); void (*test_fl)(D3D_FEATURE_LEVEL fl); } u; + const char* name; D3D_FEATURE_LEVEL fl; } *mt_tests; size_t mt_tests_size, mt_test_count; @@ -121,21 +122,25 @@ static void queue_test_entry(const struct test_entry *t) mt_tests[mt_test_count++] = *t; } -static void queue_test_fl(void (*test)(const D3D_FEATURE_LEVEL fl), D3D_FEATURE_LEVEL fl) +#define queue_test_fl(f,fl) _queue_test_fl(f,#f,fl) +static void _queue_test_fl(void (*test)(const D3D_FEATURE_LEVEL fl), const char* name, D3D_FEATURE_LEVEL fl) { struct test_entry t; t.u.test_fl = test; t.fl = fl; + t.name = name; queue_test_entry(&t); } -static void queue_test(void (*test)(void)) +#define queue_test(f) _queue_test(f,#f) +static void _queue_test(void (*test)(void), const char* name) { struct test_entry t; t.u.test = test; t.fl = 0; + t.name = name; queue_test_entry(&t); } @@ -172,6 +177,7 @@ static void run_queued_tests(void) { for (i = 0; i < mt_test_count; ++i) { + trace("fl=%d.%d %s\n", mt_tests[i].fl >> 12, (mt_tests[i].fl >> 8) & 0xf, mt_tests[i].name); run_mt_test(&mt_tests[i]); } @@ -20452,8 +20458,10 @@ static void test_fl9_draw(const D3D_FEATURE_LEVEL feature_level) release_test_context(&test_context); } -static void queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, - D3D_FEATURE_LEVEL end, void (*test_func)(const D3D_FEATURE_LEVEL fl)) +#define queue_for_each_feature_level_in_range(b,e,f) _queue_for_each_feature_level_in_range(b,e,f,#f) +static void _queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, + D3D_FEATURE_LEVEL end, void (*test_func)(const D3D_FEATURE_LEVEL fl), + const char* name) { static const D3D_FEATURE_LEVEL feature_levels[] = { @@ -20471,20 +20479,24 @@ static void queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL begin, for (i = 0; i < ARRAY_SIZE(feature_levels); ++i) { if (begin <= feature_levels[i] && feature_levels[i] <= end) - queue_test_fl(test_func, feature_levels[i]); + _queue_test_fl(test_func, name, feature_levels[i]); } } -static void queue_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +#define queue_for_each_feature_level(f) _queue_for_each_feature_level(f,#f) +static void _queue_for_each_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl), + const char* name) { - queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, - D3D_FEATURE_LEVEL_11_1, test_func); + _queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + D3D_FEATURE_LEVEL_11_1, test_func, name); } -static void queue_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl)) +#define queue_for_each_9_x_feature_level(f) _queue_for_each_9_x_feature_level(f,#f) +static void _queue_for_each_9_x_feature_level(void (*test_func)(const D3D_FEATURE_LEVEL fl), + const char* name) { - queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, - D3D_FEATURE_LEVEL_9_3, test_func); + _queue_for_each_feature_level_in_range(D3D_FEATURE_LEVEL_9_1, + D3D_FEATURE_LEVEL_9_3, test_func, name); } static void test_ddy(void) -- 2.20.1

3 8