From: Bernhard Übelacker <bernhardu@mailbox.org> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=59944 --- dlls/comctl32/tests/syslink.c | 6 ++---- dlls/comctl32_v6/syslink.c | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index 3dbf3d9bb58..5728117b884 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -341,13 +341,11 @@ static void test_LM_GETIDEALSIZE(void) win_skip("LM_GETIDEALSIZE is not supported.\n"); else { - todo_wine_if(sz.cx < 1) + todo_wine ok(sz.cx >= 1, "Unexpected ideal width, %ld >= 1.\n", sz.cx); - todo_wine_if(sz.cx >= 100) ok(sz.cx < 100, "Unexpected ideal width, %ld < 100.\n", sz.cx); - todo_wine_if(sz.cy < 1) + todo_wine ok(sz.cy >= 1, "Unexpected ideal height, %ld < 100.\n", sz.cy); - todo_wine_if(sz.cy >= 100) ok(sz.cy < 100, "Unexpected ideal height, %ld < 100.\n", sz.cy); ok(sz.cy == ret, "Unexpected ideal height, %ld.\n", sz.cy); } diff --git a/dlls/comctl32_v6/syslink.c b/dlls/comctl32_v6/syslink.c index 36f7edfca38..5f866ba9a61 100644 --- a/dlls/comctl32_v6/syslink.c +++ b/dlls/comctl32_v6/syslink.c @@ -1235,6 +1235,7 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) } } + szDim.cx = szDim.cy = 0; if((n == 0 && SkipChars != 0) || GetTextExtentExPointW(hdc, tx, n, rc.right - x, &nFit, NULL, &szDim)) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11623