[PATCH 1/2] comctl32/tests: Some cleanup for SysLink tests

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/comctl32/tests/syslink.c | 75 ++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 48 deletions(-)

diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c
index 94569d6f20..382c89d208 100644
--- a/dlls/comctl32/tests/syslink.c
+++ b/dlls/comctl32/tests/syslink.c
@@ -180,39 +180,44 @@ static HWND create_syslink(DWORD style, HWND parent)
     return hWndSysLink;
 }
 
+static void test_create_syslink(void)
+{
+    HWND hWndSysLink;
+    LONG oldstyle;
+
+    /* Create an invisible SysLink control */
+    flush_sequences(sequences, NUM_MSG_SEQUENCE);
+    hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent);
+    ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError());
+    flush_events();
+    ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE);
+
+    /* Make the SysLink control visible */
+    flush_sequences(sequences, NUM_MSG_SEQUENCE);
+    oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE);
+    SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE);
+    RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE);
+    flush_events();
+    ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE);
+    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE);
+
+    DestroyWindow(hWndSysLink);
+}
 
 START_TEST(syslink)
 {
     ULONG_PTR ctx_cookie;
-    HANDLE hCtx;
     HMODULE hComctl32;
-    BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*);
-    INITCOMMONCONTROLSEX iccex;
-    BOOL rc;
-    HWND hWndSysLink;
-    LONG oldstyle;
     POINT orig_pos;
+    HANDLE hCtx;
 
     if (!load_v6_module(&ctx_cookie, &hCtx))
         return;
 
     /* LoadLibrary is needed. This file has no reference to functions in comctl32 */
     hComctl32 = LoadLibraryA("comctl32.dll");
-    pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx");
-    if (!pInitCommonControlsEx)
-    {
-        win_skip("InitCommonControlsEx() is missing. Skipping the tests\n");
-        return;
-    }
-    iccex.dwSize = sizeof(iccex);
-    iccex.dwICC = ICC_LINK_CLASS;
-    rc = pInitCommonControlsEx(&iccex);
-    ok(rc, "InitCommonControlsEx failed (le %u)\n", GetLastError());
-    if (!rc)
-    {
-        skip("Could not register ICC_LINK_CLASS\n");
-        return;
-    }
+    ok(hComctl32 != NULL, "Failed to load comctl32.dll.\n");
 
     /* Move the cursor off the parent window */
     GetCursorPos(&orig_pos);
@@ -223,36 +228,10 @@ START_TEST(syslink)
     /* Create parent window */
     hWndParent = create_parent_window();
     ok(hWndParent != NULL, "Failed to create parent Window!\n");
-    if (!hWndParent)
-    {
-        skip("Parent window not present\n");
-        return;
-    }
-    flush_events();
-
-    /* Create an invisible SysLink control */
-    flush_sequences(sequences, NUM_MSG_SEQUENCE);
-    hWndSysLink = create_syslink(WS_CHILD | WS_TABSTOP, hWndParent);
-    ok(hWndSysLink != NULL, "Expected non NULL value (le %u)\n", GetLastError());
-    if (!hWndSysLink)
-    {
-        skip("SysLink control not present?\n");
-        return;
-    }
     flush_events();
-    ok_sequence(sequences, SYSLINK_SEQ_INDEX, empty_wnd_seq, "create SysLink", FALSE);
-    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_create_syslink_wnd_seq, "create SysLink (parent)", TRUE);
 
-    /* Make the SysLink control visible */
-    flush_sequences(sequences, NUM_MSG_SEQUENCE);
-    oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE);
-    SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE);
-    RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE);
-    flush_events();
-    ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE);
-    ok_sequence(sequences, PARENT_SEQ_INDEX, parent_visible_syslink_wnd_seq, "visible SysLink (parent)", TRUE);
+    test_create_syslink();
 
-    DestroyWindow(hWndSysLink);
     DestroyWindow(hWndParent);
     unload_v6_module(ctx_cookie, hCtx);
     SetCursorPos(orig_pos.x, orig_pos.y);
-- 
2.15.0

