From 4e0fa347fa3d585ce9cb0e0dfdef22f65dfcaf63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Sat, 8 May 2004 12:53:14 +0000 Subject: [PATCH] Sync to Wine-20040505: Pavel Roskin - Make the file type combobox non-editable. Ilya Korniyko - Added Ukrainian translations. Wolfgang Schwotzer - Update OFN_READONLY flag when closing file dialog. - Make file dialog support FNERR_BUFFERTOSMALL if buffer too small. Francois Gouget - Make Unicode strings static const. - If lpstrTitle is NULL, set it to either 'Open File' or 'Save as'. - Constify the string constants. - Make Unicode const strings static so they are not copied to the stack each time we enter the function. svn path=/trunk/; revision=9324 --- reactos/lib/comdlg32/cdlg_Cn.rc | 2 +- reactos/lib/comdlg32/cdlg_De.rc | 2 +- reactos/lib/comdlg32/cdlg_En.rc | 2 +- reactos/lib/comdlg32/cdlg_Es.rc | 2 +- reactos/lib/comdlg32/cdlg_Fr.rc | 2 +- reactos/lib/comdlg32/cdlg_It.rc | 2 +- reactos/lib/comdlg32/cdlg_Ja.rc | 2 +- reactos/lib/comdlg32/cdlg_Ko.rc | 2 +- reactos/lib/comdlg32/cdlg_Pt.rc | 2 +- reactos/lib/comdlg32/cdlg_Ru.rc | 2 +- reactos/lib/comdlg32/cdlg_Si.rc | 2 +- reactos/lib/comdlg32/cdlg_Sk.rc | 2 +- reactos/lib/comdlg32/cdlg_Sv.rc | 2 +- reactos/lib/comdlg32/cdlg_Th.rc | 2 +- reactos/lib/comdlg32/cdlg_Uk.rc | 430 ++++++++++++++++++++++++++ reactos/lib/comdlg32/cdlg_Zh.rc | 2 +- reactos/lib/comdlg32/filedlg.c | 79 ++++- reactos/lib/comdlg32/filedlg16.c | 250 ++++++++++++++- reactos/lib/comdlg32/printdlg.c | 6 +- reactos/lib/comdlg32/rsrc.rc | 1 + reactos/lib/comdlg32/winehq2ros.patch | 101 +++++- 21 files changed, 859 insertions(+), 38 deletions(-) create mode 100644 reactos/lib/comdlg32/cdlg_Uk.rc diff --git a/reactos/lib/comdlg32/cdlg_Cn.rc b/reactos/lib/comdlg32/cdlg_Cn.rc index fc0b7833650..401b071a83c 100644 --- a/reactos/lib/comdlg32/cdlg_Cn.rc +++ b/reactos/lib/comdlg32/cdlg_Cn.rc @@ -340,7 +340,7 @@ FONT 8, "Helv" EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL LTEXT "нд╪ЧюЮпм(&t)",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "ж╩╤а(&r)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/cdlg_De.rc b/reactos/lib/comdlg32/cdlg_De.rc index de455662c11..91c5c6840a2 100644 --- a/reactos/lib/comdlg32/cdlg_De.rc +++ b/reactos/lib/comdlg32/cdlg_De.rc @@ -262,7 +262,7 @@ FONT 8, "Helv" EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL LTEXT "Datei&typen",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&SchreibgeschЭtzt",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/cdlg_En.rc b/reactos/lib/comdlg32/cdlg_En.rc index 6e4b04a989f..6b59ec631cc 100644 --- a/reactos/lib/comdlg32/cdlg_En.rc +++ b/reactos/lib/comdlg32/cdlg_En.rc @@ -340,7 +340,7 @@ FONT 8, "Helv" EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL LTEXT "Files of &type:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Open as &read-only",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/cdlg_Es.rc b/reactos/lib/comdlg32/cdlg_Es.rc index 26a33226f27..cd6611357a2 100644 --- a/reactos/lib/comdlg32/cdlg_Es.rc +++ b/reactos/lib/comdlg32/cdlg_Es.rc @@ -339,7 +339,7 @@ FONT 8, "Helv" EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL LTEXT "Archivos de &tipo:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Abrir como &sСlo-lectura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/cdlg_Fr.rc b/reactos/lib/comdlg32/cdlg_Fr.rc index f87413820a9..38fce69e6dd 100644 --- a/reactos/lib/comdlg32/cdlg_Fr.rc +++ b/reactos/lib/comdlg32/cdlg_Fr.rc @@ -343,7 +343,7 @@ FONT 8, "Helv" EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL LTEXT "&Type du fichier",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Protection Иcriture",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/cdlg_It.rc b/reactos/lib/comdlg32/cdlg_It.rc index b678f3ee5fb..c98322f5bbd 100644 --- a/reactos/lib/comdlg32/cdlg_It.rc +++ b/reactos/lib/comdlg32/cdlg_It.rc @@ -340,7 +340,7 @@ FONT 8, "Helv" EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL LTEXT "File del &tipo:",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Apri in &sola lettura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/cdlg_Ja.rc b/reactos/lib/comdlg32/cdlg_Ja.rc index f41e2bf9b5b..4e1451d919f 100644 --- a/reactos/lib/comdlg32/cdlg_Ja.rc +++ b/reactos/lib/comdlg32/cdlg_Ja.rc @@ -310,7 +310,7 @@ FONT 9, "MS UI Gothic" EDITTEXT IDC_FILENAME,56,110,153,12,ES_AUTOHSCROLL LTEXT "л╖╡ы┌л▌М≈ч(&T):",IDC_FILETYPESTATIC,5,128,52,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,56,126,153,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,56,126,153,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "⌠г┌щ▌Ф┌Х░Й≈pл╖╡ы┌ф┌╣┌д┼J┌╜(&R)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/cdlg_Ko.rc b/reactos/lib/comdlg32/cdlg_Ko.rc index f795b1754cc..e75d89fee8d 100644 --- a/reactos/lib/comdlg32/cdlg_Ko.rc +++ b/reactos/lib/comdlg32/cdlg_Ko.rc @@ -287,7 +287,7 @@ FONT 9, "Helv" EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL LTEXT "фдюо гЭ╫д(&T):",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "юп╠Б юЭ©К(&R)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/cdlg_Pt.rc b/reactos/lib/comdlg32/cdlg_Pt.rc index 661c6132cb8..9ff9dfd8c1d 100644 --- a/reactos/lib/comdlg32/cdlg_Pt.rc +++ b/reactos/lib/comdlg32/cdlg_Pt.rc @@ -341,7 +341,7 @@ FONT 8, "Helv" EDITTEXT IDC_FILENAME,54,111,155,12,ES_AUTOHSCROLL LTEXT "Arquivos do &tipo:",IDC_FILETYPESTATIC,5,131,48,16, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,129,155,100,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,54,129,155,100,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Abrir como &somente-leitura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,148,74,10 diff --git a/reactos/lib/comdlg32/cdlg_Ru.rc b/reactos/lib/comdlg32/cdlg_Ru.rc index a2ce032724e..3a76440baee 100644 --- a/reactos/lib/comdlg32/cdlg_Ru.rc +++ b/reactos/lib/comdlg32/cdlg_Ru.rc @@ -309,7 +309,7 @@ FONT 8, "MS Sans Serif" 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_DROPDOWN | WS_VSCROLL | WS_TABSTOP + 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 diff --git a/reactos/lib/comdlg32/cdlg_Si.rc b/reactos/lib/comdlg32/cdlg_Si.rc index 2a8eca03a5a..84bb5a8ad7b 100644 --- a/reactos/lib/comdlg32/cdlg_Si.rc +++ b/reactos/lib/comdlg32/cdlg_Si.rc @@ -340,7 +340,7 @@ FONT 8, "MS Sans Serif" EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL LTEXT "Vrsta da&totek:",IDC_FILETYPESTATIC,5,128,49,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "&Samo za branje",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/cdlg_Sk.rc b/reactos/lib/comdlg32/cdlg_Sk.rc index 3d03e225309..5bacfbed498 100644 --- a/reactos/lib/comdlg32/cdlg_Sk.rc +++ b/reactos/lib/comdlg32/cdlg_Sk.rc @@ -311,7 +311,7 @@ FONT 8, "Helv" EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL LTEXT "&Typ sЗborov",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Otvo&ri² iba na ХМtanie",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/cdlg_Sv.rc b/reactos/lib/comdlg32/cdlg_Sv.rc index 9db8e9950c6..a8fb70ecd62 100644 --- a/reactos/lib/comdlg32/cdlg_Sv.rc +++ b/reactos/lib/comdlg32/cdlg_Sv.rc @@ -333,7 +333,7 @@ FONT 8, "Helv" EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL LTEXT "&Filformat",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,54,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "жppna som &skrivskyddad",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/cdlg_Th.rc b/reactos/lib/comdlg32/cdlg_Th.rc index 72dc74ed97a..664f6153f8f 100644 --- a/reactos/lib/comdlg32/cdlg_Th.rc +++ b/reactos/lib/comdlg32/cdlg_Th.rc @@ -337,7 +337,7 @@ FONT 8, "Helv" 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_DROPDOWN | WS_VSCROLL | WS_TABSTOP + 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 diff --git a/reactos/lib/comdlg32/cdlg_Uk.rc b/reactos/lib/comdlg32/cdlg_Uk.rc new file mode 100644 index 00000000000..146a7272ff6 --- /dev/null +++ b/reactos/lib/comdlg32/cdlg_Uk.rc @@ -0,0 +1,430 @@ +/* + * Copyright 2004 Ilya Korniyko + * + * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * WARNING: DO NOT CHANGE THE SIZE OF THE STANDARD DIALOG TEMPLATES. + */ + +LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT + +OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Відкрити" +FONT 8, "Ms Sans Serif" +{ + LTEXT "&Ім'я файлу:", 1090, 6, 6, 76, 9 + EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + 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 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&Диски:", 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 "Відкрити", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Відміна", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Довідка", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Лише для читання", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | 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 Sans Serif" +{ + LTEXT "&&Ім'я файлу:", 1090, 6, 6, 76, 9 + EDITTEXT 1152, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP + LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP + 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 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "&Диски:", 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 "Зберегти як", IDOK, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Відміна", IDCANCEL, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Довідка", 1038, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP + CHECKBOX "&Лише для читання", 1040, 208, 68, 54, 24, BS_AUTOCHECKBOX | BS_MULTILINE | 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 Sans Serif" +{ + LTEXT "Принтер:", 1088, 6, 6, 40, 9 + LTEXT "", 1089, 60, 6, 150, 9 + GROUPBOX "Друкувати", 1072, 6, 30, 160, 65, BS_GROUPBOX + RADIOBUTTON "&Все", 1056, 16, 45, 60, 12 + RADIOBUTTON "В&иділенний фрагмент", 1057, 16, 60, 60, 12 + RADIOBUTTON "&Сторінки", 1058, 16, 75, 60, 12 + DEFPUSHBUTTON "Друк", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Відміна", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Властивості", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "&з:", 1090, 60, 80, 30, 9 + LTEXT "&до:", 1091, 120, 80, 30, 9 + LTEXT "&Якість друку:", 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 "Друк до файлу", 1040, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Стисло", 1041, 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 Sans Serif" +{ + GROUPBOX "Принтер", 1072, 6, 10, 180, 65, BS_GROUPBOX + RADIOBUTTON "Принтер за &обумовленням", 1056, 16, 20, 80, 12 + LTEXT "[Нема]", 1088, 35, 35, 120, 9 + RADIOBUTTON "&Інший принтер", 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 + DEFPUSHBUTTON "OK", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Відміна", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Настройка", 1024, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP + GROUPBOX "Орієнтація", 1073, 6, 85, 100, 50, BS_GROUPBOX + RADIOBUTTON "&Книжна", 1058, 50, 100, 40, 12 + RADIOBUTTON "&Альбомна", 1059, 50, 115, 40, 12 + ICON "LANDSCAP", 1097, 10, 95, 32, 32 + ICON "PORTRAIT", 1098, 10, 95, 32, 32 + GROUPBOX "Папір", 1074, 120, 85, 180, 50, BS_GROUPBOX + LTEXT "Ро&змір", 1089, 130, 95, 30, 9 + LTEXT "&Джерело", 1090, 130, 110, 30, 9 + COMBOBOX 1137, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP + COMBOBOX 1138, 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 Sans Serif" +{ + LTEXT "&Шрифт:",1088 ,6,3,40,9 + COMBOBOX 1136 ,6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "&Стиль:",1089 ,108,3,44,9 + COMBOBOX 1137,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE + LTEXT "&Розмір:",1090,179,3,30,9 + COMBOBOX 1138,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 "&Застосувати", 1026,218,40,40,14,WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Довідка" , 1038,218,57,40,14,WS_GROUP | WS_TABSTOP + GROUPBOX "Атрибути",1072,6,72,84,34,WS_GROUP + CHECKBOX "&Закреслений", 1040, 10,82,75,10, BS_AUTOCHECKBOX | WS_TABSTOP + CHECKBOX "&Підкреслений", 1041, 10,94,75,10, BS_AUTOCHECKBOX + LTEXT "&Колір:", 1091 ,6,110,30,9 + COMBOBOX 1139,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 "АаБбAaBb",stc5,103,80,109,24,SS_NOPREFIX | NOT WS_VISIBLE + LTEXT "Скрипт:",stc7 ,98,114,80,9 + COMBOBOX cmb5,98,124,120,10,CBS_DROPDOWNLIST |CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | + CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP +} + + +CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 310, 185 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Зміна палітри" +FONT 8, "Ms Sans Serif" +{ + LTEXT "&Базова палітра:", 1088, 4, 4, 140, 10 + LTEXT "Д&одаткові кольори:", 1089, 4, 106, 140, 10 + LTEXT "Колір|За&ливка", 1090, 150, 151, 48, 10 + LTEXT "&Червоний:", 726 /*1094*/,254,126,32,10 + EDITTEXT 706, 288,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Зелений:",727/*1095*/,254,140,32,10 + EDITTEXT 707, 288,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "С&иній:",728 /*1096*/,264,154,24,10 + EDITTEXT 708, 288,152,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "Від&тінок:" ,723 /*1091*/,202,126,30,10 + EDITTEXT 703, 234,124,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Контраст:" ,724 /*1092*/,199,140,34,10 + EDITTEXT 704, 234,138,18,12, WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "&Яскравість:" ,725 /*1093*/,202,154,30,10 + EDITTEXT 705, 234,152,18,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", IDOK, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Відміна", IDCANCEL, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Довідка", 1038,100,166, 44, 14 + PUSHBUTTON "&Додати до набору", 712/*1024*/, 152, 166, 142, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Визначити колір >>", 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, 245, 62 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Пошук" +FONT 8, "Ms Sans Serif" +{ + LTEXT "&Зразок:", -1, 4, 8, 42, 8 + EDITTEXT 1152, 47, 7, 138, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "&Лише слово цілком", 1040, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Залік &реґістру", 1041, 4, 42, 100, 12, BS_AUTOCHECKBOX | WS_TABSTOP + GROUPBOX "Напрям", 1072, 107, 26, 78, 28 + CONTROL "&Вгору", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 40, 12 + CONTROL "В&низ", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 152, 38, 30, 12 + + DEFPUSHBUTTON "З&найти далі", IDOK, 190, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Відміна", IDCANCEL , 190, 23, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Довідка", pshHelp , 190, 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 Sans Serif" +{ + LTEXT "&Зразок:", -1, 4, 9, 48, 8 + EDITTEXT 1152, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + LTEXT "З&амінити на:", -1, 4, 26, 48, 8 + EDITTEXT 1153, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + CHECKBOX "&Лише слово цілком", 1040, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + CHECKBOX "Залік &реґістру", 1041, 5, 62, 104, 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 Sans Serif" +{ + 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 "Емульовано", stc12, 60, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Тип:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Емульовано", stc11, 60, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Місце:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Емульовано", stc14, 60, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Примітка:", stc13, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Емульовано", stc13, 60, 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 "&Розбити", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,230,130,40,12 + EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER + + GROUPBOX "Друкувати", 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,50,12 + CONTROL "&Виділення", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + EDITTEXT edt1, 85,122, 20,12, WS_GROUP | ES_NUMBER + EDITTEXT edt2, 120,122, 20,12, WS_GROUP | ES_NUMBER + RTEXT "&від:", stc2, 70,124, 10,8 + RTEXT "&до:", stc3, 106,124, 10,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 Sans Serif" +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 "Емульовано", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Тип:", stc7, 16, 48, 36,10, SS_NOPREFIX + LTEXT "Емульовано", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Місце:", stc10, 16, 60, 36,10, SS_NOPREFIX + LTEXT "Емульовано", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP + LTEXT "Примітки:", stc9, 16, 72, 36,10, SS_NOPREFIX + LTEXT "Емульовані", 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 "Орієнтація", grp1, 180, 92, 100,56, WS_GROUP + ICON "", ico1, 195,112, 18,20, WS_GROUP + CONTROL "&Портрет", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12 + CONTROL "Л&андшафт", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12 +END + +NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164 +STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN +CAPTION "Відкрити" +FONT 8, "MS Sans Serif" +{ + LTEXT "Шукати &в",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY + COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP + + 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 "&Про тест ВибірТеки" + IDS_DOCUMENTFOLDERS "Теки документів" + IDS_PERSONAL "Мої документи" + IDS_FAVORITES "Закладки" + IDS_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 "Перехід на стільницю" +} + +STRINGTABLE DISCARDABLE +{ + PD32_PRINT_TITLE "Друк" + + PD32_VALUE_UREADABLE "Нечитаємий елемент" + PD32_INVALID_PAGE_RANGE "Це значення не лежить у діапазоні сторінок\n\ +Введіть значенне між %d та %d" + PD32_FROM_NOT_ABOVE_TO "Значення ВІД не повинно перевищувати ДО:" + PD32_MARGINS_OVERLAP "Межі перекривають чи перевищують \ +розміри паперу.\nВведіть їх наново" + PD32_NR_OF_COPIES_EMPTY "Значення Числа Копій не може бути \ +пустим" + PD32_TOO_LARGE_COPIES "Така велика кількість копій не \ +може бути надрукована Вашим принтером.\nВведіть значення між 1 та %d" + PD32_PRINT_ERROR "Виникла помилка принтера" + PD32_NO_DEFAULT_PRINTER "Немає принтера, поставленого за обумовленням" + PD32_CANT_FIND_PRINTER "Не вдалось знайти принтер" + PD32_OUT_OF_MEMORY "Мало пам'яті" + PD32_GENERIC_ERROR "Виникла(и) помилка(и)" + PD32_DRIVER_UNKNOWN "Невідомий драйвер принтера" + + PD32_DEFAULT_PRINTER "Принтер за обумовленням; " + PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d документів у черзі" + PD32_PRINT_ALL_X_PAGES "&Всі %d сторінок" + PD32_MARGINS_IN_INCHES "Межі [дюйми]" + PD32_MARGINS_IN_MILIMETERS "Межі [мм]" + PD32_MILIMETERS "мм" + + PD32_PRINTER_STATUS_READY "Готово" + PD32_PRINTER_STATUS_PAUSED "Призупинено; " + PD32_PRINTER_STATUS_ERROR "Помилка; " + PD32_PRINTER_STATUS_PENDING_DELETION "Чекання видалення; " + PD32_PRINTER_STATUS_PAPER_JAM "Папір застряг; " + PD32_PRINTER_STATUS_PAPER_OUT "Не вистачає паперу; " + PD32_PRINTER_STATUS_MANUAL_FEED "Поставте папір вручну; " + PD32_PRINTER_STATUS_PAPER_PROBLEM "Проблема с папером; " + PD32_PRINTER_STATUS_OFFLINE "Принтер в режимі offline; " + PD32_PRINTER_STATUS_IO_ACTIVE "Ввід/Вивід активний; " + PD32_PRINTER_STATUS_BUSY "Зайнятий; " + PD32_PRINTER_STATUS_PRINTING "Йде друк; " + PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Лоток переповнений папером; " + PD32_PRINTER_STATUS_NOT_AVAILABLE "Не доступний; " + PD32_PRINTER_STATUS_WAITING "Чекання; " + PD32_PRINTER_STATUS_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 "Перервано користувачем; " + PD32_PRINTER_STATUS_OUT_OF_MEMORY "Мало пам'яті; " + PD32_PRINTER_STATUS_DOOR_OPEN "Кришка принтера відкрита; " + PD32_PRINTER_STATUS_SERVER_UNKNOWN "Невідомий сервер принтера; " + PD32_PRINTER_STATUS_POWER_SAVE "Живлення в безпечному режимі; " +} + +STRINGTABLE DISCARDABLE /* Color names */ +{ + IDS_COLOR_BLACK "Чорний" + IDS_COLOR_MAROON "Брунатний" + IDS_COLOR_GREEN "Зелений" + IDS_COLOR_OLIVE "Оливковий" + IDS_COLOR_NAVY "Синій" + IDS_COLOR_PURPLE "Пурпурний" + IDS_COLOR_TEAL "Зелено-синій" + IDS_COLOR_GRAY "Сірий" + IDS_COLOR_SILVER "Срібний" + IDS_COLOR_RED "Червоний" + IDS_COLOR_LIME "Салатовий" + IDS_COLOR_YELLOW "Жовтий" + IDS_COLOR_BLUE "Голубий" + IDS_COLOR_FUCHSIA "Фіолетовий" + IDS_COLOR_AQUA "Аквамарин" + IDS_COLOR_WHITE "Білий" +} diff --git a/reactos/lib/comdlg32/cdlg_Zh.rc b/reactos/lib/comdlg32/cdlg_Zh.rc index aba38527000..cf92b12436d 100644 --- a/reactos/lib/comdlg32/cdlg_Zh.rc +++ b/reactos/lib/comdlg32/cdlg_Zh.rc @@ -185,7 +185,7 @@ FONT 8, "Helv" EDITTEXT IDC_FILENAME,59,110,155,12,ES_AUTOHSCROLL LTEXT "≥n╟╦Н░пм(&T):",IDC_FILETYPESTATIC,5,128,42,8, SS_NOTIFY - COMBOBOX IDC_FILETYPE,59,126,155,53,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_FILETYPE,59,126,155,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "И_├╒Ёин╗вx(&R)",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10 diff --git a/reactos/lib/comdlg32/filedlg.c b/reactos/lib/comdlg32/filedlg.c index b4d33ad4afe..c03dc80f4c8 100644 --- a/reactos/lib/comdlg32/filedlg.c +++ b/reactos/lib/comdlg32/filedlg.c @@ -34,9 +34,6 @@ * * FIXME: lpstrCustomFilter not handled * - * FIXME: if the size of lpstrFile (nMaxFile) is too small the first - * two bytes of lpstrFile should contain the needed size - * * FIXME: algorithm for selecting the initial directory is too simple * * FIXME: add to recent docs @@ -228,6 +225,10 @@ HRESULT FILEDLG95_HandleCustomDialogMessages(HWND hwnd, UINT uMsg, WPARAM wParam BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCount, UINT sizeUsed); static BOOL BrowseSelectedFolder(HWND hwnd); +/* old style dialogs */ +extern BOOL GetFileName31A(LPOPENFILENAMEA lpofn, UINT dlgType); +extern BOOL GetFileName31W(LPOPENFILENAMEW lpofn, UINT dlgType); + /*********************************************************************** * GetFileName95 * @@ -1012,8 +1013,8 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) int win98plus = 0; int handledPath = FALSE; OSVERSIONINFOA osVi; - const WCHAR szwSlash[] = { '\\', 0 }; - const WCHAR szwStar[] = { '*',0 }; + static const WCHAR szwSlash[] = { '\\', 0 }; + static const WCHAR szwStar[] = { '*',0 }; TBBUTTON tbb[] = { @@ -1535,7 +1536,7 @@ BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCo WCHAR lpstrNotFound[100]; WCHAR lpstrMsg[100]; WCHAR tmp[400]; - WCHAR nl[] = {'\n',0}; + static const WCHAR nl[] = {'\n',0}; LoadStringW(COMDLG32_hInstance, IDS_FILENOTFOUND, lpstrNotFound, 100); LoadStringW(COMDLG32_hInstance, IDS_VERIFYFILE, lpstrMsg, 100); @@ -1713,7 +1714,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) { LPWSTR lpszTemp, lpszTemp1; LPITEMIDLIST pidl = NULL; - WCHAR szwInvalid[] = { '/',':','<','>','|', 0}; + static const WCHAR szwInvalid[] = { '/',':','<','>','|', 0}; /* check for invalid chars */ if((strpbrkW(lpstrPathAndFile+3, szwInvalid) != NULL) && !(fodInfos->ofnInfos->Flags & OFN_NOVALIDATE)) @@ -1743,7 +1744,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) if(*lpszTemp==0) { - WCHAR wszWild[] = { '*', '?', 0 }; + static const WCHAR wszWild[] = { '*', '?', 0 }; /* if the last element is a wildcard do a search */ if(strpbrkW(lpszTemp1, wszWild) != NULL) { @@ -1872,6 +1873,12 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) case ONOPEN_OPEN: /* fill in the return struct and close the dialog */ TRACE("ONOPEN_OPEN %s\n", debugstr_w(lpstrPathAndFile)); { + /* update READONLY check box flag */ + if ((SendMessageA(GetDlgItem(hwnd,IDC_OPENREADONLY),BM_GETCHECK,0,0) & 0x03) == BST_CHECKED) + fodInfos->ofnInfos->Flags |= OFN_READONLY; + else + fodInfos->ofnInfos->Flags &= ~OFN_READONLY; + /* add default extension */ if (fodInfos->defext) { @@ -1882,7 +1889,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) /* only add "." in case a default extension does exist */ if (*fodInfos->defext != '\0') { - const WCHAR szwDot[] = {'.',0}; + static const WCHAR szwDot[] = {'.',0}; int PathLength = strlenW(lpstrPathAndFile); strcatW(lpstrPathAndFile, szwDot); @@ -1985,9 +1992,16 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) } else { - /* FIXME set error FNERR_BUFFERTOSMALL */ + WORD size; + + size = strlenW(lpstrPathAndFile) + 1; + if (fodInfos->ofnInfos->Flags & OFN_ALLOWMULTISELECT) + size += 1; + /* return needed size in first two bytes of lpstrFile */ + *(WORD *)fodInfos->ofnInfos->lpstrFile = size; FILEDLG95_Clean(hwnd); ret = EndDialog(hwnd, FALSE); + COMDLG32_SetCommDlgExtendedError(FNERR_BUFFERTOOSMALL); } goto ret; } @@ -3184,7 +3198,7 @@ static BOOL BrowseSelectedFolder(HWND hwnd) if ( FAILED( IShellBrowser_BrowseObject( fodInfos->Shell.FOIShellBrowser, pidlSelection, SBSP_RELATIVE ) ) ) { - WCHAR notexist[] = {'P','a','t','h',' ','d','o','e','s', + static const WCHAR notexist[] = {'P','a','t','h',' ','d','o','e','s', ' ','n','o','t',' ','e','x','i','s','t',0}; MessageBoxW( hwnd, notexist, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); } @@ -3227,6 +3241,16 @@ static void MemFree(void *mem) BOOL WINAPI GetOpenFileNameA( LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ { +#if 0 /* FIXME GetFileName31A uses 16 bit stuff */ + BOOL win16look = FALSE; + + if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) + win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; + + if (win16look) + return GetFileName31A(ofn, OPEN_DIALOG); + else +#endif return GetFileDialog95A(ofn, OPEN_DIALOG); } @@ -3243,9 +3267,20 @@ BOOL WINAPI GetOpenFileNameA( BOOL WINAPI GetOpenFileNameW( LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ { +#if 0 /* FIXME GetFileName31W uses 16 bit stuff */ + BOOL win16look = FALSE; + + if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) + win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; + + if (win16look) + return GetFileName31W(ofn, OPEN_DIALOG); + else +#endif return GetFileDialog95W(ofn, OPEN_DIALOG); } + /*********************************************************************** * GetSaveFileNameA (COMDLG32.@) * @@ -3259,6 +3294,16 @@ BOOL WINAPI GetOpenFileNameW( BOOL WINAPI GetSaveFileNameA( LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ { +#if 0 /* FIXME GetFileName31A uses 16 bit stuff */ + BOOL win16look = FALSE; + + if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) + win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; + + if (win16look) + return GetFileName31A(ofn, SAVE_DIALOG); + else +#endif return GetFileDialog95A(ofn, SAVE_DIALOG); } @@ -3275,5 +3320,15 @@ BOOL WINAPI GetSaveFileNameA( BOOL WINAPI GetSaveFileNameW( LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ { - return GetFileDialog95W(ofn, SAVE_DIALOG); +#if 0 /* FIXME GetFileName31W uses 16 bit stuff */ + BOOL win16look = FALSE; + + if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) + win16look = (ofn->Flags & OFN_EXPLORER) ? FALSE : TRUE; + + if (win16look) + return GetFileName31W(ofn, SAVE_DIALOG); + else +#endif + return GetFileDialog95W(ofn, SAVE_DIALOG); } diff --git a/reactos/lib/comdlg32/filedlg16.c b/reactos/lib/comdlg32/filedlg16.c index dac494f2f1e..4c3bbdd979a 100644 --- a/reactos/lib/comdlg32/filedlg16.c +++ b/reactos/lib/comdlg32/filedlg16.c @@ -84,8 +84,6 @@ static HICON hFloppy = 0; static HICON hHDisk = 0; static HICON hCDRom = 0; static HICON hNet = 0; -static char defaultopen[]="Open File"; -static char defaultsave[]="Save as"; /*********************************************************************** * FileDlg_Init [internal] @@ -971,8 +969,8 @@ void FILEDLG_MapOfnStructA(LPOPENFILENAMEA ofnA, LPOPENFILENAMEW ofnW, BOOL open str = ofnA->lpstrTitle; else /* Allocates default title (FIXME : get it from resource) */ - str = open ? defaultopen:defaultsave; - RtlCreateUnicodeStringFromAsciiz (&usBuffer,ofnA->lpstrTitle); + str = open ? "Open File" : "Save as"; + RtlCreateUnicodeStringFromAsciiz (&usBuffer,str); ofnW->lpstrTitle = usBuffer.Buffer; ofnW->Flags = ofnA->Flags; ofnW->nFileOffset = ofnA->nFileOffset; @@ -1148,6 +1146,122 @@ static BOOL FILEDLG_CallWindowProc16(LFSPRIVATE lfs, UINT wMsg, WPARAM wParam, return FALSE; } +/*********************************************************************** + * FILEDLG_WMInitDialog [internal] + */ + +static LONG FILEDLG_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + int i, n; + WCHAR tmpstr[BUFFILE]; + LPWSTR pstr, old_pstr; + LPOPENFILENAMEW ofn; + LFSPRIVATE lfs = (LFSPRIVATE) lParam; + + if (!lfs) return FALSE; + SetPropA(hWnd, OFN_PROP, (HANDLE)lfs); + lfs->hwnd = hWnd; + ofn = lfs->ofnW; + + TRACE("flags=%lx initialdir=%s\n", ofn->Flags, debugstr_w(ofn->lpstrInitialDir)); + + SetWindowTextW( hWnd, ofn->lpstrTitle ); + /* read custom filter information */ + if (ofn->lpstrCustomFilter) + { + pstr = ofn->lpstrCustomFilter; + n = 0; + TRACE("lpstrCustomFilter = %p\n", pstr); + while(*pstr) + { + old_pstr = pstr; + i = SendDlgItemMessageW(hWnd, cmb1, CB_ADDSTRING, 0, + (LPARAM)(ofn->lpstrCustomFilter) + n ); + n += lstrlenW(pstr) + 1; + pstr += lstrlenW(pstr) + 1; + TRACE("add str=%s associated to %s\n", + debugstr_w(old_pstr), debugstr_w(pstr)); + SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr); + n += lstrlenW(pstr) + 1; + pstr += lstrlenW(pstr) + 1; + } + } + /* read filter information */ + if (ofn->lpstrFilter) { + pstr = (LPWSTR) ofn->lpstrFilter; + n = 0; + while(*pstr) { + old_pstr = pstr; + i = SendDlgItemMessageW(hWnd, cmb1, CB_ADDSTRING, 0, + (LPARAM)(ofn->lpstrFilter + n) ); + n += lstrlenW(pstr) + 1; + pstr += lstrlenW(pstr) + 1; + TRACE("add str=%s associated to %s\n", + debugstr_w(old_pstr), debugstr_w(pstr)); + SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr); + n += lstrlenW(pstr) + 1; + pstr += lstrlenW(pstr) + 1; + } + } + /* set default filter */ + if (ofn->nFilterIndex == 0 && ofn->lpstrCustomFilter == NULL) + ofn->nFilterIndex = 1; + SendDlgItemMessageW(hWnd, cmb1, CB_SETCURSEL, ofn->nFilterIndex - 1, 0); + lstrcpynW(tmpstr, FILEDLG_GetFileType(ofn->lpstrCustomFilter, + (LPWSTR)ofn->lpstrFilter, ofn->nFilterIndex - 1),BUFFILE); + TRACE("nFilterIndex = %ld, SetText of edt1 to %s\n", + ofn->nFilterIndex, debugstr_w(tmpstr)); + SetDlgItemTextW( hWnd, edt1, tmpstr ); + /* get drive list */ + *tmpstr = 0; + DlgDirListComboBoxW(hWnd, tmpstr, cmb2, 0, DDL_DRIVES | DDL_EXCLUSIVE); + /* read initial directory */ + /* FIXME: Note that this is now very version-specific (See MSDN description of + * the OPENFILENAME structure). For example under 2000/XP any path in the + * lpstrFile overrides the lpstrInitialDir, but not under 95/98/ME + */ + if (ofn->lpstrInitialDir != NULL) + { + int len; + lstrcpynW(tmpstr, ofn->lpstrInitialDir, 511); + len = lstrlenW(tmpstr); + if (len > 0 && tmpstr[len-1] != '\\' && tmpstr[len-1] != ':') { + tmpstr[len]='\\'; + tmpstr[len+1]='\0'; + } + } + else + *tmpstr = 0; + if (!FILEDLG_ScanDir(hWnd, tmpstr)) { + *tmpstr = 0; + if (!FILEDLG_ScanDir(hWnd, tmpstr)) + WARN("Couldn't read initial directory %s!\n", debugstr_w(tmpstr)); + } + /* select current drive in combo 2, omit missing drives */ + { + char dir[MAX_PATH]; + char str[4] = "a:\\"; + GetCurrentDirectoryA( sizeof(dir), dir ); + for(i = 0, n = -1; i < 26; i++) + { + str[0] = 'a' + i; + if (GetDriveTypeA(str) > DRIVE_NO_ROOT_DIR) n++; + if (toupper(str[0]) == toupper(dir[0])) break; + } + } + SendDlgItemMessageW(hWnd, cmb2, CB_SETCURSEL, n, 0); + if (!(ofn->Flags & OFN_SHOWHELP)) + ShowWindow(GetDlgItem(hWnd, pshHelp), SW_HIDE); + if (ofn->Flags & OFN_HIDEREADONLY) + ShowWindow(GetDlgItem(hWnd, chx1), SW_HIDE); + if (lfs->hook) + return (BOOL) FILEDLG_CallWindowProc(lfs, WM_INITDIALOG, wParam, lfs->lParam); + return TRUE; +} + + + + /*********************************************************************** * FILEDLG_WMInitDialog16 [internal] * The is a duplicate of the 32bit FILEDLG_WMInitDialog function @@ -1264,6 +1378,19 @@ static LONG FILEDLG_WMInitDialog16(HWND hWnd, WPARAM wParam, LPARAM lParam) return TRUE; } +/*********************************************************************** + * FILEDLG_WMMeasureItem [internal] + */ +static LONG FILEDLG_WMMeasureItem(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + LPMEASUREITEMSTRUCT lpmeasure; + + lpmeasure = (LPMEASUREITEMSTRUCT)lParam; + lpmeasure->itemHeight = fldrHeight; + return TRUE; +} + + /*********************************************************************** * FILEDLG_WMMeasureItem16 [internal] */ @@ -1278,6 +1405,54 @@ static LONG FILEDLG_WMMeasureItem16(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam) /* ------------------ Dialog procedures ---------------------- */ +/*********************************************************************** + * FileOpenDlgProc [internal] + * Used for open and save, in fact. + */ +static INT_PTR CALLBACK FileOpenDlgProc(HWND hWnd, UINT wMsg, + WPARAM wParam, LPARAM lParam) +{ + LFSPRIVATE lfs = (LFSPRIVATE)GetPropA(hWnd,OFN_PROP); + + TRACE("msg=%x wparam=%x lParam=%lx\n", wMsg, wParam, lParam); + if ((wMsg != WM_INITDIALOG) && lfs && lfs->hook) + { + INT_PTR lRet; + lRet = (INT_PTR)FILEDLG_CallWindowProc(lfs, wMsg, wParam, lParam); + if (lRet) + return lRet; /* else continue message processing */ + } + switch (wMsg) + { + case WM_INITDIALOG: + return FILEDLG_WMInitDialog(hWnd, wParam, lParam); + + case WM_MEASUREITEM: + return FILEDLG_WMMeasureItem(hWnd, wParam, lParam); + + case WM_DRAWITEM: + return FILEDLG_WMDrawItem(hWnd, wParam, lParam, !lfs->open, (DRAWITEMSTRUCT *)lParam); + + case WM_COMMAND: + return FILEDLG_WMCommand(hWnd, lParam, HIWORD(wParam), LOWORD(wParam), lfs); +#if 0 + case WM_CTLCOLOR: + SetBkColor((HDC16)wParam, 0x00C0C0C0); + switch (HIWORD(lParam)) + { + case CTLCOLOR_BTN: + SetTextColor((HDC16)wParam, 0x00000000); + return hGRAYBrush; + case CTLCOLOR_STATIC: + SetTextColor((HDC16)wParam, 0x00000000); + return hGRAYBrush; + } + break; +#endif + } + return FALSE; +} + /*********************************************************************** * FileOpenDlgProc (COMMDLG.6) */ @@ -1378,6 +1553,73 @@ BOOL16 CALLBACK FileSaveDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, return FALSE; } + + +/*********************************************************************** + * GetFileName31A [internal] + * + * Creates a win31 style dialog box for the user to select a file to open/save. + */ +BOOL GetFileName31A( + LPOPENFILENAMEA lpofn, /* addess of structure with data*/ + UINT dlgType /* type dialogue : open/save */ + ) +{ + HINSTANCE hInst; + BOOL bRet = FALSE; + LFSPRIVATE lfs; + + if (!lpofn || !FileDlg_Init()) return FALSE; + + TRACE("ofn flags %08lx\n", lpofn->Flags); + lfs = FILEDLG_AllocPrivate((LPARAM) lpofn, LFS32A, dlgType); + if (lfs) + { + hInst = (HINSTANCE)GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE ); + bRet = DialogBoxIndirectParamA( hInst, lfs->template, lpofn->hwndOwner, + FileOpenDlgProc, (LPARAM)lfs); + FILEDLG_DestroyPrivate(lfs); + } + + TRACE("return lpstrFile='%s' !\n", lpofn->lpstrFile); + return bRet; +} + +/*********************************************************************** + * GetFileName31W [internal] + * + * Creates a win31 style dialog box for the user to select a file to open/save + */ +BOOL GetFileName31W( + LPOPENFILENAMEW lpofn, /* addess of structure with data*/ + UINT dlgType /* type dialogue : open/save */ + ) +{ + HINSTANCE hInst; + BOOL bRet = FALSE; + LFSPRIVATE lfs; + + if (!lpofn || !FileDlg_Init()) return FALSE; + + lfs = FILEDLG_AllocPrivate((LPARAM) lpofn, LFS32W, dlgType); + if (lfs) + { + hInst = (HINSTANCE)GetWindowLongA( lpofn->hwndOwner, GWL_HINSTANCE ); + bRet = DialogBoxIndirectParamW( hInst, lfs->template, lpofn->hwndOwner, + FileOpenDlgProc, (LPARAM)lfs); + FILEDLG_DestroyPrivate(lfs); + } + + TRACE("return lpstrFile=%s !\n", debugstr_w(lpofn->lpstrFile)); + return bRet; +} + + + + + + + /* ------------------ APIs ---------------------- */ /*********************************************************************** diff --git a/reactos/lib/comdlg32/printdlg.c b/reactos/lib/comdlg32/printdlg.c index 917f2334cc4..edc555ad615 100644 --- a/reactos/lib/comdlg32/printdlg.c +++ b/reactos/lib/comdlg32/printdlg.c @@ -1866,8 +1866,8 @@ static HGLOBAL PRINTDLG_GetDlgTemplateW(PRINTDLGW *lppd) { HRSRC hResInfo; HGLOBAL hDlgTmpl; - const WCHAR xpsetup[] = { 'P','R','I','N','T','3','2','_','S','E','T','U','P',0}; - const WCHAR xprint[] = { 'P','R','I','N','T','3','2',0}; + static const WCHAR xpsetup[] = { 'P','R','I','N','T','3','2','_','S','E','T','U','P',0}; + static const WCHAR xprint[] = { 'P','R','I','N','T','3','2',0}; if (lppd->Flags & PD_PRINTSETUP) { if(lppd->Flags & PD_ENABLESETUPTEMPLATEHANDLE) { @@ -2875,7 +2875,7 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) { /* short cut exit, just return default values */ if (setupdlg->Flags & PSD_RETURNDEFAULT) { - const WCHAR a4[] = {'A','4',0}; + static const WCHAR a4[] = {'A','4',0}; setupdlg->hDevMode = pdlg.hDevMode; setupdlg->hDevNames = pdlg.hDevNames; /* FIXME: Just return "A4" for now. */ diff --git a/reactos/lib/comdlg32/rsrc.rc b/reactos/lib/comdlg32/rsrc.rc index c5fbf3bb71d..28c87577e1b 100644 --- a/reactos/lib/comdlg32/rsrc.rc +++ b/reactos/lib/comdlg32/rsrc.rc @@ -63,6 +63,7 @@ #include "cdlg_Sk.rc" #include "cdlg_Sv.rc" #include "cdlg_Th.rc" +#include "cdlg_Uk.rc" #include "cdlg_Wa.rc" #include "cdlg_Ja.rc" #include "cdlg_Zh.rc" diff --git a/reactos/lib/comdlg32/winehq2ros.patch b/reactos/lib/comdlg32/winehq2ros.patch index d05ddbbfd30..04afdf2914c 100644 --- a/reactos/lib/comdlg32/winehq2ros.patch +++ b/reactos/lib/comdlg32/winehq2ros.patch @@ -1,10 +1,103 @@ +Index: Makefile.in +=================================================================== +RCS file: /home/wine/wine/dlls/commdlg/Makefile.in,v +retrieving revision 1.39 +diff -u -r1.39 Makefile.in +--- Makefile.in 12 Apr 2004 22:03:55 -0000 1.39 ++++ Makefile.in 8 May 2004 13:01:07 -0000 +@@ -13,7 +13,6 @@ + cdlg32.c \ + colordlg.c \ + filedlg.c \ +- filedlg16.c \ + filedlgbrowser.c \ + finddlg32.c \ + filetitle.c \ +@@ -22,6 +21,7 @@ + + C_SRCS16 = \ + colordlg16.c \ ++ filedlg16.c \ + finddlg.c \ + fontdlg16.c \ + generic.c \ +Index: filedlg.c +=================================================================== +RCS file: /home/wine/wine/dlls/commdlg/filedlg.c,v +retrieving revision 1.79 +diff -u -r1.79 filedlg.c +--- filedlg.c 5 May 2004 23:49:39 -0000 1.79 ++++ filedlg.c 8 May 2004 13:01:08 -0000 +@@ -3241,6 +3241,7 @@ + BOOL WINAPI GetOpenFileNameA( + LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ + { ++#if 0 /* FIXME GetFileName31A uses 16 bit stuff */ + BOOL win16look = FALSE; + + if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) +@@ -3249,6 +3250,7 @@ + if (win16look) + return GetFileName31A(ofn, OPEN_DIALOG); + else ++#endif + return GetFileDialog95A(ofn, OPEN_DIALOG); + } + +@@ -3265,6 +3267,7 @@ + BOOL WINAPI GetOpenFileNameW( + LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ + { ++#if 0 /* FIXME GetFileName31W uses 16 bit stuff */ + BOOL win16look = FALSE; + + if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) +@@ -3273,6 +3276,7 @@ + if (win16look) + return GetFileName31W(ofn, OPEN_DIALOG); + else ++#endif + return GetFileDialog95W(ofn, OPEN_DIALOG); + } + +@@ -3290,6 +3294,7 @@ + BOOL WINAPI GetSaveFileNameA( + LPOPENFILENAMEA ofn) /* [in/out] address of init structure */ + { ++#if 0 /* FIXME GetFileName31A uses 16 bit stuff */ + BOOL win16look = FALSE; + + if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) +@@ -3298,6 +3303,7 @@ + if (win16look) + return GetFileName31A(ofn, SAVE_DIALOG); + else ++#endif + return GetFileDialog95A(ofn, SAVE_DIALOG); + } + +@@ -3314,6 +3320,7 @@ + BOOL WINAPI GetSaveFileNameW( + LPOPENFILENAMEW ofn) /* [in/out] address of init structure */ + { ++#if 0 /* FIXME GetFileName31W uses 16 bit stuff */ + BOOL win16look = FALSE; + + if (ofn->Flags & (OFN_ALLOWMULTISELECT|OFN_ENABLEHOOK|OFN_ENABLETEMPLATE)) +@@ -3322,5 +3329,6 @@ + if (win16look) + return GetFileName31W(ofn, SAVE_DIALOG); + else ++#endif + return GetFileDialog95W(ofn, SAVE_DIALOG); + } Index: printdlg.c =================================================================== RCS file: /home/wine/wine/dlls/commdlg/printdlg.c,v -retrieving revision 1.74 -diff -u -r1.74 printdlg.c ---- printdlg.c 9 Jan 2004 05:10:35 -0000 1.74 -+++ printdlg.c 15 Apr 2004 08:51:04 -0000 +retrieving revision 1.75 +diff -u -r1.75 printdlg.c +--- printdlg.c 19 Apr 2004 20:12:15 -0000 1.75 ++++ printdlg.c 8 May 2004 13:01:09 -0000 @@ -341,7 +341,7 @@ lpdm->dmCollate = (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);