[PATCH v12 0/1] MR3114: comctl32/syslink: Check item type before increasing link ID in SYSLINK_LinkAtPt().

[Zhao Yi (＠Zhaoyi)]

Fix the issue of incorrect linkid calculation due to a lack of judgment on the current type.

Signed-off-by: Zhaoyi <zhaoyi(a)uniontech.com>

--
  v12: comctl32/tests: Add a test case to get syslinkid.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/3114

[PATCH v12 1/1] comctl32/tests: Add a test case to get syslinkid.

[Zhaoyi]

From: Zhaoyi <zhaoyi(a)uniontech.com>

Signed-off-by: Zhaoyi <zhaoyi(a)uniontech.com>
---
 dlls/comctl32/tests/syslink.c | 38 +++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c
index d5192c26b5c..c0bdfdaf0b9 100644
--- a/dlls/comctl32/tests/syslink.c
+++ b/dlls/comctl32/tests/syslink.c
@@ -30,6 +30,7 @@
 #define SYSLINK_SEQ_INDEX 1
 
 static HWND hWndParent;
+static int g_link_id;
 
 static struct msg_sequence *sequences[NUM_MSG_SEQUENCE];
 
@@ -99,6 +100,20 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP
         add_message(sequences, PARENT_SEQ_INDEX, &msg);
     }
 
+    switch(message)
+    {
+       case WM_NOTIFY:
+       {
+           NMLINK *nml = ((NMLINK *)lParam);
+           if (nml && NM_CLICK == nml->hdr.code)
+           {
+               g_link_id = nml->item.iLink;
+           }
+           break;
+       }
+       default:
+            break;
+    }
     defwndproc_counter++;
     ret = DefWindowProcW(hwnd, message, wParam, lParam);
     defwndproc_counter--;
@@ -238,6 +253,28 @@ static void test_LM_GETIDEALSIZE(void)
     DestroyWindow(hwnd);
 }
 
+static void test_link_id(void)
+{
+    HWND hwnd;
+
+    hwnd = create_syslink(WS_CHILD | WS_TABSTOP | WS_VISIBLE, hWndParent);
+    ok(hwnd != NULL, "Failed to create SysLink window.\n");
+
+    /* test link1 at (50, 10) */
+    g_link_id = 0;
+    SendMessageA(hwnd, WM_LBUTTONDOWN, 1, MAKELPARAM(50, 10));
+    SendMessageA(hwnd, WM_LBUTTONUP, 0, MAKELPARAM(50, 10));
+    todo_wine ok(g_link_id == 0, "Got unexpected link id %d.\n", g_link_id);
+
+    /* test link2 at (25, 25) */
+    g_link_id = 0;
+    SendMessageA(hwnd, WM_LBUTTONDOWN, 1, MAKELPARAM(25, 25));
+    SendMessageA(hwnd, WM_LBUTTONUP, 0, MAKELPARAM(25, 25));
+    todo_wine ok(g_link_id == 1, "Got unexpected link id %d.\n", g_link_id);
+
+    DestroyWindow(hwnd);
+}
+
 START_TEST(syslink)
 {
     ULONG_PTR ctx_cookie;
@@ -266,6 +303,7 @@ START_TEST(syslink)
     test_create_syslink();
     test_LM_GETIDEALHEIGHT();
     test_LM_GETIDEALSIZE();
+    test_link_id();
 
     DestroyWindow(hWndParent);
     unload_v6_module(ctx_cookie, hCtx);
-- 
GitLab

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