[PATCH 0/4] MR2154: user32/tests: Test WM_DEVICECHANGE Unicode conversion.

List overview All Threads

newer

older

[PATCH 0/1] MR2155: services:...

[PATCH v6 0/3] MR2105: ddraw: Add...

Zebediah Figura (＠zfigura)

10 Feb 2023 10 Feb '23

5:29 a.m.

And some cleanup.

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/2154

Show replies by date

Zebediah Figura

10 Feb 10 Feb

5:29 a.m.

New subject: [PATCH 1/4] user32/tests: Add a register_class() helper.

From: Zebediah Figura zfigura@codeweavers.com

--- dlls/user32/tests/msg.c | 80 +++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 35e4f0dd1f8..33df0f9a96a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -119,6 +119,13 @@ static const WCHAR testWindowClassW[] =

static LRESULT WINAPI ParentMsgCheckProcA(HWND, UINT, WPARAM, LPARAM);

+static void register_class(const WNDCLASSA *class) +{ + BOOL ret = RegisterClassA(class); + ok(ret, "Failed to register class %s, error %lu.\n", + debugstr_a(class->lpszClassName), GetLastError()); +} + /* FIXME: add tests for these Window Edge Styles (Win31/Win95/98 look), in order of precedence: @@ -4099,7 +4106,7 @@ static LRESULT WINAPI mdi_frame_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, return ret; }

-static BOOL mdi_RegisterWindowClasses(void) +static void mdi_register_classes(void) { WNDCLASSA cls;

@@ -4113,20 +4120,18 @@ static BOOL mdi_RegisterWindowClasses(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "MDI_frame_class"; - if (!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = mdi_child_wnd_proc; cls.lpszClassName = "MDI_child_class"; - if (!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

if (!GetClassInfoA(0, "MDIClient", &cls)) assert(0); old_mdi_client_proc = cls.lpfnWndProc; cls.hInstance = GetModuleHandleA(0); cls.lpfnWndProc = mdi_client_hook_proc; cls.lpszClassName = "MDI_client_class"; - if (!RegisterClassA(&cls)) assert(0); - - return TRUE; + register_class(&cls); }

static void test_mdi_messages(void) @@ -4139,7 +4144,7 @@ static void test_mdi_messages(void) HMENU hMenu = CreateMenu(); LONG val;

- if (!mdi_RegisterWindowClasses()) assert(0); + mdi_register_classes();

flush_sequence();

@@ -6742,7 +6747,7 @@ static void subclass_button(void) cls.lpfnWndProc = button_hook_proc; cls.lpszClassName = "my_button_class"; UnregisterClassA(cls.lpszClassName, cls.hInstance); - if (!RegisterClassA(&cls)) assert(0); + register_class(&cls); }

static void test_button_messages(void) @@ -7672,7 +7677,7 @@ static void subclass_static(void) cls.lpfnWndProc = static_hook_proc; cls.lpszClassName = "my_static_class"; UnregisterClassA(cls.lpszClassName, cls.hInstance); - if (!RegisterClassA(&cls)) assert(0); + register_class(&cls); }

static void test_static_messages(void) @@ -7947,7 +7952,7 @@ static void subclass_combobox(void) cls.lpfnWndProc = combobox_hook_proc; cls.lpszClassName = "my_combobox_class"; UnregisterClassA(cls.lpszClassName, cls.hInstance); - if (!RegisterClassA(&cls)) assert(0); + register_class(&cls); }

static void test_combobox_messages(void) @@ -8129,7 +8134,7 @@ static void register_wmime_keydown_class(void) cls.lpfnWndProc = wmime_keydown_procA; cls.hInstance = GetModuleHandleA(0); cls.lpszClassName = "wmime_keydown_class"; - if (!RegisterClassA(&cls)) assert(0); + register_class(&cls); }

static void test_wmime_keydown_message(void) @@ -10817,7 +10822,7 @@ static LRESULT WINAPI HotkeyMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam return ret; }

-static BOOL RegisterWindowClasses(void) +static void register_classes(void) { WNDCLASSA cls; WNDCLASSW clsW; @@ -10832,39 +10837,39 @@ static BOOL RegisterWindowClasses(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "TestWindowClass"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = HotkeyMsgCheckProcA; cls.lpszClassName = "HotkeyWindowClass"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = ShowWindowProcA; cls.lpszClassName = "ShowWindowClass"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = PopupMsgCheckProcA; cls.lpszClassName = "TestPopupClass"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = ParentMsgCheckProcA; cls.lpszClassName = "TestParentClass"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = StopQuitMsgCheckProcA; cls.lpszClassName = "StopQuitClass"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = DefWindowProcA; cls.lpszClassName = "SimpleWindowClass"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = PaintLoopProcA; cls.lpszClassName = "PaintLoopWindowClass"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.style = CS_NOCLOSE; cls.lpszClassName = "NoCloseWindowClass"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

ok(GetClassInfoA(0, "#32770", &cls), "GetClassInfo failed\n"); cls.style = 0; @@ -10872,27 +10877,27 @@ static BOOL RegisterWindowClasses(void) cls.hbrBackground = 0; cls.lpfnWndProc = TestDlgProcA; cls.lpszClassName = "TestDialogClass"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = DefWindowProcA; cls.style = CS_PARENTDC; cls.lpszClassName = "SimpleWindowClassWithParentDC"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = DefWindowProcA; cls.style = CS_HREDRAW; cls.lpszClassName = "SimpleWindowClassWithHRedraw"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = DefWindowProcA; cls.style = CS_VREDRAW; cls.lpszClassName = "SimpleWindowClassWithVRedraw"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

cls.lpfnWndProc = DefWindowProcA; cls.style = CS_HREDRAW | CS_VREDRAW; cls.lpszClassName = "SimpleWindowClassWithHVRedraw"; - if(!RegisterClassA(&cls)) return FALSE; + register_class(&cls);

clsW.style = 0; clsW.lpfnWndProc = MsgCheckProcW; @@ -10905,8 +10910,6 @@ static BOOL RegisterWindowClasses(void) clsW.lpszMenuName = NULL; clsW.lpszClassName = testWindowClassW; RegisterClassW(&clsW); /* ignore error, this fails on Win9x */ - - return TRUE; }

