2 added + 15 modified, total 17 files
reactos/lib/comdlg32
diff -N cdlg_Th.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ cdlg_Th.rc 11 Mar 2004 21:15:50 -0000 1.1
@@ -0,0 +1,456 @@
+/*
+ * Copyright 2003 Jon Griffiths (With thanks to Uraiwan Tupsang 'Oi')
+ *
+ * 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_THAI, SUBLANG_DEFAULT
+
+OPEN_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "����"
+FONT 8, "Helv"
+{
+ LTEXT "��������:", 1090, 6, 6, 76, 9
+ EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "���������:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "�������:", 1089, 6, 104, 90, 9
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "�����:", 1091, 110, 104, 92, 9
+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "����", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "������", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "���������", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "��������������", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+SAVE_FILE DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 275, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "����������..."
+FONT 8, "Helv"
+{
+ LTEXT "��������:", 1090, 6, 6, 76, 9
+ EDITTEXT edt1, 6, 16, 90, 12, ES_AUTOHSCROLL | ES_OEMCONVERT | WS_BORDER | WS_TABSTOP
+ LISTBOX 1120, 6, 32, 90, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "���������:", -1, 110, 6, 92, 9
+ LTEXT "", 1088, 110, 18, 92, 9, SS_NOPREFIX | WS_GROUP
+ LISTBOX 1121, 110, 32, 92, 68, LBS_STANDARD | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_DISABLENOSCROLL | WS_TABSTOP
+ LTEXT "�������:", 1089, 6, 104, 90, 9
+ COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ LTEXT "�����:", 1091, 110, 104, 92, 9
+ COMBOBOX cmb2, 110, 114, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "������", 1, 208, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "������", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "���������", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ CHECKBOX "��������������", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "�����"
+FONT 8, "Helv"
+{
+ LTEXT "������������:", 1088, 6, 6, 40, 9
+ LTEXT "", 1089, 60, 6, 150, 9
+ GROUPBOX "���", grp1, 6, 30, 160, 65, BS_GROUPBOX
+ RADIOBUTTON "�������", rad1, 16, 45, 60, 12
+ RADIOBUTTON "������������", rad2, 16, 60, 60, 12
+ RADIOBUTTON "���", rad3, 16, 75, 60, 12
+ DEFPUSHBUTTON "�����", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "������", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "��������", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ LTEXT "���:", 1090, 60, 80, 30, 9
+ LTEXT "������:", 1091, 120, 80, 30, 9
+ LTEXT "������������:", 1092, 6, 100, 76, 9
+ COMBOBOX cmb1, 80, 100, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ CHECKBOX "�������������", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "���", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 264, 134
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "��������������������"
+FONT 8, "Helv"
+{
+ GROUPBOX "������������", grp1, 6, 10, 180, 65, BS_GROUPBOX
+ RADIOBUTTON "������������&Default", rad1, 16, 20, 80, 12
+ LTEXT "[�����������]", 1088, 35, 35, 120, 9
+ RADIOBUTTON "������������Specific", rad2, 16, 50, 80, 12
+ COMBOBOX cmb1, 35, 65, 149, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ DEFPUSHBUTTON "����", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "������", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "��������", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
+ GROUPBOX "������������", grp2, 6, 85, 100, 50, BS_GROUPBOX
+ RADIOBUTTON "�������", rad3, 50, 100, 40, 12
+ RADIOBUTTON "������", rad4, 50, 115, 40, 12
+ ICON "LANDSCAP", stc10, 10, 95, 32, 32
+ ICON "PORTRAIT", stc11, 10, 95, 32, 32
+ GROUPBOX "������", grp3, 120, 85, 180, 50, BS_GROUPBOX
+ LTEXT "����", 1089, 130, 95, 30, 9
+ LTEXT "���", 1090, 130, 110, 30, 9
+ COMBOBOX cmb2, 155, 95, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX cmb3, 155, 110, 92, 68, CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_AUTOHSCROLL | CBS_SORT | CBS_HASSTRINGS | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+}
+
+
+CHOOSE_FONT DIALOG DISCARDABLE 13, 54, 264, 147
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "��������"
+FONT 8, "Helv"
+{
+ LTEXT "��������:",stc1 ,6,3,40,9
+ COMBOBOX cmb1, 6,13,94,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+ CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+ LTEXT "��������������:",stc2 ,108,3,44,9
+ COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+ WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
+ LTEXT "����:",stc3,179,3,30,9
+ COMBOBOX cmb3,179,13,32,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
+ WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE | CBS_SORT
+ DEFPUSHBUTTON "����",IDOK,218,6,40,14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "������",IDCANCEL,218,23,40,14,WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "���������", psh3,218,40,40,14,WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "���������" , pshHelp,218,57,40,14,WS_GROUP | WS_TABSTOP
+ GROUPBOX "Effects",grp1,6,72,84,34,WS_GROUP
+ CHECKBOX "Stri&keout", chx1, 10,82,50,10, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "����������", chx2, 10,94,50,10, BS_AUTOCHECKBOX
+ LTEXT "��:", stc4 ,6,110,30,9
+ COMBOBOX cmb4,6,120,84,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS |
+ CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
+ GROUPBOX "��������",grp2,98,72,160,49,WS_GROUP
+ CTEXT "A�BC���",stc5,104,81,149,37,SS_NOPREFIX | NOT WS_VISIBLE
+}
+
+
+CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "��"
+FONT 8, "Helv"
+{
+ LTEXT "&Basic Colors:", 1088, 4, 4, 140, 10
+ LTEXT "'��������������':", 1089, 4, 106, 140, 10
+ LTEXT "�� | ������", 1090, 150, 151, 48, 10
+ LTEXT "�����:", 726 /*1094*/,249,126,24,10
+ EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "�������:",727/*1095*/,249,140,24,10
+ EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "�����:",728 /*1096*/,249,154,24,10
+ EDITTEXT 708, 275,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&H:" ,723 /*1091*/,202,126,22,10
+ EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&S:" ,724 /*1092*/,202,140,22,10
+ EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "&L:" ,725 /*1093*/,202,154,22,10
+ EDITTEXT 705, 226,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ CONTROL "" ,720,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,14,140,86
+ CONTROL "" ,721,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP,4,116,140,28
+ CONTROL "" ,710,"STATIC",WS_BORDER|SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,4,118,116
+ CONTROL "" ,702,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 278,4,8,116
+ CONTROL "" ,709,"STATIC",SS_SIMPLE|WS_TABSTOP|WS_GROUP, 152,124,40,26
+ DEFPUSHBUTTON "����", 1, 4, 166, 44, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "������", 2, 52, 166, 44, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "���������", pshHelp,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, 236, 62
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "�����"
+FONT 8, "Helv"
+{
+ LTEXT "��������������:", -1, 4, 8, 42, 8
+ EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "�����������������", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "��������������-����", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ GROUPBOX "���", grp1, 107, 26, 68, 28
+ CONTROL "����", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "��", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
+
+ DEFPUSHBUTTON "����������", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "������", IDCANCEL , 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "���������", pshHelp , 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+REPLACEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 230, 94
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "�����"
+FONT 8, "Helv"
+{
+ LTEXT "��������������:", -1, 4, 9, 48, 8
+ EDITTEXT edt1, 54, 7, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "���������������:", -1, 4, 26, 48, 8
+ EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
+ CHECKBOX "�����������������", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "��������������-����", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+
+ DEFPUSHBUTTON "����������", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "�����", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "�����������", psh2 , 174, 38, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "������", IDCANCEL , 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
+ PUSHBUTTON "���������", pshHelp , 174, 75, 50, 14, WS_GROUP | WS_TABSTOP
+}
+
+
+PRINT32 DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 186
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+ DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "�����"
+FONT 8, "Helv"
+{
+ DEFPUSHBUTTON "����", 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, 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, 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,240,130,36,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,36,12
+ CONTROL "������������", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+ EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER
+ EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER
+ RTEXT "���:", stc2, 52,124, 20,8
+ RTEXT "������:", stc3, 100,124, 16,8
+}
+
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+ DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "��������������������"
+FONT 8, "Helv"
+BEGIN
+ DEFPUSHBUTTON "����",IDOK,180,156,48,14,WS_GROUP
+ PUSHBUTTON "������",IDCANCEL,232,156,48,14
+/* PUSHBUTTON "Network...", 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
+
+PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "��������"
+FONT 8, "Helv"
+BEGIN
+ CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
+ CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
+ CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ GROUPBOX "������", grp2, 8, 96, 224, 56, BS_GROUPBOX
+ LTEXT "����:", stc2, 16, 112, 36, 8
+ COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+ LTEXT "���:", stc3, 16, 132, 36, 8
+ COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+ GROUPBOX "������������", grp1, 8, 156, 64, 56, BS_GROUPBOX
+ AUTORADIOBUTTON "�������", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+ AUTORADIOBUTTON "������", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+ GROUPBOX "���������", grp4, 80, 156, 152, 56, BS_GROUPBOX
+ LTEXT "����:", stc15, 88, 172, 21, 8
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ LTEXT "���:", stc16, 159, 172, 27, 8
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ LTEXT "��:", stc17, 88, 192, 21, 8
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ LTEXT "����:", stc18, 159, 192, 23, 8
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ DEFPUSHBUTTON "����", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
+ PUSHBUTTON "������", IDCANCEL, 126, 220, 50, 14
+ PUSHBUTTON "������������...", psh3, 184, 220, 48, 14
+END
+
+NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
+CAPTION "����"
+FONT 8, "Helv"
+{
+ 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_DROPDOWN | 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 "��������� FolderPicker Test"
+ IDS_DOCUMENTFOLDERS "Document Folders"
+ IDS_PERSONAL "��������������"
+ IDS_FAVORITES "��������������"
+ IDS_PATH "System Path"
+ IDS_DESKTOP "������������"
+ IDS_FONTS "��������"
+ IDS_MYCOMPUTER "��������������"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SYSTEMFOLDERS "System Folders"
+ IDS_LOCALHARDRIVES "������������������������"
+ IDS_FILENOTFOUND "���������"
+ IDS_VERIFYFILE "Please verify if the correct file name was given"
+ IDS_CREATEFILE "File does not exist\nDo you want to create file"
+ IDS_OVERWRITEFILE "File does already exist.\nDo you want to replace it?"
+ IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path"
+ 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 "����������������������� %d ��� %d"
+ PD32_FROM_NOT_ABOVE_TO "'���' ���������������� '������'"
+ PD32_MARGINS_OVERLAP "�������������������\n���������������"
+ PD32_NR_OF_COPIES_EMPTY "The number of 'Number of copies' \
+value cannot be empty."
+ PD32_TOO_LARGE_COPIES "This large nmuber of copies is not \
+supported by your printer.\nPlease enter a value between 1 and %d."
+ PD32_PRINT_ERROR "�������������������"
+ PD32_NO_DEFAULT_PRINTER "��������������������"
+ PD32_CANT_FIND_PRINTER "�����������������"
+ PD32_OUT_OF_MEMORY "�����������"
+ 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 "Feed paper manual; "
+ PD32_PRINTER_STATUS_PAPER_PROBLEM "Paper problem; "
+ PD32_PRINTER_STATUS_OFFLINE "���������������; "
+ PD32_PRINTER_STATUS_IO_ACTIVE "I/O Active; "
+ PD32_PRINTER_STATUS_BUSY "����; "
+ PD32_PRINTER_STATUS_PRINTING "�����������; "
+ PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "�������; "
+ 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 "Fuchsia"
+ IDS_COLOR_AQUA "���������"
+ IDS_COLOR_WHITE "�����"
+}
reactos/lib/comdlg32
diff -N winehq2ros.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ winehq2ros.patch 11 Mar 2004 21:15:50 -0000 1.1
@@ -0,0 +1,268 @@
+Index: filetitle.c
+===================================================================
+RCS file: /home/wine/wine/dlls/commdlg/filetitle.c,v
+retrieving revision 1.15
+diff -u -r1.15 filetitle.c
+--- filetitle.c 5 Sep 2003 23:08:42 -0000 1.15
++++ filetitle.c 11 Mar 2004 21:21:49 -0000
+@@ -40,7 +40,7 @@
+ * GetFileTitleA (COMDLG32.@)
+ *
+ */
+-short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, UINT cbBuf)
++short WINAPI GetFileTitleA(LPCSTR lpFile, LPSTR lpTitle, WORD cbBuf)
+ {
+ int ret;
+ UNICODE_STRING strWFile;
+@@ -60,7 +60,7 @@
+ * GetFileTitleW (COMDLG32.@)
+ *
+ */
+-short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, UINT cbBuf)
++short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf)
+ {
+ int i, len;
+ static const WCHAR brkpoint[] = {'*','[',']',0};
+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 11 Mar 2004 21:21:50 -0000
+@@ -341,7 +341,7 @@
+ lpdm->dmCollate =
+ (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
+ if (lpdm->dmFields & DM_COPIES)
+- lpdm->dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
++ lpdm->u.s.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+ } else {
+ if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
+ lppd->Flags |= PD_COLLATE;
+@@ -416,7 +416,7 @@
+ lpdm->dmCollate =
+ (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
+ if (lpdm->dmFields & DM_COPIES)
+- lpdm->dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
++ lpdm->u.s.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+ } else {
+ if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
+ lppd->Flags |= PD_COLLATE;
+@@ -581,9 +581,9 @@
+ Sel, 0);
+ if (dm) {
+ if (nIDComboBox == cmb2)
+- dm->u1.s1.dmPaperSize = oldWord;
++ dm->u.s.dmPaperSize = oldWord;
+ else
+- dm->dmDefaultSource = oldWord;
++ dm->u.s.dmDefaultSource = oldWord;
+ }
+ }
+ else {
+@@ -593,9 +593,9 @@
+ */
+ if (dm) {
+ if (nIDComboBox == cmb2)
+- oldWord = dm->u1.s1.dmPaperSize;
++ oldWord = dm->u.s.dmPaperSize;
+ else
+- oldWord = dm->dmDefaultSource;
++ oldWord = dm->u.s.dmDefaultSource;
+ }
+ }
+
+@@ -691,9 +691,9 @@
+ Sel, 0);
+ if (dm) {
+ if (nIDComboBox == cmb2)
+- dm->u1.s1.dmPaperSize = oldWord;
++ dm->u.s.dmPaperSize = oldWord;
+ else
+- dm->dmDefaultSource = oldWord;
++ dm->u.s.dmDefaultSource = oldWord;
+ }
+ }
+ else {
+@@ -703,9 +703,9 @@
+ */
+ if (dm) {
+ if (nIDComboBox == cmb2)
+- oldWord = dm->u1.s1.dmPaperSize;
++ oldWord = dm->u.s.dmPaperSize;
+ else
+- oldWord = dm->dmDefaultSource;
++ oldWord = dm->u.s.dmDefaultSource;
+ }
+ }
+
+@@ -968,7 +968,7 @@
+ if (lppd->hDevMode == 0)
+ copies = lppd->nCopies;
+ else
+- copies = lpdm->dmCopies;
++ copies = lpdm->u.s.dmCopies;
+ if(copies == 0) copies = 1;
+ else if(copies < 0) copies = MAX_COPIES;
+ SetDlgItemInt(hDlg, edt3, copies, FALSE);
+@@ -990,7 +990,7 @@
+ ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
+
+ } else { /* PD_PRINTSETUP */
+- BOOL bPortrait = (lpdm->u1.s1.dmOrientation == DMORIENT_PORTRAIT);
++ BOOL bPortrait = (lpdm->u.s.dmOrientation == DMORIENT_PORTRAIT);
+
+ PRINTDLG_SetUpPaperComboBoxA(hDlg, cmb2,
+ PrintStructures->lpPrinterInfo->pPrinterName,
+@@ -1131,7 +1131,7 @@
+ if (lppd->hDevMode == 0)
+ copies = lppd->nCopies;
+ else
+- copies = lpdm->dmCopies;
++ copies = lpdm->u.s.dmCopies;
+ if(copies == 0) copies = 1;
+ else if(copies < 0) copies = MAX_COPIES;
+ SetDlgItemInt(hDlg, edt3, copies, FALSE);
+@@ -1153,7 +1153,7 @@
+ ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
+
+ } else { /* PD_PRINTSETUP */
+- BOOL bPortrait = (lpdm->u1.s1.dmOrientation == DMORIENT_PORTRAIT);
++ BOOL bPortrait = (lpdm->u.s.dmOrientation == DMORIENT_PORTRAIT);
+
+ PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb2,
+ PrintStructures->lpPrinterInfo->pPrinterName,
+@@ -1490,7 +1490,7 @@
+ case rad1: /* Paperorientation */
+ if (lppd->Flags & PD_PRINTSETUP)
+ {
+- lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
++ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
+ (LPARAM)(PrintStructures->hPortraitIcon));
+ }
+@@ -1499,7 +1499,7 @@
+ case rad2: /* Paperorientation */
+ if (lppd->Flags & PD_PRINTSETUP)
+ {
+- lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
++ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
+ (LPARAM)(PrintStructures->hLandscapeIcon));
+ }
+@@ -1523,7 +1523,7 @@
+ {
+ DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
+ if(Sel != CB_ERR)
+- lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
++ lpdm->u.s.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
+ CB_GETITEMDATA,
+ Sel, 0);
+ }
+@@ -1533,7 +1533,7 @@
+ {
+ DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
+ if(Sel != CB_ERR)
+- lpdm->dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,
++ lpdm->u.s.dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,
+ CB_GETITEMDATA, Sel,
+ 0);
+ }
+@@ -1544,8 +1544,8 @@
+ case rad1: /* orientation */
+ case rad2:
+ if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
+- if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
+- lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
++ if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
++ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
+ (WPARAM)IMAGE_ICON,
+ (LPARAM)PrintStructures->hPortraitIcon);
+@@ -1554,8 +1554,8 @@
+ (LPARAM)PrintStructures->hPortraitIcon);
+ }
+ } else {
+- if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
+- lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
++ if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
++ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
+ (WPARAM)IMAGE_ICON,
+ (LPARAM)PrintStructures->hLandscapeIcon);
+@@ -1654,7 +1654,7 @@
+ case rad1: /* Paperorientation */
+ if (lppd->Flags & PD_PRINTSETUP)
+ {
+- lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
++ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
+ (LPARAM)(PrintStructures->hPortraitIcon));
+ }
+@@ -1663,7 +1663,7 @@
+ case rad2: /* Paperorientation */
+ if (lppd->Flags & PD_PRINTSETUP)
+ {
+- lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
++ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
+ (LPARAM)(PrintStructures->hLandscapeIcon));
+ }
+@@ -1687,7 +1687,7 @@
+ {
+ DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
+ if(Sel != CB_ERR)
+- lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
++ lpdm->u.s.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
+ CB_GETITEMDATA,
+ Sel, 0);
+ }
+@@ -1697,7 +1697,7 @@
+ {
+ DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
+ if(Sel != CB_ERR)
+- lpdm->dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
++ lpdm->u.s.dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
+ CB_GETITEMDATA, Sel,
+ 0);
+ }
+@@ -1708,8 +1708,8 @@
+ case rad1: /* orientation */
+ case rad2:
+ if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
+- if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
+- lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
++ if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
++ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
+ (WPARAM)IMAGE_ICON,
+ (LPARAM)PrintStructures->hPortraitIcon);
+@@ -1718,8 +1718,8 @@
+ (LPARAM)PrintStructures->hPortraitIcon);
+ }
+ } else {
+- if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
+- lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
++ if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
++ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
+ (WPARAM)IMAGE_ICON,
+ (LPARAM)PrintStructures->hLandscapeIcon);
+@@ -2911,7 +2911,7 @@
+ /***********************************************************************
+ * PrintDlgExA (COMDLG32.@)
+ */
+-HRESULT WINAPI PrintDlgExA(LPVOID lpPrintDlgExA) /* [???] FIXME: LPPRINTDLGEXA */
++HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lpPrintDlgExA)
+ {
+ FIXME("stub\n");
+ return E_NOTIMPL;
+@@ -2919,7 +2919,7 @@
+ /***********************************************************************
+ * PrintDlgExW (COMDLG32.@)
+ */
+-HRESULT WINAPI PrintDlgExW(LPVOID lpPrintDlgExW) /* [???] FIXME: LPPRINTDLGEXW */
++HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lpPrintDlgExW)
+ {
+ FIXME("stub\n");
+ return E_NOTIMPL;
reactos/lib/comdlg32
diff -u -r1.1 -r1.2
--- Makefile.in 9 Jan 2004 01:58:22 -0000 1.1
+++ Makefile.in 11 Mar 2004 21:15:50 -0000 1.2
@@ -5,7 +5,7 @@
MODULE = comdlg32.dll
IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 kernel32 ntdll
ALTNAMES = commdlg.dll
-EXTRALIBS = $(LIBUUID)
+EXTRALIBS = -luuid
SPEC_SRCS16 = $(ALTNAMES:.dll=.spec)
reactos/lib/comdlg32
diff -u -r1.2 -r1.3
--- cdlg32.c 12 Jan 2004 23:46:20 -0000 1.2
+++ cdlg32.c 11 Mar 2004 21:15:50 -0000 1.3
@@ -19,9 +19,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include "config.h"
-#include "wine/port.h"
-
#include <stdarg.h>
#include "windef.h"
reactos/lib/comdlg32
diff -u -r1.3 -r1.4
--- cdlg_De.rc 23 Jan 2004 16:56:44 -0000 1.3
+++ cdlg_De.rc 11 Mar 2004 21:15:50 -0000 1.4
@@ -256,7 +256,7 @@
COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
LTEXT "" , IDC_TOOLBARSTATIC, 181, 2, 122, 17, NOT WS_GROUP | NOT WS_VISIBLE
- LISTBOX IDC_SHELLSTATIC,4,20,292,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
+ LISTBOX IDC_SHELLSTATIC,4,20,292,85, LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_HSCROLL | NOT WS_VISIBLE
LTEXT "Datei&name:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
EDITTEXT IDC_FILENAME,54,110,155,12,ES_AUTOHSCROLL
reactos/lib/comdlg32
diff -u -r1.1 -r1.2
--- cdlg_It.rc 9 Jan 2004 01:58:22 -0000 1.1
+++ cdlg_It.rc 11 Mar 2004 21:15:50 -0000 1.2
@@ -1,5 +1,6 @@
/*
* Copyright 1996 Tristan Tarrant
+ * Copyright 2004 Ivan Leo Murray-Smith
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -33,7 +34,7 @@
LTEXT "&Percorso:", -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 "Files di &Tipo:", 1089, 6, 104, 90, 9
+ LTEXT "File di &Tipo:", 1089, 6, 104, 90, 9
COMBOBOX 1136, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
LTEXT "&Unita':", 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
@@ -114,6 +115,7 @@
COMBOBOX 1138, 168, 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"
@@ -145,6 +147,7 @@
CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
}
+
CHOOSE_COLOR DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 300, 185
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Colore"
@@ -178,6 +181,7 @@
PUSHBUTTON "&i",713,300,200,4,14 /* just a dummy: 'i' is like &i in "sol&id" */
}
+
FINDDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 236, 62
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Trova"
@@ -190,6 +194,7 @@
GROUPBOX "Direzione", 1072, 107, 26, 68, 28
CONTROL "&Su", 1056, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 24, 12
CONTROL "&Giu'", 1057, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 142, 38, 28, 12
+
DEFPUSHBUTTON "&Trova Prossimo", IDOK, 180, 5, 54, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "Annulla", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Aiuto", 1038, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
@@ -213,3 +218,244 @@
PUSHBUTTON "Annulla", IDCANCEL, 174, 55, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Aiuto", 1038, 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 "Print"
+FONT 8, "Helv"
+{
+ DEFPUSHBUTTON "OK", IDOK, 180,164, 48,14, WS_GROUP | BS_DEFPUSHBUTTON
+ PUSHBUTTON "Annulla", IDCANCEL, 232,164, 48,14, WS_GROUP
+ PUSHBUTTON "&Aiuto", pshHelp, 50, 161, 48,14, WS_GROUP
+
+ GROUPBOX "Stampante", grp4, 8, 4, 272,84, WS_GROUP
+ CONTROL "Stampa su fi&le", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,212,70,64,12
+ PUSHBUTTON "&Propriet�", psh2, 212, 17, 60,14, WS_GROUP
+ LTEXT "&Nome:", stc6, 16, 20, 36,8
+ COMBOBOX cmb4, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+ LTEXT "Stato:", stc8, 16, 36, 36,10, SS_NOPREFIX
+ LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Tipo:", stc7, 16, 48, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Where:", stc10, 16, 60, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Comment:", stc9, 16, 72, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Remark", stc13, 52, 72, 152,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+ GROUPBOX "Copie", grp2, 160, 92, 120,64, WS_GROUP
+ LTEXT "Numero di &copie:",stc5,168,108,68,8
+ ICON "", ico3, 162,124, 76,24, WS_GROUP | SS_CENTERIMAGE
+ CONTROL "C&ollate", chx2,"Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,240,130,36,12
+ EDITTEXT edt3, 240,106, 32,12, WS_GROUP | ES_NUMBER
+
+ GROUPBOX "Print range", grp1, 8,92, 144,64, WS_GROUP
+ CONTROL "&Tutto", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
+ CONTROL "Pa&gine", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+ CONTROL "&Seleczione", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12
+ EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER
+ EDITTEXT edt2, 118,122, 26,12, WS_GROUP | ES_NUMBER
+ RTEXT "&da:", stc2, 52,124, 20,8
+ RTEXT "&a:", stc3, 100,124, 16,8
+}
+
+PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU |
+ DS_CONTEXTHELP | DS_3DLOOK
+CAPTION "Configurazione Stampante"
+FONT 8, "Helv"
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,180,156,48,14,WS_GROUP
+ PUSHBUTTON "Annulla",IDCANCEL,232,156,48,14
+/* PUSHBUTTON "Rete...", psh5, 284,156,48,14 */
+
+ GROUPBOX "Stampante", grp4, 8, 4, 272,84, WS_GROUP
+ PUSHBUTTON "&Propriet�", psh2, 212, 17, 60,14, WS_GROUP
+ LTEXT "&Nome:", stc6, 16, 20, 36,8
+ COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+ LTEXT "Stato:", stc8, 16, 36, 36,10, SS_NOPREFIX
+ LTEXT "Dummy State", stc12, 52, 36, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Tipo:", stc7, 16, 48, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Type", stc11, 52, 48, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Where:", stc10, 16, 60, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Location", stc14, 52, 60, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+ LTEXT "Commento:", stc9, 16, 72, 36,10, SS_NOPREFIX
+ LTEXT "Dummy Remark", stc13, 52, 72, 224,10, SS_NOPREFIX | SS_LEFTNOWORDWRAP
+
+ GROUPBOX "Carta", grp2, 8, 92, 164,56, WS_GROUP
+ LTEXT "Di&mensione:", stc2, 16,108, 36, 8
+ COMBOBOX cmb2, 52,106, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+ LTEXT "&Origine:", stc3, 16,128, 36, 8
+ COMBOBOX cmb3, 52,126, 112,112,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+
+ GROUPBOX "Orientazione", grp1, 180, 92, 100,56, WS_GROUP
+ ICON "", ico1, 195,112, 18,20, WS_GROUP
+ CONTROL "O&rizzontale", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP |WS_TABSTOP,224,106,52,12
+ CONTROL "V&erticale", rad2,"Button",BS_AUTORADIOBUTTON,224,126,52,12
+END
+
+PAGESETUPDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 240, 240
+STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Setup di Pagina"
+FONT 8, "Helv"
+BEGIN
+ CONTROL "", rct1, 130, 0x00020006, 80, 8, 80, 80, SS_WHITERECT
+ CONTROL "", rct2, 130, 0x00020005, 160, 12, 4, 80, SS_GRAYRECT
+ CONTROL "", rct3, 130, 0x00020005, 84, 88, 80, 4, SS_GRAYRECT
+ GROUPBOX "Carta", grp2, 8, 96, 224, 56, BS_GROUPBOX
+ LTEXT "&Dimensione:", stc2, 16, 112, 36, 8
+ COMBOBOX cmb2, 64, 110, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+ LTEXT "&Tray:", stc3, 16, 132, 36, 8
+ COMBOBOX cmb3, 64, 130, 160, 160, CBS_SIMPLE|CBS_DROPDOWN|CBS_SORT|WS_GROUP|WS_TABSTOP|WS_VSCROLL
+ GROUPBOX "Orientazione", grp1, 8, 156, 64, 56, BS_GROUPBOX
+ AUTORADIOBUTTON "&Orizzontale", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
+ AUTORADIOBUTTON "&Verticale", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
+ GROUPBOX "Bordi", grp4, 80, 156, 152, 56, BS_GROUPBOX
+ LTEXT "&Sinistro:", stc15, 88, 172, 21, 8
+ EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ LTEXT "&Destro:", stc16, 159, 172, 27, 8
+ EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ LTEXT "&Superiore:", stc17, 88, 192, 21, 8
+ EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ LTEXT "&Inferiore:", stc18, 159, 192, 23, 8
+ EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER
+ DEFPUSHBUTTON "OK", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
+ PUSHBUTTON "Annulla", IDCANCEL, 126, 220, 50, 14
+ PUSHBUTTON "S&tampante...", psh3, 184, 220, 48, 14
+END
+
+NEWFILEOPENORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 280, 164
+STYLE DS_MODALFRAME | DS_CONTEXTHELP | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_CLIPCHILDREN
+CAPTION "Apri"
+FONT 8, "Helv"
+{
+ LTEXT "Cerca &in:",IDC_LOOKINSTATIC,4,6,43,8, SS_NOTIFY
+ COMBOBOX IDC_LOOKIN,49,3,132,100,CBS_DROPDOWNLIST | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP
+
+ 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 "Nome &file:",IDC_FILENAMESTATIC,5,112,46,8, SS_NOTIFY
+ 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
+
+ CONTROL "Apri in &sola lettura",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,54,145,100,10
+
+ DEFPUSHBUTTON "&Apri", IDOK,222,110,50,14
+ PUSHBUTTON "Annulla", IDCANCEL,222,128,50,14
+ PUSHBUTTON "&Aiuto", pshHelp,222,145,50,14
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_ABOUTBOX "&Informazioni sul Test FolderPicker"
+ IDS_DOCUMENTFOLDERS "Cartelle Documenti"
+ IDS_PERSONAL "Documenti"
+ IDS_FAVORITES "Preferiti"
+ IDS_PATH "Path di Sistema"
+ IDS_DESKTOP "Desktop"
+ IDS_FONTS "Font"
+ IDS_MYCOMPUTER "Risorse del Computer"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_SYSTEMFOLDERS "Cartelle di Sistema"
+ IDS_LOCALHARDRIVES "Dischi Rigidi Locali"
+ IDS_FILENOTFOUND "File non trovato"
+ IDS_VERIFYFILE "Controllare che il nome del file fornito sia corretto"
+ IDS_CREATEFILE "Il file non esiste\nCreare il file"
+ IDS_OVERWRITEFILE "Il file esiste gi�.\nSovrascriverlo?"
+ IDS_INVALID_FILENAME_TITLE "Caratteri invalidi nel percorso"
+ IDS_INVALID_FILENAME "Il nome di un file non pu� contenere i seguenrti caratteri: \n / : < > |"
+ IDS_PATHNOTEXISTING "Il percorso specificato non esiste"
+ IDS_FILENOTEXISTING "Il file non esiste"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ IDS_UPFOLDER "Su di un livello"
+ IDS_NEWFOLDER "Crea nuova directory"
+ IDS_LISTVIEW "Lista"
+ IDS_REPORTVIEW "Dettagli"
+ IDS_TODESKTOP "Browse to Desktop"
+}
+
+STRINGTABLE DISCARDABLE
+{
+ PD32_PRINT_TITLE "Stampa"
+
+ PD32_VALUE_UREADABLE "Entry non leggibile"
+ PD32_INVALID_PAGE_RANGE "Questo valore non si trova all'interno della pagina.\n\
+Usare un valore compreso tra %d e %d."
+ PD32_FROM_NOT_ABOVE_TO "La voce 'da' non pu� eccedere la voce 'a'."
+ PD32_MARGINS_OVERLAP "I margini si sovrappongono o si trovano oltre \
+il limite della carta.\nPer favore ridefinire i margini."
+ PD32_NR_OF_COPIES_EMPTY "Il valore del numero 'Numero di copie' \
+non pu� essere vuoto."
+ PD32_TOO_LARGE_COPIES "Questo alto numero di copie non � \
+supportato dalla stampante.\nInserire un valore compreso tra 1 e %d"
+ PD32_PRINT_ERROR "Si � verificato un errore della stampante."
+ PD32_NO_DEFAULT_PRINTER "Non � stata impostata una stampante predefinita."
+ PD32_CANT_FIND_PRINTER "Stampante non trovata."
+ PD32_OUT_OF_MEMORY "Memoria esaurita."
+ PD32_GENERIC_ERROR "Si � verificato un errore."
+ PD32_DRIVER_UNKNOWN "Driver della stampante sconosciuto."
+
+ PD32_DEFAULT_PRINTER "Stampante predefinita; "
+ PD32_NR_OF_DOCUMENTS_IN_QUEUE "Ci sono %d documenti nella coda di stampa"
+ PD32_PRINT_ALL_X_PAGES "&Tutte le %d pagine"
+ PD32_MARGINS_IN_INCHES "Margini [pollici]"
+ PD32_MARGINS_IN_MILIMETERS "Margini [mm]"
+ PD32_MILIMETERS "mm"
+
+ PD32_PRINTER_STATUS_READY "Pronto"
+ PD32_PRINTER_STATUS_PAUSED "In pausa; "
+ PD32_PRINTER_STATUS_ERROR "Errore; "
+ PD32_PRINTER_STATUS_PENDING_DELETION "In attesa di annullamento; "
+ PD32_PRINTER_STATUS_PAPER_JAM "Carta inceppata; "
+ PD32_PRINTER_STATUS_PAPER_OUT "Carta esaurita; "
+ PD32_PRINTER_STATUS_MANUAL_FEED "Feed paper manual; "
+ PD32_PRINTER_STATUS_PAPER_PROBLEM "Si � verificato un problema con la carta; "
+ PD32_PRINTER_STATUS_OFFLINE "Stampante offline; "
+ PD32_PRINTER_STATUS_IO_ACTIVE "I/O Attivo; "
+ PD32_PRINTER_STATUS_BUSY "Stampante occupata; "
+ PD32_PRINTER_STATUS_PRINTING "Stampa in corso; "
+ PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Output tray is full; "
+ PD32_PRINTER_STATUS_NOT_AVAILABLE "Non disponibile; "
+ PD32_PRINTER_STATUS_WAITING "Attesa; "
+ PD32_PRINTER_STATUS_PROCESSING "Elaborazione; "
+ PD32_PRINTER_STATUS_INITIALIZING "Inizializazione; "
+ PD32_PRINTER_STATUS_WARMING_UP "La stampante si sta riscaldando; "
+ PD32_PRINTER_STATUS_TONER_LOW "Il livello del toner � basso; "
+ PD32_PRINTER_STATUS_NO_TONER "Manca il toner; "
+ PD32_PRINTER_STATUS_PAGE_PUNT "Punt della pagina; "
+ PD32_PRINTER_STATUS_USER_INTERVENTION "Interrotto dall'utente; "
+ PD32_PRINTER_STATUS_OUT_OF_MEMORY "Memoria esaurita; "
+ PD32_PRINTER_STATUS_DOOR_OPEN "La porta stampante � aperta; "
+ PD32_PRINTER_STATUS_SERVER_UNKNOWN "Server di stampa sconosciuto; "
+ PD32_PRINTER_STATUS_POWER_SAVE "Modalit� risparmio energetico; "
+}
+
+STRINGTABLE DISCARDABLE /* Color names */
+{
+ IDS_COLOR_BLACK "Nero"
+ IDS_COLOR_MAROON "Marrone rossiccio"
+ IDS_COLOR_GREEN "Verde"
+ IDS_COLOR_OLIVE "Verde oliva"
+ IDS_COLOR_NAVY "Blu notte"
+ IDS_COLOR_PURPLE "Propora"
+ IDS_COLOR_TEAL "Teal"
+ IDS_COLOR_GRAY "Grigio"
+ IDS_COLOR_SILVER "Argento"
+ IDS_COLOR_RED "Rosso"
+ IDS_COLOR_LIME "Verde cedro"
+ IDS_COLOR_YELLOW "Giallo"
+ IDS_COLOR_BLUE "Blu"
+ IDS_COLOR_FUCHSIA "Fuchsia"
+ IDS_COLOR_AQUA "Aqua"
+ IDS_COLOR_WHITE "Bianco"
+}
reactos/lib/comdlg32
diff -u -r1.1 -r1.2
--- colordlg16.c 9 Jan 2004 01:58:22 -0000 1.1
+++ colordlg16.c 11 Mar 2004 21:15:50 -0000 1.2
@@ -442,7 +442,7 @@
COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
return FALSE;
}
- size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo);
+ size = SizeofResource(COMDLG32_hInstance, hResInfo);
hGlobal16 = GlobalAlloc16(0, size);
if (!hGlobal16)
{
reactos/lib/comdlg32
diff -u -r1.2 -r1.3
--- filedlg.c 12 Jan 2004 23:46:20 -0000 1.2
+++ filedlg.c 11 Mar 2004 21:15:50 -0000 1.3
@@ -676,30 +676,11 @@
INT_PTR CALLBACK FileOpenDlgProcUserTemplate(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- FileOpenDlgInfos *fodInfos;
-
-#if 0
- TRACE("0x%04x\n", uMsg);
-#endif
-
- switch(uMsg)
- {
- case WM_INITDIALOG:
- {
- fodInfos = (FileOpenDlgInfos *)lParam;
- lParam = (LPARAM) fodInfos->ofnInfos;
-
- if(fodInfos && IsHooked(fodInfos))
- return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
- return 0;
- }
+ switch(uMsg) {
+ case WM_INITDIALOG:
+ return TRUE;
}
-
- fodInfos = (FileOpenDlgInfos *) GetPropA(GetParent(hwnd),FileOpenDlgInfosStr);
- if(fodInfos && IsHooked(fodInfos))
- return CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,hwnd,uMsg,wParam,lParam);
-
- return 0;
+ return FALSE;
}
HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd)
@@ -753,8 +734,9 @@
return NULL;
}
}
- hChildDlg= CreateDialogIndirectParamA(COMDLG32_hInstance, template,
- hwnd, FileOpenDlgProcUserTemplate, (LPARAM)fodInfos);
+ hChildDlg = CreateDialogIndirectParamA(COMDLG32_hInstance, template, hwnd,
+ IsHooked(fodInfos) ? (DLGPROC)fodInfos->ofnInfos->lpfnHook : FileOpenDlgProcUserTemplate,
+ (LPARAM)fodInfos->ofnInfos);
if(hChildDlg)
{
ShowWindow(hChildDlg,SW_SHOW);
@@ -779,7 +761,7 @@
temp.menu = temp.class = temp.title = 0;
hChildDlg = CreateDialogIndirectParamA(COMDLG32_hInstance, &temp.tmplate,
- hwnd, FileOpenDlgProcUserTemplate, (LPARAM)fodInfos);
+ hwnd, (DLGPROC)fodInfos->ofnInfos->lpfnHook, (LPARAM)fodInfos->ofnInfos);
return hChildDlg;
}
@@ -1035,15 +1017,15 @@
TBBUTTON tbb[] =
{
- {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0 },
- {VIEW_PARENTFOLDER, FCIDM_TB_UPFOLDER, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 },
- {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0 },
- {VIEW_NEWFOLDER+1, FCIDM_TB_DESKTOP, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 },
- {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0 },
- {VIEW_NEWFOLDER, FCIDM_TB_NEWFOLDER, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 },
- {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0, 0}, 0, 0 },
- {VIEW_LIST, FCIDM_TB_SMALLICON, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 },
- {VIEW_DETAILS, FCIDM_TB_REPORTVIEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0, 0}, 0, 0 },
+ {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0 },
+ {VIEW_PARENTFOLDER, FCIDM_TB_UPFOLDER, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 },
+ {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0 },
+ {VIEW_NEWFOLDER+1, FCIDM_TB_DESKTOP, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 },
+ {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0 },
+ {VIEW_NEWFOLDER, FCIDM_TB_NEWFOLDER, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 },
+ {0, 0, TBSTATE_ENABLED, BTNS_SEP, {0, 0}, 0, 0 },
+ {VIEW_LIST, FCIDM_TB_SMALLICON, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 },
+ {VIEW_DETAILS, FCIDM_TB_REPORTVIEW, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0 },
};
TBADDBITMAP tba[2];
RECT rectTB;
@@ -1159,19 +1141,31 @@
DWORD result;
strcpyW(tmpBuf, fodInfos->initdir);
- if (tmpBuf[strlenW(tmpBuf)-1] != '\\') {
- strcatW(tmpBuf, szwSlash);
+ if( PathFileExistsW(tmpBuf) ) {
+ /* initdir does not have to be a directory. If a file is
+ * specified, the dir part is taken */
+ if( PathIsDirectoryW(tmpBuf)) {
+ if (tmpBuf[strlenW(tmpBuf)-1] != '\\') {
+ strcatW(tmpBuf, szwSlash);
+ }
+ strcatW(tmpBuf, szwStar);
+ }
+ result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit);
+ if (result) {
+ *nameBit = 0x00;
+ if (fodInfos->initdir)
+ MemFree(fodInfos->initdir);
+ fodInfos->initdir = MemAlloc((strlenW(tmpBuf2) + 1)*sizeof(WCHAR));
+ strcpyW(fodInfos->initdir, tmpBuf2);
+ handledPath = TRUE;
+ TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir));
+ }
}
- strcatW(tmpBuf, szwStar);
- result = GetFullPathNameW(tmpBuf, MAX_PATH, tmpBuf2, &nameBit);
- if (result) {
- *nameBit = 0x00;
- if (fodInfos->initdir)
- MemFree(fodInfos->initdir);
- fodInfos->initdir = MemAlloc((strlenW(tmpBuf2) + 1)*sizeof(WCHAR));
- strcpyW(fodInfos->initdir, tmpBuf2);
- handledPath = TRUE;
- TRACE("Value in InitDir changed to %s\n", debugstr_w(fodInfos->initdir));
+ else if (fodInfos->initdir)
+ {
+ MemFree(fodInfos->initdir);
+ fodInfos->initdir = NULL;
+ TRACE("Value in InitDir is not an existing path, changed to (nil)\n");
}
}
}
@@ -1478,12 +1472,16 @@
TRACE("---\n");
/* First send CDN_FILEOK as MSDN doc says */
SendCustomDlgNotificationMessage(hwnd,CDN_FILEOK);
+ if (GetWindowLongW(fodInfos->DlgInfos.hwndCustomDlg, DWL_MSGRESULT))
+ {
+ TRACE("canceled\n");
+ return FALSE;
+ }
/* fodInfos->ofnInfos points to an ASCII or UNICODE structure as appropriate */
- CallWindowProcA((WNDPROC)fodInfos->ofnInfos->lpfnHook,
- fodInfos->DlgInfos.hwndCustomDlg,
- fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos);
- if (GetWindowLongA(fodInfos->DlgInfos.hwndCustomDlg, DWL_MSGRESULT))
+ SendMessageW(fodInfos->DlgInfos.hwndCustomDlg,
+ fodInfos->HookMsg.fileokstring, 0, (LPARAM)fodInfos->ofnInfos);
+ if (GetWindowLongW(fodInfos->DlgInfos.hwndCustomDlg, DWL_MSGRESULT))
{
TRACE("canceled\n");
return FALSE;
@@ -1562,9 +1560,9 @@
if ( !(fodInfos->ofnInfos->Flags & OFN_EXPLORER) )
{
/* For "oldstyle" dialog the components have to
- be spearated by blanks (not '\0'!) and short
+ be separated by blanks (not '\0'!) and short
filenames have to be used! */
- FIXME("Components have to be separated by blanks");
+ FIXME("Components have to be separated by blanks\n");
}
if(fodInfos->unicode)
{
@@ -1711,7 +1709,7 @@
nOpenAction = ONOPEN_BROWSE;
- /* dont apply any checks with OFN_NOVALIDATE */
+ /* don't apply any checks with OFN_NOVALIDATE */
{
LPWSTR lpszTemp, lpszTemp1;
LPITEMIDLIST pidl = NULL;
reactos/lib/comdlg32
diff -u -r1.1 -r1.2
--- filedlg16.c 9 Jan 2004 01:58:22 -0000 1.1
+++ filedlg16.c 11 Mar 2004 21:15:50 -0000 1.2
@@ -95,18 +95,12 @@
static BOOL initialized = 0;
if (!initialized) {
- HINSTANCE inst = GetModuleHandleA( "comdlg32.dll" );
- if (!inst)
- {
- ERR( "cannot get comdlg32.dll instance\n" );
- return FALSE;
- }
- hFolder = LoadImageA( inst, "FOLDER", IMAGE_ICON, 16, 16, LR_SHARED );
- hFolder2 = LoadImageA( inst, "FOLDER2", IMAGE_ICON, 16, 16, LR_SHARED );
- hFloppy = LoadImageA( inst, "FLOPPY", IMAGE_ICON, 16, 16, LR_SHARED );
- hHDisk = LoadImageA( inst, "HDISK", IMAGE_ICON, 16, 16, LR_SHARED );
- hCDRom = LoadImageA( inst, "CDROM", IMAGE_ICON, 16, 16, LR_SHARED );
- hNet = LoadImageA( inst, "NETWORK", IMAGE_ICON, 16, 16, LR_SHARED );
+ hFolder = LoadImageA( COMDLG32_hInstance, "FOLDER", IMAGE_ICON, 16, 16, LR_SHARED );
+ hFolder2 = LoadImageA( COMDLG32_hInstance, "FOLDER2", IMAGE_ICON, 16, 16, LR_SHARED );
+ hFloppy = LoadImageA( COMDLG32_hInstance, "FLOPPY", IMAGE_ICON, 16, 16, LR_SHARED );
+ hHDisk = LoadImageA( COMDLG32_hInstance, "HDISK", IMAGE_ICON, 16, 16, LR_SHARED );
+ hCDRom = LoadImageA( COMDLG32_hInstance, "CDROM", IMAGE_ICON, 16, 16, LR_SHARED );
+ hNet = LoadImageA( COMDLG32_hInstance, "NETWORK", IMAGE_ICON, 16, 16, LR_SHARED );
if (hFolder == 0 || hFolder2 == 0 || hFloppy == 0 ||
hHDisk == 0 || hCDRom == 0 || hNet == 0)
{
@@ -230,7 +224,7 @@
COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
return FALSE;
}
- size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo);
+ size = SizeofResource(COMDLG32_hInstance, hResInfo);
hGlobal16 = GlobalAlloc16(0, size);
if (!hGlobal16)
{
reactos/lib/comdlg32
diff -u -r1.1 -r1.2
--- finddlg.c 9 Jan 2004 01:58:22 -0000 1.1
+++ finddlg.c 11 Mar 2004 21:15:50 -0000 1.2
@@ -121,7 +121,7 @@
COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
return FALSE;
}
- size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo);
+ size = SizeofResource(COMDLG32_hInstance, hResInfo);
hGlobal16 = GlobalAlloc16(0, size);
if (!hGlobal16)
{
reactos/lib/comdlg32
diff -u -r1.1 -r1.2
--- finddlg32.c 9 Jan 2004 01:58:22 -0000 1.1
+++ finddlg32.c 11 Mar 2004 21:15:50 -0000 1.2
@@ -54,7 +54,7 @@
* The find/replace calls are passed a structure that is _not_ used
* internally. There is a local copy that holds the running info to
* be able to combine xxxA and xxxW calls. The passed pointer is
- * returned upon sendmessage. Apps wont break this way when they rely
+ * returned upon sendmessage. Apps won't break this way when they rely
* on the original pointer. This will work as long as the sizes of
* FINDREPLACEA == FINDREPLACEW. The local copy will also prevent
* the app to see the wine-specific extra flags to distinguish between
reactos/lib/comdlg32
diff -u -r1.2 -r1.3
--- fontdlg.c 12 Jan 2004 23:46:20 -0000 1.2
+++ fontdlg.c 11 Mar 2004 21:15:50 -0000 1.3
@@ -29,8 +29,9 @@
#include "winnls.h"
#include "wingdi.h"
#include "winuser.h"
-#include "wine/winuser16.h" /* Needed for CB_SETITEMDATA16 */
-#include "heap.h" /* HEAP_strdupWtoA */
+#include "wine/winbase16.h"
+#include "wine/winuser16.h"
+#include "heap.h"
#include "commdlg.h"
#include "dlgs.h"
#include "wine/debug.h"
reactos/lib/comdlg32
diff -u -r1.1 -r1.2
--- fontdlg16.c 9 Jan 2004 01:58:22 -0000 1.1
+++ fontdlg16.c 11 Mar 2004 21:15:50 -0000 1.2
@@ -205,7 +205,7 @@
COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
return FALSE;
}
- size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo);
+ size = SizeofResource(COMDLG32_hInstance, hResInfo);
hGlobal16 = GlobalAlloc16(0, size);
if (!hGlobal16)
{
reactos/lib/comdlg32
diff -u -r1.2 -r1.3
--- printdlg.c 12 Jan 2004 23:46:20 -0000 1.2
+++ printdlg.c 11 Mar 2004 21:15:50 -0000 1.3
@@ -26,8 +26,8 @@
#include <stdio.h>
#include <string.h>
-//#define NONAMELESSUNION
-//#define NONAMELESSSTRUCT
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
@@ -279,7 +279,7 @@
static BOOL PRINTDLG_UpdatePrintDlgA(HWND hDlg,
PRINT_PTRA* PrintStructures)
{
- LPPRINTDLGA lppd = PrintStructures->dlg.lpPrintDlg;
+ LPPRINTDLGA lppd = PrintStructures->lpPrintDlg;
PDEVMODEA lpdm = PrintStructures->lpDevMode;
LPPRINTER_INFO_2A pi = PrintStructures->lpPrinterInfo;
@@ -341,7 +341,7 @@
lpdm->dmCollate =
(IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
if (lpdm->dmFields & DM_COPIES)
- lpdm->dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+ lpdm->u.s.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
} else {
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
lppd->Flags |= PD_COLLATE;
@@ -356,7 +356,7 @@
static BOOL PRINTDLG_UpdatePrintDlgW(HWND hDlg,
PRINT_PTRW* PrintStructures)
{
- LPPRINTDLGW lppd = PrintStructures->dlg.lpPrintDlg;
+ LPPRINTDLGW lppd = PrintStructures->lpPrintDlg;
PDEVMODEW lpdm = PrintStructures->lpDevMode;
LPPRINTER_INFO_2W pi = PrintStructures->lpPrinterInfo;
@@ -416,7 +416,7 @@
lpdm->dmCollate =
(IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
if (lpdm->dmFields & DM_COPIES)
- lpdm->dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+ lpdm->u.s.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
} else {
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
lppd->Flags |= PD_COLLATE;
@@ -581,9 +581,9 @@
Sel, 0);
if (dm) {
if (nIDComboBox == cmb2)
- dm->dmPaperSize = oldWord;
+ dm->u.s.dmPaperSize = oldWord;
else
- dm->dmDefaultSource = oldWord;
+ dm->u.s.dmDefaultSource = oldWord;
}
}
else {
@@ -593,9 +593,9 @@
*/
if (dm) {
if (nIDComboBox == cmb2)
- oldWord = dm->dmPaperSize;
+ oldWord = dm->u.s.dmPaperSize;
else
- oldWord = dm->dmDefaultSource;
+ oldWord = dm->u.s.dmDefaultSource;
}
}
@@ -691,9 +691,9 @@
Sel, 0);
if (dm) {
if (nIDComboBox == cmb2)
- dm->dmPaperSize = oldWord;
+ dm->u.s.dmPaperSize = oldWord;
else
- dm->dmDefaultSource = oldWord;
+ dm->u.s.dmDefaultSource = oldWord;
}
}
else {
@@ -703,9 +703,9 @@
*/
if (dm) {
if (nIDComboBox == cmb2)
- oldWord = dm->dmPaperSize;
+ oldWord = dm->u.s.dmPaperSize;
else
- oldWord = dm->dmDefaultSource;
+ oldWord = dm->u.s.dmDefaultSource;
}
}
@@ -856,7 +856,7 @@
BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name,
PRINT_PTRA *PrintStructures)
{
- LPPRINTDLGA lppd = PrintStructures->dlg.lpPrintDlg;
+ LPPRINTDLGA lppd = PrintStructures->lpPrintDlg;
LPDEVMODEA lpdm = NULL;
LONG dmSize;
DWORD needed;
@@ -968,7 +968,7 @@
if (lppd->hDevMode == 0)
copies = lppd->nCopies;
else
- copies = lpdm->dmCopies;
+ copies = lpdm->u.s.dmCopies;
if(copies == 0) copies = 1;
else if(copies < 0) copies = MAX_COPIES;
SetDlgItemInt(hDlg, edt3, copies, FALSE);
@@ -990,7 +990,7 @@
ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
} else { /* PD_PRINTSETUP */
- BOOL bPortrait = (lpdm->dmOrientation == DMORIENT_PORTRAIT);
+ BOOL bPortrait = (lpdm->u.s.dmOrientation == DMORIENT_PORTRAIT);
PRINTDLG_SetUpPaperComboBoxA(hDlg, cmb2,
PrintStructures->lpPrinterInfo->pPrinterName,
@@ -1018,7 +1018,7 @@
static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name,
PRINT_PTRW *PrintStructures)
{
- LPPRINTDLGW lppd = PrintStructures->dlg.lpPrintDlg;
+ LPPRINTDLGW lppd = PrintStructures->lpPrintDlg;
LPDEVMODEW lpdm = NULL;
LONG dmSize;
DWORD needed;
@@ -1131,7 +1131,7 @@
if (lppd->hDevMode == 0)
copies = lppd->nCopies;
else
- copies = lpdm->dmCopies;
+ copies = lpdm->u.s.dmCopies;
if(copies == 0) copies = 1;
else if(copies < 0) copies = MAX_COPIES;
SetDlgItemInt(hDlg, edt3, copies, FALSE);
@@ -1153,7 +1153,7 @@
ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
} else { /* PD_PRINTSETUP */
- BOOL bPortrait = (lpdm->dmOrientation == DMORIENT_PORTRAIT);
+ BOOL bPortrait = (lpdm->u.s.dmOrientation == DMORIENT_PORTRAIT);
PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb2,
PrintStructures->lpPrinterInfo->pPrinterName,
@@ -1184,7 +1184,7 @@
static LRESULT PRINTDLG_WMInitDialog(HWND hDlg, WPARAM wParam,
PRINT_PTRA* PrintStructures)
{
- LPPRINTDLGA lppd = PrintStructures->dlg.lpPrintDlg;
+ LPPRINTDLGA lppd = PrintStructures->lpPrintDlg;
DEVNAMES *pdn;
DEVMODEA *pdm;
char *name = NULL;
@@ -1288,7 +1288,7 @@
static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam,
PRINT_PTRW* PrintStructures)
{
- LPPRINTDLGW lppd = PrintStructures->dlg.lpPrintDlg;
+ LPPRINTDLGW lppd = PrintStructures->lpPrintDlg;
DEVNAMES *pdn;
DEVMODEW *pdm;
WCHAR *name = NULL;
@@ -1396,7 +1396,7 @@
LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
LPARAM lParam, PRINT_PTRA* PrintStructures)
{
- LPPRINTDLGA lppd = PrintStructures->dlg.lpPrintDlg;
+ LPPRINTDLGA lppd = PrintStructures->lpPrintDlg;
UINT PrinterComboID = (lppd->Flags & PD_PRINTSETUP) ? cmb1 : cmb4;
LPDEVMODEA lpdm = PrintStructures->lpDevMode;
@@ -1490,7 +1490,7 @@
case rad1: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->dmOrientation = DMORIENT_PORTRAIT;
+ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hPortraitIcon));
}
@@ -1499,7 +1499,7 @@
case rad2: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->dmOrientation = DMORIENT_LANDSCAPE;
+ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hLandscapeIcon));
}
@@ -1523,7 +1523,7 @@
{
DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR)
- lpdm->dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
+ lpdm->u.s.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
CB_GETITEMDATA,
Sel, 0);
}
@@ -1533,7 +1533,7 @@
{
DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR)
- lpdm->dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,
+ lpdm->u.s.dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,
CB_GETITEMDATA, Sel,
0);
}
@@ -1544,8 +1544,8 @@
case rad1: /* orientation */
case rad2:
if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
- if(lpdm->dmOrientation != DMORIENT_PORTRAIT) {
- lpdm->dmOrientation = DMORIENT_PORTRAIT;
+ if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
+ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon);
@@ -1554,8 +1554,8 @@
(LPARAM)PrintStructures->hPortraitIcon);
}
} else {
- if(lpdm->dmOrientation != DMORIENT_LANDSCAPE) {
- lpdm->dmOrientation = DMORIENT_LANDSCAPE;
+ if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
+ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon);
@@ -1573,7 +1573,7 @@
static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
LPARAM lParam, PRINT_PTRW* PrintStructures)
{
- LPPRINTDLGW lppd = PrintStructures->dlg.lpPrintDlg;
+ LPPRINTDLGW lppd = PrintStructures->lpPrintDlg;
UINT PrinterComboID = (lppd->Flags & PD_PRINTSETUP) ? cmb1 : cmb4;
LPDEVMODEW lpdm = PrintStructures->lpDevMode;
@@ -1654,7 +1654,7 @@
case rad1: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->dmOrientation = DMORIENT_PORTRAIT;
+ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hPortraitIcon));
}
@@ -1663,7 +1663,7 @@
case rad2: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->dmOrientation = DMORIENT_LANDSCAPE;
+ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hLandscapeIcon));
}
@@ -1687,7 +1687,7 @@
{
DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR)
- lpdm->dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
+ lpdm->u.s.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
CB_GETITEMDATA,
Sel, 0);
}
@@ -1697,7 +1697,7 @@
{
DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR)
- lpdm->dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
+ lpdm->u.s.dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
CB_GETITEMDATA, Sel,
0);
}
@@ -1708,8 +1708,8 @@
case rad1: /* orientation */
case rad2:
if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
- if(lpdm->dmOrientation != DMORIENT_PORTRAIT) {
- lpdm->dmOrientation = DMORIENT_PORTRAIT;
+ if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
+ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon);
@@ -1718,8 +1718,8 @@
(LPARAM)PrintStructures->hPortraitIcon);
}
} else {
- if(lpdm->dmOrientation != DMORIENT_LANDSCAPE) {
- lpdm->dmOrientation = DMORIENT_LANDSCAPE;
+ if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
+ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon);
@@ -1752,15 +1752,15 @@
SetPropA(hDlg,"__WINE_PRINTDLGDATA",PrintStructures);
res = PRINTDLG_WMInitDialog(hDlg, wParam, PrintStructures);
- if(PrintStructures->dlg.lpPrintDlg->Flags & PD_ENABLEPRINTHOOK)
- res = PrintStructures->dlg.lpPrintDlg->lpfnPrintHook(
- hDlg, uMsg, wParam, (LPARAM)PrintStructures->dlg.lpPrintDlg
+ if(PrintStructures->lpPrintDlg->Flags & PD_ENABLEPRINTHOOK)
+ res = PrintStructures->lpPrintDlg->lpfnPrintHook(
+ hDlg, uMsg, wParam, (LPARAM)PrintStructures->lpPrintDlg
);
return res;
}
- if(PrintStructures->dlg.lpPrintDlg->Flags & PD_ENABLEPRINTHOOK) {
- res = PrintStructures->dlg.lpPrintDlg->lpfnPrintHook(hDlg,uMsg,wParam,
+ if(PrintStructures->lpPrintDlg->Flags & PD_ENABLEPRINTHOOK) {
+ res = PrintStructures->lpPrintDlg->lpfnPrintHook(hDlg,uMsg,wParam,
lParam);
if(res) return res;
}
@@ -1797,13 +1797,13 @@
SetPropW(hDlg, propW, PrintStructures);
res = PRINTDLG_WMInitDialogW(hDlg, wParam, PrintStructures);
- if(PrintStructures->dlg.lpPrintDlg->Flags & PD_ENABLEPRINTHOOK)
- res = PrintStructures->dlg.lpPrintDlg->lpfnPrintHook(hDlg, uMsg, wParam, (LPARAM)PrintStructures->dlg.lpPrintDlg);
+ if(PrintStructures->lpPrintDlg->Flags & PD_ENABLEPRINTHOOK)
+ res = PrintStructures->lpPrintDlg->lpfnPrintHook(hDlg, uMsg, wParam, (LPARAM)PrintStructures->lpPrintDlg);
return res;
}
- if(PrintStructures->dlg.lpPrintDlg->Flags & PD_ENABLEPRINTHOOK) {
- res = PrintStructures->dlg.lpPrintDlg->lpfnPrintHook(hDlg,uMsg,wParam, lParam);
+ if(PrintStructures->lpPrintDlg->Flags & PD_ENABLEPRINTHOOK) {
+ res = PrintStructures->lpPrintDlg->lpfnPrintHook(hDlg,uMsg,wParam, lParam);
if(res) return res;
}
@@ -2056,7 +2056,7 @@
PrintStructures = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(PRINT_PTRA));
- PrintStructures->dlg.lpPrintDlg = lppd;
+ PrintStructures->lpPrintDlg = lppd;
/* and create & process the dialog .
* -1 is failure, 0 is broken hwnd, everything else is ok.
@@ -2212,7 +2212,7 @@
PrintStructures = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(PRINT_PTRW));
- PrintStructures->dlg.lpPrintDlg = lppd;
+ PrintStructures->lpPrintDlg = lppd;
/* and create & process the dialog .
* -1 is failure, 0 is broken hwnd, everything else is ok.
reactos/lib/comdlg32
diff -u -r1.1 -r1.2
--- printdlg.h 9 Jan 2004 01:58:22 -0000 1.1
+++ printdlg.h 11 Mar 2004 21:15:50 -0000 1.2
@@ -33,9 +33,7 @@
typedef struct
{
LPDEVMODEA lpDevMode;
- struct {
- LPPRINTDLGA lpPrintDlg;
- } dlg;
+ LPPRINTDLGA lpPrintDlg;
LPPRINTER_INFO_2A lpPrinterInfo;
LPDRIVER_INFO_3A lpDriverInfo;
UINT HelpMessageID;
@@ -49,9 +47,7 @@
typedef struct
{
LPDEVMODEW lpDevMode;
- struct {
- LPPRINTDLGW lpPrintDlg;
- } dlg;
+ LPPRINTDLGW lpPrintDlg;
LPPRINTER_INFO_2W lpPrinterInfo;
LPDRIVER_INFO_3W lpDriverInfo;
UINT HelpMessageID;
reactos/lib/comdlg32
diff -u -r1.1 -r1.2
--- printdlg16.c 9 Jan 2004 01:58:22 -0000 1.1
+++ printdlg16.c 11 Mar 2004 21:15:50 -0000 1.2
@@ -48,27 +48,10 @@
#include "cdlg16.h"
#include "printdlg.h"
-/* This PRINTDLGA16 internal structure stores
- * pointers to several throughout useful structures.
- * This structure is a duplicate of the PRINT_PTRA
- * struct with a extra memeber.
- */
-
typedef struct
{
- LPDEVMODEA lpDevMode;
- struct {
- LPPRINTDLGA lpPrintDlg;
- LPPRINTDLG16 lpPrintDlg16;
- } dlg;
- LPPRINTER_INFO_2A lpPrinterInfo;
- LPDRIVER_INFO_3A lpDriverInfo;
- UINT HelpMessageID;
- HICON hCollateIcon; /* PrintDlg only */
- HICON hNoCollateIcon; /* PrintDlg only */
- HICON hPortraitIcon; /* PrintSetupDlg only */
- HICON hLandscapeIcon; /* PrintSetupDlg only */
- HWND hwndUpDown;
+ PRINT_PTRA print32;
+ LPPRINTDLG16 lpPrintDlg16;
} PRINT_PTRA16;
/* Internal Functions */
@@ -120,10 +103,10 @@
/***********************************************************************
* PRINTDLG_WMInitDialog [internal]
*/
-static LRESULT PRINTDLG_WMInitDialog16(HWND hDlg, WPARAM wParam,
- PRINT_PTRA16* PrintStructures)
+static LRESULT PRINTDLG_WMInitDialog16(HWND hDlg, WPARAM wParam, PRINT_PTRA16* ptr16)
{
- LPPRINTDLG16 lppd = PrintStructures->dlg.lpPrintDlg16;
+ PRINT_PTRA *PrintStructures = &ptr16->print32;
+ LPPRINTDLG16 lppd = ptr16->lpPrintDlg16;
DEVNAMES *pdn;
DEVMODEA *pdm;
char *name = NULL;
@@ -430,7 +413,8 @@
bRet = TRUE;
} else {
HGLOBAL16 hDlgTmpl;
- PRINT_PTRA16 *PrintStructures;
+ PRINT_PTRA *PrintStructures;
+ PRINT_PTRA16 *ptr16;
/* load Dialog resources,
* depending on Flags indicates Print32 or Print32_setup dialog
@@ -440,18 +424,18 @@
COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
return FALSE;
}
- PrintStructures = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
- sizeof(PRINT_PTRA16));
- PrintStructures->dlg.lpPrintDlg16 = lppd;
- PrintStructures->dlg.lpPrintDlg = (LPPRINTDLGA)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(PRINTDLGA));
-#define CVAL(x) PrintStructures->dlg.lpPrintDlg->x = lppd->x;
-#define MVAL(x) PrintStructures->dlg.lpPrintDlg->x = MapSL(lppd->x);
+ ptr16 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PRINT_PTRA16));
+ ptr16->lpPrintDlg16 = lppd;
+ PrintStructures = &ptr16->print32;
+ PrintStructures->lpPrintDlg = (LPPRINTDLGA)HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(PRINTDLGA));
+#define CVAL(x) PrintStructures->lpPrintDlg->x = lppd->x;
+#define MVAL(x) PrintStructures->lpPrintDlg->x = MapSL(lppd->x);
CVAL(Flags);
- PrintStructures->dlg.lpPrintDlg->hwndOwner = HWND_32(lppd->hwndOwner);
- PrintStructures->dlg.lpPrintDlg->hDC = HDC_32(lppd->hDC);
+ PrintStructures->lpPrintDlg->hwndOwner = HWND_32(lppd->hwndOwner);
+ PrintStructures->lpPrintDlg->hDC = HDC_32(lppd->hDC);
CVAL(nFromPage);CVAL(nToPage);CVAL(nMinPage);CVAL(nMaxPage);
CVAL(nCopies);
- PrintStructures->dlg.lpPrintDlg->hInstance = HINSTANCE_32(lppd->hInstance);
+ PrintStructures->lpPrintDlg->hInstance = HINSTANCE_32(lppd->hInstance);
CVAL(lCustData);
MVAL(lpPrintTemplateName);MVAL(lpSetupTemplateName);
/* Don't copy rest, it is 16 bit specific */
@@ -531,7 +515,7 @@
LPARAM lParam)
{
HWND hDlg = HWND_32(hDlg16);
- PRINT_PTRA16* PrintStructures;
+ PRINT_PTRA16 *PrintStructures;
BOOL16 res = FALSE;
if (uMsg!=WM_INITDIALOG) {
@@ -543,18 +527,18 @@
SetPropA(hDlg,"__WINE_PRINTDLGDATA",PrintStructures);
res = PRINTDLG_WMInitDialog16(hDlg, wParam, PrintStructures);
- if(PrintStructures->dlg.lpPrintDlg16->Flags & PD_ENABLEPRINTHOOK) {
+ if(PrintStructures->lpPrintDlg16->Flags & PD_ENABLEPRINTHOOK) {
res = CallWindowProc16(
- (WNDPROC16)PrintStructures->dlg.lpPrintDlg16->lpfnPrintHook,
- hDlg16, uMsg, wParam, (LPARAM)PrintStructures->dlg.lpPrintDlg16
+ (WNDPROC16)PrintStructures->lpPrintDlg16->lpfnPrintHook,
+ hDlg16, uMsg, wParam, (LPARAM)PrintStructures->lpPrintDlg16
);
}
return res;
}
- if(PrintStructures->dlg.lpPrintDlg16->Flags & PD_ENABLEPRINTHOOK) {
+ if(PrintStructures->lpPrintDlg16->Flags & PD_ENABLEPRINTHOOK) {
res = CallWindowProc16(
- (WNDPROC16)PrintStructures->dlg.lpPrintDlg16->lpfnPrintHook,
+ (WNDPROC16)PrintStructures->lpPrintDlg16->lpfnPrintHook,
hDlg16,uMsg, wParam, lParam
);
if(LOWORD(res)) return res;
@@ -569,12 +553,12 @@
hDlg,
MAKEWPARAM(wParam,HIWORD(lParam)),
LOWORD(lParam),
- PrintStructures
+ &PrintStructures->print32
);
}
case WM_DESTROY:
- DestroyIcon(PrintStructures->hCollateIcon);
- DestroyIcon(PrintStructures->hNoCollateIcon);
+ DestroyIcon(PrintStructures->print32.hCollateIcon);
+ DestroyIcon(PrintStructures->print32.hNoCollateIcon);
/* FIXME: don't forget to delete the paper orientation icons here! */
return FALSE;
reactos/lib/comdlg32
diff -u -r1.1 -r1.2
--- rsrc.rc 9 Jan 2004 01:58:22 -0000 1.1
+++ rsrc.rc 11 Mar 2004 21:15:50 -0000 1.2
@@ -62,6 +62,7 @@
#include "cdlg_Si.rc"
#include "cdlg_Sk.rc"
#include "cdlg_Sv.rc"
+#include "cdlg_Th.rc"
#include "cdlg_Wa.rc"
#include "cdlg_Ja.rc"
#include "cdlg_Zh.rc"
CVSspam 0.2.8