From 4798e9d2dbdbf94162d26017561408ee5f650260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Thu, 11 Mar 2004 21:15:50 +0000 Subject: [PATCH] Sync to Wine-20040309 svn path=/trunk/; revision=8648 --- reactos/lib/comdlg32/Makefile.in | 2 +- reactos/lib/comdlg32/cdlg32.c | 3 - reactos/lib/comdlg32/cdlg_De.rc | 2 +- reactos/lib/comdlg32/cdlg_It.rc | 248 +++++++++++++- reactos/lib/comdlg32/cdlg_Th.rc | 456 ++++++++++++++++++++++++++ reactos/lib/comdlg32/colordlg16.c | 2 +- reactos/lib/comdlg32/filedlg.c | 106 +++--- reactos/lib/comdlg32/filedlg16.c | 20 +- reactos/lib/comdlg32/finddlg.c | 2 +- reactos/lib/comdlg32/finddlg32.c | 2 +- reactos/lib/comdlg32/fontdlg.c | 5 +- reactos/lib/comdlg32/fontdlg16.c | 2 +- reactos/lib/comdlg32/printdlg.c | 102 +++--- reactos/lib/comdlg32/printdlg.h | 8 +- reactos/lib/comdlg32/printdlg16.c | 66 ++-- reactos/lib/comdlg32/rsrc.rc | 1 + reactos/lib/comdlg32/winehq2ros.patch | 268 +++++++++++++++ 17 files changed, 1118 insertions(+), 177 deletions(-) create mode 100644 reactos/lib/comdlg32/cdlg_Th.rc create mode 100644 reactos/lib/comdlg32/winehq2ros.patch diff --git a/reactos/lib/comdlg32/Makefile.in b/reactos/lib/comdlg32/Makefile.in index f3d024d5196..91949b80fe5 100644 --- a/reactos/lib/comdlg32/Makefile.in +++ b/reactos/lib/comdlg32/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = comdlg32.dll IMPORTS = shell32 shlwapi comctl32 winspool user32 gdi32 kernel32 ntdll ALTNAMES = commdlg.dll -EXTRALIBS = $(LIBUUID) +EXTRALIBS = -luuid SPEC_SRCS16 = $(ALTNAMES:.dll=.spec) diff --git a/reactos/lib/comdlg32/cdlg32.c b/reactos/lib/comdlg32/cdlg32.c index 40b653e788d..fc94238c6f3 100644 --- a/reactos/lib/comdlg32/cdlg32.c +++ b/reactos/lib/comdlg32/cdlg32.c @@ -19,9 +19,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "config.h" -#include "wine/port.h" - #include #include "windef.h" diff --git a/reactos/lib/comdlg32/cdlg_De.rc b/reactos/lib/comdlg32/cdlg_De.rc index 81dd8b5dba6..de455662c11 100644 --- a/reactos/lib/comdlg32/cdlg_De.rc +++ b/reactos/lib/comdlg32/cdlg_De.rc @@ -256,7 +256,7 @@ FONT 8, "Helv" 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 diff --git a/reactos/lib/comdlg32/cdlg_It.rc b/reactos/lib/comdlg32/cdlg_It.rc index abe863cb45d..b678f3ee5fb 100644 --- a/reactos/lib/comdlg32/cdlg_It.rc +++ b/reactos/lib/comdlg32/cdlg_It.rc @@ -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 @@ FONT 8, "Helv" 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 @@ FONT 8, "Helv" 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 @@ FONT 8, "Helv" 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 @@ FONT 8, "Helv" 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 @@ FONT 8, "Helv" 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 @@ FONT 8, "Helv" 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" +} diff --git a/reactos/lib/comdlg32/cdlg_Th.rc b/reactos/lib/comdlg32/cdlg_Th.rc new file mode 100644 index 00000000000..72dc74ed97a --- /dev/null +++ b/reactos/lib/comdlg32/cdlg_Th.rc @@ -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 "สีขาว" +} diff --git a/reactos/lib/comdlg32/colordlg16.c b/reactos/lib/comdlg32/colordlg16.c index 0159e47a7b3..8733452226a 100644 --- a/reactos/lib/comdlg32/colordlg16.c +++ b/reactos/lib/comdlg32/colordlg16.c @@ -442,7 +442,7 @@ BOOL16 WINAPI ChooseColor16( LPCHOOSECOLOR16 lpChCol ) COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } - size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo); + size = SizeofResource(COMDLG32_hInstance, hResInfo); hGlobal16 = GlobalAlloc16(0, size); if (!hGlobal16) { diff --git a/reactos/lib/comdlg32/filedlg.c b/reactos/lib/comdlg32/filedlg.c index 5e7db7fb450..8049ad26d45 100644 --- a/reactos/lib/comdlg32/filedlg.c +++ b/reactos/lib/comdlg32/filedlg.c @@ -676,30 +676,11 @@ static void ArrangeCtrlPositions(HWND hwndChildDlg, HWND hwndParentDlg, BOOL hid 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 @@ HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) 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 @@ HWND CreateTemplateDialog(FileOpenDlgInfos *fodInfos, HWND hwnd) 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 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) 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 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) 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 @@ static BOOL FILEDLG95_SendFileOK( HWND hwnd, FileOpenDlgInfos *fodInfos ) 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 @@ BOOL FILEDLG95_OnOpenMultipleFiles(HWND hwnd, LPWSTR lpstrFileList, UINT nFileCo 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 @@ BOOL FILEDLG95_OnOpen(HWND hwnd) nOpenAction = ONOPEN_BROWSE; - /* dont apply any checks with OFN_NOVALIDATE */ + /* don't apply any checks with OFN_NOVALIDATE */ { LPWSTR lpszTemp, lpszTemp1; LPITEMIDLIST pidl = NULL; diff --git a/reactos/lib/comdlg32/filedlg16.c b/reactos/lib/comdlg32/filedlg16.c index 063a9c0281b..dac494f2f1e 100644 --- a/reactos/lib/comdlg32/filedlg16.c +++ b/reactos/lib/comdlg32/filedlg16.c @@ -95,18 +95,12 @@ static BOOL FileDlg_Init(void) 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 @@ BOOL Get16BitsTemplate(LFSPRIVATE lfs) COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } - size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo); + size = SizeofResource(COMDLG32_hInstance, hResInfo); hGlobal16 = GlobalAlloc16(0, size); if (!hGlobal16) { diff --git a/reactos/lib/comdlg32/finddlg.c b/reactos/lib/comdlg32/finddlg.c index 70e8ad4f1c9..afaa3743c38 100644 --- a/reactos/lib/comdlg32/finddlg.c +++ b/reactos/lib/comdlg32/finddlg.c @@ -121,7 +121,7 @@ BOOL FINDDLG_Get16BitsTemplate(LFRPRIVATE lfr) COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } - size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo); + size = SizeofResource(COMDLG32_hInstance, hResInfo); hGlobal16 = GlobalAlloc16(0, size); if (!hGlobal16) { diff --git a/reactos/lib/comdlg32/finddlg32.c b/reactos/lib/comdlg32/finddlg32.c index a75de117774..6863ef7af36 100644 --- a/reactos/lib/comdlg32/finddlg32.c +++ b/reactos/lib/comdlg32/finddlg32.c @@ -54,7 +54,7 @@ static UINT HelpMessage; * 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 diff --git a/reactos/lib/comdlg32/fontdlg.c b/reactos/lib/comdlg32/fontdlg.c index 90e2d18f1eb..2be535bd4ac 100644 --- a/reactos/lib/comdlg32/fontdlg.c +++ b/reactos/lib/comdlg32/fontdlg.c @@ -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" diff --git a/reactos/lib/comdlg32/fontdlg16.c b/reactos/lib/comdlg32/fontdlg16.c index bb10e40ed7f..b1ab2b3388b 100644 --- a/reactos/lib/comdlg32/fontdlg16.c +++ b/reactos/lib/comdlg32/fontdlg16.c @@ -205,7 +205,7 @@ BOOL16 WINAPI ChooseFont16(LPCHOOSEFONT16 lpChFont) COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE); return FALSE; } - size = SizeofResource(GetModuleHandleA("COMDLG32"), hResInfo); + size = SizeofResource(COMDLG32_hInstance, hResInfo); hGlobal16 = GlobalAlloc16(0, size); if (!hGlobal16) { diff --git a/reactos/lib/comdlg32/printdlg.c b/reactos/lib/comdlg32/printdlg.c index 41a16906fa9..917f2334cc4 100644 --- a/reactos/lib/comdlg32/printdlg.c +++ b/reactos/lib/comdlg32/printdlg.c @@ -26,8 +26,8 @@ #include #include -//#define NONAMELESSUNION -//#define NONAMELESSSTRUCT +#define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" #include "wingdi.h" @@ -279,7 +279,7 @@ static BOOL PRINTDLG_CreateDevNamesW(HGLOBAL *hmem, LPCWSTR DeviceDriverName, 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 @@ static BOOL PRINTDLG_UpdatePrintDlgA(HWND hDlg, 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_UpdatePrintDlgA(HWND hDlg, 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 @@ static BOOL PRINTDLG_UpdatePrintDlgW(HWND hDlg, 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 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg, 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 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg, */ 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 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, 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 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, */ 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 @@ static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, LPPRINTER_INFO_2W pi) 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 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, 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 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, 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 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name, 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 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, 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 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, 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 BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name, 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_WMInitDialog(HWND hDlg, WPARAM wParam, 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 @@ static LRESULT PRINTDLG_WMInitDialogW(HWND hDlg, WPARAM wParam, 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 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, 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 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, 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 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, { 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 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, { 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 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, 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 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, (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 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam, 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 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, 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 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, 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 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, { 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 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, { 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 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, 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 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam, (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 @@ INT_PTR CALLBACK PrintDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, 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 @@ INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, 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 @@ BOOL WINAPI PrintDlgA( 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 @@ BOOL WINAPI PrintDlgW( 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. diff --git a/reactos/lib/comdlg32/printdlg.h b/reactos/lib/comdlg32/printdlg.h index a9d80786b94..748e5c033fc 100644 --- a/reactos/lib/comdlg32/printdlg.h +++ b/reactos/lib/comdlg32/printdlg.h @@ -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 typedef struct { LPDEVMODEW lpDevMode; - struct { - LPPRINTDLGW lpPrintDlg; - } dlg; + LPPRINTDLGW lpPrintDlg; LPPRINTER_INFO_2W lpPrinterInfo; LPDRIVER_INFO_3W lpDriverInfo; UINT HelpMessageID; diff --git a/reactos/lib/comdlg32/printdlg16.c b/reactos/lib/comdlg32/printdlg16.c index 157b5d8b991..e68b3e7abb0 100644 --- a/reactos/lib/comdlg32/printdlg16.c +++ b/reactos/lib/comdlg32/printdlg16.c @@ -48,27 +48,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); #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 @@ static BOOL PRINTDLG_CreateDevNames16(HGLOBAL16 *hmem, char* DeviceDriverName, /*********************************************************************** * 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 @@ BOOL16 WINAPI PrintDlg16( 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 @@ BOOL16 WINAPI PrintDlg16( 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 @@ BOOL16 CALLBACK PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam, LPARAM lParam) { HWND hDlg = HWND_32(hDlg16); - PRINT_PTRA16* PrintStructures; + PRINT_PTRA16 *PrintStructures; BOOL16 res = FALSE; if (uMsg!=WM_INITDIALOG) { @@ -543,18 +527,18 @@ BOOL16 CALLBACK PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam, 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 @@ BOOL16 CALLBACK PrintDlgProc16(HWND16 hDlg16, UINT16 uMsg, WPARAM16 wParam, 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; diff --git a/reactos/lib/comdlg32/rsrc.rc b/reactos/lib/comdlg32/rsrc.rc index dc3558d517d..c5fbf3bb71d 100644 --- a/reactos/lib/comdlg32/rsrc.rc +++ b/reactos/lib/comdlg32/rsrc.rc @@ -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" diff --git a/reactos/lib/comdlg32/winehq2ros.patch b/reactos/lib/comdlg32/winehq2ros.patch new file mode 100644 index 00000000000..bf2a3115379 --- /dev/null +++ b/reactos/lib/comdlg32/winehq2ros.patch @@ -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;