static BOOL is_our_logged_class(HWND hwnd) @@ -12816,7 +12819,7 @@ static void subclass_edit(void) cls.lpfnWndProc = edit_hook_proc; cls.lpszClassName = "my_edit_class"; UnregisterClassA(cls.lpszClassName, cls.hInstance); - if (!RegisterClassA(&cls)) assert(0); + register_class(&cls); }

static void test_edit_messages(void) @@ -15143,7 +15146,7 @@ static void test_dialog_messages(void) cls.hInstance = GetModuleHandleA(NULL); /* need a cast since a dlgproc is used as a wndproc */ cls.lpfnWndProc = (WNDPROC)test_dlg_proc; - if (!RegisterClassA(&cls)) assert(0); + register_class(&cls);

SetFocus(0); flush_sequence(); @@ -15183,7 +15186,7 @@ static void test_dialog_messages(void)

UnregisterClassA( cls.lpszClassName, cls.hInstance ); cls.lpfnWndProc = test_dlg_proc4; - ok( RegisterClassA(&cls), "failed to register class again\n" ); + register_class(&cls); hdlg = CreateDialogParamA(0, "FOCUS_TEST_DIALOG_4", 0, test_dlg_proc3, 0); ok(IsWindow(hdlg), "CreateDialogParam failed\n"); ok_sequence(WmCreateDialogParamSeq_4, "CreateDialogParam_4", TRUE); @@ -15296,7 +15299,7 @@ static void test_EndDialog(void) cls.lpszClassName = "MyDialogClass"; cls.hInstance = GetModuleHandleA(NULL); cls.lpfnWndProc = (WNDPROC)test_dlg_proc; - if (!RegisterClassA(&cls)) assert(0); + register_class(&cls);

flush_sequence(); SetForegroundWindow(hother); @@ -16641,7 +16644,7 @@ static void test_menu_messages(void) cls.lpszMenuName = NULL; cls.lpszClassName = "TestMenuClass"; UnregisterClassA(cls.lpszClassName, cls.hInstance); - if (!RegisterClassA(&cls)) assert(0); + register_class(&cls);

