November 2019 - Wine-Commits

Zebediah Figura : d3d8: Handle stateblocks in d3d8_device_SetStreamSource().
by Alexandre Julliard Nov. 13, 2019

Nov. 13, 2019

Module: wine Branch: master Commit: 9aef32c7337f252e8d1ff731fd73be043961ef85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aef32c7337f252e8d1ff731… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Nov 11 19:56:00 2019 -0600 d3d8: Handle stateblocks in d3d8_device_SetStreamSource(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 5f2235fb72..00539fdd07 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3347,13 +3347,17 @@ static HRESULT WINAPI d3d8_device_SetStreamSource(IDirect3DDevice8 *iface, else wined3d_buffer = buffer_impl->wined3d_buffer; - hr = wined3d_device_set_stream_source(device->wined3d_device, stream_idx, wined3d_buffer, 0, stride); + hr = wined3d_stateblock_set_stream_source(device->update_state, stream_idx, wined3d_buffer, 0, stride); if (SUCCEEDED(hr) && !device->recording) { - if (buffer_impl && buffer_impl->draw_buffer) - device->sysmem_vb |= (1u << stream_idx); - else - device->sysmem_vb &= ~(1u << stream_idx); + hr = wined3d_device_set_stream_source(device->wined3d_device, stream_idx, wined3d_buffer, 0, stride); + if (SUCCEEDED(hr)) + { + if (buffer_impl && buffer_impl->draw_buffer) + device->sysmem_vb |= (1u << stream_idx); + else + device->sysmem_vb &= ~(1u << stream_idx); + } } wined3d_mutex_unlock();

1 0

Damjan Jovanovic : comctl32: Test overwriting of pszText contents in TVN_ENDLABELEDIT.
by Alexandre Julliard Nov. 13, 2019

Nov. 13, 2019

Module: wine Branch: master Commit: 1fa32f9a5396934c6788ac02402cccc020237bf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fa32f9a5396934c6788ac02… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:11 2019 +0200 comctl32: Test overwriting of pszText contents in TVN_ENDLABELEDIT. 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 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index ac5fd4d804..19ba40c64a 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -42,6 +42,7 @@ static BOOL g_get_rect_in_expand; static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; +static const char *g_endedit_overwrite_contents; static HFONT g_customdraw_font; static BOOL g_v6; @@ -1324,7 +1325,11 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, { NMTVDISPINFOA *disp = (NMTVDISPINFOA *)lParam; if (disp->item.mask & TVIF_TEXT) + { todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); + if (g_endedit_overwrite_contents) + strcpy(disp->item.pszText, g_endedit_overwrite_contents); + } return TRUE; } case TVN_ITEMEXPANDINGA: @@ -1717,6 +1722,23 @@ static void test_itemedit(void) expect(TRUE, r); todo_wine expect(MAX_PATH - 1, strlen(item.pszText)); + /* Overwriting of pszText contents in TVN_ENDLABELEDIT */ + edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); + ok(IsWindow(edit), "Expected valid handle\n"); + r = SetWindowTextA(edit, "old"); + expect(TRUE, r); + g_endedit_overwrite_contents = "<new_contents>"; + r = SendMessageA(hTree, WM_COMMAND, MAKEWPARAM(0, EN_KILLFOCUS), (LPARAM)edit); + expect(0, r); + g_endedit_overwrite_contents = NULL; + 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); + expect(0, strcmp(item.pszText, "<new_contents>")); + DestroyWindow(hTree); }

1 0

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

Nov. 13, 2019

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 text trimming and overwriting.
by Alexandre Julliard Nov. 13, 2019

Nov. 13, 2019

