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

[PATCH 7/7] winepulse: Move pulse_get_frequency to unix lib.
by Jacek Caban 20 May '21

20 May '21

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

3 2

[PATCH 6/7] winepulse: Move pulse_get_next_packet_size to unix lib.
by Jacek Caban 20 May '21

20 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 24 ++++-------------------- dlls/winepulse.drv/pulse.c | 21 +++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 9 +-------- 3 files changed, 26 insertions(+), 28 deletions(-)

3 2

[PATCH 5/7] winepulse: Move pulse_release_capture_buffer to unix lib.
by Jacek Caban 20 May '21

20 May '21

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

3 2

[PATCH 4/7] winepulse: Move pulse_get_capture_buffer to unix lib.
by Jacek Caban 20 May '21

20 May '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 35 +++------------------------- dlls/winepulse.drv/pulse.c | 43 +++++++++++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 2 ++ 3 files changed, 48 insertions(+), 32 deletions(-)

3 2

[PATCH 3/7] winepulse: Move pulse_get_current_padding to unix lib.
by Jacek Caban 20 May '21

20 May '21

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

3 2

[PATCH 2/7] winepulse: Move pulse_get_latency to unix lib.
by Jacek Caban 20 May '21

20 May '21

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

3 2

[PATCH 1/7] winepulse: Move pulse_get_buffer_size to unix lib.
by Jacek Caban 20 May '21

20 May '21

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

3 2

[PATCH] user32/tests: Use int for wait_move_event delay type.
by Rémi Bernon 20 May '21

20 May '21

This sometimes waits forever, timing out the whole test. See for instance: https://test.winehq.org/data/ce72f9b4263a898503c154a37df6bc9d43153f4b/win20… https://test.winehq.org/data/2a667e28ba7800288f5873a4b13bc0baf6e4a857/win20… https://test.winehq.org/data/44b30c42cbb231e3ea54a47f6ecc19e641e5f889/win20… Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- As it's supposed to wait for the mouse to move and it then times out I don't expect the test to suddenly succeed, but at least it won't make the whole run time out. dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7eaa2c67945..469c193c1a3 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12523,8 +12523,9 @@ done: static void wait_move_event(HWND hwnd, int x, int y) { MSG msg; - DWORD timeout = GetTickCount() + 500, delay; + DWORD timeout = GetTickCount() + 500; BOOL ret; + int delay; while ((delay = timeout - GetTickCount()) > 0) { -- 2.31.0

2 1

[PATCH v3 1/2] user32/tests: Wait for parent window thread before checking window.
by Rémi Bernon 20 May '21

20 May '21