SetLastError(0xdeadbeef); hwnd = CreateWindowExA(0, "TestMenuClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, @@ -17112,8 +17115,7 @@ static void test_desktop_winproc(void) cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszClassName = "TestDesktopClass"; - ret = !!RegisterClassA(&cls); - ok(ret, "Failed to register class.\n"); + register_class(&cls);

hwnd = CreateWindowExA(0, cls.lpszClassName, "test_desktop_wndproc", WS_VISIBLE | WS_CAPTION | WS_OVERLAPPEDWINDOW, 0, 0, 500, 100, 0, 0, 0, NULL); @@ -17601,7 +17603,7 @@ static void do_wait_idle_child( int arg ) cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.lpszClassName = "TestClass"; - RegisterClassA( &cls ); + register_class(&cls);

PeekMessageA( &msg, 0, 0, 0, PM_NOREMOVE ); /* create the msg queue */

@@ -17758,7 +17760,7 @@ static DWORD CALLBACK wait_idle_thread( void *arg ) cls.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.lpszClassName = "TestClass"; - RegisterClassA( &cls ); + register_class(&cls);

hwnd = CreateWindowExA(0, "TestClass", NULL, WS_POPUP, 0, 0, 10, 10, 0, 0, 0, NULL); while (GetMessageA( &msg, 0, 0, 0 )) DispatchMessageA( &msg ); @@ -19306,7 +19308,7 @@ static void test_InSendMessage(void) cls.lpfnWndProc = insendmessage_wnd_proc; cls.hInstance = GetModuleHandleA(NULL); cls.lpszClassName = "InSendMessage_test"; - RegisterClassA(&cls); + register_class(&cls);

win = CreateWindowA( "InSendMessage_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0 ); ok( win != NULL, "CreateWindow failed: %ld\n", GetLastError() ); @@ -19598,7 +19600,7 @@ START_TEST(msg) init_procs(); ImmDisableIME(0);

- if (!RegisterWindowClasses()) assert(0); + register_classes();

if (pSetWinEventHook) {

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2154

Zebediah Figura

5:29 a.m.

New subject: [PATCH 2/4] user32/tests: Use ok() instead of assert().

From: Zebediah Figura zfigura@codeweavers.com

--- dlls/user32/tests/msg.c | 108 ++++++++++++++++++++++------------------ 1 file changed, 59 insertions(+), 49 deletions(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 33df0f9a96a..e4174ebff2b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -20,7 +20,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */

-#include <assert.h> #include <limits.h> #include <stdarg.h> #include <stdio.h> @@ -2425,7 +2424,6 @@ static void add_message_(int line, const struct recvd_message *msg) sequence_size *= 2; sequence = HeapReAlloc( GetProcessHeap(), 0, sequence, sequence_size * sizeof(*sequence) ); } - assert(sequence);

seq = &sequence[sequence_cnt++]; seq->hwnd = msg->hwnd; @@ -4109,6 +4107,7 @@ static LRESULT WINAPI mdi_frame_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, static void mdi_register_classes(void) { WNDCLASSA cls; + BOOL ret;

cls.style = 0; cls.lpfnWndProc = mdi_frame_wnd_proc; @@ -4126,7 +4125,8 @@ static void mdi_register_classes(void) cls.lpszClassName = "MDI_child_class"; register_class(&cls);

- if (!GetClassInfoA(0, "MDIClient", &cls)) assert(0); + ret = GetClassInfoA(0, "MDIClient", &cls); + ok(ret, "Failed to get class info, error %lu.\n", GetLastError()); old_mdi_client_proc = cls.lpfnWndProc; cls.hInstance = GetModuleHandleA(0); cls.lpfnWndProc = mdi_client_hook_proc; @@ -4155,7 +4155,7 @@ static void test_mdi_messages(void) 100, 100, CW_USEDEFAULT, CW_USEDEFAULT, GetDesktopWindow(), hMenu, GetModuleHandleA(0), NULL); - assert(mdi_frame); + ok(!!mdi_frame, "Failed to create window, error %lu.\n", GetLastError()); ok_sequence(WmCreateMDIframeSeq, "Create MDI frame window", FALSE);

ok(GetActiveWindow() == mdi_frame, "wrong active window %p\n", GetActiveWindow()); @@ -4170,7 +4170,7 @@ static void test_mdi_messages(void) WS_CHILD | WS_VISIBLE | MDIS_ALLCHILDSTYLES, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, mdi_frame, 0, GetModuleHandleA(0), &client_cs); - assert(mdi_client); + ok(!!mdi_client, "Failed to create window, error %lu.\n", GetLastError()); SetWindowLongA(mdi_client, 0, 0xdeadbeef);

ok_sequence(WmCreateMDIclientSeq, "Create visible MDI client window", FALSE); @@ -4189,7 +4189,7 @@ static void test_mdi_messages(void) WS_CHILD, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, mdi_client, 0, GetModuleHandleA(0), NULL); - assert(mdi_child); + ok(!!mdi_child, "Failed to create window, error %lu.\n", GetLastError());

flush_sequence(); ShowWindow(mdi_child, SW_SHOWNORMAL); @@ -4230,7 +4230,7 @@ static void test_mdi_messages(void) WS_CHILD | WS_VISIBLE, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, mdi_client, 0, GetModuleHandleA(0), NULL); - assert(mdi_child); + ok(!!mdi_child, "Failed to create window, error %lu.\n", GetLastError()); ok_sequence(WmCreateMDIchildVisibleSeq, "Create visible MDI child window", FALSE);

ok(GetWindowLongA(mdi_child, GWL_STYLE) & WS_VISIBLE, "MDI child should be visible\n"); @@ -4266,7 +4266,7 @@ static void test_mdi_messages(void) WS_CHILD, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, mdi_client, 0, GetModuleHandleA(0), NULL); - assert(mdi_child2); + ok(!!mdi_child2, "Failed to create window, error %lu.\n", GetLastError()); ok_sequence(WmCreateMDIchildInvisibleSeq, "Create invisible MDI child window", FALSE);

