Huw Davies : comdlg32: Scale the control size limits with dpi.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6df0198a2b069eee907d551b109f06f8a29ffc25
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6df0198a2b069eee907d551b109f06f8a29ffc25

Author: Huw Davies <huw at codeweavers.com>
Date:   Thu May  4 19:31:34 2017 +0100

comdlg32: Scale the control size limits with dpi.

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

---

 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 ccc9eb6..5d0c6e9 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 */