wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Damjan Jovanovic : comctl32: Test treeview text trimming after label editing is complete.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 8fd0ecc6cd0bf99803d8e8ac1a520d93b53b52f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fd0ecc6cd0bf99803d8e8ac… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:07 2019 +0200 comctl32: Test treeview text trimming after label editing is complete. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 2380c5796e..34b016a236 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1576,7 +1576,7 @@ static void test_itemedit(void) DWORD r; HWND edit; TVITEMA item; - CHAR buffA[20]; + CHAR buffA[500]; HWND hTree; hTree = create_treeview_control(0); @@ -1675,8 +1675,41 @@ static void test_itemedit(void) ok(IsWindow(edit), "Expected valid handle\n"); r = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); expect(MAX_PATH - 1, r); + /* WM_SETTEXT can set more... */ + memset(buffA, 'a', ARRAY_SIZE(buffA)); + buffA[ARRAY_SIZE(buffA)-1] = 0; + r = SetWindowTextA(edit, buffA); + expect(TRUE, r); + r = GetWindowTextA(edit, buffA, ARRAY_SIZE(buffA)); + expect(ARRAY_SIZE(buffA) - 1, r); + /* ...but it's trimmed to MAX_PATH chars when editing ends */ r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + + /* We can't get around that MAX_PATH limit by increasing EM_SETLIMITTEXT */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + SendMessageA(edit, EM_SETLIMITTEXT, ARRAY_SIZE(buffA)-1, 0); + memset(buffA, 'a', ARRAY_SIZE(buffA)); + buffA[ARRAY_SIZE(buffA)-1] = 0; + r = SetWindowTextA(edit, buffA); + expect(TRUE, r); + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + item.mask = TVIF_TEXT; + item.hItem = hRoot; + item.pszText = buffA; + item.cchTextMax = ARRAY_SIZE(buffA); + r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); + expect(TRUE, r); + todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); DestroyWindow(hTree); }

1 0

Damjan Jovanovic : comctl32: Implement treeview edit control EM_SETLIMITTEXT.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 5e2e794ad6ee346f0f8cfc1f85556105d680f5a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e2e794ad6ee346f0f8cfc1f… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:04 2019 +0200 comctl32: Implement treeview edit control EM_SETLIMITTEXT. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 2 +- dlls/comctl32/treeview.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 753c6b4327..2380c5796e 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1674,7 +1674,7 @@ static void test_itemedit(void) edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); ok(IsWindow(edit), "Expected valid handle\n"); r = SendMessageA(edit, EM_GETLIMITTEXT, 0, 0); - todo_wine expect(MAX_PATH - 1, r); + expect(MAX_PATH - 1, r); r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); expect(0, r); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 3c73964304..47623e2be2 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3967,6 +3967,7 @@ TREEVIEW_EditLabel(TREEVIEW_INFO *infoPtr, HTREEITEM hItem) infoPtr->wpEditOrig = (WNDPROC)SetWindowLongPtrW(hwndEdit, GWLP_WNDPROC, (DWORD_PTR) TREEVIEW_Edit_SubclassProc); + SendMessageW(hwndEdit, EM_SETLIMITTEXT, MAX_PATH - 1, 0); if (hItem->pszText) SetWindowTextW(hwndEdit, hItem->pszText);

1 0

Alexandre Julliard : kernel32: Get rid of LOCALE_IDEFAULTUNIXCODEPAGE.
by Alexandre Julliard 13 Nov '19

13 Nov '19

1 0