This test is failing from time to time. Making sure the parent thread has terminated before continuing triggers the underlying race condition, and makes the test to always fail. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- Supersedes: 205970-205971 v3: Fix another stupid mistake where the thread handle is closed before the grand child had a chance to wait on it. dlls/user32/tests/msg.c | 52 +++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 13e085dfacc..fab8f291a52 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -8791,7 +8791,10 @@ static void test_paint_messages(void) struct wnd_event { HWND hwnd; + HWND child_hwnd; + HANDLE child; HANDLE grand_child; + HANDLE ready_event; HANDLE start_event; HANDLE stop_event; }; @@ -8822,42 +8825,48 @@ static DWORD CALLBACK create_grand_child_thread( void *param ) { struct wnd_event *wnd_event = param; HWND hchild; - MSG msg; + DWORD ret; hchild = CreateWindowExA(0, "TestWindowClass", "Test child", - WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL); + WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->child_hwnd, 0, 0, NULL); ok (hchild != 0, "Failed to create child window\n"); flush_events(); flush_sequence(); + + /* wait for wnd_event->child to be set */ + ret = WaitForSingleObject( wnd_event->ready_event, 1000 ); + ok( !ret, "WaitForSingleObject failed %x\n", ret ); SetEvent( wnd_event->start_event ); - for (;;) - { - MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_ALLINPUT); - if (!IsWindow( hchild )) break; /* will be destroyed when parent thread exits */ - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); - } + /* wait for parent window thread to exit */ + ret = WaitForSingleObject( wnd_event->child, 1000 ); + ok( !ret, "WaitForSingleObject returned %x, error: %u\n", ret, GetLastError() ); + ok( IsWindow( hchild ), "Child window already destroyed\n" ); + flush_events(); + todo_wine ok( !IsWindow( hchild ), "Child window not destroyed\n" ); + return 0; } static DWORD CALLBACK create_child_thread( void *param ) { struct wnd_event *wnd_event = param; - struct wnd_event child_event; DWORD ret, tid; MSG msg; - child_event.hwnd = CreateWindowExA(0, "TestWindowClass", "Test child", - WS_CHILD | WS_VISIBLE, 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL); - ok (child_event.hwnd != 0, "Failed to create child window\n"); - SetFocus( child_event.hwnd ); + wnd_event->child_hwnd = CreateWindowExA( 0, "TestWindowClass", "Test child", WS_CHILD | WS_VISIBLE, + 0, 0, 10, 10, wnd_event->hwnd, 0, 0, NULL ); + ok( wnd_event->child_hwnd != 0, "Failed to create child windows\n" ); + SetFocus( wnd_event->child_hwnd ); + + wnd_event->grand_child = CreateThread( NULL, 0, create_grand_child_thread, wnd_event, 0, &tid ); + ok( wnd_event->grand_child != 0, "CreateThread failed, error %u\n", GetLastError() ); + flush_events(); flush_sequence(); - child_event.start_event = wnd_event->start_event; - wnd_event->grand_child = CreateThread(NULL, 0, create_grand_child_thread, &child_event, 0, &tid); for (;;) { - DWORD ret = MsgWaitForMultipleObjects(1, &child_event.start_event, FALSE, 1000, QS_SENDMESSAGE); + DWORD ret = MsgWaitForMultipleObjects(1, &wnd_event->start_event, FALSE, 1000, QS_SENDMESSAGE); if (ret != 1) break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); } @@ -8997,9 +9006,11 @@ static void test_interthread_messages(void) flush_events(); flush_sequence(); log_all_parent_messages++; + wnd_event.ready_event = CreateEventA( NULL, TRUE, FALSE, NULL ); wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL ); wnd_event.stop_event = CreateEventA( NULL, TRUE, FALSE, NULL ); - hThread = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); + wnd_event.child = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); + SetEvent( wnd_event.ready_event ); for (;;) { ret = MsgWaitForMultipleObjects(1, &wnd_event.start_event, FALSE, 1000, QS_SENDMESSAGE); @@ -9009,18 +9020,19 @@ static void test_interthread_messages(void) ok( !ret, "MsgWaitForMultipleObjects failed %x\n", ret ); /* now wait for the thread without processing messages; this shouldn't deadlock */ SetEvent( wnd_event.stop_event ); - ret = WaitForSingleObject( hThread, 5000 ); + ret = WaitForSingleObject( wnd_event.child, 5000 ); ok( !ret, "WaitForSingleObject failed %x\n", ret ); - CloseHandle( hThread ); ret = WaitForSingleObject( wnd_event.grand_child, 5000 ); ok( !ret, "WaitForSingleObject failed %x\n", ret ); CloseHandle( wnd_event.grand_child ); + CloseHandle( wnd_event.child ); CloseHandle( wnd_event.start_event ); CloseHandle( wnd_event.stop_event ); + CloseHandle( wnd_event.ready_event ); flush_events(); - ok_sequence(WmExitThreadSeq, "destroy child on thread exit", FALSE); + ok_sequence( WmExitThreadSeq, "destroy child on thread exit", TRUE ); log_all_parent_messages--; DestroyWindow( wnd_event.hwnd ); -- 2.31.0

2 4

[PATCH] user32/tests: Fix the clipboard CF_LOCALE test.
by Francois Gouget 20 May '21

20 May '21

By default CF_LOCALE matches the current input language, not the default user LCID. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/user32/tests/clipboard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 6fc4325e985..73e30996229 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -777,10 +777,11 @@ static void test_synthesized(void) case CF_LOCALE: { UINT *ptr = GlobalLock( data ); + DWORD layout = (DWORD)GetKeyboardLayout(0) & 0xffff; ok( GlobalSize( data ) == sizeof(*ptr), "%u: size %lu\n", i, GlobalSize( data )); - ok( *ptr == GetUserDefaultLCID() || + ok( *ptr == layout || broken( *ptr == MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT )), - "%u: CF_LOCALE %08x/%08x\n", i, *ptr, GetUserDefaultLCID() ); + "%u: CF_LOCALE %04x/%04x\n", i, *ptr, layout ); GlobalUnlock( data ); break; } -- 2.20.1

2 2