[PATCH 0/1] MR3750: user32: Listbox shouldn't send WM_COMMAND/LBN_DBLCLK notification if it has no items.

[Dmitry Timoshkov (＠dmitry)]

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

[PATCH 1/1] user32: Listbox shouldn't send WM_COMMAND/LBN_DBLCLK notification if it has no items.

[Dmitry Timoshkov]

From: Dmitry Timoshkov <dmitry(a)baikal.ru>

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/user32/listbox.c   |  2 +-
 dlls/user32/tests/msg.c | 70 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c
index f6b5a3fb7db..0e925973e84 100644
--- a/dlls/user32/listbox.c
+++ b/dlls/user32/listbox.c
@@ -3113,7 +3113,7 @@ LRESULT ListBoxWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam
             return LISTBOX_HandleLButtonDownCombo(descr, msg, wParam,
                                                   (INT16)LOWORD(lParam),
                                                   (INT16)HIWORD(lParam) );
-        if (descr->style & LBS_NOTIFY)
+        if ((descr->style & LBS_NOTIFY) && descr->nb_items)
             SEND_NOTIFICATION( descr, LBN_DBLCLK );
         return 0;
     case WM_MOUSEMOVE:
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index ddc6ca90cb2..2787c17d64a 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -16550,6 +16550,12 @@ static const struct message wm_lb_addstring_sort_ownerdraw[] =
     { EVENT_OBJECT_CREATE, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_CLIENT, 3 },
     { 0 }
 };
+static const struct message wm_lb_dblclick_0[] =
+{
+    { WM_LBUTTONDBLCLK, sent|wparam|lparam, 0, MAKELPARAM(1,1) },
+    { WM_LBUTTONUP, sent|wparam|lparam, 0, 0 },
+    { 0 }
+};
 
 #define check_lb_state(a1, a2, a3, a4, a5) check_lb_state_dbg(a1, a2, a3, a4, a5, __LINE__)
 
@@ -16694,6 +16700,25 @@ static void test_listbox_messages(void)
     check_lb_state(listbox, 0, -1, 0, 0);
     flush_sequence();
 
+    ret = SendMessageA(listbox, LB_DELETESTRING, 0, 0);
+    ok(ret == LB_ERR, "expected LB_ERR, got %Id\n", ret);
+    check_lb_state(listbox, 0, LB_ERR, 0, 0);
+    flush_sequence();
+
+    ret = SendMessageA(listbox, LB_RESETCONTENT, 0, 0);
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    check_lb_state(listbox, 0, LB_ERR, 0, 0);
+    flush_sequence();
+
+    if (winetest_debug > 1) trace("clicking on item 0\n");
+    ret = SendMessageA(listbox, WM_LBUTTONDBLCLK, 0, MAKELPARAM(1, 1));
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    ret = SendMessageA(listbox, WM_LBUTTONUP, 0, 0);
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    ok_sequence(wm_lb_dblclick_0, "WM_LBUTTONDBLCLK 0", FALSE );
+    check_lb_state(listbox, 0, LB_ERR, 0, 0);
+    flush_sequence();
+
     log_all_parent_messages--;
 
     DestroyWindow(listbox);
@@ -16720,6 +16745,21 @@ static void test_listbox_messages(void)
     ok_sequence(wm_lb_addstring_sort_ownerdraw, "LB_ADDSTRING", FALSE);
     check_lb_state(listbox, 3, LB_ERR, 0, 0);
 
+    ret = SendMessageA(listbox, LB_RESETCONTENT, 0, 0);
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    check_lb_state(listbox, 0, LB_ERR, 0, 0);
+    SetFocus(listbox); /* avoid focus messages */
+    flush_sequence();
+
+    if (winetest_debug > 1) trace("clicking on item 0\n");
+    ret = SendMessageA(listbox, WM_LBUTTONDBLCLK, 0, MAKELPARAM(1, 1));
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    ret = SendMessageA(listbox, WM_LBUTTONUP, 0, 0);
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    ok_sequence(wm_lb_dblclick_0, "WM_LBUTTONDBLCLK 0", FALSE );
+    check_lb_state(listbox, 0, LB_ERR, 0, 0);
+    flush_sequence();
+
     log_all_parent_messages--;
 
     DestroyWindow(listbox);
@@ -16746,6 +16786,21 @@ static void test_listbox_messages(void)
     ok_sequence(wm_lb_addstring, "LB_ADDSTRING", FALSE);
     check_lb_state(listbox, 3, LB_ERR, 0, 0);
 
+    ret = SendMessageA(listbox, LB_RESETCONTENT, 0, 0);
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    check_lb_state(listbox, 0, LB_ERR, 0, 0);
+    SetFocus(listbox); /* avoid focus messages */
+    flush_sequence();
+
+    if (winetest_debug > 1) trace("clicking on item 0\n");
+    ret = SendMessageA(listbox, WM_LBUTTONDBLCLK, 0, MAKELPARAM(1, 1));
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    ret = SendMessageA(listbox, WM_LBUTTONUP, 0, 0);
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    ok_sequence(wm_lb_dblclick_0, "WM_LBUTTONDBLCLK 0", FALSE );
+    check_lb_state(listbox, 0, LB_ERR, 0, 0);
+    flush_sequence();
+
     log_all_parent_messages--;
 
     DestroyWindow(listbox);
@@ -16772,6 +16827,21 @@ static void test_listbox_messages(void)
     ok_sequence(wm_lb_addstring, "LB_ADDSTRING", FALSE);
     check_lb_state(listbox, 3, LB_ERR, 0, 0);
 
+    ret = SendMessageA(listbox, LB_RESETCONTENT, 0, 0);
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    check_lb_state(listbox, 0, LB_ERR, 0, 0);
+    SetFocus(listbox); /* avoid focus messages */
+    flush_sequence();
+
+    if (winetest_debug > 1) trace("clicking on item 0\n");
+    ret = SendMessageA(listbox, WM_LBUTTONDBLCLK, 0, MAKELPARAM(1, 1));
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    ret = SendMessageA(listbox, WM_LBUTTONUP, 0, 0);
+    ok(ret == LB_OKAY, "expected LB_OKAY, got %Id\n", ret);
+    ok_sequence(wm_lb_dblclick_0, "WM_LBUTTONDBLCLK 0", FALSE );
+    check_lb_state(listbox, 0, LB_ERR, 0, 0);
+    flush_sequence();
+
     log_all_parent_messages--;
 
     DestroyWindow(listbox);
-- 
GitLab

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