Rémi Bernon : user32/tests: Add optional messages to test sequences.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: fdfc6022841e15e11f41c43e9f71ba9ead72f9be URL: https://source.winehq.org/git/wine.git/?a=commit;h=fdfc6022841e15e11f41c43e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:42:05 2019 +0100 user32/tests: Add optional messages to test sequences. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index dc5b0ff3ed..c0ba5834cf 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -962,6 +962,12 @@ static const struct message WmShowPopupExtremeLocationSeq[] = { { HCBT_ACTIVATE, hook }, { WM_WINDOWPOSCHANGING, sent|optional }, { WM_QUERYNEWPALETTE, sent|optional }, + + /* occasionally received on test machines */ + { WM_NCPAINT, sent|optional }, + { WM_ERASEBKGND, sent|optional }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { WM_ACTIVATEAPP, sent }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent }, @@ -7879,6 +7885,7 @@ static const struct message WmParentPaintNc[] = { { WM_NCPAINT, sent|beginpaint }, { WM_GETTEXT, sent|beginpaint|defwinproc|optional }, { WM_ERASEBKGND, sent|beginpaint|optional }, + { WM_GETMINMAXINFO, sent|optional }, { 0 } }; @@ -12731,6 +12738,7 @@ static void test_notify_message(void) } static const struct message WmMouseHoverSeq[] = { + { WM_GETMINMAXINFO, sent|optional }, /* sometimes seen on w1064v1809 */ { WM_MOUSEACTIVATE, sent|optional }, /* we can get those when moving the mouse in focus-follow-mouse mode under X11 */ { WM_MOUSEACTIVATE, sent|optional }, { WM_TIMER, sent|optional }, /* XP sends it */ @@ -13762,6 +13770,7 @@ static const struct message WmCreateDialogParamSeq_4[] = { { WM_QUERYNEWPALETTE, sent|parent|optional }, /* TODO: this message should not be sent */ { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGING, sent|parent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, + { WM_WINDOWPOSCHANGED, sent|parent|wparam|optional, SWP_NOREDRAW|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, { WM_ACTIVATEAPP, sent|parent|wparam, 1 }, { WM_NCACTIVATE, sent|parent }, { WM_ACTIVATE, sent|parent|wparam, 1 }, @@ -17751,6 +17760,10 @@ static const struct message WmRestoreMinimizedSeq[] = { WM_SYSKEYUP, sent|optional }, { HCBT_KEYSKIPPED, hook|optional }, { WM_KEYUP, sent|optional }, + { HCBT_KEYSKIPPED, hook|optional }, + { WM_SYSKEYUP, sent|optional }, + { HCBT_KEYSKIPPED, hook|optional }, + { WM_KEYUP, sent|optional }, { WM_PAINT, sent| optional }, { 0 } };

1 0

Rémi Bernon : user32/tests: Wait longer for injected mouse event to take effect.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: c1b8deeff003b7face44ad7524ce751e994952c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1b8deeff003b7face44ad75… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:42:04 2019 +0100 user32/tests: Wait longer for injected mouse event to take effect. Also rework the wait loop a bit, the delay was weird. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 45c6787c16..dc5b0ff3ed 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12300,15 +12300,15 @@ done: static void wait_move_event(HWND hwnd, int x, int y) { MSG msg; - DWORD time; + DWORD timeout = GetTickCount() + 500, delay; BOOL ret; - time = GetTickCount(); - while (GetTickCount() - time < 200) { - ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); + while ((delay = timeout - GetTickCount()) > 0) + { + ret = PeekMessageA(&msg, hwnd, WM_MOUSEMOVE, WM_MOUSEMOVE, PM_NOREMOVE); if (ret && msg.pt.x > x && msg.pt.y > y) break; - if (!ret) MsgWaitForMultipleObjects( 0, NULL, FALSE, GetTickCount() - time, QS_ALLINPUT ); - else Sleep( GetTickCount() - time ); + if (!ret) MsgWaitForMultipleObjects( 0, NULL, FALSE, delay, QS_ALLINPUT ); + else Sleep( delay ); } }

1 0

Rémi Bernon : user32/tests: Synchronize with other thread between SendMessage calls.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 0779443518ac363418b5d308e757de447b116370 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0779443518ac363418b5d308… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:42:03 2019 +0100 user32/tests: Synchronize with other thread between SendMessage calls. This sometimes fails on Windows because we check the queue status before the other thread second call to SendMessage has been made (or received). Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ad4ff7d2a7..45c6787c16 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17466,6 +17466,7 @@ static DWORD WINAPI SendMessage_thread_1(void *param) trace("thread: call SendMessage\n"); SendMessageA(wnd_event->hwnd, WM_USER+2, 0, 0); + SetEvent(wnd_event->stop_event); trace("thread: call SendMessage\n"); SendMessageA(wnd_event->hwnd, WM_USER+3, 0, 0); @@ -17492,6 +17493,7 @@ static DWORD WINAPI SendMessage_thread_2(void *param) trace("thread: call SendMessage\n"); SendMessageA(wnd_event->hwnd, WM_USER+2, 0, 0); + SetEvent(wnd_event->stop_event); trace("thread: call SendMessage\n"); SendMessageA(wnd_event->hwnd, WM_USER+3, 0, 0); @@ -17508,6 +17510,7 @@ static void test_SendMessage_other_thread(int thread_n) MSG msg; wnd_event.start_event = CreateEventA(NULL, 0, 0, NULL); + wnd_event.stop_event = CreateEventA(NULL, 0, 0, NULL); wnd_event.hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); @@ -17542,6 +17545,10 @@ static void test_SendMessage_other_thread(int thread_n) DispatchMessageA(&msg); ok_sequence(send_message_1, "SendMessage from other thread 1", thread_n == 2); + ret = WaitForSingleObject(wnd_event.stop_event, 100); + todo_wine_if (thread_n == 2) + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed, ret:%x\n", ret); + /* intentionally yield */ MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); @@ -17578,6 +17585,9 @@ todo_wine_if (thread_n == 2) flush_events(); flush_sequence(); + + CloseHandle(wnd_event.start_event); + CloseHandle(wnd_event.stop_event); } static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp )

1 0

Rémi Bernon : user32/tests: Make the test_PeekMessage3 timer fire less often.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 19c107335e9aa269bcbe282bee8b97575c7b0bb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=19c107335e9aa269bcbe282b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:42:01 2019 +0100 user32/tests: Make the test_PeekMessage3 timer fire less often. On Windows it sometimes fires again before we get the expected WM_USER message and/or before the end of the test where we don't expect any more message. We cannot fire it only once because Wine doesn't pass the tests yet and it would block otherwise, but fire it less often helps the test to pass on Windows. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2226f4ff08..ad4ff7d2a7 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -12420,7 +12420,7 @@ static void test_PeekMessage3(void) /* GetMessage() and PeekMessage(..., PM_REMOVE) should prefer messages which * were already seen. */ - SetTimer(hwnd, 1, 0, NULL); + SetTimer(hwnd, 1, 100, NULL); while (!PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE)); ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); PostMessageA(hwnd, WM_USER, 0, 0); @@ -12436,7 +12436,7 @@ static void test_PeekMessage3(void) ret = PeekMessageA(&msg, NULL, 0, 0, 0); ok(!ret, "expected PeekMessage to return FALSE, got %u\n", ret); - SetTimer(hwnd, 1, 0, NULL); + SetTimer(hwnd, 1, 100, NULL); while (!PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE)); ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); PostMessageA(hwnd, WM_USER, 0, 0); @@ -12451,7 +12451,7 @@ static void test_PeekMessage3(void) /* It doesn't matter if a message range is specified or not. */ - SetTimer(hwnd, 1, 0, NULL); + SetTimer(hwnd, 1, 100, NULL); while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); PostMessageA(hwnd, WM_USER, 0, 0); @@ -12467,7 +12467,7 @@ static void test_PeekMessage3(void) /* But not if the post messages were added before the PeekMessage() call. */ PostMessageA(hwnd, WM_USER, 0, 0); - SetTimer(hwnd, 1, 0, NULL); + SetTimer(hwnd, 1, 100, NULL); while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); ret = GetMessageA(&msg, NULL, 0, 0); @@ -12480,7 +12480,7 @@ static void test_PeekMessage3(void) /* More complicated test with multiple messages. */ PostMessageA(hwnd, WM_USER, 0, 0); - SetTimer(hwnd, 1, 0, NULL); + SetTimer(hwnd, 1, 100, NULL); while (!PeekMessageA(&msg, NULL, WM_TIMER, WM_TIMER, PM_NOREMOVE)); ok(msg.message == WM_TIMER, "msg.message = %u instead of WM_TIMER\n", msg.message); PostMessageA(hwnd, WM_USER + 1, 0, 0);

1 0

Rémi Bernon : user32/tests: Ignore WM_WININICHANGE message in test sequences.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 1450924e5985c04692ca6eae8d3834f40bda5de6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1450924e5985c04692ca6eae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:42:00 2019 +0100 user32/tests: Ignore WM_WININICHANGE message in test sequences. Tests sometimes fail because of an unexpected 0x001a message. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 39d7e1a0a1..2226f4ff08 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2085,7 +2085,8 @@ static BOOL ignore_message( UINT message ) message == WM_TIMECHANGE || message == WM_DISPLAYCHANGE || message == WM_DEVICECHANGE || - message == WM_DWMNCRENDERINGCHANGED); + message == WM_DWMNCRENDERINGCHANGED || + message == WM_WININICHANGE); } static unsigned hash_Ly_W(const WCHAR *str)