ok(!(GetWindowLongA(mdi_child2, GWL_STYLE) & WS_VISIBLE), "MDI child should not be visible\n"); @@ -4430,7 +4430,7 @@ static void test_mdi_messages(void) WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_MAXIMIZE, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, mdi_client, 0, GetModuleHandleA(0), NULL); - assert(mdi_child); + ok(!!mdi_child, "Failed to create window, error %lu.\n", GetLastError()); ok_sequence(WmCreateMDIchildVisibleMaxSeq1, "Create maximized visible 1st MDI child window", TRUE); ok(IsZoomed(mdi_child), "1st MDI child should be maximized\n");

@@ -4449,7 +4449,7 @@ static void test_mdi_messages(void) WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_MAXIMIZE, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, mdi_client, 0, GetModuleHandleA(0), NULL); - assert(mdi_child2); + ok(!!mdi_child2, "Failed to create window, error %lu.\n", GetLastError()); ok_sequence(WmCreateMDIchildVisibleMaxSeq2, "Create maximized visible 2nd MDI child 2 window", TRUE); ok(IsZoomed(mdi_child2), "2nd MDI child should be maximized\n"); ok(!IsZoomed(mdi_child), "1st MDI child should NOT be maximized\n"); @@ -4492,7 +4492,7 @@ static void test_mdi_messages(void) WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_MAXIMIZE, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, mdi_client, 0, GetModuleHandleA(0), NULL); - assert(mdi_child2); + ok(!!mdi_child2, "Failed to create window, error %lu.\n", GetLastError()); ok_sequence(WmCreateMDIchildVisibleMaxSeq2, "Create maximized visible 2nd MDI child 2 window", TRUE); ok(IsZoomed(mdi_child2), "2nd MDI child should be maximized\n"); ok(!IsZoomed(mdi_child), "1st MDI child should NOT be maximized\n"); @@ -4538,7 +4538,7 @@ static void test_mdi_messages(void) WS_CHILD | WS_MAXIMIZE | WS_CAPTION | WS_THICKFRAME, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, mdi_client, 0, GetModuleHandleA(0), NULL); - assert(mdi_child2); + ok(!!mdi_child2, "Failed to create window, error %lu.\n", GetLastError()); ok_sequence(WmCreateMDIchildInvisibleMaxSeq4, "Create maximized invisible MDI child window", FALSE); ok(IsZoomed(mdi_child2), "MDI child should be maximized\n"); ok(!(GetWindowLongA(mdi_child2, GWL_STYLE) & WS_VISIBLE), "MDI child should be not visible\n"); @@ -4576,7 +4576,7 @@ static void test_mdi_messages(void) WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_MAXIMIZE, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, mdi_client, 0, GetModuleHandleA(0), NULL); - assert(mdi_child); + ok(!!mdi_child, "Failed to create window, error %lu.\n", GetLastError()); ok_sequence(WmCreateMDIchildVisibleMaxSeq1, "Create maximized visible 1st MDI child window(Switch test)", TRUE); ok(IsZoomed(mdi_child), "1st MDI child should be maximized(Switch test)\n");

@@ -4595,7 +4595,7 @@ static void test_mdi_messages(void) WS_CHILD | WS_VISIBLE | WS_MAXIMIZEBOX | WS_MAXIMIZE, 0, 0, CW_USEDEFAULT, CW_USEDEFAULT, mdi_client, 0, GetModuleHandleA(0), NULL); - assert(mdi_child2); + ok(!!mdi_child2, "Failed to create window, error %lu.\n", GetLastError()); ok_sequence(WmCreateMDIchildVisibleMaxSeq2, "Create maximized visible 2nd MDI child window (Switch test)", TRUE);