[PATCH 2/2] comctl32/syslink: Fix return value for LM_GETIDEALSIZE

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/comctl32/syslink.c       | 12 ++++++------
 dlls/comctl32/tests/syslink.c | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c
index 339c728247..67a1a60a85 100644
--- a/dlls/comctl32/syslink.c
+++ b/dlls/comctl32/syslink.c
@@ -1472,7 +1472,7 @@ static BOOL SYSLINK_NoNextLink (const SYSLINK_INFO *infoPtr, BOOL Prev)
  *           SYSLINK_GetIdealSize
  * Calculates the ideal size of a link control at a given maximum width.
  */
-static VOID SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, LPSIZE lpSize)
+static LONG SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, SIZE *lpSize)
 {
     RECT rc;
     HDC hdc;
@@ -1493,6 +1493,8 @@ static VOID SYSLINK_GetIdealSize (const SYSLINK_INFO *infoPtr, int cxMaxWidth, L
         lpSize->cx = rc.right;
         lpSize->cy = rc.bottom;
     }
+
+    return rc.bottom;
 }
 
 /***********************************************************************
@@ -1664,11 +1666,9 @@ static LRESULT WINAPI SysLinkWindowProc(HWND hwnd, UINT message,
 
     case LM_GETIDEALHEIGHT:
         if (lParam)
-        {
-            /* LM_GETIDEALSIZE */
-            SYSLINK_GetIdealSize(infoPtr, (int)wParam, (LPSIZE)lParam);
-        }
-        return SYSLINK_GetIdealHeight(infoPtr);
+            return SYSLINK_GetIdealSize(infoPtr, (int)wParam, (SIZE *)lParam);
+        else
+            return SYSLINK_GetIdealHeight(infoPtr);
 
     case WM_SETFOCUS:
         return SYSLINK_SetFocus(infoPtr);
diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c
index 382c89d208..a6b90b6a25 100644
--- a/dlls/comctl32/tests/syslink.c
+++ b/dlls/comctl32/tests/syslink.c
@@ -205,6 +205,43 @@ static void test_create_syslink(void)
     DestroyWindow(hWndSysLink);
 }
 
+static void test_LM_GETIDEALHEIGHT(void)
+{
+    HWND hwnd;
+    LONG ret;
+
+    hwnd = create_syslink(WS_CHILD | WS_TABSTOP | WS_VISIBLE, hWndParent);
+    ok(hwnd != NULL, "Failed to create SysLink window.\n");
+
+    ret = SendMessageA(hwnd, LM_GETIDEALHEIGHT, 0, 0);
+    ok(ret > 0, "Unexpected ideal height, %d.\n", ret);
+
+    DestroyWindow(hwnd);
+}
+
+static void test_LM_GETIDEALSIZE(void)
+{
+    HWND hwnd;
+    LONG ret;
+    SIZE sz;
+
+    hwnd = create_syslink(WS_CHILD | WS_TABSTOP | WS_VISIBLE, hWndParent);
+    ok(hwnd != NULL, "Failed to create SysLink window.\n");
+
+    memset(&sz, 0, sizeof(sz));
+    ret = SendMessageA(hwnd, LM_GETIDEALSIZE, 0, (LPARAM)&sz);
+    ok(ret > 0, "Unexpected return value, %d.\n", ret);
+    if (sz.cy == 0)
+        win_skip("LM_GETIDEALSIZE is not supported.\n");
+    else
+    {
+        ok(sz.cx > 5, "Unexpected ideal width, %d.\n", sz.cx);
+        ok(sz.cy == ret, "Unexpected ideal height, %d.\n", sz.cy);
+    }
+
+    DestroyWindow(hwnd);
+}
+
 START_TEST(syslink)
 {
     ULONG_PTR ctx_cookie;
@@ -231,6 +268,8 @@ START_TEST(syslink)
     flush_events();
 
     test_create_syslink();
+    test_LM_GETIDEALHEIGHT();
+    test_LM_GETIDEALSIZE();
 
     DestroyWindow(hWndParent);
     unload_v6_module(ctx_cookie, hCtx);
-- 
2.15.0