From 6df0198a2b069eee907d551b109f06f8a29ffc25 Mon Sep 17 00:00:00 2001 From: Huw Davies Date: Thu, 4 May 2017 19:31:34 +0100 Subject: [PATCH] comdlg32: Scale the control size limits with dpi. Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- dlls/comdlg32/itemdlg.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index ccc9eb6a9d1..5d0c6e9fc9c 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -856,7 +856,7 @@ static inline customctrl *get_cctrl(FileDialogImpl *This, DWORD ctlid) static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multiline) { LPWSTR text; - UINT len, final_width; + UINT len, final_width, dpi; UINT lines, final_height; SIZE size; RECT rc; @@ -872,8 +872,12 @@ static void ctrl_resize(HWND hctrl, UINT min_width, UINT max_width, BOOL multili hdc = GetDC(hctrl); GetTextExtentPoint32W(hdc, text, lstrlenW(text), &size); + dpi = GetDeviceCaps(hdc, LOGPIXELSX); ReleaseDC(hctrl, hdc); + min_width = MulDiv(min_width, dpi, USER_DEFAULT_SCREEN_DPI); + max_width = MulDiv(max_width, dpi, USER_DEFAULT_SCREEN_DPI); + if(len && multiline) { /* FIXME: line-wrap */