ok(IsZoomed(mdi_child2), "2nd MDI child should be maximized(Switch test)\n"); @@ -6738,8 +6738,10 @@ log_it: static void subclass_button(void) { WNDCLASSA cls; + BOOL ret;

- if (!GetClassInfoA(0, "button", &cls)) assert(0); + ret = GetClassInfoA(0, "button", &cls); + ok(ret, "Failed to get class info, error %lu.\n", GetLastError());

old_button_proc = cls.lpfnWndProc;

@@ -7668,8 +7670,10 @@ static LRESULT CALLBACK static_hook_proc(HWND hwnd, UINT message, WPARAM wParam, static void subclass_static(void) { WNDCLASSA cls; + BOOL ret;

- if (!GetClassInfoA(0, "static", &cls)) assert(0); + ret = GetClassInfoA(0, "static", &cls); + ok(ret, "Failed to get class info, error %lu.\n", GetLastError());

old_static_proc = cls.lpfnWndProc;

@@ -7943,8 +7947,10 @@ static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wPara static void subclass_combobox(void) { WNDCLASSA cls; + BOOL ret;

- if (!GetClassInfoA(0, "ComboBox", &cls)) assert(0); + ret = GetClassInfoA(0, "ComboBox", &cls); + ok(ret, "Failed to get class info, error %lu.\n", GetLastError());

old_combobox_proc = cls.lpfnWndProc;

@@ -8367,6 +8373,7 @@ static void test_paint_messages(void) { BOOL ret; RECT rect, rect2; + DWORD style; POINT pt; MSG msg; HWND hparent, hchild; @@ -8907,7 +8914,8 @@ static void test_paint_messages(void) flush_events(); ok_sequence( WmParentOnlyPaint, "WmParentOnlyPaint", FALSE );

- assert( GetWindowLongA(hparent, GWL_STYLE) & WS_CLIPCHILDREN ); + style = GetWindowLongA(hparent, GWL_STYLE); + ok(style & WS_CLIPCHILDREN, "Got unexpected style %#lx.\n", style); UpdateWindow( hparent ); flush_events(); flush_sequence(); @@ -8934,7 +8942,8 @@ static void test_paint_messages(void) flush_events(); ok_sequence( WmParentPaint, "WmParentPaint", FALSE );

- assert( !(GetWindowLongA(hparent, GWL_STYLE) & WS_CLIPCHILDREN) ); + style = GetWindowLongA(hparent, GWL_STYLE); + ok(!(style & WS_CLIPCHILDREN), "Got unexpected style %#lx.\n", style); UpdateWindow( hparent ); flush_events(); flush_sequence(); @@ -10173,7 +10182,7 @@ static void test_accelerators(void) BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); BOOL ret;

- assert(hwnd != 0); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError()); UpdateWindow(hwnd); flush_events(); flush_sequence(); @@ -10187,7 +10196,7 @@ static void test_accelerators(void) ok(state == 0, "wrong CapsLock state %04x\n", state);

hAccel = LoadAcceleratorsA(GetModuleHandleA(NULL), MAKEINTRESOURCEA(1)); - assert(hAccel != 0); + ok(!!hAccel, "Failed to load accelerators, error %lu.\n", GetLastError());

flush_events(); pump_msg_loop(hwnd, 0); @@ -10253,7 +10262,7 @@ static void test_accelerators(void) ok( ret, "DestroyAcceleratorTable error %ld\n", GetLastError());

hAccel = LoadAcceleratorsA(GetModuleHandleA(NULL), MAKEINTRESOURCEA(2)); - assert(hAccel != 0); + ok(!!hAccel, "Failed to load accelerators, error %lu.\n", GetLastError());

if (winetest_debug > 1) trace("testing VK_N press/release\n"); flush_sequence(); @@ -11157,7 +11166,7 @@ static void test_message_conversion(void) hwnd = CreateWindowW (testWindowClassW, wszUnicode, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); - assert(hwnd); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError()); flush_sequence(); lRes = SendMessageA (hwnd, WM_GETTEXTLENGTH, 0, 0); ok_sequence(WmGetTextLengthAfromW, "ANSI WM_GETTEXTLENGTH to Unicode window", FALSE); @@ -11583,10 +11592,8 @@ static DWORD WINAPI win_event_global_thread_proc(void *param) MSG msg; HANDLE hevent = *(HANDLE *)param;

- assert(pNotifyWinEvent); - hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0,0,0,0,0,0,0, NULL); - assert(hwnd); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError()); if (winetest_debug > 1) trace("created thread window %p\n", hwnd);

*(HWND *)param = hwnd; @@ -11618,7 +11625,7 @@ static DWORD WINAPI cbt_global_hook_thread_proc(void *param) */

hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0,0,0,0,0,0,0, NULL); - assert(hwnd); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError()); if (winetest_debug > 1) trace("created thread window %p\n", hwnd);

*(HWND *)param = hwnd; @@ -11649,7 +11656,7 @@ static DWORD WINAPI mouse_ll_global_thread_proc(void *param) HANDLE hevent = *(HANDLE *)param;

*(HWND *)param = hwnd; @@ -11688,7 +11695,7 @@ static void test_winevents(void) WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, NULL, NULL, 0); - assert(hwnd); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError());

