diff --git a/reactos/dll/win32/comdlg32/cdlg.h b/reactos/dll/win32/comdlg32/cdlg.h
index 22cd5a21e8a..f88e2d4f68c 100644
--- a/reactos/dll/win32/comdlg32/cdlg.h
+++ b/reactos/dll/win32/comdlg32/cdlg.h
@@ -126,6 +126,13 @@ typedef struct {
#define IDS_CHARSET_ISO10 223
#define IDS_CHARSET_CELTIC 224
+/* Font styles */
+
+#define IDS_FONT_REGULAR 256
+#define IDS_FONT_BOLD 257
+#define IDS_FONT_ITALIC 258
+#define IDS_FONT_BOLD_ITALIC 259
+
/* Color names string IDs */
#define IDS_COLOR_BLACK 1040
diff --git a/reactos/dll/win32/comdlg32/cdlg_Cn.rc b/reactos/dll/win32/comdlg32/cdlg_Cn.rc
index c0ab25f9723..83f1a6b54a4 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Cn.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Cn.rc
@@ -313,13 +313,13 @@ BEGIN
AUTORADIOBUTTON "ºáÏò(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
GROUPBOX "±ß¾à", grp4, 80, 156, 152, 56, BS_GROUPBOX
LTEXT "×ó(&e):", stc15, 88, 172, 21, 8
- EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "ÓÒ(&R):", stc16, 159, 172, 27, 8
- EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "ÉÏ(&o):", stc17, 88, 192, 21, 8
- EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "ÏÂ(&B):", stc18, 159, 192, 23, 8
- EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
DEFPUSHBUTTON "È·¶¨", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "È¡Ïû", IDCANCEL, 126, 220, 50, 14
PUSHBUTTON "´òÓ¡»ú(&P)...", psh3, 184, 220, 48, 14
diff --git a/reactos/dll/win32/comdlg32/cdlg_De.rc b/reactos/dll/win32/comdlg32/cdlg_De.rc
index bdb35d61ef4..00715882b96 100644
--- a/reactos/dll/win32/comdlg32/cdlg_De.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_De.rc
@@ -74,7 +74,7 @@ FONT 8, "MS Shell Dlg"
{
LTEXT "Drucker:", 1088, 6, 6, 40, 9
LTEXT "", 1089, 60, 6, 150, 9
- GROUPBOX "Druckbereicht", 1072, 6, 30, 160, 65, BS_GROUPBOX
+ GROUPBOX "Druckbereich", 1072, 6, 30, 160, 65, BS_GROUPBOX
RADIOBUTTON "&Alles", rad1, 16, 45, 60, 12
RADIOBUTTON "A&uswahl", rad2, 16, 60, 60, 12
RADIOBUTTON "&Seiten", rad3, 16, 75, 60, 12
@@ -437,6 +437,14 @@ Bitte geben sie einen Wert zwischen %d und %d an."
PD32_PRINTER_STATUS_POWER_SAVE "Stromsparmodus; "
}
+STRINGTABLE DISCARDABLE /* Font styles */
+{
+ IDS_FONT_REGULAR "Normal"
+ IDS_FONT_BOLD "Fett"
+ IDS_FONT_ITALIC "Kursiv"
+ IDS_FONT_BOLD_ITALIC "Fett Kursiv"
+}
+
STRINGTABLE DISCARDABLE /* Color names */
{
IDS_COLOR_BLACK "Schwarz"
diff --git a/reactos/dll/win32/comdlg32/cdlg_El.rc b/reactos/dll/win32/comdlg32/cdlg_El.rc
new file mode 100644
index 00000000000..fa7843f380f
--- /dev/null
+++ b/reactos/dll/win32/comdlg32/cdlg_El.rc
@@ -0,0 +1,481 @@
+/*
+ * Copyright 2008 Apostolos Alexiadis
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/*
+ * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
+ */
+
+LANGUAGE LANG_GREEK, 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 Shell Dlg"
+{
+ LTEXT "File &¼íïìá:", 1090, 6, 6, 76, 9
+ EDITTEXT edt1, 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
+ LTEXT "&ÊáôÜëïãïé:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Ëßóôá Áñ÷åßùí ôïõ &Ôýðïõ:", 1089, 6, 104, 90, 9
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "¶íïéãìá", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "¶êõñï", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&ÂïÞèåéá", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Ìüíï ãéá ÁíÜãíùóç", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ÁðïèÞêåõóç ùò ..."
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "File &¼íïìá:", 1090, 6, 6, 76, 9
+ EDITTEXT edt1, 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
+ LTEXT "&ÊáôÜëïãïé:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "Ëßóôá Áñ÷åßùí ôïõ &Ôýðïõ:", 1089, 6, 104, 90, 9
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "ÁðïèÞêåõóç ùò", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "¶êõñï", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&ÂïÞèåéá", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Ìüíï ãéá ÁíÜãíùóç", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Åêôýðùóç"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "ÅêôõðùôÞò:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Print Range", grp1, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&¼ëá", rad1, 16, 45, 60, 12
+ RADIOBUTTON "Å&ðéëïãÞ", rad2, 16, 60, 60, 12
+ RADIOBUTTON "&Óåëßäåò", rad3, 16, 75, 60, 12
+ DEFPUSHBUTTON "Åêôýðùóç", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "¶êõñï", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&ÅãêáôÜóôáóç", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&Áðü:", 1090, 60, 80, 30, 9
+ LTEXT "&¸ùò:", 1091, 120, 80, 30, 9
+ LTEXT "Print &Ðïéüôçôá:", 1092, 6, 100, 76, 9
+ COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Åêôýðùóç óå Áñ&÷åßï", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Condensed", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ÅãêáôÜóôáóç åêôõðùôÞ"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "PÅêôõðùôÞò", grp1, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&ÐñïåðéëåãìÝíïò åêôõðùôÞò", rad1, 16, 20, 80, 12
+ LTEXT "[none]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "Specific &Printer", rad2, 16, 50, 80, 12
+ COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "¶êõñï", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&ÅãêáôÜóôáóç", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientation", grp2, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "Po&rtrait", rad3, 50, 100, 40, 12
+ RADIOBUTTON "&Landscape", rad4, 50, 115, 40, 12
+ ICON "LANDSCAP", stc10, 10, 95, 32, 32
+ ICON "PORTRAIT", stc11, 10, 95, 32, 32
+ GROUPBOX "×áñôß", grp3, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "ÌÝãå&èïò", 1089, 130, 95, 30, 9
+ LTEXT "&ÐçãÞ", 1090, 130, 110, 30, 9
+ COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ÃñáììáôïóåéñÜ"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&ÃñáììáôïóåéñÜ:",stc1 ,6,3,40,9
+ COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+ CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+ LTEXT "Óôõë Ãñ&áììáôïóåéñÜò:",stc2 ,108,3,44,9
+ COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+ WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+ LTEXT "&ÌÝãåèïò:",stc3,179,3,30,9
+ COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+ WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+ DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "¶êõñï",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&ÅöáñìïãÞ", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&ÂïÞèåéá" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
+ GROUPBOX "ÅööÝ",grp1,6,72,84,34,WS_GROUP
+ CHECKBOX "Stri&keout", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "&ÕðïãñÜììéóç", chx2, 10,94,50,10, BS_AUTOCHECKBOX
+ LTEXT "&×ñþìá:", stc4 ,6,110,30,9
+ COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ GROUPBOX "Äåßãìá",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Óêñ&éðô:",stc7 ,98,114,40,9
+ COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "×ñþìá"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&ÂÁóéêÜ ÷ñþìáôá:", 1088, 4, 4, 140, 10
+ LTEXT "&Custom ÷ñþìáôá:", 1089, 4, 106, 140, 10
+ LTEXT "×ñþìá | Sol&id", 1090, 150, 151, 48, 10
+ LTEXT "&Êüêêéíï:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&ÐñÜóéíï:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Ìðëå:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Hue:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Sat:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Lum:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "OK", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Cancel", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Help", pshHelp,100,166, 44, 14
+ PUSHBUTTON "&ÐñïóèÞêç óôá Custom ×ñþìáôá", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ïñéóìüò Custom ×ñùìÜôùí >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Åýñåóç"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Fi&nd What:", -1, 4, 8, 42, 8
+ EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Ôáßñéáóìá &Ïëüêëçñçò ËÝîçò Ìüíï", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Ôáßñéáóìá &Êåöáëáßùí", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Êáôåýèõíóç", grp1, 107, 26, 68, 28
+ CONTROL "&ÐÜíù", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "&ÊÜôù", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
+ DEFPUSHBUTTON "&Åýñåóç Åðüìåíïõ", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "¶Êõñï", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&ÂïÞèåéá", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ÁíôéêáôÜóôáóç"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Fi&nd What:", -1, 4, 9, 48, 8
+ EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "Áí&ôéêáôÜóôáóç Ìå:", -1, 4, 26, 48, 8
+ EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Ôáßñéáóìá &Ïëüêëçñçò ËÝîçò Ìüí", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Ôáßñéáóìá &Êåöáëáßù", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
+ DEFPUSHBUTTON "&Åýñåóç Åðüìåíïõ", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "&ÁíôéêáôÜóôáóç", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ÁíôéêáôÜóôáóç &¼ëùí", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "¶êõñï", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&ÂïÞèåéá", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+ DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Åêôýðùóç"
+FONT 8, "MS Shell Dlg"
+{
+ DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "¶êõñï", IDCANCEL, 232,164, 48,14, WS_GROUP
+ PUSHBUTTON "&ÂïÞèåéá", pshHelp, 50, 161, 48,14, WS_GROUP
+
+ GROUPBOX "ÅêôõðùôÞò", grp4, 8, 4, 272,84, WS_GROUP
+ CONTROL "Åêôýðùóç óå Áñ&÷åßï", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+ PUSHBUTTON "&Éäéüôçôåò", psh2, 212, 17, 60,14, WS_GROUP
+ LTEXT "&¼íïìá:", stc6, 16, 20, 36,8
+ COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+ LTEXT "ÊáôÜóôáóç:", stc8, 16, 36, 36,10, SS_NOPREFIX
+ LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Ôýðïò:", stc7, 16, 48, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Ðïõ:", stc10, 16, 60, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Ó÷üëéï:", stc9, 16, 72, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+ GROUPBOX "Áíôßãñáöá", grp2, 160, 92, 120,64, WS_GROUP
+ LTEXT "Áñéèìüò &ÁíôéãñÜöùí:",stc5,168,108,68,8
+ ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE
+ CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+ EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER
+
+ GROUPBOX "Print range", grp1, 8,92, 144,64, WS_GROUP
+ CONTROL "&¼ëá", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+ CONTROL "Óå&ëßäåò", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+ CONTROL "&ÅðéëïãÞ", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+ EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER
+ EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER
+ RTEXT "&áðü:", stc2, 52,124, 20,8
+ RTEXT "&Ýùò:", stc3, 100,124, 16,8
+}
+
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+ DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Ñýèìéóç åêôýðùóçò"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP
+ PUSHBUTTON "¶êõñï",IDCANCEL,232,156,48,14
+/* PUSHBUTTON "Äßêôõï...", psh5, 284,156,48,14 */
+
+ GROUPBOX "ÅêôõðùôÞò", grp4, 8, 4, 272,84, WS_GROUP
+ PUSHBUTTON "&Éäéüôçôåò", psh2, 212, 17, 60,14, WS_GROUP
+ LTEXT "&¼íïìá:", stc6, 16, 20, 36,8
+ COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+ LTEXT "ÊáôÜóôáóç:", stc8, 16, 36, 36,10, SS_NOPREFIX
+ LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Ôýðïò:", stc7, 16, 48, 36,10, SS_NOPREFIX
+ LTEXT "Ðïõ:", stc10, 16, 60, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Ó÷üëéï:", stc9, 16, 72, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Remark", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+ GROUPBOX "×áñôß", grp2, 8, 92, 164,56, WS_GROUP
+ LTEXT "ÌÝãå&èïò:", stc2, 16,108, 36, 8
+ COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+ LTEXT "&ÐçãÞ:", stc3, 16,128, 36, 8
+ COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+
+ GROUPBOX "Orientation", grp1, 180, 92, 100,56, WS_GROUP
+ ICON "", ico1, 195,112, 18,20, WS_GROUP
+ CONTROL "P&ortrait", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+ CONTROL "L&andscape", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+END
+
+PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Ñýèìéóç óåëßäáò"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
+ GROUPBOX "×áñôß", grp2, 8, 96, 224, 56, BS_GROUPBOX
+ LTEXT "&ÌÝãåèïò:", stc2, 16, 112, 36, 8
+ COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+ LTEXT "&Tray:", stc3, 16, 132, 36, 8
+ COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+ GROUPBOX "Orientation", grp1, 8, 156, 64, 56, BS_GROUPBOX
+ AUTORADIOBUTTON "&Portrait", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+ AUTORADIOBUTTON "&Landscape", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+ GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX
+ LTEXT "Á&ñéóôåñÜ:", stc15, 88, 172, 21, 8
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ LTEXT "&ÄåîéÜ:", stc16, 159, 172, 27, 8
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ LTEXT "ÐÜ&íù:", stc17, 88, 192, 21, 8
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ LTEXT "&ÊÜôù:", stc18, 159, 192, 23, 8
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
+ PUSHBUTTON "¶êõñï", IDCANCEL, 126, 220, 50, 14
+ PUSHBUTTON "Åê&ôõðùôÞò...", psh3, 184, 220, 48, 14
+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 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
+
+ LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
+ LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+
+ LTEXT "¼íïìá &áñ÷åßïõ:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+ EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
+
+ LTEXT "Áñ÷åßá ôïõ &ôýðïõ:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+ COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+ CONTROL "¶íïéãìá ùò &ìüíï-ãéá-áíÜãíùóç",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+
+ DEFPUSHBUTTON "&¶íïéãìá", IDOK,222,110,50,14
+ PUSHBUTTON "¶êõñï", IDCANCEL,222,128,50,14
+ PUSHBUTTON "&ÂïÞèåéá", pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_ABOUTBOX "&About FolderPicker Test"
+ IDS_DOCUMENTFOLDERS "Document Folders"
+ IDS_PERSONAL "Ôá ¸ããñáöÜ ìïõ"
+ IDS_FAVORITES "Ôá ÁãáðçìÝíá ìïõ"
+ IDS_PATH "System Path"
+ IDS_DESKTOP "ÅðéöÜíåéá Åñãáóßáò"
+ IDS_FONTS "ÃñáììáôïóåéñÝò"
+ IDS_MYCOMPUTER "Ï ÕðïëïãéóôÞò ìïõ"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SYSTEMFOLDERS "ÊáôÜëïãïé ÓõóôÞìáôïò"
+ IDS_LOCALHARDRIVES "Ôïðéêïß Óêëçñïß Äßóêïé"
+ IDS_FILENOTFOUND "Ôï áñ÷åßï äå âñÝèçêå"
+ IDS_VERIFYFILE "Ðáñáêáëþ åðéâåâáéþóôå üôé äüèçêå ôï óùóôü üíïìá áñ÷åßïõ"
+ IDS_CREATEFILE "Ôï áñ÷åßï äåí õðÜñ÷åé.\nÈÝëåôå íá äçìéïõñãÞóåôå ôï áñ÷åßï;"
+ IDS_OVERWRITEFILE "Ôï áñ÷åßï õðÜñ÷åé Þäç.\nÈÝëåôå íá ôï áíôéêáôáóôÞóåôå;"
+ IDS_INVALID_FILENAME_TITLE "Ìç Ýããõñïò(ïé) ÷áñáêôÞñáò(åò) óôï ìïíïðÜôé"
+ IDS_INVALID_FILENAME "¸íá üíïìá áñ÷åßï äå ìðïñåß íá ðåñéÝ÷åé êÜðïéïí áðü ôïõò ðáñáêÜôù ÷áñáêôÞñåò: \n / : < > |"
+ IDS_PATHNOTEXISTING "Ôï ìïíïðÜôé äåí õðÜñ÷åé"
+ IDS_FILENOTEXISTING "Ôï áñ÷åßï äåí õðÜñ÷åé"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_UPFOLDER "¸íá åðßðåäï ðÜíù"
+ IDS_NEWFOLDER "Äçìéïõñãßá íÝïõ êáôáëüãïõ"
+ IDS_LISTVIEW "Ëßóôá"
+ IDS_REPORTVIEW "ËåðôïìÝñåéåò"
+ IDS_TODESKTOP "Browse to Desktop"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ PD32_PRINT_TITLE "Åêôýðùóç"
+
+ PD32_VALUE_UREADABLE "Ìç áíáãíþóéìç åããñáöÞ"
+ PD32_INVALID_PAGE_RANGE "This value does not lie within the page range.\n\
+Please enter a value between %d and %d."
+ PD32_FROM_NOT_ABOVE_TO "The 'from' entry cannot exceed the \
+'to' entry."
+ PD32_MARGINS_OVERLAP "Margins overlap or fall outside \
+Paper boundaries.\nPlease reenter margins."
+ PD32_NR_OF_COPIES_EMPTY "The number of 'Number of copies' \
+value cannot be empty."
+ PD32_TOO_LARGE_COPIES "This large number of copies is not \
+supported by your printer.\nPlease enter a value between 1 and %d."
+ PD32_PRINT_ERROR "ÐñïêëÞèçêå óöÜëìá åêôõðùôÞ."
+ PD32_NO_DEFAULT_PRINTER "Äåí Ý÷åé ïñéóôåß ðñïåðéëåãìÝíïò åêôõðùôÞò."
+ PD32_CANT_FIND_PRINTER "Äåí Þôáí äõíáôÞ ç åýñåóç ôïõ åêôõðùôÞ."
+ PD32_OUT_OF_MEMORY "Out of memory."
+ PD32_GENERIC_ERROR "ÐñïêëÞèçêå óöÜëìá."
+ PD32_DRIVER_UNKNOWN "¶ãíùóôïò ïäçãüò åêôõðùôÞ."
+ PD32_NO_DEVICES "Before you can perform printer-related tasks \
+such as page setup or printing a document, you need to install a printer. \
+Please install one and retry."
+
+ PD32_DEFAULT_PRINTER "ÐñïåðéëåãìÝíïò åêôõðùôÞò; "
+ PD32_NR_OF_DOCUMENTS_IN_QUEUE "ÕðÜñ÷ïõí %d Ýããñáöá óôçí ïõñÜ"
+ PD32_MARGINS_IN_INCHES "Margins [inches]"
+ PD32_MARGINS_IN_MILIMETERS "Margins [mm]"
+ PD32_MILIMETERS "mm"
+
+ PD32_PRINTER_STATUS_READY "¸ôïéìï"
+ PD32_PRINTER_STATUS_PAUSED "ÓôáìáôçìÝíïò; "
+ PD32_PRINTER_STATUS_ERROR "ÓöÜëìá; "
+ PD32_PRINTER_STATUS_PENDING_DELETION "Pending deletion; "
+ PD32_PRINTER_STATUS_PAPER_JAM "Paper jam; "
+ PD32_PRINTER_STATUS_PAPER_OUT "ÔÝëïò ÷áñôéïý; "
+ PD32_PRINTER_STATUS_MANUAL_FEED "Feed paper manual; "
+ PD32_PRINTER_STATUS_PAPER_PROBLEM "Ðñüâëçìá ÷áñôéïý; "
+ PD32_PRINTER_STATUS_OFFLINE "ÅêôõðùôÞò áðïóõíäåäåìÝíïò; "
+ PD32_PRINTER_STATUS_IO_ACTIVE "I/O Active; "
+ PD32_PRINTER_STATUS_BUSY "Áðáó÷ïëçìÝíïò; "
+ PD32_PRINTER_STATUS_PRINTING "Ãßíåôáé åêôýðùóç; "
+ PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; "
+ PD32_PRINTER_STATUS_NOT_AVAILABLE "ÌÇ äéáèÝóéìïò; "
+ PD32_PRINTER_STATUS_WAITING "ÁíáìïíÞ; "
+ PD32_PRINTER_STATUS_PROCESSING "Processing; "
+ PD32_PRINTER_STATUS_INITIALIZING "Åêêßíçóç; "
+ PD32_PRINTER_STATUS_WARMING_UP "Ãßíåôáé ðñïèÝñìáíóç; "
+ PD32_PRINTER_STATUS_TONER_LOW "Ôüíåñ ÷áìçëü; "
+ PD32_PRINTER_STATUS_NO_TONER "Äåí õðÜñ÷åé ôüíåñ; "
+ PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; "
+ PD32_PRINTER_STATUS_USER_INTERVENTION "Interrupted by user; "
+ PD32_PRINTER_STATUS_OUT_OF_MEMORY "Out of memory; "
+ PD32_PRINTER_STATUS_DOOR_OPEN "The printer door is open; "
+ PD32_PRINTER_STATUS_SERVER_UNKNOWN "Print server unknown; "
+ PD32_PRINTER_STATUS_POWER_SAVE "Power save mode; "
+}
+
+STRINGTABLE DISCARDABLE /* Font styles */
+{
+ IDS_FONT_REGULAR "ÊáíïíéêÜ"
+ IDS_FONT_BOLD "¸íôïíá"
+ IDS_FONT_ITALIC "ÐëÜãéá"
+ IDS_FONT_BOLD_ITALIC "¸íôïíá ÐëÜãéá"
+}
+
+STRINGTABLE DISCARDABLE /* Color names */
+{
+ IDS_COLOR_BLACK "Ìáýñï"
+ IDS_COLOR_MAROON "Maroon"
+ IDS_COLOR_GREEN "ÐñÜóéíï"
+ IDS_COLOR_OLIVE "Olive"
+ IDS_COLOR_NAVY "Navy"
+ IDS_COLOR_PURPLE "Ìùâ"
+ IDS_COLOR_TEAL "Teal"
+ IDS_COLOR_GRAY "Ãêñé"
+ IDS_COLOR_SILVER "Áóçìß"
+ IDS_COLOR_RED "Êüêêéíï"
+ IDS_COLOR_LIME "Lime"
+ IDS_COLOR_YELLOW "Êßôñéíï"
+ IDS_COLOR_BLUE "Ìðëå"
+ IDS_COLOR_FUCHSIA "Fuchsia"
+ IDS_COLOR_AQUA "Aqua"
+ IDS_COLOR_WHITE "¶óðñï"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_FONT_SIZE "ÅðéëÝîôå ìÝãåèïò ãñáììáôïóåéñÜò ìåôáîý %d êáé %d ðüíôïõò."
+ IDS_SAVE_BUTTON "&ÁðïèÞêåõóç"
+ IDS_SAVE_IN "ÁðïèÞêåõóç &óå:"
+ IDS_SAVE "ÁðïèÞêåõóç"
+ IDS_SAVE_AS "ÁðïèÞêåõóç ùò"
+ IDS_OPEN_FILE "¶íïéãìá Áñ÷åßïõ"
+}
diff --git a/reactos/dll/win32/comdlg32/cdlg_En.rc b/reactos/dll/win32/comdlg32/cdlg_En.rc
index a9be1a940e4..20214484d95 100644
--- a/reactos/dll/win32/comdlg32/cdlg_En.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_En.rc
@@ -443,6 +443,14 @@ Please install one and retry."
PD32_PRINTER_STATUS_POWER_SAVE "Power save mode; "
}
+STRINGTABLE DISCARDABLE /* Font styles */
+{
+ IDS_FONT_REGULAR "Regular"
+ IDS_FONT_BOLD "Bold"
+ IDS_FONT_ITALIC "Italic"
+ IDS_FONT_BOLD_ITALIC "Bold Italic"
+}
+
STRINGTABLE DISCARDABLE /* Color names */
{
IDS_COLOR_BLACK "Black"
diff --git a/reactos/dll/win32/comdlg32/cdlg_Es.rc b/reactos/dll/win32/comdlg32/cdlg_Es.rc
index 6ee4881d778..c70680a831c 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Es.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Es.rc
@@ -312,13 +312,13 @@ BEGIN
AUTORADIOBUTTON "&Apaisado", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
GROUPBOX "Márgenes", grp4, 80, 156, 152, 56, BS_GROUPBOX
LTEXT "I&zquierdo:", stc15, 88, 172, 21, 8
- EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Derecho:", stc16, 159, 172, 27, 8
- EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Superior:", stc17, 88, 192, 21, 8
- EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "In&ferior:", stc18, 159, 192, 23, 8
- EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
DEFPUSHBUTTON "Aceptar", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14
PUSHBUTTON "&Impresora...", psh3, 184, 220, 48, 14
diff --git a/reactos/dll/win32/comdlg32/cdlg_Fr.rc b/reactos/dll/win32/comdlg32/cdlg_Fr.rc
index a47048d5752..b38faaa4fa2 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Fr.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Fr.rc
@@ -317,13 +317,13 @@ BEGIN
AUTORADIOBUTTON "P&aysage", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
GROUPBOX "Marges", grp4, 80, 156, 152, 56, BS_GROUPBOX
LTEXT "&Droite:", stc15, 88, 172, 21, 8
- EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Gauche:", stc16, 159, 172, 27, 8
- EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Haut:", stc17, 88, 192, 21, 8
- EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Bas:", stc18, 159, 192, 23, 8
- EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "Annuler", IDCANCEL, 126, 220, 50, 14
PUSHBUTTON "&Imprimante...", psh3, 184, 220, 48, 14
diff --git a/reactos/dll/win32/comdlg32/cdlg_It.rc b/reactos/dll/win32/comdlg32/cdlg_It.rc
index ed086f71560..830c26ffce2 100644
--- a/reactos/dll/win32/comdlg32/cdlg_It.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_It.rc
@@ -314,13 +314,13 @@ BEGIN
AUTORADIOBUTTON "&Verticale", rad2, 13, 190, 52, 12, BS_AUTORADIOBUTTON
GROUPBOX "Bordi", grp4, 80, 156, 152, 56, BS_GROUPBOX
LTEXT "&Sinistro:", stc15, 88, 172, 21, 8
- EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Destro:", stc16, 159, 172, 27, 8
- EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Superiore:", stc17, 88, 192, 21, 8
- EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Inferiore:", stc18, 159, 192, 23, 8
- EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "Annulla", IDCANCEL, 126, 220, 50, 14
PUSHBUTTON "S&tampante...", psh3, 184, 220, 48, 14
diff --git a/reactos/dll/win32/comdlg32/cdlg_Nl.rc b/reactos/dll/win32/comdlg32/cdlg_Nl.rc
index 7ac94ea2118..3b78e6a5a10 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Nl.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Nl.rc
@@ -1,5 +1,6 @@
/*
* Copyright 1999 Klaas van Gend
+ * Copyright 2008 Frans Kool
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -35,7 +36,7 @@ FONT 8, "MS Shell Dlg"
LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
LTEXT "Bestands&typen:", 1089, 6, 104, 90, 9
COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
+ LTEXT "Schij&ven:", 1091, 110, 104, 92, 9
COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "&Openen", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
@@ -57,7 +58,7 @@ FONT 8, "MS Shell Dlg"
LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
LTEXT "Bestands&typen:", 1089, 6, 104, 90, 9
COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
- LTEXT "Dri&ves:", 1091, 110, 104, 92, 9
+ LTEXT "Schij&ven:", 1091, 110, 104, 92, 9
COMBOBOX 1137, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "&Opslaan als", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Annuleren", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
@@ -85,7 +86,7 @@ FONT 8, "MS Shell Dlg"
LTEXT "Afdruk&kwaliteit:", 1092, 6, 100, 76, 9
COMBOBOX 1136, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
CHECKBOX "Naar &bestand", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "Condensed", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Verkort", 1041, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
}
@@ -95,7 +96,7 @@ CAPTION "Afdrukeigenschappen"
FONT 8, "MS Shell Dlg"
{
GROUPBOX "Printer", 1072, 6, 10, 180, 65, BS_GROUPBOX
- RADIOBUTTON "&Default Printer", 1056, 16, 20, 80, 12
+ RADIOBUTTON "Stan&daard Printer", 1056, 16, 20, 80, 12
LTEXT "[geen]", 1088, 35, 35, 120, 9
RADIOBUTTON "Specifieke &Printer", 1057, 16, 50, 80, 12
COMBOBOX 1136, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
@@ -103,7 +104,7 @@ FONT 8, "MS Shell Dlg"
PUSHBUTTON "Annuleren", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Setup", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
GROUPBOX "Afdrukstand", 1073, 6, 85, 100, 50, BS_GROUPBOX
- RADIOBUTTON "&Staand", 1058, 50, 100, 40, 12
+ RADIOBUTTON "S&taand", 1058, 50, 100, 40, 12
RADIOBUTTON "&Liggend", 1059, 50, 115, 40, 12
ICON "LANDSCAP", 1097, 10, 95, 32, 32
ICON "PORTRAIT", 1098, 10, 95, 32, 32
@@ -250,7 +251,7 @@ CAPTION "Print32"
FONT 8, "MS Shell Dlg"
{
DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
- PUSHBUTTON "Cancel", IDCANCEL, 232,164, 48,14, WS_GROUP
+ PUSHBUTTON "Annuleren", IDCANCEL, 232,164, 48,14, WS_GROUP
PUSHBUTTON "&Help", pshHelp, 50, 161, 48,14, WS_GROUP
GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP
@@ -259,15 +260,15 @@ FONT 8, "MS Shell Dlg"
LTEXT "&Naam:", stc6, 16, 20, 36,8
COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
LTEXT "Status:", stc8, 16, 36, 36,10, SS_NOPREFIX
- LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Dummy Status", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
LTEXT "Type:", stc7, 16, 48, 36,10, SS_NOPREFIX
LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
LTEXT "Waar:", stc10, 16, 60, 36,10, SS_NOPREFIX
- LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Dummy Locatie", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
LTEXT "Opmerking:", stc9, 16, 72, 36,10, SS_NOPREFIX
- LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Dummy Opmerking", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
- GROUPBOX "Aantal ", grp2, 160, 92, 120,64, WS_GROUP
+ GROUPBOX "Aantal", grp2, 160, 92, 120,64, WS_GROUP
LTEXT "Aantal e&xemplaren:",stc5,168,108,68,8
ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE
CONTROL "&Sorteren", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
@@ -283,6 +284,71 @@ FONT 8, "MS Shell Dlg"
RTEXT "&t/m:", stc3, 100,124, 16,8
}
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+ DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Print Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP
+ PUSHBUTTON "Annuleren",IDCANCEL,232,156,48,14
+
+ GROUPBOX "Printer", grp4, 8, 4, 272,84, WS_GROUP
+ PUSHBUTTON "&Eigenschappen", psh2, 212, 17, 60,14, WS_GROUP
+ LTEXT "&Naam:", stc6, 16, 20, 36,8
+ COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+ LTEXT "Status:", stc8, 16, 36, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Status", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Type:", stc7, 16, 48, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Waar:", stc10, 16, 60, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Locatie", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Opmerking:", stc9, 16, 72, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Opmerking", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+ GROUPBOX "Papier", grp2, 8, 92, 164,56, WS_GROUP
+ LTEXT "&Grootte:", stc2, 16,108, 36, 8
+ COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+ LTEXT "&Bron:", stc3, 16,128, 36, 8
+ COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+
+ GROUPBOX "Orientatie", grp1, 180, 92, 100,56, WS_GROUP
+ ICON "", ico1, 195,112, 18,20, WS_GROUP
+ CONTROL "P&ortret", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+ CONTROL "L&iggend", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+END
+
+PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Setup Page"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
+ GROUPBOX "Papier", grp2, 8, 96, 224, 56, BS_GROUPBOX
+ LTEXT "&Grootte:", stc2, 16, 112, 36, 8
+ COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+ LTEXT "La&de:", stc3, 16, 132, 36, 8
+ COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+ GROUPBOX "Orientatie", grp1, 8, 156, 64, 56, BS_GROUPBOX
+ AUTORADIOBUTTON "&Portret", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+ AUTORADIOBUTTON "&Liggend", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+ GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX
+ LTEXT "L&inks:", stc15, 88, 172, 21, 8
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ LTEXT "&Rechts:", stc16, 159, 172, 27, 8
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ LTEXT "B&oven:", stc17, 88, 192, 21, 8
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ LTEXT "&Onder:", stc18, 159, 192, 23, 8
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
+ PUSHBUTTON "Annuleren", IDCANCEL, 126, 220, 50, 14
+ PUSHBUTTON "P&rinter...", psh3, 184, 220, 48, 14
+END
+
+
STRINGTABLE DISCARDABLE
{
IDS_ABOUTBOX "&Info over FolderPicker"
@@ -341,11 +407,11 @@ beschikbaar"
PD32_GENERIC_ERROR "Er onstond een niet nader \
gespecifieerde fout"
PD32_DRIVER_UNKNOWN "De printer driver is onbekend"
- PD32_NO_DEVICES "Before you can perform printer-related tasks \
-such as page setup or printing a document, you need to install a printer. \
-Please install one and retry."
+ PD32_NO_DEVICES "Voordat u printer-gerelateerde taken \
+zoals pagina instellingen of het printen van een document kun uitvoeren, moet u een \
+printer installeren. Installeer een printer en probeer het opnieuw."
- PD32_DEFAULT_PRINTER "Default Printer, "
+ PD32_DEFAULT_PRINTER "Standaard Printer, "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "Er staan %d documenten in de \
wachtrij"
PD32_MARGINS_IN_INCHES "Marges [inch]"
@@ -356,7 +422,7 @@ wachtrij"
PD32_PRINTER_STATUS_PAUSED "Gepauseerd, "
PD32_PRINTER_STATUS_ERROR "Fout, "
PD32_PRINTER_STATUS_PENDING_DELETION "Bezig met verwijderen, "
- PD32_PRINTER_STATUS_PAPER_JAM "Paper jam, "
+ PD32_PRINTER_STATUS_PAPER_JAM "Papier opstopping, "
PD32_PRINTER_STATUS_PAPER_OUT "Papier is op, "
PD32_PRINTER_STATUS_MANUAL_FEED "Voer s.v.p. met de hand papier in, "
PD32_PRINTER_STATUS_PAPER_PROBLEM "Papier probleem, "
@@ -367,7 +433,7 @@ wachtrij"
PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "De uitvoerlade is vol, "
PD32_PRINTER_STATUS_NOT_AVAILABLE "Niet aanwezig, "
PD32_PRINTER_STATUS_WAITING "Aan het wachten, "
- PD32_PRINTER_STATUS_PROCESSING "Aan het Verwerken, "
+ PD32_PRINTER_STATUS_PROCESSING "Aan het verwerken, "
PD32_PRINTER_STATUS_INITIALIZING "Aan het opstarten, "
PD32_PRINTER_STATUS_WARMING_UP "Aan het opwarmen, "
PD32_PRINTER_STATUS_TONER_LOW "Er is nog maar weinig toner, "
@@ -377,7 +443,15 @@ wachtrij"
PD32_PRINTER_STATUS_OUT_OF_MEMORY "Onvoldoende geheugen beschikbaar, "
PD32_PRINTER_STATUS_DOOR_OPEN "De printer staat is open, "
PD32_PRINTER_STATUS_SERVER_UNKNOWN "Print server onbekend; "
- PD32_PRINTER_STATUS_POWER_SAVE "Power safe mode; "
+ PD32_PRINTER_STATUS_POWER_SAVE "Power safe modus; "
+}
+
+STRINGTABLE DISCARDABLE /* Font styles */
+{
+ IDS_FONT_REGULAR "Normaal"
+ IDS_FONT_BOLD "Vet"
+ IDS_FONT_ITALIC "Cursief"
+ IDS_FONT_BOLD_ITALIC "Vet-Cursief"
}
STRINGTABLE DISCARDABLE /* Color names */
diff --git a/reactos/dll/win32/comdlg32/cdlg_Pl.rc b/reactos/dll/win32/comdlg32/cdlg_Pl.rc
index 7376fb74642..a8776a39e7f 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Pl.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Pl.rc
@@ -315,13 +315,13 @@ BEGIN
AUTORADIOBUTTON "P&ozioma", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
GROUPBOX "Marginesy", grp4, 80, 156, 152, 56, BS_GROUPBOX
LTEXT "&Lewy:", stc15, 88, 172, 21, 8
- EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Prawy:", stc16, 159, 172, 27, 8
- EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Górny:", stc17, 88, 192, 21, 8
- EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Dolny:", stc18, 159, 192, 23, 8
- EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "Anuluj", IDCANCEL, 126, 220, 50, 14
PUSHBUTTON "Dr&ukarka...", psh3, 184, 220, 48, 14
@@ -449,6 +449,14 @@ STRINGTABLE DISCARDABLE
IDS_OPEN_FILE "Otwórz plik"
}
+STRINGTABLE DISCARDABLE /* Font styles */
+{
+ IDS_FONT_REGULAR "Regularny"
+ IDS_FONT_BOLD "Pogrubiony"
+ IDS_FONT_ITALIC "Kusywa"
+ IDS_FONT_BOLD_ITALIC "Pogrubiona kursywa"
+}
+
STRINGTABLE DISCARDABLE /* Color names */
{
IDS_COLOR_BLACK "Czarny"
diff --git a/reactos/dll/win32/comdlg32/cdlg_Pt.rc b/reactos/dll/win32/comdlg32/cdlg_Pt.rc
index 0506d2aac2b..99912d3f2f0 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Pt.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Pt.rc
@@ -622,13 +622,13 @@ BEGIN
AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
GROUPBOX "Bordas", grp4, 80, 156, 152, 56, BS_GROUPBOX
LTEXT "&Esquerda:", stc15, 88, 172, 21, 8
- EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Direita:", stc16, 159, 172, 27, 8
- EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Superior:", stc17, 88, 192, 21, 8
- EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Inferior:", stc18, 159, 192, 23, 8
- EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14
PUSHBUTTON "Im&pressora...", psh3, 184, 220, 50, 14
@@ -654,13 +654,13 @@ BEGIN
AUTORADIOBUTTON "&Paisagem", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
GROUPBOX "Bordas", grp4, 80, 156, 152, 56, BS_GROUPBOX
LTEXT "&Esquerda:", stc15, 88, 172, 21, 8
- EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Direita:", stc16, 159, 172, 27, 8
- EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Superior:", stc17, 88, 192, 21, 8
- EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Inferior:", stc18, 159, 192, 23, 8
- EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "Cancelar", IDCANCEL, 126, 220, 50, 14
PUSHBUTTON "Im&pressora...", psh3, 184, 220, 50, 14
diff --git a/reactos/dll/win32/comdlg32/cdlg_Ro.rc b/reactos/dll/win32/comdlg32/cdlg_Ro.rc
new file mode 100644
index 00000000000..e1cfc247da0
--- /dev/null
+++ b/reactos/dll/win32/comdlg32/cdlg_Ro.rc
@@ -0,0 +1,480 @@
+/*
+ * Copyright 1995 Alexandre Julliard
+ * Copyright 2008 Michael Stefaniuc
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/*
+ * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES.
+ */
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+#pragma code_page(65001)
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Deschide"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Nume fișier:", 1090, 6, 6, 76, 9
+ EDITTEXT edt1, 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
+ LTEXT "&Dosare:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Tip de fișier:", 1089, 6, 104, 90, 9
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "D&iscuri:", 1091, 110, 104, 92, 9
+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Deschide", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Renunță", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ajutor", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Numai-citire", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Salvare ca ..."
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Nume fișier:", 1090, 6, 6, 76, 9
+ EDITTEXT edt1, 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
+ LTEXT "&Dosare:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "&Tip de fișier:", 1089, 6, 104, 90, 9
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "D&iscuri:", 1091, 110, 104, 92, 9
+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "Salvează ca", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Renunță", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ajutor", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Numai-citire", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Tipărire"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Imprimantă:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "Interval tipărire", grp1, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "&Toate", rad1, 16, 45, 60, 12
+ RADIOBUTTON "S&elecție", rad2, 16, 60, 60, 12
+ RADIOBUTTON "&Pagini", rad3, 16, 75, 60, 12
+ DEFPUSHBUTTON "Tipăreşte", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Renunță", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Setează", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "&De la:", 1090, 60, 80, 30, 9
+ LTEXT "&La:", 1091, 120, 80, 30, 9
+ LTEXT "&Calitate tipărire:", 1092, 6, 100, 76, 9
+ COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "Tipăreşte în fişier", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Comprimat", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Setări tipărire"
+FONT 8, "MS Shell Dlg"
+{
+ GROUPBOX "Imprimantă", grp1, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "&Imprimantă implicită", rad1, 16, 20, 80, 12
+ LTEXT "[nimic]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "I&mprimantă specifică", rad2, 16, 50, 80, 12
+ COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Renunță", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Setează", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "Orientare", grp2, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "P&ortret", rad3, 50, 100, 40, 12
+ RADIOBUTTON "&Peisaj", rad4, 50, 115, 40, 12
+ ICON "LANDSCAP", stc10, 10, 95, 32, 32
+ ICON "PORTRAIT", stc11, 10, 95, 32, 32
+ GROUPBOX "Hârtie", grp3, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "&Mărime", 1089, 130, 95, 30, 9
+ LTEXT "&Sursă", 1090, 130, 110, 30, 9
+ COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Font"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Font:",stc1 ,6,3,40,9
+ COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+ CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+ LTEXT "&Stil font:",stc2 ,108,3,44,9
+ COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+ WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+ LTEXT "&Mărime:",stc3,179,3,30,9
+ COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+ WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+ DEFPUSHBUTTON "OK",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Renunță",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "A&plică", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ajutor" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
+ GROUPBOX "Efecte",grp1,6,72,84,34,WS_GROUP
+ CHECKBOX "&Linie mijloc", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "&Subliniat", chx2, 10,94,50,10, BS_AUTOCHECKBOX
+ LTEXT "&Culoare:", stc4 ,6,110,30,9
+ COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ GROUPBOX "Eșantion",grp2,98,72,120,36,WS_GROUP
+ CTEXT "AaBbYyZz",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE
+ LTEXT "Scr&ipt:",stc7 ,98,114,40,9
+ COMBOBOX cmb5,98,124,120,90,CBS_DROPDOWNLIST | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Culoare"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Culori de &basă:", 1088, 4, 4, 140, 10
+ LTEXT "&Culori personalizate:", 1089, 4, 106, 140, 10
+ LTEXT "Culoare | Sol&id", 1090, 150, 151, 48, 10
+ LTEXT "&Roșu:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Verde:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Albastru:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Nuanță:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Sat:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&Lum:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "OK", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Renunță", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Ajutor", pshHelp,100,166, 44, 14
+ PUSHBUTTON "&Adaugă culori personalizate", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Definește colori personalizate >>", 719/*1025*/, 4, 150, 142, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */
+}
+
+
+FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Caută"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "&Caută:", -1, 4, 8, 42, 8
+ EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Numai cuvinte întregi", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Sensibil la registru", chx2, 4, 42, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "Direcție", grp1, 107, 26, 68, 28
+ CONTROL "&Sus", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 30, 12
+ CONTROL "&Jos", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
+ DEFPUSHBUTTON "Caută &înainte", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Renunță", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ajutor", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "ÃŽnlocuire"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Caută:", -1, 4, 9, 48, 8
+ EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "ÃŽn&locuieÅŸte cu:", -1, 4, 26, 48, 8
+ EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "&Numai cuvinte întregi", chx1, 5, 46, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "Sensibil la registru", chx2, 5, 62, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
+ DEFPUSHBUTTON "Caută &înainte", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "&ÃŽnlocuieÅŸte", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "ÃŽnlocuieÅŸte &tot", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "Renunță", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "&Ajutor", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+ DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Tipărire"
+FONT 8, "MS Shell Dlg"
+{
+ DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Renunță", IDCANCEL, 232,164, 48,14, WS_GROUP
+ PUSHBUTTON "&Ajutor", pshHelp, 50, 161, 48,14, WS_GROUP
+
+ GROUPBOX "Imprimantă", grp4, 8, 4, 272,84, WS_GROUP
+ CONTROL "Tipăreşte în &fişier",chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+ PUSHBUTTON "&Proprietăți", psh2, 212, 17, 60,14, WS_GROUP
+ LTEXT "&Nume:", stc6, 16, 20, 36,8
+ COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+ LTEXT "Stare:", stc8, 16, 36, 36,10, SS_NOPREFIX
+ LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Tip:", stc7, 16, 48, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Loc:", stc10, 16, 60, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Comentariu:", stc9, 16, 72, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+ GROUPBOX "Copii", grp2, 160, 92, 120,64, WS_GROUP
+ LTEXT "Număr de &copii:",stc5,168,108,68,8
+ ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE
+ CONTROL "C&olaționate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+ EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER
+
+ GROUPBOX "Interval tipărire",grp1, 8,92, 144,64, WS_GROUP
+ CONTROL "&Toate", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+ CONTROL "Pa&ginile", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+ CONTROL "&Selecție", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+ EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER
+ EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER
+ RTEXT "&de la:", stc2, 52,124, 20,8
+ RTEXT "&la:", stc3, 100,124, 16,8
+}
+
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+ DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Setări tipărire"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP
+ PUSHBUTTON "Renunță",IDCANCEL,232,156,48,14
+/* PUSHBUTTON "Network...", psh5, 284,156,48,14 */
+
+ GROUPBOX "Imprimantă", grp4, 8, 4, 272,84, WS_GROUP
+ PUSHBUTTON "&Proprietăți", psh2, 212, 17, 60,14, WS_GROUP
+ LTEXT "&Nume:", stc6, 16, 20, 36,8
+ COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+ LTEXT "Stare:", stc8, 16, 36, 36,10, SS_NOPREFIX
+ LTEXT "[nimic]", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Tip:", stc7, 16, 48, 36,10, SS_NOPREFIX
+ LTEXT "[nimic]", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Loc:", stc10, 16, 60, 36,10, SS_NOPREFIX
+ LTEXT "[nimic]", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Comentariu:", stc9, 16, 72, 36,10, SS_NOPREFIX
+ LTEXT "[nimic]", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+ GROUPBOX "Hârtie", grp2, 8, 92, 164,56, WS_GROUP
+ LTEXT "&Mărime:", stc2, 16,108, 36, 8
+ COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+ LTEXT "&Sursă:", stc3, 16,128, 36, 8
+ COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+
+ GROUPBOX "Orientare", grp1, 180, 92, 100,56, WS_GROUP
+ ICON "", ico1, 195,112, 18,20, WS_GROUP
+ CONTROL "P&ortret", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+ CONTROL "&Peisaj", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+END
+
+PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Setare Pagină"
+FONT 8, "MS Shell Dlg"
+BEGIN
+ CONTROL "", rct1, "Static", SS_WHITERECT, 80, 8, 80, 80
+ CONTROL "", rct2, "Static", SS_GRAYRECT, 160, 12, 4, 80
+ CONTROL "", rct3, "Static", SS_GRAYRECT, 84, 88, 80, 4
+ GROUPBOX "Hârtie", grp2, 8, 96, 224, 56, BS_GROUPBOX
+ LTEXT "&Mărime:", stc2, 16, 112, 36, 8
+ COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+ LTEXT "S&ertar:", stc3, 16, 132, 36, 8
+ COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+ GROUPBOX "Orientare", grp1, 8, 156, 64, 56, BS_GROUPBOX
+ AUTORADIOBUTTON "P&ortret", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+ AUTORADIOBUTTON "&Peisaj", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+ GROUPBOX "Margini", grp4, 80, 156, 152, 56, BS_GROUPBOX
+ LTEXT "S&tânga:", stc15, 84, 172, 27, 8
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ LTEXT "&Dreapta:", stc16, 159, 172, 27, 8
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ LTEXT "&Sus:", stc17, 84, 192, 21, 8
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ LTEXT "&Jos:", stc18, 159, 192, 23, 8
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
+ DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
+ PUSHBUTTON "Renunță", IDCANCEL, 126, 220, 50, 14
+ PUSHBUTTON "&Imprimantă...", psh3, 184, 220, 48, 14
+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 "Deschide"
+FONT 8, "MS Shell Dlg"
+{
+ LTEXT "Caută &în:",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
+
+ LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 102, 17, NOT WS_GROUP | NOT WS_VISIBLE
+ LISTBOX IDC_SHELLSTATIC,4,20,272,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+
+ LTEXT "&Nume fișier:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+ EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
+
+ LTEXT "&Tip de fișier:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY
+ COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+
+ CONTROL "Deschide pentru &numai-citire",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,110,10
+
+ DEFPUSHBUTTON "&Deschide", IDOK,222,110,50,14
+ PUSHBUTTON "Renunță", IDCANCEL,222,128,50,14
+ PUSHBUTTON "&Ajutor", pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_ABOUTBOX "&Despre testul FolderPicker"
+ IDS_DOCUMENTFOLDERS "Dosarele de documente"
+ IDS_PERSONAL "Documentele mele"
+ IDS_FAVORITES "Favoritele mele"
+ IDS_PATH "Calea de sistem"
+ IDS_DESKTOP "Birou"
+ IDS_FONTS "Fonturi"
+ IDS_MYCOMPUTER "Computerul meu"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SYSTEMFOLDERS "Dosarele de sistem"
+ IDS_LOCALHARDRIVES "Discurile locale"
+ IDS_FILENOTFOUND "Fișierul nu a fost găsit"
+ IDS_VERIFYFILE "Verificați vă rog că numele de fișier este corect"
+ IDS_CREATEFILE "Fişierul nu există.\nDoriți să creați acest fișier?"
+ IDS_OVERWRITEFILE "Fișierul există deja.\nDoriți să îl înlocuiți?"
+ IDS_INVALID_FILENAME_TITLE "Caracter(e) invalid(e) în cale"
+ IDS_INVALID_FILENAME "Numele de fișier nu poate conține caracterele următoare: \n / : < > |"
+ IDS_PATHNOTEXISTING "Calea nu există"
+ IDS_FILENOTEXISTING "Fişierul nu există"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_UPFOLDER "Un nivel de dosare mai sus"
+ IDS_NEWFOLDER "Creează un dosar nou"
+ IDS_LISTVIEW "Listă"
+ IDS_REPORTVIEW "Detalii"
+ IDS_TODESKTOP "Navigează la birou"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ PD32_PRINT_TITLE "Tipărire"
+
+ PD32_VALUE_UREADABLE "Înregistrare necitibilă"
+ PD32_INVALID_PAGE_RANGE "Această valoare nu este inclusă în intervalul de tipărire.\n Introduceți vă rog un număr între %d și %d."
+ PD32_FROM_NOT_ABOVE_TO "Numărul 'de la' nu poate fi mai mare decât numărul 'la'."
+ PD32_MARGINS_OVERLAP "Marginile se suprapun sau sunt in afara hârtiei.\nIntroduceți vă rog din nou marginile."
+ PD32_NR_OF_COPIES_EMPTY "Numărul de copii nu poate fi nul."
+ PD32_TOO_LARGE_COPIES "Imprimanta nu suportă un număr așa de mare de copii.\nIntroduceți vă rog un număr între 1 și %d."
+ PD32_PRINT_ERROR "S-a produs o eroare la tipărire."
+ PD32_NO_DEFAULT_PRINTER "Imprimanta implicită n-a fost definită."
+ PD32_CANT_FIND_PRINTER "Nu pot găsi imprimanta."
+ PD32_OUT_OF_MEMORY "Memorie insuficientă."
+ PD32_GENERIC_ERROR "S-a produs o eroare."
+ PD32_DRIVER_UNKNOWN "Driver de imprimantă necunoscut."
+ PD32_NO_DEVICES "Trebuie să instalați o imprimantă înainte de a executa activități în referință cu imprimanta ca spre exemplu setări pagină sau tipărirea unui document. Instalați va rog o imprimantă și reincercați."
+
+ PD32_DEFAULT_PRINTER "Imprimantă implicită; "
+ PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d documente sunt în coadă"
+ PD32_MARGINS_IN_INCHES "Margini [țoli]"
+ PD32_MARGINS_IN_MILIMETERS "Margini [mm]"
+ PD32_MILIMETERS "mm"
+
+ PD32_PRINTER_STATUS_READY "Gata"
+ PD32_PRINTER_STATUS_PAUSED "Pauză; "
+ PD32_PRINTER_STATUS_ERROR "Eroare; "
+ PD32_PRINTER_STATUS_PENDING_DELETION "Aștept stergerea; "
+ PD32_PRINTER_STATUS_PAPER_JAM "Hârtie blocată în imprimantă; "
+ PD32_PRINTER_STATUS_PAPER_OUT "Fără hârtia; "
+ PD32_PRINTER_STATUS_MANUAL_FEED "Alimentați hârtia manual; "
+ PD32_PRINTER_STATUS_PAPER_PROBLEM "Problemă cu hârtia; "
+ PD32_PRINTER_STATUS_OFFLINE "Imprimantă deconectată; "
+ PD32_PRINTER_STATUS_IO_ACTIVE "I/O activ; "
+ PD32_PRINTER_STATUS_BUSY "Ocupat; "
+ PD32_PRINTER_STATUS_PRINTING "Tipăresc; "
+ PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Sertarul de ieșire este plin; "
+ PD32_PRINTER_STATUS_NOT_AVAILABLE "Indisponibil; "
+ PD32_PRINTER_STATUS_WAITING "Aștept; "
+ PD32_PRINTER_STATUS_PROCESSING "Procesez; "
+ PD32_PRINTER_STATUS_INITIALIZING "Initializez; "
+ PD32_PRINTER_STATUS_WARMING_UP "Încălzesc; "
+ PD32_PRINTER_STATUS_TONER_LOW "Toner puțin; "
+ PD32_PRINTER_STATUS_NO_TONER "Fără toner; "
+ PD32_PRINTER_STATUS_PAGE_PUNT "Page punt; "
+ PD32_PRINTER_STATUS_USER_INTERVENTION "ÃŽntrerupere utilizator; "
+ PD32_PRINTER_STATUS_OUT_OF_MEMORY "Memorie insuficientă; "
+ PD32_PRINTER_STATUS_DOOR_OPEN "Carcasa imprimantei este deschisă; "
+ PD32_PRINTER_STATUS_SERVER_UNKNOWN "Server de tipărire necunoscut; "
+ PD32_PRINTER_STATUS_POWER_SAVE "Economisire de energie; "
+}
+
+STRINGTABLE DISCARDABLE /* Font styles */
+{
+ IDS_FONT_REGULAR "Normal"
+ IDS_FONT_BOLD "Aldin"
+ IDS_FONT_ITALIC "Cursiv"
+ IDS_FONT_BOLD_ITALIC "Aldin cursiv"
+}
+
+STRINGTABLE DISCARDABLE /* Color names */
+{
+ IDS_COLOR_BLACK "Negru"
+ IDS_COLOR_MAROON "Maro"
+ IDS_COLOR_GREEN "Verde"
+ IDS_COLOR_OLIVE "Oliviu"
+ IDS_COLOR_NAVY "Ultramarin"
+ IDS_COLOR_PURPLE "Violet"
+ IDS_COLOR_TEAL "Verde-albastru"
+ IDS_COLOR_GRAY "Griu"
+ IDS_COLOR_SILVER "Argintiu"
+ IDS_COLOR_RED "Roșu"
+ IDS_COLOR_LIME "Verde deschis"
+ IDS_COLOR_YELLOW "Galben"
+ IDS_COLOR_BLUE "Albastru"
+ IDS_COLOR_FUCHSIA "Roz"
+ IDS_COLOR_AQUA "Azur"
+ IDS_COLOR_WHITE "Alb"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_FONT_SIZE "Alegeți o mărime de font între %d și %d puncte."
+ IDS_SAVE_BUTTON "&Salvează"
+ IDS_SAVE_IN "Salvează &în:"
+ IDS_SAVE "Salvează"
+ IDS_SAVE_AS "Salvează ca"
+ IDS_OPEN_FILE "Deschide fișier"
+}
+
+#pragma code_page(default){
diff --git a/reactos/dll/win32/comdlg32/cdlg_Ru.rc b/reactos/dll/win32/comdlg32/cdlg_Ru.rc
index 6e7adb8ccb0..16e02f10d4e 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Ru.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Ru.rc
@@ -442,6 +442,14 @@ STRINGTABLE DISCARDABLE
PD32_PRINTER_STATUS_POWER_SAVE "Ïèòàíèå â áåçîïàñíîì ðåæèìå; "
}
+STRINGTABLE DISCARDABLE /* Font styles */
+{
+ IDS_FONT_REGULAR "Íîðìàëüíûé"
+ IDS_FONT_BOLD "Æèðíûé"
+ IDS_FONT_ITALIC "Êóðñèâ"
+ IDS_FONT_BOLD_ITALIC "Æèðíûé êóðñèâ"
+}
+
STRINGTABLE DISCARDABLE /* Color names */
{
IDS_COLOR_BLACK "׸ðíûé"
diff --git a/reactos/dll/win32/comdlg32/cdlg_Si.rc b/reactos/dll/win32/comdlg32/cdlg_Si.rc
index de83fa44047..eaa27a6f43c 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Si.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Si.rc
@@ -313,13 +313,13 @@ BEGIN
AUTORADIOBUTTON "L&e¾eèa", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
GROUPBOX "Robovi", grp4, 80, 156, 152, 56, BS_GROUPBOX
LTEXT "&Levo:", stc15, 88, 172, 21, 8
- EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Desno:", stc16, 159, 172, 27, 8
- EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Zgoraj:", stc17, 88, 192, 21, 8
- EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Spodaj:", stc18, 159, 192, 23, 8
- EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
DEFPUSHBUTTON "V redu", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "Preklièi", IDCANCEL, 126, 220, 50, 14
PUSHBUTTON "&Tiskalnik ...", psh3, 184, 220, 48, 14
diff --git a/reactos/dll/win32/comdlg32/cdlg_Sv.rc b/reactos/dll/win32/comdlg32/cdlg_Sv.rc
index bc954c8cab0..a313b0933ab 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Sv.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Sv.rc
@@ -306,13 +306,13 @@ BEGIN
AUTORADIOBUTTON "&Liggande", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
GROUPBOX "Marginaler", grp4, 80, 156, 152, 56, BS_GROUPBOX
LTEXT "&Vänster:", stc15, 88, 172, 21, 8
- EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Höger:", stc16, 159, 172, 27, 8
- EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Överkant:", stc17, 88, 192, 21, 8
- EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "&Nederkant:", stc18, 159, 192, 23, 8
- EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
DEFPUSHBUTTON "Ok", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "Avbryt", IDCANCEL, 126, 220, 50, 14
PUSHBUTTON "&Skrivare...", psh3, 184, 220, 48, 14
diff --git a/reactos/dll/win32/comdlg32/cdlg_Th.rc b/reactos/dll/win32/comdlg32/cdlg_Th.rc
index bab56d27d56..28e6cef78db 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Th.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Th.rc
@@ -310,13 +310,13 @@ BEGIN
AUTORADIOBUTTON "á¹Ç¹Í¹", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
GROUPBOX "¢Íº¡ÃдÒÉ", grp4, 80, 156, 152, 56, BS_GROUPBOX
LTEXT "«éÒÂ:", stc15, 88, 172, 21, 8
- EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "¢ÇÒ:", stc16, 159, 172, 27, 8
- EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "º¹:", stc17, 88, 192, 21, 8
- EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "ÅèÒ§:", stc18, 159, 192, 23, 8
- EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
DEFPUSHBUTTON "µ¡Å§", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "¡àÅÔ¡", IDCANCEL, 126, 220, 50, 14
PUSHBUTTON "à¤Ã×èͧ¾ÔÁ¾ì...", psh3, 184, 220, 48, 14
diff --git a/reactos/dll/win32/comdlg32/colordlg.c b/reactos/dll/win32/comdlg32/colordlg.c
index 777b0bd8d2a..1b4c0d59c3b 100644
--- a/reactos/dll/win32/comdlg32/colordlg.c
+++ b/reactos/dll/win32/comdlg32/colordlg.c
@@ -80,7 +80,7 @@ typedef struct CCPRIVATE
RECT fullsize; /* original dialog window size */
UINT msetrgb; /* # of SETRGBSTRING message (today not used) */
RECT old3angle; /* last position of l-marker */
- RECT oldcross; /* last position of color/satuation marker */
+ RECT oldcross; /* last position of color/saturation marker */
BOOL updating; /* to prevent recursive WM_COMMAND/EN_UPDATE processing */
int h;
int s;
@@ -443,6 +443,7 @@ void CC_PaintSelectedColor( HWND hDlg, COLORREF cr )
{
FillRect(hdc, &rect, hBrush);
DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT);
+ DeleteObject(hBrush);
}
ReleaseDC(hwnd, hdc);
}
diff --git a/reactos/dll/win32/comdlg32/colordlg16.c b/reactos/dll/win32/comdlg32/colordlg16.c
index 7680239da1e..adbcf9862a7 100644
--- a/reactos/dll/win32/comdlg32/colordlg16.c
+++ b/reactos/dll/win32/comdlg32/colordlg16.c
@@ -58,7 +58,7 @@ typedef struct CCPRIVATE
RECT fullsize; /* original dialog window size */
UINT msetrgb; /* # of SETRGBSTRING message (today not used) */
RECT old3angle; /* last position of l-marker */
- RECT oldcross; /* last position of color/satuation marker */
+ RECT oldcross; /* last position of color/saturation marker */
BOOL updating; /* to prevent recursive WM_COMMAND/EN_UPDATE processing */
int h;
int s;
diff --git a/reactos/dll/win32/comdlg32/comdlg32.rbuild b/reactos/dll/win32/comdlg32/comdlg32.rbuild
index 92f36a58200..e50c32ab2f8 100644
--- a/reactos/dll/win32/comdlg32/comdlg32.rbuild
+++ b/reactos/dll/win32/comdlg32/comdlg32.rbuild
@@ -8,18 +8,6 @@
0x600
0x600
- wine
- shell32
- shlwapi
- comctl32
- winspool
- user32
- gdi32
- advapi32
- kernel32
- ntdll
- ole32
- uuid
cdlg32.c
colordlg.c
filedlg.c
@@ -30,5 +18,17 @@
printdlg.c
rsrc.rc
comdlg32.spec
+ wine
+ shell32
+ shlwapi
+ comctl32
+ winspool
+ user32
+ gdi32
+ advapi32
+ kernel32
+ ole32
+ uuid
+ ntdll
diff --git a/reactos/dll/win32/comdlg32/filedlg.c b/reactos/dll/win32/comdlg32/filedlg.c
index 3e9c692b3e6..3e662ec4619 100644
--- a/reactos/dll/win32/comdlg32/filedlg.c
+++ b/reactos/dll/win32/comdlg32/filedlg.c
@@ -889,7 +889,7 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer
{
/* 'n' includes trailing \0 */
bufW[n-1] = '\\';
- memcpy( &bufW[n], lpstrFileList, (size-n)*sizeof(WCHAR) );
+ lstrcpynW( &bufW[n], lpstrFileList, size - n );
}
TRACE("returned -> %s\n",debugstr_wn(bufW, total));
}
@@ -931,16 +931,15 @@ static INT_PTR FILEDLG95_Handle_GetFileSpec(HWND hwnd, DWORD size, LPVOID buffer
FILEDLG95_FILENAME_GetFileNames(hwnd, &lpstrFileList, &sizeUsed, ' ');
if( fodInfos->unicode )
{
- LPWSTR bufW = buffer;
- memcpy( bufW, lpstrFileList, sizeof(WCHAR)*sizeUsed );
+ lstrcpynW( buffer, lpstrFileList, size );
}
else
{
LPSTR bufA = buffer;
- sizeUsed = WideCharToMultiByte( CP_ACP, 0, lpstrFileList, sizeUsed,
- NULL, 0, NULL, NULL);
- WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed,
- bufA, size, NULL, NULL);
+ DWORD sizeA = WideCharToMultiByte( CP_ACP, 0, lpstrFileList, sizeUsed, NULL, 0, NULL, NULL);
+ WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed, bufA, size, NULL, NULL);
+ if (size && size < sizeA) bufA[size - 1] = 0;
+ sizeUsed = sizeA;
}
MemFree(lpstrFileList);
@@ -1373,9 +1372,9 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd)
if (handledPath == FALSE && (win2000plus || win98plus)) {
fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR));
- if(FAILED(COMDLG32_SHGetFolderPathW(hwnd, CSIDL_PERSONAL, 0, 0, fodInfos->initdir)))
+ if(!COMDLG32_SHGetFolderPathW(hwnd, CSIDL_PERSONAL, 0, 0, fodInfos->initdir))
{
- if(FAILED(COMDLG32_SHGetFolderPathW(hwnd, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, 0, 0, fodInfos->initdir)))
+ if(!COMDLG32_SHGetFolderPathW(hwnd, CSIDL_DESKTOPDIRECTORY|CSIDL_FLAG_CREATE, 0, 0, fodInfos->initdir))
{
/* last fallback */
GetCurrentDirectoryW(MAX_PATH, fodInfos->initdir);
@@ -1834,7 +1833,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
TRACE("current directory=%s\n", debugstr_w(lpstrPathAndFile));
- /* if the user specifyed a fully qualified path use it */
+ /* if the user specified a fully qualified path use it */
if(PathIsRelativeW(lpstrFileList))
{
lstrcatW(lpstrPathAndFile, lpstrFileList);
@@ -3237,29 +3236,27 @@ static int FILEDLG95_FILENAME_GetFileNames (HWND hwnd, LPWSTR * lpstrFileList, U
while ((lpstrEdit[nStrCharCount]!='"') && (nStrCharCount <= nStrLen))
{
(*lpstrFileList)[nFileIndex++] = lpstrEdit[nStrCharCount];
- (*sizeUsed)++;
nStrCharCount++;
}
(*lpstrFileList)[nFileIndex++] = separator;
- (*sizeUsed)++;
nFileCount++;
}
nStrCharCount++;
}
/* single, unquoted string */
- if ((nStrLen > 0) && (*sizeUsed == 0) )
+ if ((nStrLen > 0) && (nFileIndex == 0) )
{
lstrcpyW(*lpstrFileList, lpstrEdit);
nFileIndex = lstrlenW(lpstrEdit) + 1;
- (*sizeUsed) = nFileIndex;
nFileCount = 1;
}
- /* trailing \0 */
- (*lpstrFileList)[nFileIndex] = '\0';
- (*sizeUsed)++;
+ /* trailing \0 */
+ if (nFileIndex && separator) nFileIndex--; /* remove trailing separator */
+ (*lpstrFileList)[nFileIndex++] = '\0';
+ *sizeUsed = nFileIndex;
MemFree(lpstrEdit);
return nFileCount;
}
@@ -3681,7 +3678,7 @@ static void CALLBACK FD32_UpdateResult(const FD31_DATA *lfs)
priv->ofnA->lpstrFile, ofnW->nMaxFile, NULL, NULL ))
priv->ofnA->lpstrFile[ofnW->nMaxFile-1] = 0;
- /* offsets are not guarenteed to be the same in WCHAR to MULTIBYTE conversion */
+ /* offsets are not guaranteed to be the same in WCHAR to MULTIBYTE conversion */
/* set filename offset */
lpszTemp = PathFindFileNameA(priv->ofnA->lpstrFile);
priv->ofnA->nFileOffset = (lpszTemp - priv->ofnA->lpstrFile);
@@ -3813,7 +3810,7 @@ static INT_PTR CALLBACK FD32_FileOpenDlgProc(HWND hWnd, UINT wMsg,
*
* Creates a win31 style dialog box for the user to select a file to open/save.
*/
-static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* addess of structure with data*/
+static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* address of structure with data*/
UINT dlgType /* type dialogue : open/save */
)
{
@@ -3844,7 +3841,7 @@ static BOOL GetFileName31A(LPOPENFILENAMEA lpofn, /* addess of structure with da
*
* Creates a win31 style dialog box for the user to select a file to open/save
*/
-static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* addess of structure with data*/
+static BOOL GetFileName31W(LPOPENFILENAMEW lpofn, /* address of structure with data*/
UINT dlgType /* type dialogue : open/save */
)
{
diff --git a/reactos/dll/win32/comdlg32/filedlg16.c b/reactos/dll/win32/comdlg32/filedlg16.c
index bf9325d09e5..a722a2b8d4e 100644
--- a/reactos/dll/win32/comdlg32/filedlg16.c
+++ b/reactos/dll/win32/comdlg32/filedlg16.c
@@ -73,7 +73,7 @@ static void FD16_MapOfnStruct16(const OPENFILENAME16 *ofn16, LPOPENFILENAMEW ofn
if (HIWORD(ofn16->lpTemplateName))
ofnA.lpTemplateName = MapSL(ofn16->lpTemplateName);
else
- ofnA.lpTemplateName = (LPSTR) ofn16->lpTemplateName; /* ressource number */
+ ofnA.lpTemplateName = (LPSTR) ofn16->lpTemplateName; /* resource number */
/* now calls the 32 bits Ansi to Unicode version to complete the job */
FD31_MapOfnStructA(&ofnA, ofnW, open);
}
@@ -485,7 +485,7 @@ BOOL16 WINAPI GetOpenFileName16(
* unknown. There are some FIXME's left.
*/
BOOL16 WINAPI GetSaveFileName16(
- SEGPTR ofn /* [in/out] addess of structure with data*/
+ SEGPTR ofn /* [in/out] address of structure with data*/
)
{
HINSTANCE16 hInst;
diff --git a/reactos/dll/win32/comdlg32/fontdlg.c b/reactos/dll/win32/comdlg32/fontdlg.c
index f25d17d3daf..2532f2ffc13 100644
--- a/reactos/dll/win32/comdlg32/fontdlg.c
+++ b/reactos/dll/win32/comdlg32/fontdlg.c
@@ -357,24 +357,20 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTW *lplf)
{
int italic;
int weight;
- const WCHAR *stname;
+ UINT resId;
};
- static const WCHAR strRegular[] = {'R','e','g','u','l','a','r',0};
- static const WCHAR strItalic[] = {'I','t','a','l','i','c',0};
- static const WCHAR strBold[] = {'B','o','l','d',0};
- static const WCHAR strBoldItalic[] = {'B','o','l','d',' ','I','t','a','l','i','c',0};
static const struct FONTSTYLE fontstyles[FSTYLES]={
- { 0, FW_NORMAL, strRegular },
- { 1, FW_NORMAL, strItalic },
- { 0, FW_BOLD, strBold },
- { 1, FW_BOLD, strBoldItalic }
+ { 0, FW_NORMAL, IDS_FONT_REGULAR },
+ { 1, FW_NORMAL, IDS_FONT_ITALIC },
+ { 0, FW_BOLD, IDS_FONT_BOLD },
+ { 1, FW_BOLD, IDS_FONT_BOLD_ITALIC }
};
HFONT hf;
TEXTMETRICW tm;
int i,j;
LOGFONTW lf;
- memcpy(&lf, lplf, sizeof(LOGFONTW));
+ lf = *lplf;
for (i=0;i FW_MEDIUM)) &&
((tm.tmItalic != 0)==fontstyles[i].italic))
{
- j=SendMessageW(hwnd,CB_ADDSTRING,0,(LPARAM)fontstyles[i].stname );
+ WCHAR name[64];
+ LoadStringW(COMDLG32_hInstance, fontstyles[i].resId, name, 64);
+ j=SendMessageW(hwnd,CB_ADDSTRING,0,(LPARAM)name );
if (j==CB_ERR) return 1;
j=SendMessageW(hwnd, CB_SETITEMDATA, j,
MAKELONG(tm.tmWeight,fontstyles[i].italic));
@@ -963,7 +961,7 @@ LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam,
call back with the extra FONTTYPE_... bits added */
lpxx->lfPitchAndFamily = HIWORD(l) >> 8;
}
- lstrcpyW(lpxx->lfFaceName,str);
+ lstrcpynW(lpxx->lfFaceName, str, sizeof(lpxx->lfFaceName)/sizeof(lpxx->lfFaceName[0]));
i=SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0);
if (i!=CB_ERR)
{
diff --git a/reactos/dll/win32/comdlg32/printdlg.c b/reactos/dll/win32/comdlg32/printdlg.c
index 95f4dac7f17..ea5d34e5624 100644
--- a/reactos/dll/win32/comdlg32/printdlg.c
+++ b/reactos/dll/win32/comdlg32/printdlg.c
@@ -308,15 +308,12 @@ static BOOL PRINTDLG_UpdatePrintDlgA(HWND hDlg,
nToPage = GetDlgItemInt(hDlg, edt2, NULL, FALSE);
if (nFromPage < lppd->nMinPage || nFromPage > lppd->nMaxPage ||
nToPage < lppd->nMinPage || nToPage > lppd->nMaxPage) {
- char resourcestr[256];
- char resultstr[256];
- LoadStringA(COMDLG32_hInstance, PD32_INVALID_PAGE_RANGE,
- resourcestr, 255);
- sprintf(resultstr,resourcestr, lppd->nMinPage, lppd->nMaxPage);
- LoadStringA(COMDLG32_hInstance, PD32_PRINT_TITLE,
- resourcestr, 255);
- MessageBoxA(hDlg, resultstr, resourcestr,
- MB_OK | MB_ICONWARNING);
+ WCHAR resourcestr[256];
+ WCHAR resultstr[256];
+ LoadStringW(COMDLG32_hInstance, PD32_INVALID_PAGE_RANGE, resourcestr, 255);
+ wsprintfW(resultstr,resourcestr, lppd->nMinPage, lppd->nMaxPage);
+ LoadStringW(COMDLG32_hInstance, PD32_PRINT_TITLE, resourcestr, 255);
+ MessageBoxW(hDlg, resultstr, resourcestr, MB_OK | MB_ICONWARNING);
return FALSE;
}
lppd->nFromPage = nFromPage;
@@ -356,11 +353,29 @@ static BOOL PRINTDLG_UpdatePrintDlgA(HWND hDlg,
if (lpdm->dmFields & DM_COPIES)
lpdm->u1.s1.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
} else {
+ /* Application is responsible for multiple copies */
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
lppd->Flags |= PD_COLLATE;
else
lppd->Flags &= ~PD_COLLATE;
lppd->nCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+ /* multiple copies already included in the document. Driver must print only one copy */
+ lpdm->u1.s1.dmCopies = 1;
+ }
+
+ /* Print quality, PrintDlg16 */
+ if(GetDlgItem(hDlg, cmb1))
+ {
+ HWND hQuality = GetDlgItem(hDlg, cmb1);
+ int Sel = SendMessageA(hQuality, CB_GETCURSEL, 0, 0);
+
+ if(Sel != CB_ERR)
+ {
+ LONG dpi = SendMessageA(hQuality, CB_GETITEMDATA, Sel, 0);
+ lpdm->dmFields |= DM_PRINTQUALITY | DM_YRESOLUTION;
+ lpdm->u1.s1.dmPrintQuality = LOWORD(dpi);
+ lpdm->dmYResolution = HIWORD(dpi);
+ }
}
}
return TRUE;
@@ -485,7 +500,6 @@ static BOOL PRINTDLG_PaperSizeA(
for (i=0;iFlags & PD_HIDEPRINTTOFILE)
ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
+ /* Fill print quality combo, PrintDlg16 */
+ if(GetDlgItem(hDlg, cmb1))
+ {
+ DWORD numResolutions = DeviceCapabilitiesA(PrintStructures->lpPrinterInfo->pPrinterName,
+ PrintStructures->lpPrinterInfo->pPortName,
+ DC_ENUMRESOLUTIONS, NULL, lpdm);
+
+ if(numResolutions != -1)
+ {
+ HWND hQuality = GetDlgItem(hDlg, cmb1);
+ LONG* Resolutions;
+ char buf[255];
+ int i;
+ int dpiX, dpiY;
+ HDC hPrinterDC = CreateDCA(PrintStructures->lpPrinterInfo->pDriverName,
+ PrintStructures->lpPrinterInfo->pPrinterName,
+ 0, lpdm);
+
+ Resolutions = HeapAlloc(GetProcessHeap(), 0, numResolutions*sizeof(LONG)*2);
+ DeviceCapabilitiesA(PrintStructures->lpPrinterInfo->pPrinterName,
+ PrintStructures->lpPrinterInfo->pPortName,
+ DC_ENUMRESOLUTIONS, (LPSTR)Resolutions, lpdm);
+
+ dpiX = GetDeviceCaps(hPrinterDC, LOGPIXELSX);
+ dpiY = GetDeviceCaps(hPrinterDC, LOGPIXELSY);
+ DeleteDC(hPrinterDC);
+
+ SendMessageA(hQuality, CB_RESETCONTENT, 0, 0);
+ for(i = 0; i < (numResolutions * 2); i += 2)
+ {
+ BOOL IsDefault = FALSE;
+ LRESULT Index;
+
+ if(Resolutions[i] == Resolutions[i+1])
+ {
+ if(dpiX == Resolutions[i])
+ IsDefault = TRUE;
+ sprintf(buf, "%d dpi", Resolutions[i]);
+ } else
+ {
+ if(dpiX == Resolutions[i] && dpiY == Resolutions[i+1])
+ IsDefault = TRUE;
+ sprintf(buf, "%d dpi x %d dpi", Resolutions[i], Resolutions[i+1]);
+ }
+
+ Index = SendMessageA(hQuality, CB_ADDSTRING, 0, (LPARAM)buf);
+
+ if(IsDefault)
+ SendMessageA(hQuality, CB_SETCURSEL, Index, 0);
+
+ SendMessageA(hQuality, CB_SETITEMDATA, Index, MAKELONG(dpiX,dpiY));
+ }
+ HeapFree(GetProcessHeap(), 0, Resolutions);
+ }
+ }
} else { /* PD_PRINTSETUP */
BOOL bPortrait = (lpdm->u1.s1.dmOrientation == DMORIENT_PORTRAIT);
@@ -1536,9 +1604,8 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
}
break;
- case cmb1: /* Printer Combobox in PRINT SETUP, quality combobox in PRINT */
+ case cmb1: /* Printer Combobox in PRINT SETUP, quality combobox in PRINT16 */
if (PrinterComboID != LOWORD(wParam)) {
- FIXME("No handling for print quality combo box yet.\n");
break;
}
/* FALLTHROUGH */
@@ -1700,11 +1767,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
}
break;
- case cmb1: /* Printer Combobox in PRINT SETUP, quality combobox in PRINT */
- if (PrinterComboID != LOWORD(wParam)) {
- FIXME("No handling for print quality combo box yet.\n");
- break;
- }
+ case cmb1: /* Printer Combobox in PRINT SETUP */
/* FALLTHROUGH */
case cmb4: /* Printer combobox */
if (HIWORD(wParam)==CBN_SELCHANGE) {
@@ -2338,7 +2401,7 @@ typedef struct {
} PageSetupDataA;
typedef struct {
- LPPAGESETUPDLGW dlga;
+ LPPAGESETUPDLGW dlgw;
PRINTDLGW pdlg;
PAGESETUPDLGW curdlg; /* Current dialog state */
} PageSetupDataW;
@@ -2421,16 +2484,16 @@ _c_size2strA(PageSetupDataA *pda,DWORD size,LPSTR strout) {
return;
}
static void
-_c_size2strW(PageSetupDataW *pda,DWORD size,LPWSTR strout) {
+_c_size2strW(PageSetupDataW *pdw,DWORD size,LPWSTR strout) {
static const char mm_fmt[] = "%.2f mm";
static const char in_fmt[] = "%.2f in";
char buf[20];
- if (pda->dlga->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) {
+ if (pdw->dlgw->Flags & PSD_INHUNDREDTHSOFMILLIMETERS) {
sprintf(buf, mm_fmt, (size * 1.0) / 100.0);
- } else if (pda->dlga->Flags & PSD_INTHOUSANDTHSOFINCHES) {
+ } else if (pdw->dlgw->Flags & PSD_INTHOUSANDTHSOFINCHES) {
sprintf(buf, in_fmt, (size * 1.0) / 1000.0);
} else {
- pda->dlga->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
+ pdw->dlgw->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
sprintf(buf, mm_fmt, (size * 1.0) / 100.0);
}
@@ -2543,15 +2606,15 @@ PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) {
}
static BOOL
-PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pda) {
+PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pdw) {
DEVNAMES *dn;
DEVMODEW *dm;
LPWSTR devname,portname;
WCHAR papername[64];
WCHAR buf[200];
- dn = GlobalLock(pda->pdlg.hDevNames);
- dm = GlobalLock(pda->pdlg.hDevMode);
+ dn = GlobalLock(pdw->pdlg.hDevNames);
+ dm = GlobalLock(pdw->pdlg.hDevMode);
devname = ((WCHAR*)dn)+dn->wDeviceOffset;
portname = ((WCHAR*)dn)+dn->wOutputOffset;
@@ -2560,35 +2623,35 @@ PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pda) {
/* Save paper source into device context */
PRINTDLG_SetUpPaperComboBoxW(hDlg,cmb3,devname,portname,dm);
- if (GetDlgItemTextW(hDlg,cmb2,papername,sizeof(papername))>0) {
- PRINTDLG_PaperSizeW(&(pda->pdlg),papername,&(pda->dlga->ptPaperSize));
- pda->dlga->ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga,pda->dlga->ptPaperSize.x);
- pda->dlga->ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga,pda->dlga->ptPaperSize.y);
+ if (GetDlgItemTextW(hDlg,cmb2,papername,sizeof(papername)/sizeof(papername[0]))>0) {
+ PRINTDLG_PaperSizeW(&(pdw->pdlg),papername,&(pdw->dlgw->ptPaperSize));
+ pdw->dlgw->ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pdw->dlgw,pdw->dlgw->ptPaperSize.x);
+ pdw->dlgw->ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pdw->dlgw,pdw->dlgw->ptPaperSize.y);
} else
FIXME("could not get dialog text for papersize cmbbox?\n");
-#define GETVAL(id,val) if (GetDlgItemTextW(hDlg,id,buf,sizeof(buf)/sizeof(buf[0]))>0) { val = _c_str2sizeW(pda->dlga,buf); } else { FIXME("could not get dlgitemtextw for %x\n",id); }
- GETVAL(edt4,pda->dlga->rtMargin.left);
- GETVAL(edt5,pda->dlga->rtMargin.top);
- GETVAL(edt6,pda->dlga->rtMargin.right);
- GETVAL(edt7,pda->dlga->rtMargin.bottom);
+#define GETVAL(id,val) if (GetDlgItemTextW(hDlg,id,buf,sizeof(buf)/sizeof(buf[0]))>0) { val = _c_str2sizeW(pdw->dlgw,buf); } else { FIXME("could not get dlgitemtextw for %x\n",id); }
+ GETVAL(edt4,pdw->dlgw->rtMargin.left);
+ GETVAL(edt5,pdw->dlgw->rtMargin.top);
+ GETVAL(edt6,pdw->dlgw->rtMargin.right);
+ GETVAL(edt7,pdw->dlgw->rtMargin.bottom);
#undef GETVAL
/* If we are in landscape, swap x and y of page size */
if (IsDlgButtonChecked(hDlg, rad2)) {
DWORD tmp;
- tmp = pda->dlga->ptPaperSize.x;
- pda->dlga->ptPaperSize.x = pda->dlga->ptPaperSize.y;
- pda->dlga->ptPaperSize.y = tmp;
+ tmp = pdw->dlgw->ptPaperSize.x;
+ pdw->dlgw->ptPaperSize.x = pdw->dlgw->ptPaperSize.y;
+ pdw->dlgw->ptPaperSize.y = tmp;
}
/* Save orientation */
- if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y)
+ if (pdw->dlgw->ptPaperSize.x > pdw->dlgw->ptPaperSize.y)
dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
else
dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
- GlobalUnlock(pda->pdlg.hDevNames);
- GlobalUnlock(pda->pdlg.hDevMode);
+ GlobalUnlock(pdw->pdlg.hDevNames);
+ GlobalUnlock(pdw->pdlg.hDevMode);
return TRUE;
}
@@ -2684,34 +2747,34 @@ PRINTDLG_PS_ChangePrinterA(HWND hDlg, PageSetupDataA *pda) {
return TRUE;
}
-static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pda)
+static void PRINTDLG_PS_SetOrientationW(HWND hDlg, PageSetupDataW* pdw)
{
WCHAR PaperName[64];
GetDlgItemTextW(hDlg, cmb2, PaperName, sizeof(PaperName)/sizeof(WCHAR));
- PRINTDLG_PaperSizeW(&pda->pdlg, PaperName, &pda->curdlg.ptPaperSize);
- pda->curdlg.ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.x);
- pda->curdlg.ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pda->dlga, pda->curdlg.ptPaperSize.y);
+ PRINTDLG_PaperSizeW(&pdw->pdlg, PaperName, &pdw->curdlg.ptPaperSize);
+ pdw->curdlg.ptPaperSize.x = _c_10mm2size((LPPAGESETUPDLGA)pdw->dlgw, pdw->curdlg.ptPaperSize.x);
+ pdw->curdlg.ptPaperSize.y = _c_10mm2size((LPPAGESETUPDLGA)pdw->dlgw, pdw->curdlg.ptPaperSize.y);
if(IsDlgButtonChecked(hDlg, rad2))
{
- DWORD tmp = pda->curdlg.ptPaperSize.x;
- pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y;
- pda->curdlg.ptPaperSize.y = tmp;
+ DWORD tmp = pdw->curdlg.ptPaperSize.x;
+ pdw->curdlg.ptPaperSize.x = pdw->curdlg.ptPaperSize.y;
+ pdw->curdlg.ptPaperSize.y = tmp;
}
}
-static void PRINTDLG_PS_UpdatePrintDlgW(PageSetupDataW* pda, HWND hDlg)
+static void PRINTDLG_PS_UpdatePrintDlgW(PageSetupDataW* pdw, HWND hDlg)
{
DEVMODEW* dm;
DWORD sel;
- dm = GlobalLock(pda->pdlg.hDevMode);
+ dm = GlobalLock(pdw->pdlg.hDevMode);
if(!dm)
return;
- if(pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x)
+ if(pdw->curdlg.ptPaperSize.y > pdw->curdlg.ptPaperSize.x)
dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
else
dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
@@ -2721,17 +2784,17 @@ static void PRINTDLG_PS_UpdatePrintDlgW(PageSetupDataW* pda, HWND hDlg)
if(sel != CB_ERR)
dm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2, CB_GETITEMDATA, sel, 0);
- GlobalUnlock(pda->pdlg.hDevMode);
+ GlobalUnlock(pdw->pdlg.hDevMode);
}
static BOOL
-PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pda) {
+PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pdw) {
DEVNAMES *dn;
DEVMODEW *dm;
LPWSTR devname,portname;
- dn = GlobalLock(pda->pdlg.hDevNames);
- dm = GlobalLock(pda->pdlg.hDevMode);
+ dn = GlobalLock(pdw->pdlg.hDevNames);
+ dm = GlobalLock(pdw->pdlg.hDevMode);
devname = ((WCHAR*)dn)+dn->wDeviceOffset;
portname = ((WCHAR*)dn)+dn->wOutputOffset;
PRINTDLG_SetUpPaperComboBoxW(hDlg,cmb2,devname,portname,dm);
@@ -2743,10 +2806,10 @@ PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pda) {
else /* this is default if papersize is not set */
CheckRadioButton(hDlg, rad1, rad2, rad1);
- GlobalUnlock(pda->pdlg.hDevNames);
- GlobalUnlock(pda->pdlg.hDevMode);
+ GlobalUnlock(pdw->pdlg.hDevNames);
+ GlobalUnlock(pdw->pdlg.hDevMode);
- PRINTDLG_PS_SetOrientationW(hDlg, pda);
+ PRINTDLG_PS_SetOrientationW(hDlg, pdw);
return TRUE;
}
@@ -2785,7 +2848,7 @@ PRINTDLG_PS_ChangePaperPrev(const PageSetupDataA *pda)
MoveWindow(GetDlgItem(pda->hDlg, rct2), x+width, y+SHADOW, SHADOW, height, FALSE);
MoveWindow(GetDlgItem(pda->hDlg, rct3), x+SHADOW, y+height, width, SHADOW, FALSE);
MoveWindow(GetDlgItem(pda->hDlg, rct1), x, y, width, height, FALSE);
- memcpy(&rtTmp, &pda->rtDrawRect, sizeof(RECT));
+ rtTmp = pda->rtDrawRect;
rtTmp.right += SHADOW;
rtTmp.bottom += SHADOW;
#undef SHADOW
@@ -2966,13 +3029,13 @@ PRINTDLG_PS_WMCommandA(
static BOOL
PRINTDLG_PS_WMCommandW(
- HWND hDlg, WPARAM wParam, LPARAM lParam, PageSetupDataW *pda
+ HWND hDlg, WPARAM wParam, LPARAM lParam, PageSetupDataW *pdw
) {
TRACE("loword (lparam) %d, wparam 0x%lx, lparam %08lx\n",
LOWORD(lParam),wParam,lParam);
switch (LOWORD(wParam)) {
case IDOK:
- if (!PRINTDLG_PS_UpdateDlgStructW(hDlg, pda))
+ if (!PRINTDLG_PS_UpdateDlgStructW(hDlg, pdw))
return(FALSE);
EndDialog(hDlg, TRUE);
return TRUE ;
@@ -2983,15 +3046,15 @@ PRINTDLG_PS_WMCommandW(
case rad1:
case rad2:
- if((LOWORD(wParam) == rad1 && pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) ||
- (LOWORD(wParam) == rad2 && pda->curdlg.ptPaperSize.y > pda->curdlg.ptPaperSize.x))
+ if((LOWORD(wParam) == rad1 && pdw->curdlg.ptPaperSize.x > pdw->curdlg.ptPaperSize.y) ||
+ (LOWORD(wParam) == rad2 && pdw->curdlg.ptPaperSize.y > pdw->curdlg.ptPaperSize.x))
{
WCHAR tmpText[25];
WCHAR tmpText2[25];
- DWORD tmp = pda->curdlg.ptPaperSize.y;
+ DWORD tmp = pdw->curdlg.ptPaperSize.y;
- pda->curdlg.ptPaperSize.y = pda->curdlg.ptPaperSize.x;
- pda->curdlg.ptPaperSize.x = tmp;
+ pdw->curdlg.ptPaperSize.y = pdw->curdlg.ptPaperSize.x;
+ pdw->curdlg.ptPaperSize.x = tmp;
GetDlgItemTextW(hDlg, edt4, tmpText, sizeof(tmpText)/sizeof(WCHAR));
GetDlgItemTextW(hDlg, edt5, tmpText2, sizeof(tmpText2)/sizeof(WCHAR));
@@ -3006,11 +3069,11 @@ PRINTDLG_PS_WMCommandW(
break;
case psh3: {
- pda->pdlg.Flags = 0;
- pda->pdlg.hwndOwner = hDlg;
- PRINTDLG_PS_UpdatePrintDlgW(pda, hDlg);
- if (PrintDlgW(&(pda->pdlg)))
- PRINTDLG_PS_ChangePrinterW(hDlg,pda);
+ pdw->pdlg.Flags = 0;
+ pdw->pdlg.hwndOwner = hDlg;
+ PRINTDLG_PS_UpdatePrintDlgW(pdw, hDlg);
+ if (PrintDlgW(&(pdw->pdlg)))
+ PRINTDLG_PS_ChangePrinterW(hDlg,pdw);
return TRUE;
}
}
@@ -3232,7 +3295,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (uMsg == WM_INITDIALOG) { /*Init dialog*/
pda = (PageSetupDataA*)lParam;
pda->hDlg = hDlg; /* saving handle to main window to PageSetupDataA structure */
- memcpy(&pda->curdlg, pda->dlga, sizeof(pda->curdlg));
+ pda->curdlg = *pda->dlga;
hDrawWnd = GetDlgItem(hDlg, rct1);
TRACE("set property to %p\n", pda);
@@ -3246,7 +3309,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
GWLP_WNDPROC,
(ULONG_PTR)PRINTDLG_PagePaintProc);
- /* FIXME: Paint hook. Must it be at begin of initializtion or at end? */
+ /* FIXME: Paint hook. Must it be at begin of initialization or at end? */
res = TRUE;
if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) {
if (!pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga))
@@ -3352,82 +3415,82 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
static const WCHAR __WINE_PAGESETUPDLGDATA[] =
{ '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E',
'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 };
- PageSetupDataW *pda;
+ PageSetupDataW *pdw;
BOOL res = FALSE;
if (uMsg==WM_INITDIALOG) {
res = TRUE;
- pda = (PageSetupDataW*)lParam;
- memcpy(&pda->curdlg, pda, sizeof(pda->curdlg));
- SetPropW(hDlg, __WINE_PAGESETUPDLGDATA, pda);
- if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) {
- res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pda->dlga);
+ pdw = (PageSetupDataW*)lParam;
+ pdw->curdlg = *pdw->dlgw;
+ SetPropW(hDlg, __WINE_PAGESETUPDLGDATA, pdw);
+ if (pdw->dlgw->Flags & PSD_ENABLEPAGESETUPHOOK) {
+ res = pdw->dlgw->lpfnPageSetupHook(hDlg,uMsg,wParam,(LPARAM)pdw->dlgw);
if (!res) {
FIXME("Setup page hook failed?\n");
res = TRUE;
}
}
- if (pda->dlga->Flags & PSD_ENABLEPAGEPAINTHOOK) {
+ if (pdw->dlgw->Flags & PSD_ENABLEPAGEPAINTHOOK) {
FIXME("PagePaintHook not yet implemented!\n");
}
- if (pda->dlga->Flags & PSD_DISABLEPRINTER)
+ if (pdw->dlgw->Flags & PSD_DISABLEPRINTER)
EnableWindow(GetDlgItem(hDlg, psh3), FALSE);
- if (pda->dlga->Flags & PSD_DISABLEMARGINS) {
+ if (pdw->dlgw->Flags & PSD_DISABLEMARGINS) {
EnableWindow(GetDlgItem(hDlg, edt4), FALSE);
EnableWindow(GetDlgItem(hDlg, edt5), FALSE);
EnableWindow(GetDlgItem(hDlg, edt6), FALSE);
EnableWindow(GetDlgItem(hDlg, edt7), FALSE);
}
- PRINTDLG_PS_ChangePrinterW(hDlg,pda);
+ PRINTDLG_PS_ChangePrinterW(hDlg,pdw);
- if (pda->dlga->Flags & PSD_DISABLEORIENTATION) {
+ if (pdw->dlgw->Flags & PSD_DISABLEORIENTATION) {
EnableWindow(GetDlgItem(hDlg,rad1),FALSE);
EnableWindow(GetDlgItem(hDlg,rad2),FALSE);
}
/* We fill them out enabled or not */
- if (pda->dlga->Flags & PSD_MARGINS) {
+ if (pdw->dlgw->Flags & PSD_MARGINS) {
WCHAR str[100];
- _c_size2strW(pda,pda->dlga->rtMargin.left,str);
+ _c_size2strW(pdw,pdw->dlgw->rtMargin.left,str);
SetDlgItemTextW(hDlg,edt4,str);
- _c_size2strW(pda,pda->dlga->rtMargin.top,str);
+ _c_size2strW(pdw,pdw->dlgw->rtMargin.top,str);
SetDlgItemTextW(hDlg,edt5,str);
- _c_size2strW(pda,pda->dlga->rtMargin.right,str);
+ _c_size2strW(pdw,pdw->dlgw->rtMargin.right,str);
SetDlgItemTextW(hDlg,edt6,str);
- _c_size2strW(pda,pda->dlga->rtMargin.bottom,str);
+ _c_size2strW(pdw,pdw->dlgw->rtMargin.bottom,str);
SetDlgItemTextW(hDlg,edt7,str);
} else {
/* default is 1 inch */
- DWORD size = _c_inch2size((LPPAGESETUPDLGA)pda->dlga,1000);
+ DWORD size = _c_inch2size((LPPAGESETUPDLGA)pdw->dlgw,1000);
WCHAR str[20];
- _c_size2strW(pda,size,str);
+ _c_size2strW(pdw,size,str);
SetDlgItemTextW(hDlg,edt4,str);
SetDlgItemTextW(hDlg,edt5,str);
SetDlgItemTextW(hDlg,edt6,str);
SetDlgItemTextW(hDlg,edt7,str);
}
- if (pda->dlga->Flags & PSD_DISABLEPAPER) {
+ if (pdw->dlgw->Flags & PSD_DISABLEPAPER) {
EnableWindow(GetDlgItem(hDlg,cmb2),FALSE);
EnableWindow(GetDlgItem(hDlg,cmb3),FALSE);
}
return TRUE;
} else {
- pda = (PageSetupDataW*)GetPropW(hDlg, __WINE_PAGESETUPDLGDATA);
- if (!pda) {
+ pdw = (PageSetupDataW*)GetPropW(hDlg, __WINE_PAGESETUPDLGDATA);
+ if (!pdw) {
WARN("__WINE_PAGESETUPDLGDATA prop not set?\n");
return FALSE;
}
- if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) {
- res = pda->dlga->lpfnPageSetupHook(hDlg,uMsg,wParam,lParam);
+ if (pdw->dlgw->Flags & PSD_ENABLEPAGESETUPHOOK) {
+ res = pdw->dlgw->lpfnPageSetupHook(hDlg,uMsg,wParam,lParam);
if (res) return res;
}
}
switch (uMsg) {
case WM_COMMAND:
- return PRINTDLG_PS_WMCommandW(hDlg, wParam, lParam, pda);
+ return PRINTDLG_PS_WMCommandW(hDlg, wParam, lParam, pdw);
}
return FALSE;
}
@@ -3504,9 +3567,9 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
bRet = PrintDlgA(&pdlg);
if (!bRet){
if (!(setupdlg->Flags & PSD_NOWARNING)) {
- char errstr[256];
- LoadStringA(COMDLG32_hInstance, PD32_NO_DEFAULT_PRINTER, errstr, 255);
- MessageBoxA(setupdlg->hwndOwner, errstr, 0, MB_OK | MB_ICONERROR);
+ WCHAR errstr[256];
+ LoadStringW(COMDLG32_hInstance, PD32_NO_DEFAULT_PRINTER, errstr, 255);
+ MessageBoxW(setupdlg->hwndOwner, errstr, 0, MB_OK | MB_ICONERROR);
}
return FALSE;
}
@@ -3537,10 +3600,10 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
return FALSE;
}
-
+
pda = HeapAlloc(GetProcessHeap(),0,sizeof(*pda));
pda->dlga = setupdlg;
- memcpy(&pda->pdlg,&pdlg,sizeof(pdlg));
+ pda->pdlg = pdlg;
bRet = (0hInstance,
@@ -3630,8 +3693,8 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) {
return FALSE;
}
pdw = HeapAlloc(GetProcessHeap(),0,sizeof(*pdw));
- pdw->dlga = setupdlg;
- memcpy(&pdw->pdlg,&pdlg,sizeof(pdlg));
+ pdw->dlgw = setupdlg;
+ pdw->pdlg = pdlg;
bRet = (0hInstance,
diff --git a/reactos/dll/win32/comdlg32/rsrc.rc b/reactos/dll/win32/comdlg32/rsrc.rc
index c2e51b17449..1b1dad3aa7e 100644
--- a/reactos/dll/win32/comdlg32/rsrc.rc
+++ b/reactos/dll/win32/comdlg32/rsrc.rc
@@ -47,6 +47,7 @@
#include "cdlg_Cs.rc"
#include "cdlg_Da.rc"
#include "cdlg_De.rc"
+#include "cdlg_El.rc"
#include "cdlg_En.rc"
#include "cdlg_Eo.rc"
#include "cdlg_Es.rc"
@@ -59,6 +60,7 @@
#include "cdlg_No.rc"
#include "cdlg_Pl.rc"
#include "cdlg_Pt.rc"
+#include "cdlg_Ro.rc"
#include "cdlg_Ru.rc"
#include "cdlg_Si.rc"
#include "cdlg_Sk.rc"