Module: wine Branch: master Commit: 80bd7fdd5629a89dec7ee5e14a05c2ff512301c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80bd7fdd5629a89dec7ee5e1… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Nov 13 05:54:15 2019 +0200 comctl32: Implement treeview edit control text trimming and overwriting. 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 | 8 ++++---- dlls/comctl32/treeview.c | 21 +++++++++------------ 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 82db67d5d0..eb63439f0b 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1327,7 +1327,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, NMTVDISPINFOA *disp = (NMTVDISPINFOA *)lParam; if (disp->item.mask & TVIF_TEXT) { - todo_wine ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); + ok(disp->item.cchTextMax == MAX_PATH, "cchTextMax is %d\n", disp->item.cchTextMax); if (g_endedit_overwrite_contents) strcpy(disp->item.pszText, g_endedit_overwrite_contents); if (g_endedit_overwrite_ptr) @@ -1705,7 +1705,7 @@ static void test_itemedit(void) 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)); + 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); @@ -1723,7 +1723,7 @@ static void test_itemedit(void) 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)); + expect(MAX_PATH - 1, strlen(item.pszText)); /* Overwriting of pszText contents in TVN_ENDLABELEDIT */ edit = (HWND)SendMessageA(hTree, TVM_EDITLABELA, 0, (LPARAM)hRoot); @@ -1757,7 +1757,7 @@ static void test_itemedit(void) item.cchTextMax = ARRAY_SIZE(buffA); r = SendMessageA(hTree, TVM_GETITEMA, 0, (LPARAM)&item); expect(TRUE, r); - todo_wine expect(0, strcmp(item.pszText, "<new_ptr>")); + expect(0, strcmp(item.pszText, "<new_ptr>")); DestroyWindow(hTree); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 47623e2be2..0d2c825714 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3993,8 +3993,8 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) TREEVIEW_ITEM *editedItem = infoPtr->editItem; NMTVDISPINFOW tvdi; BOOL bCommit; - WCHAR tmpText[1024] = { '\0' }; - WCHAR *newText = tmpText; + WCHAR tmpText[MAX_PATH] = { '\0' }; + WCHAR *newText; int iLength = 0; if (!IsWindow(infoPtr->hwndEdit)) return FALSE; @@ -4007,18 +4007,13 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (!bCancel) { if (!infoPtr->bNtfUnicode) - iLength = GetWindowTextA(infoPtr->hwndEdit, (LPSTR)tmpText, 1023); + iLength = GetWindowTextA(infoPtr->hwndEdit, (LPSTR)tmpText, ARRAY_SIZE(tmpText)); else - iLength = GetWindowTextW(infoPtr->hwndEdit, tmpText, 1023); - - if (iLength >= 1023) - { - ERR("Insufficient space to retrieve new item label\n"); - } + iLength = GetWindowTextW(infoPtr->hwndEdit, tmpText, ARRAY_SIZE(tmpText)); tvdi.item.mask = TVIF_TEXT; tvdi.item.pszText = tmpText; - tvdi.item.cchTextMax = iLength + 1; + tvdi.item.cchTextMax = ARRAY_SIZE(tmpText); } else { @@ -4032,11 +4027,13 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) { if (!infoPtr->bNtfUnicode) { - DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, NULL, 0 ); + DWORD len = MultiByteToWideChar( CP_ACP, 0, (LPSTR)tvdi.item.pszText, -1, NULL, 0 ); newText = heap_alloc(len * sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, (LPSTR)tmpText, -1, newText, len ); + MultiByteToWideChar( CP_ACP, 0, (LPSTR)tvdi.item.pszText, -1, newText, len ); iLength = len - 1; } + else + newText = tvdi.item.pszText; if (lstrcmpW(newText, editedItem->pszText) != 0) {

1 0

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

Nov. 13, 2019

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: Tweak test result for w1064v1809.
by Alexandre Julliard Nov. 13, 2019

Nov. 13, 2019

Module: wine Branch: master Commit: 843cadb728e04ea9d464e703fe740b5cbac0649f URL: https://source.winehq.org/git/wine.git/?a=commit;h=843cadb728e04ea9d464e703… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:41:55 2019 +0100 user32/tests: Tweak test result for w1064v1809. Seems like the wparam is not always as expected. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2b777e0c89..26d3abee0f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9059,8 +9059,8 @@ static const struct message WmShiftMouseButton[] = { { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xc0000001 }, /* XP */ { WM_KEYUP, wparam|lparam, VK_SHIFT, 0xc0000001 }, { WM_KEYUP, sent|wparam|lparam, VK_SHIFT, 0xc0000001 }, - { WM_LBUTTONUP, wparam|optional, MK_SHIFT, 0 }, /* >= w1064v1809 */ - { WM_LBUTTONUP, sent|wparam|optional, MK_SHIFT, 0 }, /* >= w1064v1809 */ + { WM_LBUTTONUP, optional, 0, 0 }, /* >= w1064v1809 */ + { WM_LBUTTONUP, sent|optional, 0, 0 }, /* >= w1064v1809 */ { 0 } }; static const struct message WmF1Seq[] = {

1 0

Rémi Bernon : user32/tests: Increase test_timers count tolerance on Windows.
by Alexandre Julliard Nov. 13, 2019

Nov. 13, 2019

Module: wine Branch: master Commit: b6f7c0a4929dafcd56cbc2cd07b391c01fae7f8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6f7c0a4929dafcd56cbc2cd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 12 21:41:54 2019 +0100 user32/tests: Increase test_timers count tolerance on Windows. Sometimes the tests fail on w1064v1809 with count equals to 54, or 53. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 193a20fd95..2b777e0c89 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -10275,8 +10275,8 @@ static void test_timers(void) while (GetTickCount()-start < 1001 && GetMessageA(&msg, info.hWnd, 0, 0)) DispatchMessageA(&msg); ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */ - || broken(abs(count-43) < TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, + || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ + || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w2k3, win8 */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); ok(KillTimer(info.hWnd, id), "KillTimer failed\n"); @@ -10345,7 +10345,8 @@ static void test_timers_no_wnd(void) while (GetTickCount()-start < 1001 && GetMessageA(&msg, NULL, 0, 0)) DispatchMessageA(&msg); ok(abs(count-TIMER_COUNT_EXPECTED) < TIMER_COUNT_TOLERANCE /* xp */ - || broken(abs(count-64) < TIMER_COUNT_TOLERANCE) /* most common */, + || broken(abs(count-64) <= TIMER_COUNT_TOLERANCE) /* most common */ + || broken(abs(count-43) <= TIMER_COUNT_TOLERANCE) /* w1064v1809 */, "did not get expected count for minimum timeout (%d != ~%d).\n", count, TIMER_COUNT_EXPECTED); KillTimer(NULL, id);

1 0

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

Nov. 13, 2019

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

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

Nov. 13, 2019

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: Wait longer for injected mouse event to take effect.
by Alexandre Julliard Nov. 13, 2019

Nov. 13, 2019

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