/****** start of global hook test *************/ hCBT_global_hook = SetWindowsHookExA(WH_CBT, cbt_global_hook_proc, GetModuleHandleA(0), 0); @@ -11700,7 +11707,7 @@ static void test_winevents(void) }

hevent = CreateEventA(NULL, 0, 0, NULL); - assert(hevent); + ok(!!hevent, "Failed to create event, error %lu.\n", GetLastError()); hwnd2 = hevent;

hthread = CreateThread(NULL, 0, cbt_global_hook_thread_proc, &hwnd2, 0, &tid); @@ -11763,7 +11770,7 @@ static void test_winevents(void) ok(hhook != 0, "SetWinEventHook error %ld\n", GetLastError());

hevent = CreateEventA(NULL, 0, 0, NULL); - assert(hevent); + ok(!!hevent, "Failed to create event, error %lu.\n", GetLastError()); hwnd2 = hevent;

hthread = CreateThread(NULL, 0, win_event_global_thread_proc, &hwnd2, 0, &tid); @@ -11799,7 +11806,7 @@ static void test_winevents(void) ok(hhook != 0, "SetWinEventHook error %ld\n", GetLastError());

hevent = CreateEventA(NULL, 0, 0, NULL); - assert(hevent); + ok(!!hevent, "Failed to create event, error %lu.\n", GetLastError()); hwnd2 = hevent;

flush_sequence(); @@ -11846,7 +11853,7 @@ static void test_winevents(void) }

hevent = CreateEventA(NULL, 0, 0, NULL); - assert(hevent); + ok(!!hevent, "Failed to create event, error %lu.\n", GetLastError()); hwnd2 = hevent;

hthread = CreateThread(NULL, 0, mouse_ll_global_thread_proc, &hwnd2, 0, &tid); @@ -12143,19 +12150,19 @@ static void test_DestroyWindow(void)

parent = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); - assert(parent != 0); + ok(!!parent, "Failed to create window, error %lu.\n", GetLastError()); child1 = CreateWindowExA(0, "TestWindowClass", NULL, WS_CHILD, 0, 0, 50, 50, parent, (HMENU)child_id++, 0, NULL); - assert(child1 != 0); + ok(!!child1, "Failed to create window, error %lu.\n", GetLastError()); child2 = CreateWindowExA(0, "TestWindowClass", NULL, WS_CHILD, 0, 0, 50, 50, GetDesktopWindow(), (HMENU)child_id++, 0, NULL); - assert(child2 != 0); + ok(!!child2, "Failed to create window, error %lu.\n", GetLastError()); child3 = CreateWindowExA(0, "TestWindowClass", NULL, WS_CHILD, 0, 0, 50, 50, child1, (HMENU)child_id++, 0, NULL); - assert(child3 != 0); + ok(!!child3, "Failed to create window, error %lu.\n", GetLastError()); child4 = CreateWindowExA(0, "TestWindowClass", NULL, WS_POPUP, 0, 0, 50, 50, parent, 0, 0, NULL); - assert(child4 != 0); + ok(!!child4, "Failed to create window, error %lu.\n", GetLastError());

/* test owner/parent of child2 */ test = GetParent(child2); @@ -12810,8 +12817,10 @@ static DWORD WINAPI test_edit_ime_messages(void *unused_arg) static void subclass_edit(void) { WNDCLASSA cls; + BOOL ret;

- if (!GetClassInfoA(0, "edit", &cls)) assert(0); + ret = GetClassInfoA(0, "edit", &cls); + ok(ret, "Failed to get class info, error %lu.\n", GetLastError());

old_edit_proc = cls.lpfnWndProc;

@@ -12985,8 +12994,7 @@ static DWORD CALLBACK send_msg_thread_2(void *param) break;

default: - if (winetest_debug > 1) trace("unexpected return: %04lx\n", ret); - assert(0); + ok(0, "Unexpected return %#lx.\n", ret); break; } } @@ -13005,7 +13013,7 @@ static void test_PeekMessage(void)

