From 182a403eae74ab0cd2b4f4adea3fb60f58f66fe0 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@codeweavers.com>
Date: Mon, 16 Aug 2004 21:12:13 +0000
Subject: [PATCH] - Use "MS Shell Dlg" in the Open File dialog templates as in
 Windows - Resize child dialog when its controls are moved relatively stc32  
 "magic" control.

---
 dlls/commdlg/cdlg_Ca.rc |  2 +-
 dlls/commdlg/cdlg_Cn.rc |  4 ++--
 dlls/commdlg/cdlg_Cs.rc |  2 +-
 dlls/commdlg/cdlg_Da.rc |  2 +-
 dlls/commdlg/cdlg_De.rc |  4 ++--
 dlls/commdlg/cdlg_En.rc |  4 ++--
 dlls/commdlg/cdlg_Eo.rc |  2 +-
 dlls/commdlg/cdlg_Es.rc |  4 ++--
 dlls/commdlg/cdlg_Fi.rc |  2 +-
 dlls/commdlg/cdlg_Fr.rc |  4 ++--
 dlls/commdlg/cdlg_Hu.rc |  6 +++---
 dlls/commdlg/cdlg_It.rc |  4 ++--
 dlls/commdlg/cdlg_Ko.rc |  4 ++--
 dlls/commdlg/cdlg_Nl.rc |  2 +-
 dlls/commdlg/cdlg_No.rc |  2 +-
 dlls/commdlg/cdlg_Pl.rc |  2 +-
 dlls/commdlg/cdlg_Pt.rc |  4 ++--
 dlls/commdlg/cdlg_Ru.rc |  4 ++--
 dlls/commdlg/cdlg_Si.rc |  4 ++--
 dlls/commdlg/cdlg_Sk.rc |  4 ++--
 dlls/commdlg/cdlg_Sv.rc |  4 ++--
 dlls/commdlg/cdlg_Th.rc |  4 ++--
 dlls/commdlg/cdlg_Uk.rc |  4 ++--
 dlls/commdlg/cdlg_Wa.rc |  2 +-
 dlls/commdlg/cdlg_Zh.rc |  4 ++--
 dlls/commdlg/filedlg.c  | 18 ++++++++++++++++--
 26 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/dlls/commdlg/cdlg_Ca.rc b/dlls/commdlg/cdlg_Ca.rc
index 403df1b31b8..0d19a311e5f 100644
--- a/dlls/commdlg/cdlg_Ca.rc
+++ b/dlls/commdlg/cdlg_Ca.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Obrir"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Nom:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Cn.rc b/dlls/commdlg/cdlg_Cn.rc
index 401b071a83c..47b5e7b352e 100644
--- a/dlls/commdlg/cdlg_Cn.rc
+++ b/dlls/commdlg/cdlg_Cn.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "打开"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "文件名(&N):", 1090, 6, 6, 76, 9
  EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -328,7 +328,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "打开"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"搜寻(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Cs.rc b/dlls/commdlg/cdlg_Cs.rc
index db74a23586d..e6205074598 100644
--- a/dlls/commdlg/cdlg_Cs.rc
+++ b/dlls/commdlg/cdlg_Cs.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Otev鴈n� souboru"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&jm閚o souboru:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Da.rc b/dlls/commdlg/cdlg_Da.rc
index 075e8bb2c9f..7e28084636b 100644
--- a/dlls/commdlg/cdlg_Da.rc
+++ b/dlls/commdlg/cdlg_Da.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "舃n"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_De.rc b/dlls/commdlg/cdlg_De.rc
index d37cf37cfa2..cc701494fb3 100644
--- a/dlls/commdlg/cdlg_De.rc
+++ b/dlls/commdlg/cdlg_De.rc
@@ -26,7 +26,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "謋fnen"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "Datei&name:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -251,7 +251,7 @@ FONT 8, "Helv"
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "謋fnen"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"&Suche in",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_En.rc b/dlls/commdlg/cdlg_En.rc
index 6b59ec631cc..b5edba21bee 100644
--- a/dlls/commdlg/cdlg_En.rc
+++ b/dlls/commdlg/cdlg_En.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Open"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "File &Name:", 1090, 6, 6, 76, 9
  EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -328,7 +328,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "Open"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"Look &in:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Eo.rc b/dlls/commdlg/cdlg_Eo.rc
index c9a5f87b2dd..57d95aebec8 100644
--- a/dlls/commdlg/cdlg_Eo.rc
+++ b/dlls/commdlg/cdlg_Eo.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Malfermu dosieron"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "Dosier&nomo:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Es.rc b/dlls/commdlg/cdlg_Es.rc
index cd6611357a2..a23efc454c7 100644
--- a/dlls/commdlg/cdlg_Es.rc
+++ b/dlls/commdlg/cdlg_Es.rc
@@ -26,7 +26,7 @@ LANGUAGE LANG_SPANISH, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Abrir"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "Nombre de &archivo:", 1090, 6, 6, 76, 9
  EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -327,7 +327,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "Abrir"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"Mirar &en:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Fi.rc b/dlls/commdlg/cdlg_Fi.rc
