comdlg32: Select the correct font before querying the extents.

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comdlg32: Select the correct font before querying the extents.
5d9ab56d · Huw Davies · Alexandre Julliard · e77771c0 · 5d9ab56d
Commit 5d9ab56d authored May 05, 2017 by Huw Davies Committed by Alexandre Julliard May 05, 2017
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

itemdlg.c dlls/comdlg32/itemdlg.c +4 -0

No files found.
--- a/dlls/comdlg32/itemdlg.c
+++ b/dlls/comdlg32/itemdlg.c
@@ -862,6 +862,7 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multili
    RECT rc;
    HDC hdc;
    WCHAR *c;
+    HFONT font;

    TRACE("\n");

@@ -871,7 +872,10 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multili
    SendMessageW(hctrl, WM_GETTEXT, len+1, (LPARAM)text);

    hdc = GetDC(hctrl);
+    font = (HFONT)SendMessageW(hctrl, WM_GETFONT, 0, 0);
+    font = SelectObject(hdc, font);
    GetTextExtentPoint32W(hdc, text, lstrlenW(text), &size);
+    SelectObject(hdc, font);
    ReleaseDC(hctrl, hdc);

    if(len && multiline)