info.hwnd = CreateWindowA("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, 100, 100, 200, 200, 0, 0, 0, NULL); - assert(info.hwnd); + ok(!!info.hwnd, "Failed to create window, error %lu.\n", GetLastError()); ShowWindow(info.hwnd, SW_SHOW); UpdateWindow(info.hwnd); SetFocus(info.hwnd); @@ -13518,7 +13526,7 @@ static void test_PeekMessage2(void) /* Initialise window and make sure it is ready for events */ hwnd = CreateWindowA("TestWindowClass", "PeekMessage2", WS_OVERLAPPEDWINDOW, 10, 10, 800, 800, NULL, NULL, NULL, NULL); - assert(hwnd); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError()); if (winetest_debug > 1) trace("Window for test_PeekMessage2 %p\n", hwnd); ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); @@ -14042,13 +14050,13 @@ static void test_TrackMouseEvent(void) WS_OVERLAPPEDWINDOW | WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 300, 300, 0, NULL, NULL, 0); - assert(hwnd); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError());

hchild = CreateWindowExA(0, "TestWindowClass", NULL, WS_CHILD | WS_BORDER | WS_VISIBLE, 50, 50, 200, 200, hwnd, NULL, NULL, 0); - assert(hchild); + ok(!!hchild, "Failed to create window, error %lu.\n", GetLastError());

SetWindowPos( hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE ); flush_events(); @@ -14712,7 +14720,7 @@ static void test_ShowWindow(void) hwnd = CreateWindowExA(0, "ShowWindowClass", NULL, WS_BASE, 120, 120, 90, 90, 0, 0, 0, NULL); - assert(hwnd); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError());

style = GetWindowLongA(hwnd, GWL_STYLE) & ~WS_BASE; ok(style == 0, "expected style 0, got %08lx\n", style); @@ -16953,7 +16961,7 @@ static void test_defwinproc(void)

hwnd = CreateWindowExA(0, "TestWindowClass", "test_defwndproc", WS_VISIBLE | WS_CAPTION | WS_OVERLAPPEDWINDOW, 0,0,500,100,0,0,0, NULL); - assert(hwnd); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError()); flush_events();

buffA[0] = 0; @@ -17220,16 +17228,18 @@ static void test_clipboard_viewers(void) WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, GetDesktopWindow(), NULL, hInst, NULL); + ok(!!hWnd1, "Failed to create window, error %lu.\n", GetLastError()); hWnd2 = CreateWindowExA(0, "SimpleWindowClass", "Clipboard viewer test wnd 2", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, GetDesktopWindow(), NULL, hInst, NULL); + ok(!!hWnd2, "Failed to create window, error %lu.\n", GetLastError()); hWnd3 = CreateWindowExA(0, "SimpleWindowClass", "Clipboard viewer test wnd 3", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, GetDesktopWindow(), NULL, hInst, NULL); + ok(!!hWnd3, "Failed to create window, error %lu.\n", GetLastError()); if (winetest_debug > 1) trace("clipbd viewers: hWnd1=%p, hWnd2=%p, hWnd3=%p\n", hWnd1, hWnd2, hWnd3); - assert(hWnd1 && hWnd2 && hWnd3);

CountClipboardFormats(); /* Ensure that we do not have an X11 update to the clipboard */ flush_sequence(); @@ -17349,7 +17359,7 @@ static void test_PostMessage(void) win_skip("Skipping some PostMessage tests on Win9x/WinMe\n"); return; } - assert(hwnd); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError());

flush_events();

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2154

Zebediah Figura

5:29 a.m.

New subject: [PATCH 3/4] user32/tests: Avoid leaking a window in test_message_conversion().

From: Zebediah Figura zfigura@codeweavers.com

--- dlls/user32/tests/msg.c | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e4174ebff2b..268ed9d8b8f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11161,6 +11161,8 @@ static void test_message_conversion(void) ok(lRes == 0 && (GetLastError() == ERROR_MESSAGE_SYNC_ONLY || GetLastError() == ERROR_INVALID_PARAMETER), "SendMessageCallback on sync only message returned %Id, last error %ld\n", lRes, GetLastError());

+ DestroyWindow(hwnd); + /* Check WM_GETTEXTLENGTH A->W behaviour, whether WM_GETTEXT is also sent or not */