1 0

Rémi Bernon : user32/tests: Close event at the end of the test_WaitForInputIdle test.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 8134b8b6f50fb5528bcb1cbe316d29a3421b4baf URL: https://source.winehq.org/git/wine.git/?a=commit;h=8134b8b6f50fb5528bcb1cbe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:41:58 2019 +0100 user32/tests: Close event at the end of the test_WaitForInputIdle test. There's some random timeout failures on Windows VMs in this test, this is probably not going to fix them, but cleaning up is not going to hurt. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f136ea1166..39d7e1a0a1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16315,6 +16315,7 @@ static void test_WaitForInputIdle( char *argv0 ) CloseHandle( pi.hThread ); } } + CloseHandle( end_event ); CloseHandle( start_event ); PostThreadMessageA( id, WM_QUIT, 0, 0 ); WaitForSingleObject( thread, 10000 );

1 0

Rémi Bernon : user32/tests: Synchronize with the SendMessageTimeout thread.
by Alexandre Julliard 13 Nov '19

13 Nov '19

Module: wine Branch: master Commit: 41094ed5ba91935345f9aeb435a7df09b17686d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41094ed5ba91935345f9aeb4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:41:56 2019 +0100 user32/tests: Synchronize with the SendMessageTimeout thread. We wait a bit after starting the thread, but sometimes the test fails because we didn't wait long enough. This synchronizes the Sleep and the SendMessageTimeout calls. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 26d3abee0f..f136ea1166 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11355,12 +11355,14 @@ struct sendmsg_info HWND hwnd; DWORD timeout; DWORD ret; + HANDLE ready; }; static DWORD CALLBACK send_msg_thread( LPVOID arg ) { struct sendmsg_info *info = arg; SetLastError( 0xdeadbeef ); + SetEvent( info->ready ); info->ret = SendMessageTimeoutA( info->hwnd, WM_USER, 0, 0, 0, info->timeout, NULL ); if (!info->ret) ok( GetLastError() == ERROR_TIMEOUT || broken(GetLastError() == 0), /* win9x */ @@ -11390,6 +11392,7 @@ static void test_SendMessageTimeout(void) DWORD tid; BOOL is_win9x; + info.ready = CreateEventA( NULL, 0, 0, NULL ); info.hwnd = CreateWindowA( "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); flush_events(); @@ -11397,7 +11400,9 @@ static void test_SendMessageTimeout(void) info.timeout = 1000; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); wait_for_thread( thread ); CloseHandle( thread ); ok( info.ret == 1, "SendMessageTimeout failed\n" ); @@ -11405,7 +11410,9 @@ static void test_SendMessageTimeout(void) info.timeout = 1; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); Sleep(100); /* SendMessageTimeout should time out here */ wait_for_thread( thread ); CloseHandle( thread ); @@ -11415,7 +11422,9 @@ static void test_SendMessageTimeout(void) /* 0 means infinite timeout (but not on win9x) */ info.timeout = 0; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); Sleep(100); wait_for_thread( thread ); CloseHandle( thread ); @@ -11426,7 +11435,9 @@ static void test_SendMessageTimeout(void) /* timeout is treated as signed despite the prototype (but not on win9x) */ info.timeout = 0x7fffffff; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); Sleep(100); wait_for_thread( thread ); CloseHandle( thread ); @@ -11435,7 +11446,9 @@ static void test_SendMessageTimeout(void) info.timeout = 0x80000000; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); Sleep(100); wait_for_thread( thread ); CloseHandle( thread ); @@ -11454,7 +11467,9 @@ static void test_SendMessageTimeout(void) SetWindowLongPtrA( info.hwnd, GWLP_WNDPROC, (LONG_PTR)send_msg_delay_proc ); info.timeout = 100; info.ret = 0xdeadbeef; + ResetEvent( info.ready ); thread = CreateThread( NULL, 0, send_msg_thread, &info, 0, &tid ); + WaitForSingleObject( info.ready, INFINITE ); wait_for_thread( thread ); CloseHandle( thread ); /* we should time out but still get the message */ @@ -11462,6 +11477,7 @@ static void test_SendMessageTimeout(void) ok_sequence( WmUser, "WmUser", FALSE ); DestroyWindow( info.hwnd ); + CloseHandle( info.ready ); }

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2019