Fix a couple of bugs with custom open file dialog templates

Dmitry Timoshkov dmitry at baikal.ru
Mon Aug 16 08:52:39 CDT 2004 

Hello,

this patch fixes 2 bugs causing an app I'm working on to have an open
file dialog box wrongly sized:
1. the app's dialog template and open file dialog template use different
fonts, therefore they have different dialog units and algorithm in
filedlg.c/ArrangeCtrlPositions() can't work correctly. Windows uses
"MS Shell Dlg" in the open file dialog template.
2. there was a bug in the ArrangeCtrlPositions algorithm which didn't
take into account that a child dialog should be resized accordingly
when its controls are moved relatively stc32 "magic" control.

I verified that other apps which use custom dialog templates still work
correctly with this patch applied.

Changelog:
    Dmitry Timoshkov <dmitry at codeweavers.com>
    - 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.

diff -u cvs/hq/wine/dlls/commdlg/cdlg_Ca.rc wine/dlls/commdlg/cdlg_Ca.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Ca.rc	2004-07-06 11:26:29.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Ca.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Cn.rc wine/dlls/commdlg/cdlg_Cn.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Cn.rc	2004-05-04 14:33:46.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Cn.rc	2004-08-16 18:16:05.000000000 +0900
@@ -25,7 +25,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_S
 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 -u cvs/hq/wine/dlls/commdlg/cdlg_Cs.rc wine/dlls/commdlg/cdlg_Cs.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Cs.rc	2003-07-29 18:07:39.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Cs.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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øení souboru"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&jméno souboru:", 1090, 6, 6, 76, 9
  EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
diff -u cvs/hq/wine/dlls/commdlg/cdlg_Da.rc wine/dlls/commdlg/cdlg_Da.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Da.rc	2003-12-04 16:15:29.000000000 +0800
+++ wine/dlls/commdlg/cdlg_Da.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 "Åbn"
-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 -u cvs/hq/wine/dlls/commdlg/cdlg_De.rc wine/dlls/commdlg/cdlg_De.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_De.rc	2004-07-27 23:15:52.000000000 +0900
+++ wine/dlls/commdlg/cdlg_De.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 "Öffnen"
-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 "Öffnen"
-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 -u cvs/hq/wine/dlls/commdlg/cdlg_En.rc wine/dlls/commdlg/cdlg_En.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_En.rc	2004-05-04 14:33:46.000000000 +0900
+++ wine/dlls/commdlg/cdlg_En.rc	2004-08-16 18:16:05.000000000 +0900
@@ -25,7 +25,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
 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 -u cvs/hq/wine/dlls/commdlg/cdlg_Eo.rc wine/dlls/commdlg/cdlg_Eo.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Eo.rc	2003-07-29 18:07:40.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Eo.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Es.rc wine/dlls/commdlg/cdlg_Es.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Es.rc	2004-05-04 14:33:46.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Es.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Fi.rc wine/dlls/commdlg/cdlg_Fi.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Fi.rc	2003-12-04 16:15:30.000000000 +0800
+++ wine/dlls/commdlg/cdlg_Fi.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Fr.rc wine/dlls/commdlg/cdlg_Fr.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Fr.rc	2004-07-06 11:26:29.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Fr.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Hu.rc wine/dlls/commdlg/cdlg_Hu.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Hu.rc	2003-12-04 16:15:30.000000000 +0800
+++ wine/dlls/commdlg/cdlg_Hu.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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ás"
-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égsem", IDCANCEL, "BUTTON", WS_GROUP | WS_TABSTOP, 208, 24, 56, 14
         CONTROL "&Segítség", 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 -u cvs/hq/wine/dlls/commdlg/cdlg_It.rc wine/dlls/commdlg/cdlg_It.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_It.rc	2004-05-28 12:22:57.000000000 +0900
+++ wine/dlls/commdlg/cdlg_It.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Ko.rc wine/dlls/commdlg/cdlg_Ko.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Ko.rc	2004-05-04 14:33:46.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Ko.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Nl.rc wine/dlls/commdlg/cdlg_Nl.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Nl.rc	2003-12-04 16:15:30.000000000 +0800
+++ wine/dlls/commdlg/cdlg_Nl.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_No.rc wine/dlls/commdlg/cdlg_No.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_No.rc	2003-07-29 18:07:40.000000000 +0900
+++ wine/dlls/commdlg/cdlg_No.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 "Åpne"
-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 -u cvs/hq/wine/dlls/commdlg/cdlg_Pl.rc wine/dlls/commdlg/cdlg_Pl.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Pl.rc	2004-08-15 17:11:04.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Pl.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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órz"
-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 -u cvs/hq/wine/dlls/commdlg/cdlg_Pt.rc wine/dlls/commdlg/cdlg_Pt.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Pt.rc	2004-05-04 14:33:46.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Pt.rc	2004-08-16 18:16:05.000000000 +0900
@@ -26,7 +26,7 @@ LANGUAGE LANG_PORTUGUESE, SUBLANG_DEFAUL
 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 -u cvs/hq/wine/dlls/commdlg/cdlg_Ru.rc wine/dlls/commdlg/cdlg_Ru.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Ru.rc	2004-07-06 11:26:29.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Ru.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Si.rc wine/dlls/commdlg/cdlg_Si.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Si.rc	2004-05-04 14:33:46.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Si.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Sk.rc wine/dlls/commdlg/cdlg_Sk.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Sk.rc	2004-05-04 14:33:46.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Sk.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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úboru"
-FONT 8, "Helv"
+FONT 8, "MS Shell Dlg"
 {
  LTEXT "&Meno súboru:", 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¾ada &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 -u cvs/hq/wine/dlls/commdlg/cdlg_Sv.rc wine/dlls/commdlg/cdlg_Sv.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Sv.rc	2004-05-04 14:33:46.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Sv.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 "Öppna"
-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 "Öppna"
-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 -u cvs/hq/wine/dlls/commdlg/cdlg_Th.rc wine/dlls/commdlg/cdlg_Th.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Th.rc	2004-05-04 14:33:46.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Th.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Uk.rc wine/dlls/commdlg/cdlg_Uk.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Uk.rc	2004-07-06 11:26:29.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Uk.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Wa.rc wine/dlls/commdlg/cdlg_Wa.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Wa.rc	2003-12-04 16:15:30.000000000 +0800
+++ wine/dlls/commdlg/cdlg_Wa.rc	2004-08-16 18:16:05.000000000 +0900
@@ -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 -u cvs/hq/wine/dlls/commdlg/cdlg_Zh.rc wine/dlls/commdlg/cdlg_Zh.rc
--- cvs/hq/wine/dlls/commdlg/cdlg_Zh.rc	2004-05-04 14:33:46.000000000 +0900
+++ wine/dlls/commdlg/cdlg_Zh.rc	2004-08-16 18:16:05.000000000 +0900
@@ -26,7 +26,7 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_T
 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°¸Ãû·Q(&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 "é_†¢Åf™n"
-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 -u cvs/hq/wine/dlls/commdlg/filedlg.c wine/dlls/commdlg/filedlg.c
--- cvs/hq/wine/dlls/commdlg/filedlg.c	2004-07-27 23:15:53.000000000 +0900
+++ wine/dlls/commdlg/filedlg.c	2004-08-16 18:16:05.000000000 +0900
@@ -517,7 +517,7 @@ static void ArrangeCtrlPositions(HWND hw
 {
     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 hw
             /* 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 hw
 
     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 hw
         }
         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

More information about the wine-patches mailing list