index 7fe34ae170f..565b75168ed 100644
--- a/dlls/commdlg/cdlg_Fi.rc
+++ b/dlls/commdlg/cdlg_Fi.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Avaa"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "Tiedosto&nimi:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Fr.rc b/dlls/commdlg/cdlg_Fr.rc
index f462bad0260..e8207d2d1b4 100644
--- a/dlls/commdlg/cdlg_Fr.rc
+++ b/dlls/commdlg/cdlg_Fr.rc
@@ -28,7 +28,7 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Ouvrir"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Nom de fichier:", 1090, 6, 6, 76, 9
  EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -331,7 +331,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "Ouvrir"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"&Rechercher dans",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Hu.rc b/dlls/commdlg/cdlg_Hu.rc
index 6b4fba0ba79..75f2d2c9894 100644
--- a/dlls/commdlg/cdlg_Hu.rc
+++ b/dlls/commdlg/cdlg_Hu.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 OPEN_FILE DIALOG 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Megnyit醩"
-FONT 8, "Helv"
-BEGIN
+FONT 8, "MS Shell Dlg"
+{
         LTEXT "File &neve:", 1090, 6, 6, 76, 9
         EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
         LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
@@ -41,7 +41,7 @@ BEGIN
         CONTROL "M間sem", IDCANCEL, "BUTTON", WS_GROUP | WS_TABSTOP, 208, 24, 56, 14
         CONTROL "&Seg韙s間", 1038, "BUTTON", WS_GROUP | WS_TABSTOP, 208, 46, 56, 14
         CONTROL "&Csak olvashat�", 1040, "BUTTON", BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP, 208, 68, 63, 12
-END
+}
 
 SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
diff --git a/dlls/commdlg/cdlg_It.rc b/dlls/commdlg/cdlg_It.rc
index 8dcbc360202..a70b799d5c3 100644
--- a/dlls/commdlg/cdlg_It.rc
+++ b/dlls/commdlg/cdlg_It.rc
@@ -26,7 +26,7 @@ LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Apri"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Nome file:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -328,7 +328,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "Apri"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"Cerca &in:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Ko.rc b/dlls/commdlg/cdlg_Ko.rc
index e75d89fee8d..54f23efc30b 100644
--- a/dlls/commdlg/cdlg_Ko.rc
+++ b/dlls/commdlg/cdlg_Ko.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "凯扁"
-FONT 9, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "颇老 捞抚(&N):", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -275,7 +275,7 @@ FONT 9, "Helv"
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "凯扁"
-FONT 9, "Helv"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT       "困摹(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX    IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Nl.rc b/dlls/commdlg/cdlg_Nl.rc
index 9c8e29f867c..012e5589a73 100644
--- a/dlls/commdlg/cdlg_Nl.rc
+++ b/dlls/commdlg/cdlg_Nl.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_DUTCH, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Bestand openen"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "Bestands&naam:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_No.rc b/dlls/commdlg/cdlg_No.rc
index 2c54c2b1d7d..33a9f7a9dcf 100644
--- a/dlls/commdlg/cdlg_No.rc
+++ b/dlls/commdlg/cdlg_No.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "舙ne"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Filnavn:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Pl.rc b/dlls/commdlg/cdlg_Pl.rc
index 27e4c8f5178..62ee2c8033d 100644
--- a/dlls/commdlg/cdlg_Pl.rc
+++ b/dlls/commdlg/cdlg_Pl.rc
@@ -26,7 +26,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 OPEN_FILE DIALOG 36, 24, 279, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Otw髍z"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 BEGIN
 	LTEXT "&Nazwa pliku:", 1090, 6, 6, 76, 9, WS_CHILD | WS_VISIBLE | WS_GROUP
 	EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Pt.rc b/dlls/commdlg/cdlg_Pt.rc
index 9ff9dfd8c1d..bfc103d2801 100644
--- a/dlls/commdlg/cdlg_Pt.rc
+++ b/dlls/commdlg/cdlg_Pt.rc
@@ -26,7 +26,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Abrir"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "Nome do &Arquivo:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -329,7 +329,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "Abrir"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"&Examinar:",IDC_LOOKINSTATIC,5,6,31,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,40,3,134,300,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Ru.rc b/dlls/commdlg/cdlg_Ru.rc
index 798d400884a..3c21dac4b78 100644
--- a/dlls/commdlg/cdlg_Ru.rc
+++ b/dlls/commdlg/cdlg_Ru.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "悟牮�"
-FONT 8, "Ms Sans Serif"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&褥� 羿殡�:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -297,7 +297,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "悟牮�"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"锐赅螯 &�",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Si.rc b/dlls/commdlg/cdlg_Si.rc
index 84bb5a8ad7b..e90a6bd8d98 100644
--- a/dlls/commdlg/cdlg_Si.rc
+++ b/dlls/commdlg/cdlg_Si.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Odpiranje"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "Ime &datoteke:", 1090, 6, 6, 76, 9
  EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -328,7 +328,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "Odpiranje"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"&I氳i v",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Sk.rc b/dlls/commdlg/cdlg_Sk.rc