hwnd = CreateWindowW (testWindowClassW, wszUnicode,

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2154

Zebediah Figura

5:29 a.m.

New subject: [PATCH 4/4] user32/tests: Test WM_DEVICECHANGE Unicode conversion.

From: Zebediah Figura zfigura@codeweavers.com

--- dlls/user32/tests/msg.c | 47 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 268ed9d8b8f..cca211cc22a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -22,6 +22,7 @@

#include <limits.h> #include <stdarg.h> +#include <stdbool.h> #include <stdio.h>

#include "windef.h" @@ -11038,8 +11039,14 @@ static void CALLBACK win_event_proc(HWINEVENTHOOK hevent, static const WCHAR wszUnicode[] = {'U','n','i','c','o','d','e',0}; static const WCHAR wszAnsi[] = {'U',0};

+static const GUID iface_guid = {0x66666666}; +static bool got_device_broadcast; + static LRESULT CALLBACK MsgConversionProcW(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + const DEV_BROADCAST_DEVICEINTERFACE_A *ifaceA = (const void *)lParam; + const DEV_BROADCAST_DEVICEINTERFACE_W *ifaceW = (const void *)lParam; + switch (uMsg) { case CB_FINDSTRINGEXACT: @@ -11048,6 +11055,30 @@ static LRESULT CALLBACK MsgConversionProcW(HWND hwnd, UINT uMsg, WPARAM wParam, if (!lstrcmpW((LPCWSTR)lParam, wszAnsi)) return 0; return -1; + + case WM_DEVICECHANGE: + if (wParam == DBT_DEVICEARRIVAL && IsEqualGUID(&ifaceA->dbcc_classguid, &iface_guid)) + { + DWORD expect_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, dbcc_name[strlen(ifaceA->dbcc_name)]); + + ok(ifaceA->dbcc_size == expect_size, "Expected %lu, got %lu.\n", expect_size, ifaceA->dbcc_size); + ok(ifaceA->dbcc_devicetype == DBT_DEVTYP_DEVICEINTERFACE, + "Got notification type %#lx.\n", ifaceA->dbcc_devicetype); + ok(!ifaceA->dbcc_reserved, "Got reserved %#lx.\n", ifaceA->dbcc_reserved); + ok(!strcmp(ifaceA->dbcc_name, "test name"), "Got name %s.\n", debugstr_a(ifaceA->dbcc_name)); + return 2; + } + else if (wParam == DBT_CUSTOMEVENT && IsEqualGUID(&ifaceA->dbcc_classguid, &iface_guid)) + { + DWORD expect_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[wcslen(ifaceW->dbcc_name) + 1]); + + ok(ifaceW->dbcc_size == expect_size, "Expected %lu, got %lu.\n", expect_size, ifaceW->dbcc_size); + ok(ifaceW->dbcc_devicetype == DBT_DEVTYP_DEVICEINTERFACE, + "Got notification type %#lx.\n", ifaceW->dbcc_devicetype); + ok(!ifaceW->dbcc_reserved, "Got reserved %#lx.\n", ifaceW->dbcc_reserved); + ok(!wcscmp(ifaceW->dbcc_name, L"test name"), "Got name %s.\n", debugstr_w(ifaceW->dbcc_name)); + got_device_broadcast = true; + } } return DefWindowProcW(hwnd, uMsg, wParam, lParam); } @@ -11079,6 +11110,8 @@ static void test_message_conversion(void) { static const WCHAR wszMsgConversionClass[] = {'M','s','g','C','o','n','v','e','r','s','i','o','n','C','l','a','s','s',0}; + char buffer[200]; + DEV_BROADCAST_DEVICEINTERFACE_A *dev_interface = (void *)buffer; WNDCLASSW cls; LRESULT lRes; HWND hwnd; @@ -11161,6 +11194,20 @@ static void test_message_conversion(void) ok(lRes == 0 && (GetLastError() == ERROR_MESSAGE_SYNC_ONLY || GetLastError() == ERROR_INVALID_PARAMETER), "SendMessageCallback on sync only message returned %Id, last error %ld\n", lRes, GetLastError());

+ /* Test WM_DEVICECHANGE. */ + + dev_interface->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; + dev_interface->dbcc_reserved = 0; + dev_interface->dbcc_classguid = iface_guid; + strcpy(dev_interface->dbcc_name, "test name"); + dev_interface->dbcc_size = offsetof(DEV_BROADCAST_DEVICEINTERFACE_A, + dbcc_name[strlen(dev_interface->dbcc_name)]); + lRes = SendMessageA(hwnd, WM_DEVICECHANGE, DBT_DEVICEARRIVAL, (LPARAM)dev_interface); + ok(lRes == 2, "Got %Id, error %lu.\n", lRes, GetLastError()); + lRes = BroadcastSystemMessageA(0, NULL, WM_DEVICECHANGE, DBT_CUSTOMEVENT, (LPARAM)dev_interface); + todo_wine ok(!lRes, "Got %Id, error %lu.\n", lRes, GetLastError()); + todo_wine ok(got_device_broadcast, "Device broadcast was not received.\n"); + DestroyWindow(hwnd);

/* Check WM_GETTEXTLENGTH A->W behaviour, whether WM_GETTEXT is also sent or not */

-- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2154

Marvin

5:54 a.m.

New subject: [PATCH 4/4] user32/tests: Test WM_DEVICECHANGE Unicode conversion.

Hi,

It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=129281

Your paranoid android.

=== w7u_2qxl (32 bit report) ===

user32: msg.c:11208: Test failed: Got 1, error 1159.

=== w7u_el (32 bit report) ===

user32: msg.c:11208: Test failed: Got 1, error 1159.

=== w1064v1507 (32 bit report) ===