1 added + 20 modified, total 21 files
reactos/lib/comdlg32
diff -N cdlg_Uk.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ cdlg_Uk.rc 8 May 2004 12:53:14 -0000 1.1
@@ -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 "�і���"
+}
reactos/lib/comdlg32
diff -u -r1.3 -r1.4
--- cdlg_Cn.rc 23 Jan 2004 16:56:44 -0000 1.3
+++ cdlg_Cn.rc 8 May 2004 12:53:14 -0000 1.4
@@ -340,7 +340,7 @@
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
reactos/lib/comdlg32
diff -u -r1.4 -r1.5
--- cdlg_De.rc 11 Mar 2004 21:15:50 -0000 1.4
+++ cdlg_De.rc 8 May 2004 12:53:14 -0000 1.5
@@ -262,7 +262,7 @@
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
reactos/lib/comdlg32
diff -u -r1.4 -r1.5
--- cdlg_En.rc 15 Apr 2004 08:42:21 -0000 1.4
+++ cdlg_En.rc 8 May 2004 12:53:14 -0000 1.5
@@ -340,7 +340,7 @@
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
reactos/lib/comdlg32
diff -u -r1.2 -r1.3
--- cdlg_Es.rc 15 Apr 2004 08:42:21 -0000 1.2
+++ cdlg_Es.rc 8 May 2004 12:53:14 -0000 1.3
@@ -339,7 +339,7 @@
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
reactos/lib/comdlg32
diff -u -r1.3 -r1.4
--- cdlg_Fr.rc 23 Jan 2004 16:56:44 -0000 1.3
+++ cdlg_Fr.rc 8 May 2004 12:53:14 -0000 1.4
@@ -343,7 +343,7 @@
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
reactos/lib/comdlg32
diff -u -r1.2 -r1.3
--- cdlg_It.rc 11 Mar 2004 21:15:50 -0000 1.2
+++ cdlg_It.rc 8 May 2004 12:53:14 -0000 1.3
@@ -340,7 +340,7 @@
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
reactos/lib/comdlg32
diff -u -r1.3 -r1.4
--- cdlg_Ja.rc 23 Jan 2004 16:56:44 -0000 1.3
+++ cdlg_Ja.rc 8 May 2004 12:53:14 -0000 1.4
@@ -310,7 +310,7 @@
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
reactos/lib/comdlg32
diff -u -r1.3 -r1.4
--- cdlg_Ko.rc 23 Jan 2004 16:56:44 -0000 1.3
+++ cdlg_Ko.rc 8 May 2004 12:53:14 -0000 1.4
@@ -287,7 +287,7 @@
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
reactos/lib/comdlg32
diff -u -r1.4 -r1.5
--- cdlg_Pt.rc 15 Apr 2004 08:42:21 -0000 1.4
+++ cdlg_Pt.rc 8 May 2004 12:53:14 -0000 1.5
@@ -341,7 +341,7 @@
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
reactos/lib/comdlg32
diff -u -r1.3 -r1.4
--- cdlg_Ru.rc 23 Jan 2004 16:56:44 -0000 1.3
+++ cdlg_Ru.rc 8 May 2004 12:53:14 -0000 1.4
@@ -309,7 +309,7 @@
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
reactos/lib/comdlg32
diff -u -r1.3 -r1.4
--- cdlg_Si.rc 23 Jan 2004 16:56:44 -0000 1.3
+++ cdlg_Si.rc 8 May 2004 12:53:14 -0000 1.4
@@ -340,7 +340,7 @@
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
reactos/lib/comdlg32
diff -u -r1.3 -r1.4
--- cdlg_Sk.rc 23 Jan 2004 16:56:44 -0000 1.3
+++ cdlg_Sk.rc 8 May 2004 12:53:14 -0000 1.4
@@ -311,7 +311,7 @@
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
reactos/lib/comdlg32
diff -u -r1.3 -r1.4
--- cdlg_Sv.rc 23 Jan 2004 16:56:44 -0000 1.3
+++ cdlg_Sv.rc 8 May 2004 12:53:14 -0000 1.4
@@ -333,7 +333,7 @@
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
reactos/lib/comdlg32
diff -u -r1.1 -r1.2
--- cdlg_Th.rc 11 Mar 2004 21:15:50 -0000 1.1
+++ cdlg_Th.rc 8 May 2004 12:53:14 -0000 1.2
@@ -337,7 +337,7 @@
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
reactos/lib/comdlg32
diff -u -r1.3 -r1.4
--- cdlg_Zh.rc 23 Jan 2004 16:56:44 -0000 1.3
+++ cdlg_Zh.rc 8 May 2004 12:53:14 -0000 1.4
@@ -185,7 +185,7 @@
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
reactos/lib/comdlg32
diff -u -r1.4 -r1.5
--- filedlg.c 15 Apr 2004 08:42:21 -0000 1.4
+++ filedlg.c 8 May 2004 12:53:14 -0000 1.5
@@ -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 @@
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 @@
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 @@
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 @@
{
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 @@
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 @@
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 @@
/* 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 @@
}
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 @@
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 @@
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 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 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 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);
}
reactos/lib/comdlg32
diff -u -r1.2 -r1.3
--- filedlg16.c 11 Mar 2004 21:15:50 -0000 1.2
+++ filedlg16.c 8 May 2004 12:53:14 -0000 1.3
@@ -84,8 +84,6 @@
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 @@
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;
@@ -1149,6 +1147,122 @@
}
/***********************************************************************
+ * 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
* The only differnce is that it calls FILEDLG_CallWindowProc16
@@ -1265,6 +1379,19 @@
}
/***********************************************************************
+ * 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]
*/
static LONG FILEDLG_WMMeasureItem16(HWND16 hWnd, WPARAM16 wParam, LPARAM lParam)
@@ -1279,6 +1406,54 @@
/* ------------------ 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)
*/
BOOL16 CALLBACK FileOpenDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam,
@@ -1378,6 +1553,73 @@
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 ---------------------- */
/***********************************************************************
reactos/lib/comdlg32
diff -u -r1.3 -r1.4
--- printdlg.c 11 Mar 2004 21:15:50 -0000 1.3
+++ printdlg.c 8 May 2004 12:53:14 -0000 1.4
@@ -1866,8 +1866,8 @@
{
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 @@
/* 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. */
reactos/lib/comdlg32
diff -u -r1.2 -r1.3
--- rsrc.rc 11 Mar 2004 21:15:50 -0000 1.2
+++ rsrc.rc 8 May 2004 12:53:14 -0000 1.3
@@ -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"
reactos/lib/comdlg32
diff -u -r1.2 -r1.3
--- winehq2ros.patch 15 Apr 2004 08:42:21 -0000 1.2
+++ winehq2ros.patch 8 May 2004 12:53:14 -0000 1.3
@@ -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);
CVSspam 0.2.8