index 5bacfbed498..1321e20be6e 100644
--- a/dlls/commdlg/cdlg_Sk.rc
+++ b/dlls/commdlg/cdlg_Sk.rc
@@ -27,7 +27,7 @@ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Otvorenie s鷅oru"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Meno s鷅oru:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -299,7 +299,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "Otvori�"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"H綼da� &v",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Sv.rc b/dlls/commdlg/cdlg_Sv.rc
index a8fb70ecd62..ccd2568415a 100644
--- a/dlls/commdlg/cdlg_Sv.rc
+++ b/dlls/commdlg/cdlg_Sv.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_SWEDISH, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "謕pna"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "Fil&namn:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -321,7 +321,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "謕pna"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT       "Leta &i",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
  COMBOBOX    IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Th.rc b/dlls/commdlg/cdlg_Th.rc
index 664f6153f8f..ae46186597c 100644
--- a/dlls/commdlg/cdlg_Th.rc
+++ b/dlls/commdlg/cdlg_Th.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_THAI, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "嗷源"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "柰峥榱:", 1090, 6, 6, 76, 9
  EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -325,7 +325,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "嗷源"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"促㈤咬愎:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Uk.rc b/dlls/commdlg/cdlg_Uk.rc
index df82c1f086e..c3fda6855ea 100644
--- a/dlls/commdlg/cdlg_Uk.rc
+++ b/dlls/commdlg/cdlg_Uk.rc
@@ -25,7 +25,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "鲁潢痂蜩"
-FONT 8, "Ms Sans Serif"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&察'� 羿殡�:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -297,7 +297,7 @@ END
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "鲁潢痂蜩"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"伢赅蜩 &�",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Wa.rc b/dlls/commdlg/cdlg_Wa.rc
index 5f828fe2707..657ddc67620 100644
--- a/dlls/commdlg/cdlg_Wa.rc
+++ b/dlls/commdlg/cdlg_Wa.rc
@@ -30,7 +30,7 @@ LANGUAGE LANG_WALON, SUBLANG_DEFAULT
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Drov�"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&No do fitch�:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
diff --git a/dlls/commdlg/cdlg_Zh.rc b/dlls/commdlg/cdlg_Zh.rc
index cf92b12436d..3a15e6abdd7 100644
--- a/dlls/commdlg/cdlg_Zh.rc
+++ b/dlls/commdlg/cdlg_Zh.rc
@@ -26,7 +26,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
 OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "開啟"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "檔案名稱(&N):", 1090, 6, 6, 100, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
@@ -173,7 +173,7 @@ FONT 8, "Helv"
 NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
 STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
 CAPTION "開啟舊檔"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
     LTEXT	"搜尋位置(&I)",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
     COMBOBOX	IDC_LOOKIN,52,3,130,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c
index a486c33ee36..9422ce6170a 100644
--- a/dlls/commdlg/filedlg.c
+++ b/dlls/commdlg/filedlg.c
@@ -517,7 +517,7 @@ static void ArrangeCtrlPositions(HWND hwndChildDlg, HWND hwndParentDlg, BOOL hid
 {
     HWND hwndChild, hwndStc32;
     RECT rectParent, rectChild, rectStc32;
-    INT help_fixup = 0;
+    INT help_fixup = 0, child_height_fixup = 0, child_width_fixup = 0;
 
     /* Take into account if open as read only checkbox and help button
      * are hidden
@@ -580,16 +580,24 @@ static void ArrangeCtrlPositions(HWND hwndChildDlg, HWND hwndParentDlg, BOOL hid
             /* move only if stc32 exist */
             if (hwndStc32 && rectChild.left > rectStc32.right)
             {
+                LONG old_left = rectChild.left;
+
                 /* move to the right of visible controls of the parent dialog */
                 rectChild.left += rectParent.right;
                 rectChild.left -= rectStc32.right;
+
+                child_width_fixup = rectChild.left - old_left;
             }
             /* move even if stc32 doesn't exist */
             if (rectChild.top > rectStc32.bottom)
             {
+                LONG old_top = rectChild.top;
+
                 /* move below visible controls of the parent dialog */
                 rectChild.top += rectParent.bottom;
                 rectChild.top -= rectStc32.bottom - rectStc32.top;
+
+                child_height_fixup = rectChild.top - old_top;
             }
 
             SetWindowPos(hwndChild, 0, rectChild.left, rectChild.top,
@@ -627,6 +635,9 @@ static void ArrangeCtrlPositions(HWND hwndChildDlg, HWND hwndParentDlg, BOOL hid
 
     if (hwndStc32)
     {
+        rectChild.right += child_width_fixup;
+        rectChild.bottom += child_height_fixup;
+
         if (rectParent.right > rectChild.right)
         {
             rectParent.right += rectChild.right;
@@ -644,7 +655,10 @@ static void ArrangeCtrlPositions(HWND hwndChildDlg, HWND hwndParentDlg, BOOL hid
         }
         else
         {
-            rectParent.bottom = rectChild.bottom;
+            /* child dialog is higher, unconditionally set new dialog
+             * height to its size (help_fixup will be subtracted below)
+             */
+            rectParent.bottom = rectChild.bottom + help_fixup;
         }
     }
     else