diff --git a/reactos/dll/win32/comdlg32/800.bmp b/reactos/dll/win32/comdlg32/800.bmp
new file mode 100644
index 00000000000..3b7dae210a7
Binary files /dev/null and b/reactos/dll/win32/comdlg32/800.bmp differ
diff --git a/reactos/dll/win32/comdlg32/cdlg.h b/reactos/dll/win32/comdlg32/cdlg.h
index f7a59055116..22cd5a21e8a 100644
--- a/reactos/dll/win32/comdlg32/cdlg.h
+++ b/reactos/dll/win32/comdlg32/cdlg.h
@@ -189,7 +189,7 @@ BOOL CC_HookCallChk( const CHOOSECOLORW *lpcc );
int CC_MouseCheckResultWindow( HWND hDlg, LPARAM lParam );
LRESULT CC_WMLButtonDown( HWND hDlg, WPARAM wParam, LPARAM lParam );
LRESULT CC_WMLButtonUp( HWND hDlg, WPARAM wParam, LPARAM lParam );
-LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD
+LRESULT CC_WMCommand( HWND hDlg, WPARAM wParam, LPARAM lParam, WORD
notifyCode, HWND hwndCtl );
LRESULT CC_WMMouseMove( HWND hDlg, LPARAM lParam );
LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam );
diff --git a/reactos/dll/win32/comdlg32/cdlg_Bg.rc b/reactos/dll/win32/comdlg32/cdlg_Bg.rc
index 50b08e751fb..f990df05ada 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Bg.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Bg.rc
@@ -18,7 +18,7 @@
/*
* Òóê èçðè÷íî ïèøåøå äà íå ïèïàì íåùî, àìà àç ãî ïèïíàõ.
- * Àêî èìà ïðîáëåìè íÿêîé äà ãè îïðàâè.
+ * Àêî èìà ïðîáëåìè íÿêîé äà ãè îïðàâè.
*/
LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
diff --git a/reactos/dll/win32/comdlg32/cdlg_Cs.rc b/reactos/dll/win32/comdlg32/cdlg_Cs.rc
index a4e8194b6d3..1a7f5dfb2f7 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Cs.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Cs.rc
@@ -197,7 +197,7 @@ FONT 8, "MS Shell Dlg"
GROUPBOX "Smìr", grp1, 107, 26, 68, 28
CONTROL "N&ahoru", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
CONTROL "&Dolù", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
-
+
DEFPUSHBUTTON "Najít d&alší", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "Zrušit", IDCANCEL, 182, 23, 50, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "&Nápovìda", pshHelp, 182, 45, 50, 14, WS_GROUP | WS_TABSTOP
diff --git a/reactos/dll/win32/comdlg32/cdlg_En.rc b/reactos/dll/win32/comdlg32/cdlg_En.rc
index fa43e983629..a9be1a940e4 100644
--- a/reactos/dll/win32/comdlg32/cdlg_En.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_En.rc
@@ -367,8 +367,8 @@ STRINGTABLE DISCARDABLE
IDS_LOCALHARDRIVES "Local Hard Drives"
IDS_FILENOTFOUND "File not found"
IDS_VERIFYFILE "Please verify that 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_CREATEFILE "File does not exist.\nDo you want to create file?"
+ IDS_OVERWRITEFILE "File already exists.\nDo you want to replace it?"
IDS_INVALID_FILENAME_TITLE "Invalid character(s) in path"
IDS_INVALID_FILENAME "A filename cannot contain any of the following characters: \n / : < > |"
IDS_PATHNOTEXISTING "Path does not exist"
diff --git a/reactos/dll/win32/comdlg32/cdlg_Eo.rc b/reactos/dll/win32/comdlg32/cdlg_Eo.rc
index c462b1d3abd..ade9c9b0b63 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Eo.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Eo.rc
@@ -372,7 +372,7 @@ IDS_INVALID_FILENAME "La dosiernomo ne povas enhavi la jenajn tipojn: \n / :
IDS_PATHNOTEXISTING "Vojo estas neekzistanta"
IDS_FILENOTEXISTING "Dosiero estas neekzistanta"
}
-
+
STRINGTABLE DISCARDABLE
{
IDS_UPFOLDER "Suriru da unu nivelo"
@@ -381,11 +381,11 @@ STRINGTABLE DISCARDABLE
IDS_REPORTVIEW "Detale"
IDS_TODESKTOP "Foliu Desktop"
}
-
+
STRINGTABLE DISCARDABLE
{
PD32_PRINT_TITLE "Presu"
-
+
PD32_VALUE_UREADABLE "Nelegebla Entry"
PD32_INVALID_PAGE_RANGE "Æi tiu valoro ne estas en la paøo.\n\
Enigu valoron inter %d kaj %d."
@@ -405,13 +405,13 @@ STRINGTABLE DISCARDABLE
PD32_NO_DEVICES "Antaý ol vi povos plenumi printiltaskojn \
kvazaý impozi paøon aý presi dokumenton, estas necese ke vi instalu printilon. \
Oni konsilas instali øin kaj reprovi."
-
+
PD32_DEFAULT_PRINTER "Defaýlta Printilo; "
PD32_NR_OF_DOCUMENTS_IN_QUEUE "%d dokumento(j) estas en presvico"
PD32_MARGINS_IN_INCHES "Marøenoj [inches]"
PD32_MARGINS_IN_MILIMETERS "Marøenoj [mm]"
PD32_MILIMETERS "mm"
-
+
PD32_PRINTER_STATUS_READY "Preta"
PD32_PRINTER_STATUS_PAUSED "Paýse; "
PD32_PRINTER_STATUS_ERROR "Eroro; "
@@ -439,7 +439,7 @@ STRINGTABLE DISCARDABLE
PD32_PRINTER_STATUS_SERVER_UNKNOWN "Nekonata pres-servanto; "
PD32_PRINTER_STATUS_POWER_SAVE "Energiþpare; "
}
-
+
STRINGTABLE DISCARDABLE /* Color names */
{
IDS_COLOR_BLACK "Nigro"
@@ -459,7 +459,7 @@ STRINGTABLE DISCARDABLE /* Color names */
IDS_COLOR_AQUA "Akvo"
IDS_COLOR_WHITE "Blanko"
}
-
+
STRINGTABLE DISCARDABLE
{
IDS_FONT_SIZE "Elektu tiparan grandecvaloron inter %d kaj %d punktoj."
diff --git a/reactos/dll/win32/comdlg32/cdlg_Ko.rc b/reactos/dll/win32/comdlg32/cdlg_Ko.rc
index 35cde8cb22a..a855fb1dedb 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Ko.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Ko.rc
@@ -1,7 +1,7 @@
/*
* Copyright 1996 Bang Jun Young
- * Copyright 2005,2006 YunSong Hwang
- * Copyright 2006 Byeong-Sik Jeon
+ * Copyright 2005,2006,2007 YunSong Hwang
+ * Copyright 2006 Byeong-Sik Jeon
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -61,7 +61,7 @@ FONT 9, "MS Shell Dlg"
COMBOBOX cmb1, 6, 114, 90, 36, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_BORDER | WS_VSCROLL | WS_TABSTOP
LTEXT "µå¶óÀ̺ê(&V):", 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
+ DEFPUSHBUTTON "´Ù¸¥ À̸§À¸·Î ÀúÀå", 1, 197, 6, 68, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Ãë¼Ò", 2, 208, 24, 56, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "µµ¿ò¸»(&H)", pshHelp, 208, 46, 56, 14, WS_GROUP | WS_TABSTOP
CHECKBOX "Àбâ Àü¿ë(&R)", chx1, 208, 68, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
@@ -82,12 +82,12 @@ FONT 9, "MS Shell Dlg"
DEFPUSHBUTTON "Àμâ", 1, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Ãë¼Ò", 2, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP
PUSHBUTTON "¼³Á¤(&S)", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
- LTEXT "½ÃÀÛ(&F)m:", 1090, 60, 80, 30, 9
+ LTEXT "½ÃÀÛ(&F):", 1090, 60, 80, 30, 9
LTEXT "³¡(&T):", 1091, 120, 80, 30, 9
LTEXT "Àμâ Ç°Áú(&Q):", 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 "ÆÄÀÏ·Î Àμâ(&L)", chx1, 20, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "ÆøÀÌ Á¼°Ô", chx2, 160, 100, 50, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "ÆÄÀÏ·Î Àμâ(&L)", chx1,9, 116, 67, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
+ CHECKBOX "ÆøÀÌ Á¼°Ô", chx2, 181, 103, 51, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
}
@@ -100,7 +100,7 @@ FONT 9, "MS Shell Dlg"
RADIOBUTTON "±âº» ÇÁ¸°ÅÍ(&D)", rad1, 16, 20, 80, 12
LTEXT "[¾øÀ½]", 1088, 35, 35, 120, 9
RADIOBUTTON "¼±ÅÃÇÑ ÇÁ¸°ÅÍ(&P)", 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
+ COMBOBOX cmb1, 83, 50, 98, 19, 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 "¼³Á¤(&S)", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP
@@ -116,7 +116,7 @@ FONT 9, "MS Shell Dlg"
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 "±Û²Ã"
@@ -125,7 +125,7 @@ FONT 9, "MS Shell Dlg"
LTEXT "±Û²Ã(&F):",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 "±Û²Ã ½ºÅ¸ÀÏ(&Y):",stc2 ,108,3,44,9
+ LTEXT "±Û²Ã ½ºÅ¸ÀÏ(&Y):",stc2 ,108,3,59,9
COMBOBOX cmb2,108,13,64,54, CBS_OWNERDRAWFIXED | CBS_HASSTRINGS | CBS_DISABLENOSCROLL |
WS_VSCROLL | WS_TABSTOP | CBS_SIMPLE
LTEXT "Å©±â(&S):",stc3,179,3,30,9
@@ -157,17 +157,17 @@ FONT 9, "MS Shell Dlg"
LTEXT "±âº» »ö»ó(&B):", 1088, 4, 4, 140, 10
LTEXT "»ç¿ëÀÚ Á¤ÀÇ »ö»ó(&C):", 1089, 4, 106, 140, 10
LTEXT "»ö»ó | ´Ü»ö(&I)", 1090, 150, 151, 48, 10
- LTEXT "»¡°(&R):", 726 /*1094*/,249,126,24,10
- EDITTEXT 706, 275,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "³ì»ö(&G):",727/*1095*/,249,140,24,10
- EDITTEXT 707, 275,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "ÆĶû(&B):",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
+ LTEXT "»¡°(&R):", 726 /*1094*/,249,126,27,10
+ EDITTEXT 706, 277,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "³ì»ö(&G):",727/*1095*/,249,140,27,10
+ EDITTEXT 707, 277,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "ÆĶû(&B):",728 /*1096*/,249,154,27,10
+ EDITTEXT 708, 277,152,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
+ LTEXT "»ö»ó(&H):" ,723 /*1091*/,197,126,31,10
EDITTEXT 703, 226,124,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "äµµ(&S):" ,724 /*1092*/,202,140,22,10
+ LTEXT "äµµ(&S):" ,724 /*1092*/,197,140,31,10
EDITTEXT 704, 226,138,21,12, WS_BORDER | WS_GROUP | WS_TABSTOP
- LTEXT "¸íµµ(&L):" ,725 /*1093*/,202,154,22,10
+ LTEXT "¸íµµ(&L):" ,725 /*1093*/,197,154,31,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
@@ -191,9 +191,9 @@ FONT 9, "MS Shell Dlg"
LTEXT "ãÀ» ³»¿ë(&N):", -1, 4, 8, 42, 8
EDITTEXT edt1, 47, 7, 128, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
CHECKBOX "´Ü¾î ´ÜÀ§·Î(&W)", chx1, 4, 26, 100, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "´ë/¼Ò¹®ÀÚ ±¸ºÐ(&C)", chx2, 4, 42, 64, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "´ë/¼Ò¹®ÀÚ ±¸ºÐ(&C)", chx2, 4, 42, 74, 12, BS_AUTOCHECKBOX | WS_TABSTOP
GROUPBOX "¹æÇâ", grp1, 107, 26, 68, 28
- CONTROL "À§·Î(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 20, 12
+ CONTROL "À§·Î(&U)", rad1, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_TABSTOP, 111, 38, 24, 12
CONTROL "¾Æ·¡·Î(&D)", rad2, "BUTTON", BS_AUTORADIOBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 138, 38, 30, 12
DEFPUSHBUTTON "´ÙÀ½ ã±â(&F)", IDOK, 182, 5, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
@@ -212,7 +212,7 @@ FONT 9, "MS Shell Dlg"
LTEXT "¹Ù²Ü ³»¿ë(&P):", -1, 4, 26, 48, 8
EDITTEXT edt2, 54, 24, 114, 12, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP
CHECKBOX "´Ü¾î ´ÜÀ§·Î(&W)", chx1, 5, 46, 104, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP
- CHECKBOX "´ë/¼Ò¹®ÀÚ ±¸ºÐ(&C)", chx2, 5, 62, 59, 12, BS_AUTOCHECKBOX | WS_TABSTOP
+ CHECKBOX "´ë/¼Ò¹®ÀÚ ±¸ºÐ(&C)", chx2, 5, 62, 74, 12, BS_AUTOCHECKBOX | WS_TABSTOP
DEFPUSHBUTTON "´ÙÀ½ ã±â(&F)", IDOK, 174, 4, 50, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON
PUSHBUTTON "¹Ù²Ù±â(&R)", psh1 , 174, 21, 50, 14, WS_GROUP | WS_TABSTOP
@@ -254,12 +254,12 @@ FONT 9, "MS Shell Dlg"
GROUPBOX "Àμ⠹üÀ§", grp1, 8,92, 144,64, WS_GROUP
CONTROL "¸ðµÎ(&A)", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12
- CONTROL "ÆäÀÌÁö(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12
+ CONTROL "ÆäÀÌÁö(&G)", rad3,"Button",BS_AUTORADIOBUTTON,16,122,45,12
CONTROL "¼±Åà ¿µ¿ª(&S)", 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 "¿©±â¼ºÎÅÍ(&F):", stc2, 52,124, 20,8
- RTEXT "¿©±â±îÁö(&T):", stc3, 100,124, 16,8
+ RTEXT "½ÃÀÛ(&F):", stc2, 73,113, 27,8
+ RTEXT "³¡(&T):", stc3, 120,113, 22,8
}
PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178
@@ -313,14 +313,14 @@ BEGIN
GROUPBOX "¹æÇâ", grp1, 8, 156, 64, 56, BS_GROUPBOX
AUTORADIOBUTTON "¼¼·Î(&P)", rad1, 16, 170, 52, 12, BS_AUTORADIOBUTTON
AUTORADIOBUTTON "°¡·Î(&L)", rad2, 16, 190, 52, 12, BS_AUTORADIOBUTTON
- GROUPBOX "Borders", grp4, 80, 156, 152, 56, BS_GROUPBOX
- LTEXT "¿ÞÂÊ(&E):", stc15, 88, 172, 21, 8
+ GROUPBOX "°¡ÀåÀÚ¸®", grp4, 80, 156, 152, 56, BS_GROUPBOX
+ LTEXT "¿ÞÂÊ(&E):", stc15, 82, 173, 28, 8
EDITTEXT edt4, 111, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
- LTEXT "¿À¸¥ÂÊ(&R):", stc16, 159, 172, 27, 8
+ LTEXT "¿À¸¥ÂÊ(&R):", stc16, 151, 172, 34, 8
EDITTEXT edt6, 187, 170, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
LTEXT "ˤ(&O):", stc17, 88, 192, 21, 8
EDITTEXT edt5, 111, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
- LTEXT "¾Æ·¡(&B):", stc18, 159, 192, 23, 8
+ LTEXT "¾Æ·¡(&B):", stc18, 154, 191, 31, 8
EDITTEXT edt7, 187, 190, 39, 12, WS_TABSTOP|WS_GROUP|WS_BORDER|ES_NUMBER
DEFPUSHBUTTON "È®ÀÎ", IDOK, 71, 220, 50, 14, BS_PUSHBUTTON
PUSHBUTTON "Ãë¼Ò", IDCANCEL, 126, 220, 50, 14
diff --git a/reactos/dll/win32/comdlg32/cdlg_Ru.rc b/reactos/dll/win32/comdlg32/cdlg_Ru.rc
index e178694a239..6e7adb8ccb0 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Ru.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Ru.rc
@@ -323,7 +323,7 @@ BEGIN
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
diff --git a/reactos/dll/win32/comdlg32/cdlg_Sv.rc b/reactos/dll/win32/comdlg32/cdlg_Sv.rc
index 46af76637a3..bc954c8cab0 100644
--- a/reactos/dll/win32/comdlg32/cdlg_Sv.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_Sv.rc
@@ -387,28 +387,28 @@ Var god skriv in ett v
PD32_FROM_NOT_ABOVE_TO "'från'-fältet kan inte överskrida 'till'-fältet"
PD32_MARGINS_OVERLAP "Marginalerna överlappar eller är utanför \
pappersgränserna.\nVar god skriv in marginallerna igen."
- PD32_NR_OF_COPIES_EMPTY "Numret 'Antal kopior' kan inte vara tomt."
- PD32_TOO_LARGE_COPIES "Din skrivare stödjer inte så många kopior som du angav. Vad god skriv in ett värde mellan 1 och %d."
+ PD32_NR_OF_COPIES_EMPTY "Fältet 'Antal kopior' kan inte vara tomt."
+ PD32_TOO_LARGE_COPIES "Din skrivare saknar stöd för så många kopior som du angav. Vad god skriv in ett värde mellan 1 och %d."
PD32_PRINT_ERROR "Ett skrivarfel inträffade."
PD32_NO_DEFAULT_PRINTER "Det finns ingen standardskrivare."
PD32_CANT_FIND_PRINTER "Kan inte hitta skrivare."
PD32_OUT_OF_MEMORY "Slut på minne."
- PD32_GENERIC_ERROR "Ett fel uppstog."
+ PD32_GENERIC_ERROR "Ett fel uppstod."
PD32_DRIVER_UNKNOWN "Okänd skrivardrivrutin."
PD32_NO_DEVICES "Before you can perform printer-related tasks \
such as page setup or printing a document, you need to install a printer. \
Please install one and retry."
PD32_DEFAULT_PRINTER "Standardskrivare; "
- PD32_NR_OF_DOCUMENTS_IN_QUEUE "Det är %d dokument i kön"
- PD32_MARGINS_IN_INCHES "Marginaler [inches]"
+ PD32_NR_OF_DOCUMENTS_IN_QUEUE "Det finns %d dokument i kön"
+ PD32_MARGINS_IN_INCHES "Marginaler [tum]"
PD32_MARGINS_IN_MILIMETERS "Marginaler [millimeter]"
PD32_MILIMETERS "millimeter"
PD32_PRINTER_STATUS_READY "Redo"
PD32_PRINTER_STATUS_PAUSED "Stannad; "
PD32_PRINTER_STATUS_ERROR "Fel; "
- PD32_PRINTER_STATUS_PENDING_DELETION "Pendlande borttagning; "
+ PD32_PRINTER_STATUS_PENDING_DELETION "Väntande borttagning; "
PD32_PRINTER_STATUS_PAPER_JAM "Papperskrångel; "
PD32_PRINTER_STATUS_PAPER_OUT "Slut på papper; "
PD32_PRINTER_STATUS_MANUAL_FEED "Fyll på papper manuellet; "
@@ -420,8 +420,8 @@ Please install one and retry."
PD32_PRINTER_STATUS_OUTPUT_BIN_FULL "Utmatningsfacket är fullt; "
PD32_PRINTER_STATUS_NOT_AVAILABLE "Inte tillgänglig; "
PD32_PRINTER_STATUS_WAITING "Väntar; "
- PD32_PRINTER_STATUS_PROCESSING "Proceserar; "
- PD32_PRINTER_STATUS_INITIALIZING "Initialiserar; "
+ PD32_PRINTER_STATUS_PROCESSING "Behandlar; "
+ PD32_PRINTER_STATUS_INITIALIZING "Initierar; "
PD32_PRINTER_STATUS_WARMING_UP "Värmer upp; "
PD32_PRINTER_STATUS_TONER_LOW "Toner snart slut; "
PD32_PRINTER_STATUS_NO_TONER "Inga toner; "
diff --git a/reactos/dll/win32/comdlg32/cdlg_xx.rc b/reactos/dll/win32/comdlg32/cdlg_xx.rc
index 19afc9f47a1..7c9280e13f9 100644
--- a/reactos/dll/win32/comdlg32/cdlg_xx.rc
+++ b/reactos/dll/win32/comdlg32/cdlg_xx.rc
@@ -61,589 +61,38 @@ STRINGTABLE DISCARDABLE
}
-/* BINRES pd32_collate.ico */
+/* @makedep: pd32_collate.ico */
PD32_COLLATE ICON DISCARDABLE LOADONCALL pd32_collate.ico
-/* {
- '00 00 01 00 01 00 4C 18 10 00 00 00 00 00 48 05'
- '00 00 16 00 00 00 28 00 00 00 4C 00 00 00 30 00'
- '00 00 01 00 04 00 00 00 00 00 E0 04 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
- '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 04 00 00 00 00 00 0F F0 00 00 00'
- '00 00 0F F0 00 00 00 00 00 00 00 00 00 0F F0 00'
- '00 00 00 00 0F F0 00 00 00 00 00 00 80 04 00 00'
- '00 00 00 0F FF F0 00 00 00 0F FF F0 00 00 00 00'
- '00 00 00 00 00 0F FF F0 00 00 00 0F FF F0 00 00'
- '00 00 00 00 80 04 00 00 00 00 00 FF FF FF FF 00'
- '00 00 00 F0 00 00 00 00 00 00 00 00 00 FF FF FF'
- 'FF 00 00 00 00 F0 00 00 00 00 00 00 44 03 00 00'
- '00 00 00 FF FF FF FF FF 00 FF F0 FF 00 00 00 00'
- '00 00 00 00 00 FF FF FF FF FF 00 FF F0 FF 00 00'
- '00 00 00 00 80 04 00 00 00 00 0F FF FF FF FF FF'
- 'FF 00 F0 FF 00 00 00 00 00 00 00 00 0F FF FF FF'
- 'FF FF FF 00 F0 FF 00 00 00 00 00 00 04 00 00 00'
- '00 00 0F FF FF FF FF FF FF 0F F0 FF F0 00 00 00'
- '00 00 00 00 0F FF FF FF FF FF FF 0F F0 FF F0 00'
- '00 00 00 00 62 01 00 00 00 00 0F FF FF FF FF FF'
- 'FF 0F F0 FF F0 00 00 00 00 00 00 00 0F FF FF FF'
- 'FF FF FF 0F F0 FF F0 00 00 00 00 00 E2 00 00 00'
- '00 00 FF FF FF FF FF FF F0 FF F0 FF F0 00 00 00'
- '00 00 00 00 FF FF FF FF FF FF F0 FF F0 FF F0 00'
- '00 00 00 00 00 A0 00 00 00 00 FF FF FF FF FF FF'
- 'F0 FF F0 FF FF 00 00 00 00 00 00 00 FF FF FF FF'
- 'FF FF F0 FF F0 FF FF 00 00 00 00 00 FF FF 00 00'
- '00 0F FF FF FF FF FF FF 0F FF F0 FF FF 00 00 00'
- '00 00 00 0F FF FF FF FF FF FF 0F FF F0 FF FF 00'
- '00 00 00 00 FF FF 00 00 00 0F FF FF FF FF FF FF'
- '0F FF F0 FF FF 00 00 00 00 00 00 0F FF FF FF FF'
- 'FF FF 0F FF F0 FF FF 00 00 00 00 00 FF FF 00 00'
- '00 0F FF FF FF FF FF FF 0F FF F0 F0 0F F0 00 00'
- '00 00 00 0F FF FF FF FF FF FF 0F FF F0 F0 0F F0'
- '00 00 00 00 FF FF 00 00 00 FF FF FF FF FF FF F0'
- 'FF FF F0 0F F0 F0 00 00 00 00 00 FF FF FF FF FF'
- 'FF F0 FF FF F0 0F F0 F0 00 00 00 00 FF FF 00 00'
- '00 FF FF FF FF FF FF F0 FF FF F0 FF F0 FF 00 00'
- '00 00 00 FF FF FF FF FF FF F0 FF FF F0 FF F0 FF'
- '00 00 00 00 FF FF 00 00 00 FF FF FF FF FF 0F F0'
- 'FF FF F0 FF 00 0F 00 00 00 00 00 FF FF FF FF FF'
- '0F F0 FF FF F0 FF 00 0F 00 00 00 00 FF FF 00 00'
- '0F FF FF FF FF FF 0F 0F 00 00 F0 FF FF 0F 00 00'
- '00 00 0F FF FF FF FF FF 0F 0F 00 00 F0 FF FF 0F'
- '00 00 00 00 FF FF 00 00 0F FF FF FF FF F0 FF 0F'
- 'F0 FF F0 FF 00 FF F0 00 00 00 0F FF FF FF FF F0'
- 'FF 0F F0 FF F0 FF 00 FF F0 00 00 00 FF FF 00 00'
- '00 0F FF FF F0 F0 F0 FF FF 0F F0 FF F0 00 00 00'
- '00 00 00 0F FF FF F0 F0 F0 FF FF 0F F0 FF F0 00'
- '00 00 00 00 FF FF 00 00 00 00 00 FF FF 00 F0 FF'
- '0F F0 F0 F0 00 00 00 00 00 00 00 00 00 FF FF 00'
- 'F0 FF 0F F0 F0 F0 00 00 00 00 00 00 FF FF 00 00'
- '00 00 00 00 FF FF 0F FF 0F F0 F0 00 00 00 00 00'
- '00 00 00 00 00 00 FF FF 0F FF 0F F0 F0 00 00 00'
- '00 00 00 00 FF FF 00 00 00 00 00 00 00 0F 0F FF'
- 'F0 0F F0 00 00 00 00 00 00 00 00 00 00 00 00 0F'
- '0F FF F0 0F F0 00 00 00 00 00 00 00 FF FF 00 00'
- '00 00 00 00 0F F0 FF FF FF FF F0 00 00 00 00 00'
- '00 00 00 00 00 00 0F F0 FF FF FF FF F0 00 00 00'
- '00 00 00 00 FF FF 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 A0 FF C7'
- 'FF 9F FF FC 7F F9 FF F0 00 00 FF C0 FC 0F FF FC'
- '0F C0 FF F0 00 00 FF C0 30 0F FF FC 03 00 FF F0'
- '00 00 FF 80 00 0F FF F8 00 00 FF F0 00 00 FF 80'
- '00 07 FF F8 00 00 7F F0 00 00 FF 00 00 03 FF F0'
- '00 00 3F F0 00 00 FF 00 00 03 FF F0 00 00 3F F0'
- '00 00 FF 00 00 03 FF F0 00 00 3F F0 00 00 FE 00'
- '00 03 FF E0 00 00 3F F0 00 00 FE 00 00 01 FF E0'
- '00 00 1F F0 00 00 FC 00 00 01 FF C0 00 00 1F F0'
- '00 00 FC 00 00 00 FF C0 00 00 0F F0 00 00 FC 00'
- '00 00 FF C0 00 00 0F F0 00 00 F8 00 00 00 FF 80'
- '00 00 0F F0 00 00 F8 00 00 00 7F 80 00 00 07 F0'
- '00 00 F8 00 00 00 7F 80 00 00 07 F0 00 00 F0 00'
- '00 00 7F 00 00 00 07 F0 00 00 F0 00 00 00 3F 00'
- '00 00 03 F0 00 00 F8 00 00 00 7F 80 00 00 07 F0'
- '00 00 FF 00 00 07 FF F0 00 00 7F F0 00 00 FF C0'
- '00 1F FF FC 00 01 FF F0 00 00 FF F0 00 3F FF FF'
- '00 03 FF F0 00 00 FF F0 00 3F FF FF 00 03 FF F0'
- '00 00 FF F0 00 3F FF FF 00 03 FF F0 00 00'
-} */
-
-
-/* BINRES pd32_nocollate.ico */
+/* @makedep: pd32_nocollate.ico */
PD32_NOCOLLATE ICON pd32_nocollate.ico
-/* {
- '00 00 01 00 01 00 4C 18 10 00 00 00 00 00 48 05'
- '00 00 16 00 00 00 28 00 00 00 4C 00 00 00 30 00'
- '00 00 01 00 04 00 00 00 00 00 E0 04 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
- '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 FA 02 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 AD 81 00 FF'
- 'FF FF FF FF FF 00 00 00 00 00 00 00 FF FF FF FF'
- 'FF FF 00 00 00 00 00 00 00 FF FF FF FF FF FF 00'
- '00 00 00 00 13 00 00 FF FF FF FF FF FF 00 00 00'
- '00 00 00 00 FF FF FF FF FF FF 00 00 00 00 00 00'
- '00 FF FF FF FF FF FF 00 00 00 00 00 32 04 00 FF'
- 'FF FF FF FF FF 00 00 00 00 00 00 00 FF FF FF FF'
- 'FF FF 0F 00 00 00 00 00 00 FF FF FF FF FF FF 0F'
- '00 00 00 00 02 00 00 FF FF FF FF FF FF 0F 00 00'
- '00 00 00 00 FF FF FF FF FF FF 0F 00 00 00 00 00'
- '00 FF FF FF FF FF FF 0F 00 00 00 00 56 01 00 FF'
- 'FF FF FF FF FF 0F F0 00 00 00 00 00 FF FF FF FF'
- 'FF FF 0F F0 00 00 00 00 00 FF FF FF FF FF FF 0F'
- 'F0 00 00 00 4D 04 00 FF FF FF FF FF FF 0F F0 00'
- '00 00 00 00 FF FF FF FF FF FF 0F F0 00 00 00 00'
- '00 FF FF FF FF FF FF 0F F0 00 00 00 02 00 00 FF'
- 'FF FF FF FF FF 0F FF 00 00 00 00 00 FF FF FF FF'
- 'FF FF 0F FF 00 00 00 00 00 FF FF FF FF FF FF 0F'
- 'FF 00 00 00 62 01 00 FF FF FF FF FF FF 0F FF 00'
- '00 00 00 00 FF FF FF FF FF FF 0F FF 00 00 00 00'
- '00 FF FF FF FF FF FF 0F FF 00 00 00 4D 04 00 FF'
- 'FF FF FF FF FF 0F FF F0 00 00 00 00 FF FF FF FF'
- 'FF FF 0F FF F0 00 00 00 00 FF FF FF FF FF FF 0F'
- 'FF F0 00 00 02 00 00 FF FF FF FF FF FF 0F FF F0'
- '00 00 00 00 FF FF FF FF FF FF 0F FF 00 00 00 00'
- '00 FF FF FF FF FF FF 0F FF F0 00 00 62 01 00 FF'
- 'FF FF FF FF FF 0F F0 FF 00 00 00 00 FF FF FF FF'
- 'FF FF 0F 00 0F 00 00 00 00 FF FF FF FF FF FF 0F'
- '00 FF 00 00 00 00 00 FF FF FF FF FF FF 0F F0 FF'
- '00 00 00 00 FF FF FF FF FF FF 00 0F FF 00 00 00'
- '00 FF FF FF FF FF FF 00 FF 0F 00 00 02 00 00 FF'
- 'FF FF FF F0 FF 0F FF 0F F0 00 00 00 FF FF FF F0'
- '00 0F 0F 00 0F F0 00 00 00 FF FF FF FF 00 FF 0F'
- 'F0 0F F0 00 62 01 00 FF FF FF FF F0 FF 0F FF F0'
- 'FF 00 00 00 FF FF FF F0 FF FF 0F FF F0 F0 00 00'
- '00 FF FF FF F0 FF 0F 0F 0F 0F F0 00 00 00 00 FF'
- 'FF FF FF F0 FF 0F FF 00 FF 00 00 00 FF FF FF FF'
- '0F FF 0F FF F0 FF 00 00 00 FF FF FF FF FF 0F 0F'
- 'FF F0 FF 00 02 00 00 FF FF FF FF F0 FF 0F FF FF'
- '00 00 00 00 FF FF FF FF F0 FF 0F F0 0F F0 00 00'
- '00 FF FF FF FF F0 FF 0F F0 0F F0 00 C4 00 00 FF'
- 'FF FF FF F0 FF 0F FF F0 00 00 00 00 FF FF FF F0'
- 'FF 0F 0F FF FF 00 00 00 00 FF FF FF F0 FF 0F 0F'
- 'FF FF 00 00 32 04 00 FF FF FF FF 00 FF 0F FF 00'
- '00 00 00 00 FF FF FF FF 00 FF 0F FF 00 00 00 00'
- '00 FF FF FF FF 00 FF 0F FF 00 00 00 02 00 00 FF'
- 'FF FF FF FF FF 0F 00 00 00 00 00 00 FF FF FF FF'
- 'FF FF 0F 00 00 00 00 00 00 FF FF FF FF FF FF 0F'
- '00 00 00 00 FF 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 0F F0 00 00 00 00 00 00 00 00 00 00 00'
- '0F F0 00 00 00 00 00 00 00 00 00 00 00 0F F0 00'
- '00 00 00 00 AD 81 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 FF 07 FF F3'
- 'FF FF FC FF FF FF 3F F0 0F FF 80 01 FF E0 00 7F'
- 'F8 00 1F F0 00 00 80 01 FF E0 00 3F F8 00 0F FF'
- 'FF FF 80 00 FF E0 00 3F F8 00 0F F0 00 00 80 00'
- 'FF E0 00 1F F8 00 07 FF F0 FF 80 00 7F E0 00 1F'
- 'F8 00 07 F0 00 00 80 00 3F E0 00 0F F8 00 03 FF'
- 'F0 00 80 00 3F E0 00 0F F8 00 03 FF FF FF 80 00'
- '1F E0 00 07 F8 00 01 F0 E2 00 80 00 1F E0 00 07'
- 'F8 00 01 FF F0 FF 80 00 0F E0 00 03 F8 00 00 F0'
- 'FF FF 80 00 0F E0 00 03 F8 00 00 F0 00 00 80 00'
- '07 E0 00 01 F8 00 00 7F FF FF 80 00 07 E0 00 01'
- 'F8 00 00 70 00 00 80 00 03 E0 00 00 F8 00 00 3F'
- 'F0 FF 80 00 01 E0 00 00 F8 00 00 30 00 0F 80 00'
- '01 E0 00 00 78 00 00 1F FF 00 80 00 03 E0 00 00'
- '78 00 00 1F FF FF 80 00 0F E0 00 01 F8 00 00 70'
- 'FF FF 80 00 1F E0 00 03 F8 00 00 FF 0F FF 80 00'
- '3F E0 00 0F F8 00 03 FF FF FF 80 00 FF E0 00 3F'
- 'F8 00 0F F0 00 00 FF C3 FF FF F0 FF FF FC 3F FF'
- 'FF FF FF E7 FF FF F9 FF FF FE 7F F0 00 00'
-} */
-/* BINRES pd32_portrait.ico */
+/* @makedep: pd32_portrait.ico */
PD32_PORTRAIT ICON pd32_portrait.ico
-/* {
- '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02'
- '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
- '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
- '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00'
- 'FF F0 00 00 FF FF FF 00 00 00 FF FF 00 00 00 00'
- 'FF FF 00 FF FF FF FF FF 00 0F FF FF 00 00 00 00'
- 'FF FF F0 FF FF FF FF FF 00 FF FF FF 00 00 00 00'
- 'FF FF F0 0F FF FF FF F0 00 FF FF FF 00 00 00 00'
- 'FF FF FF 0F FF FF FF F0 0F FF FF FF 00 00 00 00'
- 'FF FF FF 00 00 00 00 00 0F FF FF FF 00 00 00 00'
- 'FF FF FF F0 FF FF FF 00 FF FF FF FF 00 00 00 00'
- 'FF FF FF F0 0F FF F0 00 FF FF FF FF 00 00 00 00'
- 'FF FF FF FF 0F FF F0 0F FF FF FF FF 00 00 00 00'
- 'FF FF FF FF 00 FF 00 0F FF FF FF FF 00 00 00 00'
- 'FF FF FF FF F0 FF 00 FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF F0 00 00 FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF 00 0F FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF 00 0F FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF F0 FF FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF F0 FF FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF FF FF FF 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF 0F FF F0 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF 0F FF 00 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF 0F F0 00 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF 0F 00 00 00 00 00 00'
- 'FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 E0 00'
- '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00'
- '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00'
- '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00'
- '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00'
- '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00'
- '00 07 E0 00 00 07 E0 00 00 07 E0 00 00 07 E0 00'
- '00 07 E0 00 00 07 E0 00 00 0F E0 00 00 1F E0 00'
- '00 3F E0 00 00 7F E0 00 00 FF E0 00 01 FF'
-} */
-/* BINRES pd32_landscape.ico */
+/* @makedep: pd32_landscape.ico */
PD32_LANDSCAPE ICON pd32_landscape.ico
-/* {
- '00 00 01 00 01 00 20 20 10 00 00 00 00 00 E8 02'
- '00 00 16 00 00 00 28 00 00 00 20 00 00 00 40 00'
- '00 00 01 00 04 00 00 00 00 00 80 02 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 C0 C0 C0 00 80 80'
- '80 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 0F FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF F0 0F FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF F0 0F FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF F0 0F FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF F0 0F FF'
- 'FF FF FF FF FF FF FF FF FF FF FF FF FF F0 0F FF'
- 'FF F0 00 00 FF FF FF 00 00 00 FF FF FF F0 0F FF'
- 'FF FF 00 FF FF FF FF FF 00 0F FF FF FF F0 0F FF'
- 'FF FF F0 FF FF FF FF FF 00 FF FF FF FF F0 0F FF'
- 'FF FF F0 0F FF FF FF F0 00 FF FF FF FF F0 0F FF'
- 'FF FF FF 0F FF FF FF F0 0F FF FF FF FF F0 0F FF'
- 'FF FF FF 00 00 00 00 00 0F FF FF FF FF F0 0F FF'
- 'FF FF FF F0 FF FF FF 00 FF FF FF FF FF F0 0F FF'
- 'FF FF FF F0 0F FF F0 00 FF FF FF FF FF F0 0F FF'
- 'FF FF FF FF 0F FF F0 0F FF FF FF FF FF F0 0F FF'
- 'FF FF FF FF 00 FF 00 0F FF FF FF FF FF F0 0F FF'
- 'FF FF FF FF F0 FF 00 FF FF FF FF FF FF F0 0F FF'
- 'FF FF FF FF F0 00 00 FF FF FF FF FF FF F0 0F FF'
- 'FF FF FF FF FF 00 0F FF FF FF FF FF FF F0 0F FF'
- 'FF FF FF FF FF 00 0F FF FF FF F0 00 00 00 0F FF'
- 'FF FF FF FF FF F0 FF FF FF FF F0 FF FF 00 0F FF'
- 'FF FF FF FF FF F0 FF FF FF FF F0 FF F0 00 0F FF'
- 'FF FF FF FF FF FF FF FF FF FF F0 FF 00 00 0F FF'
- 'FF FF FF FF FF FF FF FF FF FF F0 F0 00 00 0F FF'
- 'FF FF FF FF FF FF FF FF FF FF F0 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
- 'FF FF FF FF FF FF FF FF FF FF 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00'
- '00 03 00 00 00 07 00 00 00 0F 00 00 00 1F 00 00'
- '00 3F FF FF FF FF FF FF FF FF FF FF FF FF'
-} */
-/* BINRES 800.bmp */
+/* @makedep: 800.bmp */
800 BITMAP DISCARDABLE LOADONCALL "800.bmp"
-/* {
- '42 4D 36 05 00 00 00 00 00 00 36 04 00 00 28 00'
- '00 00 10 00 00 00 10 00 00 00 01 00 08 00 00 00'
- '00 00 00 01 00 00 12 0B 00 00 12 0B 00 00 00 01'
- '00 00 00 01 00 00 00 00 00 00 00 00 80 00 00 80'
- '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
- '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
- '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
- '00 00 FF FF FF 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 07 07 07 08 08 08 08 08 08 08'
- '08 08 08 08 08 07 07 07 07 08 08 08 08 08 08 08'
- '08 08 08 08 08 07 07 00 00 00 00 00 00 00 00 00'
- '00 00 00 08 08 07 07 00 0F 0F 0F 00 0B 0B 00 0F'
- '0F 0F 00 08 08 07 07 00 0F 0F 0F 00 0B 0B 00 0F'
- '0F 0F 00 08 08 07 07 00 0F 0F 0F 00 0B 0B 00 0F'
- '0F 0F 00 08 08 07 07 00 0F 0F 0F 00 0B 0B 00 0F'
- '0F 0F 00 08 08 07 07 00 0F 0F 0F 00 00 00 00 0F'
- '0F 0F 00 08 08 08 07 00 0F 0F 0F 0F 0F 0F 0F 0F'
- '0F 0F 00 08 08 07 00 0B 00 0F 0F 0F 0F 0F 0F 0F'
- '0F 00 0B 00 07 07 07 00 0B 00 0F 0F 0F 0F 0F 0F'
- '00 0B 00 08 07 07 07 07 00 0B 00 0F 0F 0F 0F 00'
- '0B 00 08 08 07 07 07 07 07 00 0B 00 0F 0F 00 0B'
- '00 00 08 08 07 07 07 07 07 07 00 0B 00 00 0B 00'
- '01 00 08 08 07 07 07 07 07 07 07 00 0B 0B 00 07'
- '01 00 07 07 07 07 07 07 07 07 07 07 00 00 07 07'
- '01 00 07 07 07 07'
-} */
-
-/* BINRES folder.ico */
+/* @makedep: folder.ico */
FOLDER ICON folder.ico
-/* {
- '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
- '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
- '00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0'
- 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 77 77 77 77 77 77 77 07 77'
- '77 77 77 77 77 77 07 FB 8B 8B 8B 8B 8B 77 07 F8'
- 'B8 B8 B8 B8 B8 77 07 FB 8B 8B 8B 8B 8B 77 07 F8'
- 'B8 B8 B8 B8 B8 77 07 FB 8B 8B 8B 8B 8B 77 07 F8'
- 'B8 B8 B8 B8 B8 77 07 FB 8B 8B 8B 8B 8B 77 07 FF'
- 'FF FF FF FF FF 77 07 B8 B8 B8 B7 77 77 70 00 7B'
- '8B 8B 70 00 00 00 00 07 77 77 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
- '00 00 C0 00 00 00 80 00 00 00 80 00 00 00 80 00'
- '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
- '00 00 80 00 00 00 80 00 00 00 80 01 00 00 C0 7F'
- '00 00 E0 FF 00 00 FF FF 00 00 FF FF 00 00'
-} */
-
-/* BINRES folder2.ico */
+/* @makedep: folder2.ico */
FOLDER2 ICON folder2.ico
-/* {
- '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
- '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
- '00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0'
- 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 07 77 77 77 77 77 77 00 77'
- '77 77 77 77 77 77 00 7F B8 B8 B8 B8 B7 77 07 FB'
- '8B 8B 8B 8B 87 77 07 F8 B8 B8 B8 B8 77 77 7F 8B'
- '8B 8B 8B 8B 77 77 7F FF FF FF FF F7 77 77 77 77'
- '77 77 77 77 7B 77 07 F7 B7 B7 B7 B7 B7 77 07 FB'
- '7B 7B 7F FF FF 77 07 F7 B7 B7 F7 77 77 70 00 7F'
- 'FF FF 70 00 00 00 00 07 77 77 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
- '00 00 E0 00 00 00 C0 00 00 00 C0 00 00 00 80 00'
- '00 00 80 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 80 00 00 00 80 00 00 00 80 01 00 00 C0 7F'
- '00 00 E0 FF 00 00 FF FF 00 00 FF FF 00 00'
-} */
-
-/* BINRES floppy.ico */
+/* @makedep: floppy.ico */
FLOPPY ICON floppy.ico
-/* {
- '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
- '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
- '00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0'
- 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 77'
- '77 77 77 77 77 70 00 88 AA 88 88 00 88 70 00 88'
- 'AA 88 88 00 88 70 00 88 88 88 88 88 88 70 00 88'
- '88 00 00 88 88 70 00 80 00 00 00 00 08 70 00 88'
- '88 00 00 88 88 70 00 88 88 88 88 88 88 70 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
- '00 00 FF FF 00 00 FF FF 00 00 80 00 00 00 80 00'
- '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
- '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
- '00 00 FF FF 00 00 FF FF 00 00 FF FF 00 00'
-} */
-
-/* BINRES cdrom.ico */
+/* @makedep: cdrom.ico */
CDROM ICON cdrom.ico
-/* {
- '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
- '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
- '00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0'
- 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 00 77 BB 88 80 00 00 00 07'
- 'AE EB 88 88 80 00 00 7B AA EB 88 88 88 00 00 7B'
- 'BA EE 88 88 88 00 07 BB BB BE FF F8 88 80 07 88'
- '88 87 07 F8 88 80 07 88 88 80 00 F8 88 80 07 88'
- '88 87 07 88 88 80 07 88 88 88 88 EB BB B0 00 78'
- '88 88 88 AE BB 00 00 78 88 88 88 AA EB 00 00 07'
- '88 88 88 BA E0 00 00 00 77 88 88 B0 00 00 00 00'
- '00 77 77 70 00 00 00 00 00 00 00 00 00 00 FC 1F'
- '00 00 F0 07 00 00 E0 03 00 00 C0 01 00 00 C0 01'
- '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
- '00 00 80 00 00 00 C0 01 00 00 C0 01 00 00 E0 03'
- '00 00 F0 07 00 00 FC 1F 00 00 FF FF 00 00'
-} */
-
-/* BINRES hdisk.ico */
+/* @makedep: hdisk.ico */
HDISK ICON hdisk.ico
-/* {
- '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
- '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
- '00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0'
- 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 77'
- '77 77 77 77 77 70 00 88 88 88 88 AA 88 70 00 88'
- '88 88 88 AA 88 70 00 77 77 77 77 77 77 70 00 88'
- '88 88 88 88 88 70 00 88 88 88 88 88 88 70 00 88'
- '88 88 88 88 88 70 00 88 88 88 88 88 88 70 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
- '00 00 FF FF 00 00 FF FF 00 00 80 00 00 00 80 00'
- '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
- '00 00 80 00 00 00 80 00 00 00 80 00 00 00 80 00'
- '00 00 FF FF 00 00 FF FF 00 00 FF FF 00 00'
-} */
-
-/* BINRES network.ico */
+/* @makedep: network.ico */
NETWORK ICON network.ico
-/* {
- '00 00 01 00 01 00 10 10 10 00 00 00 00 00 28 01'
- '00 00 16 00 00 00 28 00 00 00 10 00 00 00 20 00'
- '00 00 01 00 04 00 00 00 00 00 C0 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 80 00 00 80 00 00 00 80 80 00 80 00'
- '00 00 80 00 80 00 80 80 00 00 80 80 80 00 C0 C0'
- 'C0 00 00 00 FF 00 00 FF 00 00 00 FF FF 00 FF 00'
- '00 00 FF 00 FF 00 FF FF 00 00 FF FF FF 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 BF B0 00 00 00 08 88 88 BB B0 88 88 88 00 00'
- '00 08 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 07 8F FF FF FF FF 87 00 07 87'
- '77 77 77 77 87 70 07 88 88 88 88 88 87 70 07 88'
- '88 88 88 8A 87 70 07 FF FF FF FF FF F7 70 00 78'
- '88 88 88 88 88 70 00 07 77 77 77 77 77 70 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 00 00 FF FF'
- '00 00 FC 3F 00 00 80 00 00 00 80 00 00 00 FE 7F'
- '00 00 FE 7F 00 00 C0 03 00 00 80 01 00 00 80 00'
- '00 00 80 00 00 00 80 00 00 00 80 00 00 00 C0 00'
- '00 00 E0 01 00 00 FF FF 00 00 FF FF 00 00'
-} */
-/* BINRES fontpics.bmp */
+/* @makedep: fontpics.bmp */
38 BITMAP DISCARDABLE LOADONCALL fontpics.bmp
-/*{
- '42 4D E6 02 00 00 00 00 00 00 76 00 00 00 28 00'
- '00 00 64 00 00 00 0C 00 00 00 01 00 04 00 00 00'
- '00 00 70 02 00 00 00 00 00 00 00 00 00 00 00 00'
- '00 00 00 00 00 00 00 00 00 00 00 00 80 00 00 80'
- '00 00 00 80 80 00 80 00 00 00 80 00 80 00 80 80'
- '00 00 C0 C0 C0 00 80 80 80 00 00 00 FF 00 00 FF'
- '00 00 00 FF FF 00 FF 00 00 00 FF 00 FF 00 FF FF'
- '00 00 FF FF FF 00 CC CC CC CC C5 55 55 5C CC CC'
- 'CC C0 00 00 00 00 00 00 00 CC CC CC CC 78 06 87'
- 'CC CC CC CC CC CC CC 78 06 87 CC CC CC CC CC CC'
- 'CC CC CC CC CC CC CC CC 00 00 CC CC CC CC CC C5'
- '5C CC CC CC CC 07 77 77 77 77 77 77 77 0C CC CC'
- 'C8 87 CC C7 67 CC CC CC CC CC C8 87 CC C7 67 CC'
- 'CC CC CC CC C7 97 7C C7 87 CC CC CC 00 00 CC CC'
- '66 66 66 C5 5C CC CC CC CC 07 77 77 77 77 99 AA'
- '77 0C CC CC 70 7C CC CC 76 7C CC CC CC CC 70 7C'
- '66 6C 76 7C CC CC CC CC C9 99 97 C9 99 97 CC CC'
- '00 00 CC CC CC 66 CC C5 5C CC CC CC CC C0 00 08'
- '88 88 88 00 00 CC CC CC 80 CC CC CC C8 6C CC CC'
- 'CC CC 80 CC CC C6 C8 6C CC CC CC CC C9 99 C7 C7'
- '99 C7 CC CC 00 00 CC CC CC 66 CC C5 5C CC CC CC'
- 'CC C8 0F FF FF FF FF FF 08 CC CC CC 00 CC CC CC'
- 'C7 67 CC CC CC CC 00 6C C6 66 C7 67 CC CC CC CC'
- 'C7 99 CC 77 99 CC CC CC 00 00 CC CC CC 66 CC C5'
- '5C CC CC CC CC C8 FF F8 88 88 88 FF F8 CC CC CC'
- '00 CC CC CC CC 67 CC CC CC CC 00 C6 CC 6C CC 67'
- 'CC CC CC CC C7 99 CC C8 99 7C CC CC 00 00 CC CC'
- 'CC 65 CC C5 5C CC 5C CC CC C8 0F FF FF FF FF FF'
- '08 CC CC CC 80 CC CC CC CC 66 CC CC CC CC 80 C6'
- '6C 66 6C 66 CC CC CC CC CC 99 7C C7 99 7C CC CC'
- '00 00 CC CC CC 65 5C C5 5C C5 5C CC CC C8 FF F8'
- '88 88 88 FF F8 CC CC CC 70 7C CC CC CC 66 CC CC'
- 'CC CC 70 7C 6C 6C CC 66 CC CC CC CC CC 89 7C CC'
- '99 7C CC CC 00 00 CC CC CC 65 55 55 55 55 5C CC'
- 'CC C8 0F FF FF FF FF FF 08 CC CC CC C0 8C CC CC'
- 'CC 68 CC CC CC CC C0 8C 66 CC CC 68 CC CC CC CC'
- 'CC C9 9C CC 99 9C CC CC 00 00 CC 6C CC 66 CC C6'
- 'CC CC CC CC CC C8 FF F8 88 88 88 FF F8 CC CC CC'
- 'C7 07 CC CC C7 67 CC CC CC CC C7 07 CC CC C7 67'
- 'CC CC CC CC CC CC 77 CC 89 9C CC CC 00 00 CC 66'
- 'CC 66 CC 66 CC CC CC CC CC C8 0F FF FF FF FF FF'
- '08 CC CC CC CC 78 7C CC 78 7C CC CC CC CC CC 78'
- '7C CC 78 7C CC CC CC CC CC CC CC 89 97 7C CC CC'
- '00 00 CC 66 66 66 66 66 CC CC CC CC CC C8 88 88'
- '88 88 88 88 88 CC CC CC CC CC 78 06 77 CC CC CC'
- 'CC CC CC CC 78 06 77 CC CC CC CC CC CC CC CC CC'
- 'CC CC CC CC 00 00'
-}*/
diff --git a/reactos/dll/win32/comdlg32/cdrom.ico b/reactos/dll/win32/comdlg32/cdrom.ico
new file mode 100644
index 00000000000..5673c9c2f14
Binary files /dev/null and b/reactos/dll/win32/comdlg32/cdrom.ico differ
diff --git a/reactos/dll/win32/comdlg32/comdlg32.rbuild b/reactos/dll/win32/comdlg32/comdlg32.rbuild
index 85d7d489834..055d3eba453 100644
--- a/reactos/dll/win32/comdlg32/comdlg32.rbuild
+++ b/reactos/dll/win32/comdlg32/comdlg32.rbuild
@@ -4,12 +4,9 @@
.
include/reactos/wine
-
-
- 0x600
- 0x501
- 0x501
+ 0x600
+ 0x600
wine
shell32
shlwapi
diff --git a/reactos/dll/win32/comdlg32/comdlg32_ros.diff b/reactos/dll/win32/comdlg32/comdlg32_ros.diff
deleted file mode 100644
index ecb6296daff..00000000000
--- a/reactos/dll/win32/comdlg32/comdlg32_ros.diff
+++ /dev/null
@@ -1,331 +0,0 @@
-Index: printdlg.c
-===================================================================
---- printdlg.c (revision 23123)
-+++ printdlg.c (working copy)
-@@ -352,7 +352,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;
-@@ -435,7 +435,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;
-@@ -600,9 +600,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 {
-@@ -612,9 +612,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;
- }
- }
-
-@@ -710,9 +710,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 {
-@@ -722,9 +722,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;
- }
- }
-
-@@ -974,7 +974,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);
-@@ -996,7 +996,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,
-@@ -1123,7 +1123,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);
-@@ -1145,7 +1145,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,
-@@ -1519,7 +1519,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));
- }
-@@ -1528,7 +1528,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));
- }
-@@ -1552,7 +1552,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);
- }
-@@ -1562,7 +1562,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);
- }
-@@ -1573,8 +1573,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);
-@@ -1583,8 +1583,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);
-@@ -1683,7 +1683,7 @@
- case rad1: /* Paperorientation */
- if (lppd->Flags & PD_PRINTSETUP)
- {
-- lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
-+ lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
- SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
- (LPARAM)(PrintStructures->hPortraitIcon));
- }
-@@ -1692,7 +1692,7 @@
- case rad2: /* Paperorientation */
- if (lppd->Flags & PD_PRINTSETUP)
- {
-- lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
-+ lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
- SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
- (LPARAM)(PrintStructures->hLandscapeIcon));
- }
-@@ -1716,7 +1716,7 @@
- {
- DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0);
- if(Sel != CB_ERR)
-- lpdm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2,
-+ lpdm->u.s.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2,
- CB_GETITEMDATA,
- Sel, 0);
- }
-@@ -1726,7 +1726,7 @@
- {
- DWORD Sel = SendDlgItemMessageW(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);
- }
-@@ -1737,8 +1737,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;
- SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
- (WPARAM)IMAGE_ICON,
- (LPARAM)PrintStructures->hPortraitIcon);
-@@ -1747,8 +1747,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;
- SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
- (WPARAM)IMAGE_ICON,
- (LPARAM)PrintStructures->hLandscapeIcon);
-@@ -2513,15 +2513,15 @@
-
- /* Save paper orientation into device context */
- if(pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y)
-- dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
-+ dm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
- else
-- dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
-+ dm->u.s.dmOrientation = DMORIENT_PORTRAIT;
-
- /* Save paper size into the device context */
- paperword = SendDlgItemMessageA(hDlg,cmb2,CB_GETITEMDATA,
- SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0), 0);
- if (paperword != CB_ERR)
-- dm->u1.s1.dmPaperSize = paperword;
-+ dm->u.s.dmPaperSize = paperword;
- else
- FIXME("could not get dialog text for papersize cmbbox?\n");
-
-@@ -2529,7 +2529,7 @@
- paperword = SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA,
- SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0), 0);
- if (paperword != CB_ERR)
-- dm->dmDefaultSource = paperword;
-+ dm->u.s.dmDefaultSource = paperword;
- else
- FIXME("could not get dialog text for papersize cmbbox?\n");
-
-@@ -2580,9 +2580,9 @@
-
- /* Save orientation */
- if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y)
-- dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
-+ dm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
- else
-- dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
-+ dm->u.s.dmOrientation = DMORIENT_PORTRAIT;
-
- GlobalUnlock(pda->pdlg.hDevNames);
- GlobalUnlock(pda->pdlg.hDevMode);
-@@ -2834,7 +2834,7 @@
- case cmb3:
- if(msg == CBN_SELCHANGE){
- DEVMODEA *dm = GlobalLock(pda->pdlg.hDevMode);
-- dm->dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,CB_GETITEMDATA,
-+ dm->u.s.dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,CB_GETITEMDATA,
- SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0), 0);
- GlobalUnlock(pda->pdlg.hDevMode);
- }
-@@ -2857,10 +2857,10 @@
- DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT);
- ClosePrinter(hPrinter);
- /* Changing paper */
-- PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u1.s1.dmPaperSize, &(pda->curdlg.ptPaperSize));
-+ PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u.s.dmPaperSize, &(pda->curdlg.ptPaperSize));
- pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x);
- pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y);
-- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE){
-+ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE){
- DWORD tmp = pda->curdlg.ptPaperSize.x;
- pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y;
- pda->curdlg.ptPaperSize.y = tmp;
-@@ -2874,7 +2874,7 @@
- count = SendDlgItemMessageA(hDlg, cmb2, CB_GETCOUNT, 0, 0);
- if(count != CB_ERR){
- for(i=0; iu1.s1.dmPaperSize) {
-+ if(SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, i, 0) == dm->u.s.dmPaperSize) {
- SendDlgItemMessageA(hDlg, cmb2, CB_SETCURSEL, i, 0);
- break;
- }
-@@ -3180,7 +3180,7 @@
- if(pda->dlga->hDevMode)
- {
- dm = GlobalLock(pda->dlga->hDevMode);
-- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE)
-+ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
- CheckRadioButton(hDlg, rad1, rad2, rad2);
- else /* this is default if papersize is not set */
- CheckRadioButton(hDlg, rad1, rad2, rad1);
-@@ -3226,8 +3226,8 @@
- PRINTDLG_PS_ChangePrinterA(hDlg, pda);
- dm = GlobalLock(pda->pdlg.hDevMode);
- if(dm){
-- dm->dmDefaultSource = 15; /*FIXME: Automatic select. Does it always 15 at start? */
-- PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u1.s1.dmPaperSize, &pda->curdlg.ptPaperSize);
-+ dm->u.s.dmDefaultSource = 15; /*FIXME: Automatic select. Does it always 15 at start? */
-+ PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u.s.dmPaperSize, &pda->curdlg.ptPaperSize);
- GlobalUnlock(pda->pdlg.hDevMode);
- pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x);
- pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y);
-@@ -3297,7 +3297,7 @@
- {
- dm = GlobalLock(pda->dlga->hDevMode);
- /* Landscape orientation */
-- if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE)
-+ if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
- CheckRadioButton(hDlg, rad1, rad2, rad2);
- else /* this is default if papersize is not set */
- CheckRadioButton(hDlg, rad1, rad2, rad1);
-@@ -3439,7 +3439,7 @@
- setupdlg->hDevMode = pdlg.hDevMode;
- setupdlg->hDevNames = pdlg.hDevNames;
- dm = GlobalLock(pdlg.hDevMode);
-- PRINTDLG_PaperSizeA(&pdlg, dm->u1.s1.dmPaperSize, &setupdlg->ptPaperSize);
-+ PRINTDLG_PaperSizeA(&pdlg, dm->u.s.dmPaperSize, &setupdlg->ptPaperSize);
- GlobalUnlock(pdlg.hDevMode);
- setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x);
- setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y);
diff --git a/reactos/dll/win32/comdlg32/filedlg.c b/reactos/dll/win32/comdlg32/filedlg.c
index 0b26ed4e85f..67fefd1d141 100644
--- a/reactos/dll/win32/comdlg32/filedlg.c
+++ b/reactos/dll/win32/comdlg32/filedlg.c
@@ -36,7 +36,7 @@
*
* FIXME: add to recent docs
*
- * FIXME: flags not implemented: OFN_CREATEPROMPT, OFN_DONTADDTORECENT,
+ * FIXME: flags not implemented: OFN_DONTADDTORECENT,
* OFN_ENABLEINCLUDENOTIFY, OFN_ENABLESIZING,
* OFN_NODEREFERENCELINKS, OFN_NOREADONLYRETURN,
* OFN_NOTESTFILECREATE, OFN_USEMONIKERS
@@ -61,12 +61,11 @@
#include "windef.h"
#include "winbase.h"
-#include "winreg.h"
#include "winternl.h"
#include "winnls.h"
#include "wingdi.h"
-#include "winuser.h"
#include "winreg.h"
+#include "winuser.h"
#include "commdlg.h"
#include "dlgs.h"
#include "cdlg.h"
@@ -83,7 +82,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
#define UNIMPLEMENTED_FLAGS \
-(OFN_CREATEPROMPT | OFN_DONTADDTORECENT |\
+(OFN_DONTADDTORECENT |\
OFN_ENABLEINCLUDENOTIFY | OFN_ENABLESIZING |\
OFN_NODEREFERENCELINKS | OFN_NOREADONLYRETURN |\
OFN_NOTESTFILECREATE /*| OFN_USEMONIKERS*/)
@@ -295,7 +294,7 @@ static BOOL WINAPI GetFileName95(FileOpenDlgInfos *fodInfos)
fodInfos->ofnInfos->hwndOwner,
FileOpenDlgProc95,
(LPARAM) fodInfos);
- if (SUCCEEDED(hr))
+ if (SUCCEEDED(hr))
OleUninitialize();
/* Unable to create the dialog */
@@ -531,7 +530,7 @@ BOOL WINAPI GetFileDialog95W(LPOPENFILENAMEW ofn,UINT iDlgType)
static BOOL COMDLG32_GetDisplayNameOf(LPCITEMIDLIST pidl, LPWSTR pwszPath) {
LPSHELLFOLDER psfDesktop;
STRRET strret;
-
+
if (FAILED(SHGetDesktopFolder(&psfDesktop)))
return FALSE;
@@ -577,9 +576,9 @@ static void ArrangeCtrlPositions(HWND hwndChildDlg, HWND hwndParentDlg, BOOL hid
However, if there is a static text component with the stc32 id, a special case happens.
The x and y coordinates of stc32 indicate the top left corner where to place the standard file dialog box
in the window and the cx and cy indicate how to size the window.
- Moreover, if the new component's coordinates are on the left of the stc32 , it is placed on the left
+ Moreover, if the new component's coordinates are on the left of the stc32 , it is placed on the left
of the standard file dialog box. If they are above the stc32 component, it is placed above and so on....
-
+
*/
GetClientRect(hwndParentDlg, &rectParent);
@@ -897,20 +896,20 @@ static INT_PTR FILEDLG95_Handle_GetFilePath(HWND hwnd, DWORD size, LPVOID buffer
else
{
LPSTR bufA = buffer;
- total = WideCharToMultiByte(CP_ACP, 0, lpstrCurrentDir, -1,
+ total = WideCharToMultiByte(CP_ACP, 0, lpstrCurrentDir, -1,
NULL, 0, NULL, NULL);
- total += WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed,
+ total += WideCharToMultiByte(CP_ACP, 0, lpstrFileList, sizeUsed,
NULL, 0, NULL, NULL);
/* Prepend the current path */
- n = WideCharToMultiByte(CP_ACP, 0, lpstrCurrentDir, -1,
+ n = WideCharToMultiByte(CP_ACP, 0, lpstrCurrentDir, -1,
bufA, size, NULL, NULL);
if(nShellInfos.pidlAbsCurrent, lpstrPath);
- if (lParam)
+ if (lParam)
{
if (fodInfos->unicode)
lstrcpynW((LPWSTR)lParam, lpstrPath, (int)wParam);
else
- WideCharToMultiByte(CP_ACP, 0, lpstrPath, -1,
+ WideCharToMultiByte(CP_ACP, 0, lpstrPath, -1,
(LPSTR)lParam, (int)wParam, NULL, NULL);
- }
+ }
retval = lstrlenW(lpstrPath);
break;
@@ -1922,9 +1921,9 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
TRACE("parse now=%s next=%s sf=%p\n",debugstr_w(lpwstrTemp), debugstr_w(lpszTemp), lpsf);
/* append a backslash to drive letters */
- if(lstrlenW(lpwstrTemp)==2 && lpwstrTemp[1] == ':' &&
+ if(lstrlenW(lpwstrTemp)==2 && lpwstrTemp[1] == ':' &&
((lpwstrTemp[0] >= 'a' && lpwstrTemp[0] <= 'z') ||
- (lpwstrTemp[0] >= 'A' && lpwstrTemp[0] <= 'Z')))
+ (lpwstrTemp[0] >= 'A' && lpwstrTemp[0] <= 'Z')))
{
PathAddBackslashW(lpwstrTemp);
}
@@ -2063,7 +2062,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
{
/* if no extension is specified with file name, then */
/* attach the extension from file filter or default one */
-
+
WCHAR *filterExt = NULL;
LPWSTR lpstrFilter = NULL;
static const WCHAR szwDot[] = {'.',0};
@@ -2071,7 +2070,7 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
/* Attach the dot*/
lstrcatW(lpstrPathAndFile, szwDot);
-
+
/*Get the file extension from file type filter*/
lpstrFilter = (LPWSTR) CBGetItemDataPtr(fodInfos->DlgInfos.hwndFileTypeCB,
fodInfos->ofnInfos->nFilterIndex-1);
@@ -2118,6 +2117,24 @@ BOOL FILEDLG95_OnOpen(HWND hwnd)
}
}
+ /* In Open dialog: check if it should be created if it doesn't exist */
+ if (!(fodInfos->DlgInfos.dwDlgProp & FODPROP_SAVEDLG)
+ && fodInfos->ofnInfos->Flags & OFN_CREATEPROMPT
+ && !PathFileExistsW(lpstrPathAndFile))
+ {
+ WCHAR lpstrCreate[100];
+ int answer;
+
+ LoadStringW(COMDLG32_hInstance, IDS_CREATEFILE, lpstrCreate, 100);
+ answer = MessageBoxW(hwnd, lpstrCreate, fodInfos->title,
+ MB_YESNO | MB_ICONEXCLAMATION);
+ if (answer == IDNO)
+ {
+ ret = FALSE;
+ goto ret;
+ }
+ }
+
/* Check that the size of the file does not exceed buffer size.
(Allow for extra \0 if OFN_MULTISELECT is set.) */
if(lstrlenW(lpstrPathAndFile) < fodInfos->ofnInfos->nMaxFile -
@@ -2564,8 +2581,8 @@ static void FILEDLG95_FILETYPE_Clean(HWND hwnd)
* Initialisation of the look in combo box
*/
-/* Small helper function, to determine if the unixfs shell extension is rooted
- * at the desktop. Copied from dlls/shell32/shfldr_unixfs.c.
+/* Small helper function, to determine if the unixfs shell extension is rooted
+ * at the desktop. Copied from dlls/shell32/shfldr_unixfs.c.
*/
static inline BOOL FILEDLG95_unixfs_is_rooted_at_desktop(void) {
HKEY hKey;
@@ -2576,10 +2593,10 @@ static inline BOOL FILEDLG95_unixfs_is_rooted_at_desktop(void) {
'N','a','m','e','S','p','a','c','e','\\','{','9','D','2','0','A','A','E','8',
'-','0','6','2','5','-','4','4','B','0','-','9','C','A','7','-',
'7','1','8','8','9','C','2','2','5','4','D','9','}',0 };
-
+
if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRootedAtDesktop, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
return FALSE;
-
+
RegCloseKey(hKey);
return TRUE;
}
@@ -2601,7 +2618,7 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo)
/* set item height for both text field and listbox */
CBSetItemHeight(hwndCombo,-1,GetSystemMetrics(SM_CYSMICON));
CBSetItemHeight(hwndCombo,0,GetSystemMetrics(SM_CYSMICON));
-
+
/* Turn on the extended UI for the combo box like Windows does */
CBSetExtendedUI(hwndCombo, TRUE);
@@ -2624,7 +2641,7 @@ static void FILEDLG95_LOOKIN_Init(HWND hwndCombo)
FILEDLG95_LOOKIN_AddItem(hwndCombo, pidlTmp,LISTEND);
/* If the unixfs extension is rooted, we don't expand the drives by default */
- if (!FILEDLG95_unixfs_is_rooted_at_desktop())
+ if (!FILEDLG95_unixfs_is_rooted_at_desktop())
{
/* special handling for CSIDL_DRIVES */
if (COMDLG32_PIDL_ILIsEqual(pidlTmp, pidlDrives))
@@ -3125,8 +3142,8 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd)
}
}
SetWindowTextW( fodInfos->DlgInfos.hwndFileName, lpstrAllFile );
-
- /* Select the file name like Windows does */
+
+ /* Select the file name like Windows does */
SendMessageW(fodInfos->DlgInfos.hwndFileName, EM_SETSEL, 0, (LPARAM)-1);
}
HeapFree(GetProcessHeap(),0, lpstrAllFile );
@@ -3279,7 +3296,7 @@ LPITEMIDLIST GetPidlFromDataObject ( IDataObject *doSelected, UINT nPidlIndex)
if (!doSelected)
return NULL;
-
+
/* Set the FORMATETC structure*/
SETDefFormatEtc(formatetc, RegisterClipboardFormatA(CFSTR_SHELLIDLIST), TYMED_HGLOBAL);
diff --git a/reactos/dll/win32/comdlg32/filedlgbrowser.c b/reactos/dll/win32/comdlg32/filedlgbrowser.c
index 04676f9fd92..55ef65b482c 100644
--- a/reactos/dll/win32/comdlg32/filedlgbrowser.c
+++ b/reactos/dll/win32/comdlg32/filedlgbrowser.c
@@ -134,17 +134,17 @@ static void COMDLG32_UpdateCurrentDir(const FileOpenDlgInfos *fodInfos)
res = SHGetDesktopFolder(&psfDesktop);
if (FAILED(res))
return;
-
+
res = IShellFolder_GetDisplayNameOf(psfDesktop, fodInfos->ShellInfos.pidlAbsCurrent,
SHGDN_FORPARSING, &strret);
if (SUCCEEDED(res)) {
WCHAR wszCurrentDir[MAX_PATH];
-
+
res = StrRetToBufW(&strret, fodInfos->ShellInfos.pidlAbsCurrent, wszCurrentDir, MAX_PATH);
if (SUCCEEDED(res))
SetCurrentDirectoryW(wszCurrentDir);
}
-
+
IShellFolder_Release(psfDesktop);
}
@@ -868,8 +868,8 @@ static HRESULT WINAPI IShellBrowserImpl_ICommDlgBrowser_IncludeObject(ICommDlgBr
ulAttr = SFGAO_HIDDEN | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR | SFGAO_LINK;
IShellFolder_GetAttributesOf(fodInfos->Shell.FOIShellFolder, 1, &pidl, &ulAttr);
- if( (ulAttr & SFGAO_HIDDEN) /* hidden */
- | !(ulAttr & (SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR))) /* special folder */
+ if( (ulAttr & SFGAO_HIDDEN) || /* hidden */
+ !(ulAttr & (SFGAO_FILESYSTEM | SFGAO_FILESYSANCESTOR))) /* special folder */
return S_FALSE;
/* always include directories and links */
diff --git a/reactos/dll/win32/comdlg32/floppy.ico b/reactos/dll/win32/comdlg32/floppy.ico
new file mode 100644
index 00000000000..726f8769231
Binary files /dev/null and b/reactos/dll/win32/comdlg32/floppy.ico differ
diff --git a/reactos/dll/win32/comdlg32/folder.ico b/reactos/dll/win32/comdlg32/folder.ico
new file mode 100644
index 00000000000..eeba9f57c65
Binary files /dev/null and b/reactos/dll/win32/comdlg32/folder.ico differ
diff --git a/reactos/dll/win32/comdlg32/folder2.ico b/reactos/dll/win32/comdlg32/folder2.ico
new file mode 100644
index 00000000000..6f1e662c418
Binary files /dev/null and b/reactos/dll/win32/comdlg32/folder2.ico differ
diff --git a/reactos/dll/win32/comdlg32/fontpics.bmp b/reactos/dll/win32/comdlg32/fontpics.bmp
new file mode 100644
index 00000000000..6c3c1b6ded9
Binary files /dev/null and b/reactos/dll/win32/comdlg32/fontpics.bmp differ
diff --git a/reactos/dll/win32/comdlg32/hdisk.ico b/reactos/dll/win32/comdlg32/hdisk.ico
new file mode 100644
index 00000000000..688dbe5be9f
Binary files /dev/null and b/reactos/dll/win32/comdlg32/hdisk.ico differ
diff --git a/reactos/dll/win32/comdlg32/network.ico b/reactos/dll/win32/comdlg32/network.ico
new file mode 100644
index 00000000000..1683b7ce4c3
Binary files /dev/null and b/reactos/dll/win32/comdlg32/network.ico differ
diff --git a/reactos/dll/win32/comdlg32/pd32_collate.ico b/reactos/dll/win32/comdlg32/pd32_collate.ico
new file mode 100644
index 00000000000..cccfc1cf9de
Binary files /dev/null and b/reactos/dll/win32/comdlg32/pd32_collate.ico differ
diff --git a/reactos/dll/win32/comdlg32/pd32_landscape.ico b/reactos/dll/win32/comdlg32/pd32_landscape.ico
new file mode 100644
index 00000000000..f06cfa51a30
Binary files /dev/null and b/reactos/dll/win32/comdlg32/pd32_landscape.ico differ
diff --git a/reactos/dll/win32/comdlg32/pd32_nocollate.ico b/reactos/dll/win32/comdlg32/pd32_nocollate.ico
new file mode 100644
index 00000000000..bf84a231bd5
Binary files /dev/null and b/reactos/dll/win32/comdlg32/pd32_nocollate.ico differ
diff --git a/reactos/dll/win32/comdlg32/pd32_portrait.ico b/reactos/dll/win32/comdlg32/pd32_portrait.ico
new file mode 100644
index 00000000000..4001f9c74cb
Binary files /dev/null and b/reactos/dll/win32/comdlg32/pd32_portrait.ico differ
diff --git a/reactos/dll/win32/comdlg32/printdlg.c b/reactos/dll/win32/comdlg32/printdlg.c
index b0a7279e264..39ac750c3a3 100644
--- a/reactos/dll/win32/comdlg32/printdlg.c
+++ b/reactos/dll/win32/comdlg32/printdlg.c
@@ -121,7 +121,7 @@ INT PRINTDLG_SetUpPrinterListComboA(HWND hDlg, UINT id, LPCSTR name)
&num);
SendDlgItemMessageA(hDlg, id, CB_RESETCONTENT, 0, 0);
-
+
for(i = 0; i < num; i++) {
SendDlgItemMessageA(hDlg, id, CB_ADDSTRING, 0,
(LPARAM)pi[i].pPrinterName );
@@ -133,8 +133,9 @@ INT PRINTDLG_SetUpPrinterListComboA(HWND hDlg, UINT id, LPCSTR name)
char buf[260];
DWORD dwBufLen = sizeof(buf);
- FIXME("Can't find '%s' in printer list so trying to find default\n",
- name);
+ if (name != NULL)
+ WARN("Can't find %s in printer list so trying to find default\n",
+ debugstr_a(name));
if(!GetDefaultPrinterA(buf, &dwBufLen))
return num;
i = SendDlgItemMessageA(hDlg, id, CB_FINDSTRINGEXACT, -1, (LPARAM)buf);
@@ -165,8 +166,9 @@ static INT PRINTDLG_SetUpPrinterListComboW(HWND hDlg, UINT id, LPCWSTR name)
(LPARAM)name)) == CB_ERR) {
WCHAR buf[260];
DWORD dwBufLen = sizeof(buf)/sizeof(buf[0]);
- TRACE("Can't find '%s' in printer list so trying to find default\n",
- debugstr_w(name));
+ if (name != NULL)
+ WARN("Can't find %s in printer list so trying to find default\n",
+ debugstr_w(name));
if(!GetDefaultPrinterW(buf, &dwBufLen))
return num;
i = SendDlgItemMessageW(hDlg, id, CB_FINDSTRINGEXACT, -1, (LPARAM)buf);
@@ -352,7 +354,7 @@ static BOOL PRINTDLG_UpdatePrintDlgA(HWND hDlg,
lpdm->dmCollate =
(IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
if (lpdm->dmFields & DM_COPIES)
- lpdm->u.s.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+ lpdm->u1.s1.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
} else {
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
lppd->Flags |= PD_COLLATE;
@@ -435,7 +437,7 @@ static BOOL PRINTDLG_UpdatePrintDlgW(HWND hDlg,
lpdm->dmCollate =
(IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED);
if (lpdm->dmFields & DM_COPIES)
- lpdm->u.s.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
+ lpdm->u1.s1.dmCopies = GetDlgItemInt(hDlg, edt3, NULL, FALSE);
} else {
if (IsDlgButtonChecked(hDlg, chx2) == BST_CHECKED)
lppd->Flags |= PD_COLLATE;
@@ -600,9 +602,9 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg,
Sel, 0);
if (dm) {
if (nIDComboBox == cmb2)
- dm->u.s.dmPaperSize = oldWord;
+ dm->u1.s1.dmPaperSize = oldWord;
else
- dm->u.s.dmDefaultSource = oldWord;
+ dm->u1.s1.dmDefaultSource = oldWord;
}
}
else {
@@ -612,9 +614,9 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg,
*/
if (dm) {
if (nIDComboBox == cmb2)
- oldWord = dm->u.s.dmPaperSize;
+ oldWord = dm->u1.s1.dmPaperSize;
else
- oldWord = dm->u.s.dmDefaultSource;
+ oldWord = dm->u1.s1.dmDefaultSource;
}
}
@@ -710,9 +712,9 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg,
Sel, 0);
if (dm) {
if (nIDComboBox == cmb2)
- dm->u.s.dmPaperSize = oldWord;
+ dm->u1.s1.dmPaperSize = oldWord;
else
- dm->u.s.dmDefaultSource = oldWord;
+ dm->u1.s1.dmDefaultSource = oldWord;
}
}
else {
@@ -722,9 +724,9 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg,
*/
if (dm) {
if (nIDComboBox == cmb2)
- oldWord = dm->u.s.dmPaperSize;
+ oldWord = dm->u1.s1.dmPaperSize;
else
- oldWord = dm->u.s.dmDefaultSource;
+ oldWord = dm->u1.s1.dmDefaultSource;
}
}
@@ -822,7 +824,7 @@ static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, const PRINTER_INFO_2A *p
/* set all other printer info texts */
SetDlgItemTextA(hDlg, stc11, pi->pDriverName);
-
+
if (pi->pLocation != NULL && pi->pLocation[0] != '\0')
SetDlgItemTextA(hDlg, stc14, pi->pLocation);
else
@@ -974,7 +976,7 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name,
if (lppd->hDevMode == 0)
copies = lppd->nCopies;
else
- copies = lpdm->u.s.dmCopies;
+ copies = lpdm->u1.s1.dmCopies;
if(copies == 0) copies = 1;
else if(copies < 0) copies = MAX_COPIES;
SetDlgItemInt(hDlg, edt3, copies, FALSE);
@@ -996,7 +998,7 @@ BOOL PRINTDLG_ChangePrinterA(HWND hDlg, char *name,
ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
} else { /* PD_PRINTSETUP */
- BOOL bPortrait = (lpdm->u.s.dmOrientation == DMORIENT_PORTRAIT);
+ BOOL bPortrait = (lpdm->u1.s1.dmOrientation == DMORIENT_PORTRAIT);
PRINTDLG_SetUpPaperComboBoxA(hDlg, cmb2,
PrintStructures->lpPrinterInfo->pPrinterName,
@@ -1123,7 +1125,7 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name,
if (lppd->hDevMode == 0)
copies = lppd->nCopies;
else
- copies = lpdm->u.s.dmCopies;
+ copies = lpdm->u1.s1.dmCopies;
if(copies == 0) copies = 1;
else if(copies < 0) copies = MAX_COPIES;
SetDlgItemInt(hDlg, edt3, copies, FALSE);
@@ -1145,7 +1147,7 @@ static BOOL PRINTDLG_ChangePrinterW(HWND hDlg, WCHAR *name,
ShowWindow(GetDlgItem(hDlg, chx1), SW_HIDE);
} else { /* PD_PRINTSETUP */
- BOOL bPortrait = (lpdm->u.s.dmOrientation == DMORIENT_PORTRAIT);
+ BOOL bPortrait = (lpdm->u1.s1.dmOrientation == DMORIENT_PORTRAIT);
PRINTDLG_SetUpPaperComboBoxW(hDlg, cmb2,
PrintStructures->lpPrinterInfo->pPrinterName,
@@ -1519,7 +1521,7 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
case rad1: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hPortraitIcon));
}
@@ -1528,7 +1530,7 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
case rad2: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hLandscapeIcon));
}
@@ -1552,7 +1554,7 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
{
DWORD Sel = SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR)
- lpdm->u.s.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
+ lpdm->u1.s1.dmPaperSize = SendDlgItemMessageA(hDlg, cmb2,
CB_GETITEMDATA,
Sel, 0);
}
@@ -1562,7 +1564,7 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
{
DWORD Sel = SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR)
- lpdm->u.s.dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,
+ lpdm->u1.s1.dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,
CB_GETITEMDATA, Sel,
0);
}
@@ -1573,8 +1575,8 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
case rad1: /* orientation */
case rad2:
if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
- if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
- lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
+ lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon);
@@ -1583,8 +1585,8 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
(LPARAM)PrintStructures->hPortraitIcon);
}
} else {
- if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
- lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
+ lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageA(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon);
@@ -1683,7 +1685,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
case rad1: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hPortraitIcon));
}
@@ -1692,7 +1694,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
case rad2: /* Paperorientation */
if (lppd->Flags & PD_PRINTSETUP)
{
- lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageW(hDlg, ico1, STM_SETIMAGE, (WPARAM) IMAGE_ICON,
(LPARAM)(PrintStructures->hLandscapeIcon));
}
@@ -1716,7 +1718,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
{
DWORD Sel = SendDlgItemMessageW(hDlg, cmb2, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR)
- lpdm->u.s.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2,
+ lpdm->u1.s1.dmPaperSize = SendDlgItemMessageW(hDlg, cmb2,
CB_GETITEMDATA,
Sel, 0);
}
@@ -1726,7 +1728,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
{
DWORD Sel = SendDlgItemMessageW(hDlg, cmb3, CB_GETCURSEL, 0, 0);
if(Sel != CB_ERR)
- lpdm->u.s.dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
+ lpdm->u1.s1.dmDefaultSource = SendDlgItemMessageW(hDlg, cmb3,
CB_GETITEMDATA, Sel,
0);
}
@@ -1737,8 +1739,8 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
case rad1: /* orientation */
case rad2:
if (IsDlgButtonChecked(hDlg, rad1) == BST_CHECKED) {
- if(lpdm->u.s.dmOrientation != DMORIENT_PORTRAIT) {
- lpdm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ if(lpdm->u1.s1.dmOrientation != DMORIENT_PORTRAIT) {
+ lpdm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hPortraitIcon);
@@ -1747,8 +1749,8 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
(LPARAM)PrintStructures->hPortraitIcon);
}
} else {
- if(lpdm->u.s.dmOrientation != DMORIENT_LANDSCAPE) {
- lpdm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ if(lpdm->u1.s1.dmOrientation != DMORIENT_LANDSCAPE) {
+ lpdm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
SendDlgItemMessageW(hDlg, stc10, STM_SETIMAGE,
(WPARAM)IMAGE_ICON,
(LPARAM)PrintStructures->hLandscapeIcon);
@@ -1985,16 +1987,16 @@ static BOOL PRINTDLG_CreateDCW(LPPRINTDLGW lppd)
/***********************************************************************
* PrintDlgA (COMDLG32.@)
*
- * Displays the the PRINT dialog box, which enables the user to specify
+ * Displays the PRINT dialog box, which enables the user to specify
* specific properties of the print job.
- *
+ *
* PARAMS
* lppd [IO] ptr to PRINTDLG32 struct
- *
+ *
* RETURNS
* nonzero if the user pressed the OK button
* zero if the user cancelled the window or an error occurred
- *
+ *
* BUGS
* PrintDlg:
* * The Collate Icons do not display, even though they are in the code.
@@ -2345,7 +2347,7 @@ static HGLOBAL PRINTDLG_GetPGSTemplateA(const PAGESETUPDLGA *lppd)
{
HRSRC hResInfo;
HGLOBAL hDlgTmpl;
-
+
if(lppd->Flags & PSD_ENABLEPAGESETUPTEMPLATEHANDLE) {
hDlgTmpl = lppd->hPageSetupTemplate;
} else if(lppd->Flags & PSD_ENABLEPAGESETUPTEMPLATE) {
@@ -2488,7 +2490,7 @@ _c_str2sizeW(const PAGESETUPDLGW *dlga, LPCWSTR strin) {
/****************************************************************************
* PRINTDLG_PS_UpdateDlgStructA
*
- * Updates pda->dlga structure
+ * Updates pda->dlga structure
* Function calls when user presses OK button
*
* PARAMS
@@ -2507,21 +2509,21 @@ PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) {
memcpy(pda->dlga, &pda->curdlg, sizeof(pda->curdlg));
pda->dlga->hDevMode = pda->pdlg.hDevMode;
pda->dlga->hDevNames = pda->pdlg.hDevNames;
-
+
dn = GlobalLock(pda->pdlg.hDevNames);
dm = GlobalLock(pda->pdlg.hDevMode);
/* Save paper orientation into device context */
if(pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y)
- dm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
else
- dm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
/* Save paper size into the device context */
paperword = SendDlgItemMessageA(hDlg,cmb2,CB_GETITEMDATA,
SendDlgItemMessageA(hDlg, cmb2, CB_GETCURSEL, 0, 0), 0);
if (paperword != CB_ERR)
- dm->u.s.dmPaperSize = paperword;
+ dm->u1.s1.dmPaperSize = paperword;
else
FIXME("could not get dialog text for papersize cmbbox?\n");
@@ -2529,7 +2531,7 @@ PRINTDLG_PS_UpdateDlgStructA(HWND hDlg, PageSetupDataA *pda) {
paperword = SendDlgItemMessageA(hDlg,cmb1,CB_GETITEMDATA,
SendDlgItemMessageA(hDlg, cmb1, CB_GETCURSEL, 0, 0), 0);
if (paperword != CB_ERR)
- dm->u.s.dmDefaultSource = paperword;
+ dm->u1.s1.dmDefaultSource = paperword;
else
FIXME("could not get dialog text for papersize cmbbox?\n");
@@ -2580,9 +2582,9 @@ PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pda) {
/* Save orientation */
if (pda->dlga->ptPaperSize.x > pda->dlga->ptPaperSize.y)
- dm->u.s.dmOrientation = DMORIENT_LANDSCAPE;
+ dm->u1.s1.dmOrientation = DMORIENT_LANDSCAPE;
else
- dm->u.s.dmOrientation = DMORIENT_PORTRAIT;
+ dm->u1.s1.dmOrientation = DMORIENT_PORTRAIT;
GlobalUnlock(pda->pdlg.hDevNames);
GlobalUnlock(pda->pdlg.hDevMode);
@@ -2593,12 +2595,12 @@ PRINTDLG_PS_UpdateDlgStructW(HWND hDlg, PageSetupDataW *pda) {
* PRINTDLG_PS_ChangeActivePrinerA
*
* Redefines hDevMode and hDevNames HANDLES and initialises it.
- *
+ *
* PARAMS
* name [in] Name of a printer for activation
* pda [in/out] ptr to PageSetupDataA structure
- *
- * RETURN
+ *
+ * RETURN
* TRUE if success
* FALSE if fail
*/
@@ -2609,7 +2611,7 @@ PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){
LPPRINTER_INFO_2A lpPrinterInfo;
LPDRIVER_INFO_3A lpDriverInfo;
DEVMODEA *pDevMode, *dm;
-
+
if(!OpenPrinterA(name, &hprn, NULL)){
ERR("Can't open printer %s\n", name);
return FALSE;
@@ -2626,7 +2628,7 @@ PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){
return FALSE;
}
ClosePrinter(hprn);
-
+
needed = DocumentPropertiesA(0, 0, name, NULL, NULL, 0);
if(needed == -1) {
ERR("DocumentProperties fails on %s\n", debugstr_a(name));
@@ -2642,12 +2644,12 @@ PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){
GMEM_MOVEABLE);
dm = GlobalLock(pda->pdlg.hDevMode);
memcpy(dm, pDevMode, pDevMode->dmSize + pDevMode->dmDriverExtra);
-
+
PRINTDLG_CreateDevNames(&(pda->pdlg.hDevNames),
lpDriverInfo->pDriverPath,
lpPrinterInfo->pPrinterName,
lpPrinterInfo->pPortName);
-
+
GlobalUnlock(pda->pdlg.hDevMode);
HeapFree(GetProcessHeap(), 0, pDevMode);
HeapFree(GetProcessHeap(), 0, lpPrinterInfo);
@@ -2660,7 +2662,7 @@ PRINTDLG_PS_ChangeActivePrinterA(LPSTR name, PageSetupDataA *pda){
*
* Fills Printers, Paper and Source combo
*
- * RETURNS
+ * RETURNS
* TRUE
*/
static BOOL
@@ -2668,7 +2670,7 @@ PRINTDLG_PS_ChangePrinterA(HWND hDlg, PageSetupDataA *pda) {
DEVNAMES *dn;
DEVMODEA *dm;
LPSTR devname,portname;
-
+
dn = GlobalLock(pda->pdlg.hDevNames);
dm = GlobalLock(pda->pdlg.hDevMode);
devname = ((char*)dn)+dn->wDeviceOffset;
@@ -2699,8 +2701,8 @@ PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pda) {
}
/******************************************************************************************
- * PRINTDLG_PS_ChangePaperPrev
- *
+ * PRINTDLG_PS_ChangePaperPrev
+ *
* Changes paper preview size / position
*
* PARAMS:
@@ -2709,12 +2711,12 @@ PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pda) {
* RETURNS:
* always - TRUE
*/
-static BOOL
+static BOOL
PRINTDLG_PS_ChangePaperPrev(const PageSetupDataA *pda)
{
LONG width, height, x, y;
RECT rtTmp;
-
+
if(pda->curdlg.ptPaperSize.x > pda->curdlg.ptPaperSize.y) {
width = pda->rtDrawRect.right - pda->rtDrawRect.left;
height = pda->curdlg.ptPaperSize.y * width / pda->curdlg.ptPaperSize.x;
@@ -2735,7 +2737,7 @@ PRINTDLG_PS_ChangePaperPrev(const PageSetupDataA *pda)
memcpy(&rtTmp, &pda->rtDrawRect, sizeof(RECT));
rtTmp.right += SHADOW;
rtTmp.bottom += SHADOW;
-#undef SHADOW
+#undef SHADOW
InvalidateRect(pda->hDlg, &rtTmp, TRUE);
return TRUE;
@@ -2754,7 +2756,7 @@ if(msg == EN_CHANGE){ \
* process WM_COMMAND message for PageSetupDlgA
*
* PARAMS
- * hDlg [in] Main dialog HANDLE
+ * hDlg [in] Main dialog HANDLE
* wParam [in] WM_COMMAND wParam
* lParam [in] WM_COMMAND lParam
* pda [in/out] ptr to PageSetupDataA
@@ -2767,7 +2769,7 @@ PRINTDLG_PS_WMCommandA(
WORD msg = HIWORD(wParam);
WORD id = LOWORD(wParam);
char buf[200];
-
+
TRACE("loword (lparam) %d, wparam 0x%lx, lparam %08lx\n",
LOWORD(lParam),wParam,lParam);
switch (id) {
@@ -2820,7 +2822,7 @@ PRINTDLG_PS_WMCommandA(
PRINTDLG_PaperSizeA(&(pda->pdlg), paperword,&(pda->curdlg.ptPaperSize));
pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga,pda->curdlg.ptPaperSize.x);
pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga,pda->curdlg.ptPaperSize.y);
-
+
if (IsDlgButtonChecked(hDlg, rad2)) {
DWORD tmp = pda->curdlg.ptPaperSize.x;
pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y;
@@ -2829,12 +2831,12 @@ PRINTDLG_PS_WMCommandA(
PRINTDLG_PS_ChangePaperPrev(pda);
} else
FIXME("could not get dialog text for papersize cmbbox?\n");
- }
+ }
break;
case cmb3:
if(msg == CBN_SELCHANGE){
DEVMODEA *dm = GlobalLock(pda->pdlg.hDevMode);
- dm->u.s.dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,CB_GETITEMDATA,
+ dm->u1.s1.dmDefaultSource = SendDlgItemMessageA(hDlg, cmb3,CB_GETITEMDATA,
SendDlgItemMessageA(hDlg, cmb3, CB_GETCURSEL, 0, 0), 0);
GlobalUnlock(pda->pdlg.hDevMode);
}
@@ -2846,7 +2848,7 @@ PRINTDLG_PS_WMCommandA(
DEVMODEA *dm;
LRESULT count;
int i;
-
+
GetDlgItemTextA(hDlg, cmb1, PrinterName, 255);
if (!OpenPrinterA(PrinterName, &hPrinter, NULL)) {
FIXME("Call to OpenPrinter did not succeed!\n");
@@ -2857,10 +2859,10 @@ PRINTDLG_PS_WMCommandA(
DM_IN_BUFFER | DM_OUT_BUFFER | DM_IN_PROMPT);
ClosePrinter(hPrinter);
/* Changing paper */
- PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u.s.dmPaperSize, &(pda->curdlg.ptPaperSize));
+ PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u1.s1.dmPaperSize, &(pda->curdlg.ptPaperSize));
pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x);
pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y);
- if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE){
+ if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE){
DWORD tmp = pda->curdlg.ptPaperSize.x;
pda->curdlg.ptPaperSize.x = pda->curdlg.ptPaperSize.y;
pda->curdlg.ptPaperSize.y = tmp;
@@ -2872,18 +2874,18 @@ PRINTDLG_PS_WMCommandA(
PRINTDLG_PS_ChangePaperPrev(pda);
/* Selecting paper in combo */
count = SendDlgItemMessageA(hDlg, cmb2, CB_GETCOUNT, 0, 0);
- if(count != CB_ERR){
+ if(count != CB_ERR){
for(i=0; iu.s.dmPaperSize) {
+ if(SendDlgItemMessageA(hDlg, cmb2, CB_GETITEMDATA, i, 0) == dm->u1.s1.dmPaperSize) {
SendDlgItemMessageA(hDlg, cmb2, CB_SETCURSEL, i, 0);
break;
}
}
}
-
+
GlobalUnlock(pda->pdlg.hDevMode);
break;
- }
+ }
case edt4:
GETVAL(id, pda->curdlg.rtMargin.left);
break;
@@ -2900,7 +2902,7 @@ PRINTDLG_PS_WMCommandA(
InvalidateRect(GetDlgItem(hDlg, rct1), NULL, TRUE);
return FALSE;
}
-#undef GETVAL
+#undef GETVAL
static BOOL
PRINTDLG_PS_WMCommandW(
@@ -2933,7 +2935,7 @@ PRINTDLG_PS_WMCommandW(
/***********************************************************************
* DefaultPagePaintHook
- * Default hook paint procedure that receives WM_PSD_* messages from the dialog box
+ * Default hook paint procedure that receives WM_PSD_* messages from the dialog box
* whenever the sample page is redrawn.
*/
@@ -3012,7 +3014,7 @@ PRINTDLG_DefaultPagePaintHook(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
* The image consists of a rectangle that represents the selected paper
* or envelope type, with a dotted-line rectangle representing
* the current margins, and partial (Greek text) characters
- * to show how text looks on the printed page.
+ * to show how text looks on the printed page.
*
* The following messages in the order sends to user hook procedure:
* WM_PSD_PAGESETUPDLG Draw the contents of the sample page
@@ -3063,16 +3065,16 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
hdc = BeginPaint(hWnd, &ps);
GetClientRect(hWnd, &rcClient);
-
+
scalx = rcClient.right / (double)pda->curdlg.ptPaperSize.x;
- scaly = rcClient.bottom / (double)pda->curdlg.ptPaperSize.y;
+ scaly = rcClient.bottom / (double)pda->curdlg.ptPaperSize.y;
rcMargin = rcClient;
-
+
rcMargin.left += (LONG)pda->curdlg.rtMargin.left * scalx;
rcMargin.top += (LONG)pda->curdlg.rtMargin.top * scalx;
rcMargin.right -= (LONG)pda->curdlg.rtMargin.right * scaly;
rcMargin.bottom -= (LONG)pda->curdlg.rtMargin.bottom * scaly;
-
+
/* if the space is too small then we make sure to not draw anything */
rcMargin.left = min(rcMargin.left, rcMargin.right);
rcMargin.top = min(rcMargin.top, rcMargin.bottom);
@@ -3087,7 +3089,7 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
hpen = CreatePen(PS_SOLID, 1, GetSysColor(COLOR_3DSHADOW));
holdpen = SelectObject(hdc, hpen);
-
+
/* paint left edge */
MoveToEx(hdc, rcClient.left, rcClient.top, NULL);
LineTo(hdc, rcClient.left, rcClient.bottom-1);
@@ -3117,7 +3119,7 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
rcMargin.top += 2;
rcMargin.right -= 2;
rcMargin.bottom -= 2;
-
+
/* if the space is too small then we make sure to not draw anything */
rcMargin.left = min(rcMargin.left, rcMargin.right);
rcMargin.top = min(rcMargin.top, rcMargin.bottom);
@@ -3146,8 +3148,8 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
pda = (PageSetupDataA*)lParam;
pda->hDlg = hDlg; /* saving handle to main window to PageSetupDataA structure */
memcpy(&pda->curdlg, pda->dlga, sizeof(pda->curdlg));
-
- hDrawWnd = GetDlgItem(hDlg, rct1);
+
+ hDrawWnd = GetDlgItem(hDlg, rct1);
TRACE("set property to %p\n", pda);
SetPropA(hDlg, "__WINE_PAGESETUPDLGDATA", pda);
SetPropA(hDrawWnd, "__WINE_PAGESETUPDLGDATA", pda);
@@ -3158,7 +3160,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
hDrawWnd,
GWLP_WNDPROC,
(ULONG_PTR)PRINTDLG_PagePaintProc);
-
+
/* FIXME: Paint hook. Must it be at begin of initializtion or at end? */
res = TRUE;
if (pda->dlga->Flags & PSD_ENABLEPAGESETUPHOOK) {
@@ -3180,7 +3182,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
if(pda->dlga->hDevMode)
{
dm = GlobalLock(pda->dlga->hDevMode);
- if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
+ if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE)
CheckRadioButton(hDlg, rad1, rad2, rad2);
else /* this is default if papersize is not set */
CheckRadioButton(hDlg, rad1, rad2, rad1);
@@ -3226,8 +3228,8 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
PRINTDLG_PS_ChangePrinterA(hDlg, pda);
dm = GlobalLock(pda->pdlg.hDevMode);
if(dm){
- dm->u.s.dmDefaultSource = 15; /*FIXME: Automatic select. Does it always 15 at start? */
- PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u.s.dmPaperSize, &pda->curdlg.ptPaperSize);
+ dm->u1.s1.dmDefaultSource = 15; /*FIXME: Automatic select. Does it always 15 at start? */
+ PRINTDLG_PaperSizeA(&(pda->pdlg), dm->u1.s1.dmPaperSize, &pda->curdlg.ptPaperSize);
GlobalUnlock(pda->pdlg.hDevMode);
pda->curdlg.ptPaperSize.x = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.x);
pda->curdlg.ptPaperSize.y = _c_10mm2size(pda->dlga, pda->curdlg.ptPaperSize.y);
@@ -3236,7 +3238,7 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
pda->curdlg.ptPaperSize.y = pda->curdlg.ptPaperSize.x;
pda->curdlg.ptPaperSize.x = tmp;
}
- } else
+ } else
WARN("GlobalLock(pda->pdlg.hDevMode) fail? hDevMode=%p\n", pda->pdlg.hDevMode);
/* Drawing paper prev */
PRINTDLG_PS_ChangePaperPrev(pda);
@@ -3262,8 +3264,8 @@ PRINTDLG_PageDlgProcA(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
static INT_PTR CALLBACK
PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
- static const WCHAR __WINE_PAGESETUPDLGDATA[] =
- { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E',
+ static const WCHAR __WINE_PAGESETUPDLGDATA[] =
+ { '_', '_', 'W', 'I', 'N', 'E', '_', 'P', 'A', 'G', 'E',
'S', 'E', 'T', 'U', 'P', 'D', 'L', 'G', 'D', 'A', 'T', 'A', 0 };
PageSetupDataW *pda;
LPDEVMODEW dm;
@@ -3297,7 +3299,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
dm = GlobalLock(pda->dlga->hDevMode);
/* Landscape orientation */
- if (dm->u.s.dmOrientation == DMORIENT_LANDSCAPE)
+ if (dm->u1.s1.dmOrientation == DMORIENT_LANDSCAPE)
CheckRadioButton(hDlg, rad1, rad2, rad2);
else /* this is default if papersize is not set */
CheckRadioButton(hDlg, rad1, rad2, rad1);
@@ -3357,7 +3359,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
/***********************************************************************
* PageSetupDlgA (COMDLG32.@)
*
- * Displays the the PAGE SETUP dialog box, which enables the user to specify
+ * Displays the PAGE SETUP dialog box, which enables the user to specify
* specific properties of a printed page such as
* size, source, orientation and the width of the page margins.
*
@@ -3371,7 +3373,7 @@ PageDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
* NOTES
* The values of hDevMode and hDevNames are filled on output and can be
* changed in PAGESETUPDLG when they are passed in PageSetupDlg.
- *
+ *
*/
BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
@@ -3381,6 +3383,11 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
PageSetupDataA *pda;
PRINTDLGA pdlg;
+ if (setupdlg == NULL) {
+ COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION);
+ return FALSE;
+ }
+
/* TRACE */
if(TRACE_ON(commdlg)) {
char flagstr[1000] = "";
@@ -3397,11 +3404,8 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
setupdlg->hDevNames,
setupdlg->hInstance, setupdlg->Flags, flagstr);
}
+
/* Checking setupdlg structure */
- if (setupdlg == NULL) {
- COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION);
- return FALSE;
- }
if(setupdlg->lStructSize != sizeof(PAGESETUPDLGA)) {
COMDLG32_SetCommDlgExtendedError(CDERR_STRUCTSIZE);
return FALSE;
@@ -3439,7 +3443,7 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
setupdlg->hDevMode = pdlg.hDevMode;
setupdlg->hDevNames = pdlg.hDevNames;
dm = GlobalLock(pdlg.hDevMode);
- PRINTDLG_PaperSizeA(&pdlg, dm->u.s.dmPaperSize, &setupdlg->ptPaperSize);
+ PRINTDLG_PaperSizeA(&pdlg, dm->u1.s1.dmPaperSize, &setupdlg->ptPaperSize);
GlobalUnlock(pdlg.hDevMode);
setupdlg->ptPaperSize.x=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.x);
setupdlg->ptPaperSize.y=_c_10mm2size(setupdlg,setupdlg->ptPaperSize.y);
@@ -3457,7 +3461,7 @@ BOOL WINAPI PageSetupDlgA(LPPAGESETUPDLGA setupdlg) {
COMDLG32_SetCommDlgExtendedError(CDERR_LOADRESFAILURE);
return FALSE;
}
-
+
pda = HeapAlloc(GetProcessHeap(),0,sizeof(*pda));
pda->dlga = setupdlg;
memcpy(&pda->pdlg,&pdlg,sizeof(pdlg));
@@ -3486,6 +3490,12 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) {
PRINTDLGW pdlg;
FIXME("Unicode implementation is not done yet\n");
+
+ if (setupdlg == NULL) {
+ COMDLG32_SetCommDlgExtendedError(CDERR_INITIALIZATION);
+ return FALSE;
+ }
+
if(TRACE_ON(commdlg)) {
char flagstr[1000] = "";
const struct pd_flags *pflag = psd_flags;
@@ -3558,29 +3568,37 @@ BOOL WINAPI PageSetupDlgW(LPPAGESETUPDLGW setupdlg) {
}
/***********************************************************************
- * PrintDlgExA (COMDLG32.@)
+ * PrintDlgExA (COMDLG32.@)
*
* See PrintDlgExW.
*
- * FIXME
- * Stub
+ * BUGS
+ * Only a Stub
+ *
*/
-HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lpPrintDlgExA)
+HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lppd)
{
- FIXME("stub\n");
- return E_NOTIMPL;
+
+ FIXME("(%p) stub\n", lppd);
+ if ((lppd == NULL) || (lppd->lStructSize != sizeof(PRINTDLGEXA))) {
+ return E_INVALIDARG;
+ }
+
+ if (!IsWindow(lppd->hwndOwner)) {
+ return E_HANDLE;
+ }
+
+ return E_NOTIMPL;
}
/***********************************************************************
- * PrintDlgExW (COMDLG32.@)
- *
- * Display the the PRINT dialog box, which enables the user to specify
- * specific properties of the print job. The property sheet can also have
- * additional application-specific and driver-specific property pages.
+ * PrintDlgExW (COMDLG32.@)
*
+ * Display the property sheet style PRINT dialog box
+ *
* PARAMS
* lppd [IO] ptr to PRINTDLGEX struct
- *
+ *
* RETURNS
* Success: S_OK
* Failure: One of the following COM error codes:
@@ -3589,12 +3607,27 @@ HRESULT WINAPI PrintDlgExA(LPPRINTDLGEXA lpPrintDlgExA)
* E_POINTER Invalid pointer.
* E_HANDLE Invalid handle.
* E_FAIL Unspecified error.
+ *
+ * NOTES
+ * This Dialog enables the user to specify specific properties of the print job.
+ * The property sheet can also have additional application-specific and
+ * driver-specific property pages.
+ *
+ * BUGS
+ * Only a Stub
*
- * FIXME
- * Stub
*/
-HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lpPrintDlgExW)
+HRESULT WINAPI PrintDlgExW(LPPRINTDLGEXW lppd)
{
- FIXME("stub\n");
- return E_NOTIMPL;
+
+ FIXME("(%p) stub\n", lppd);
+ if ((lppd == NULL) || (lppd->lStructSize != sizeof(PRINTDLGEXW))) {
+ return E_INVALIDARG;
+ }
+
+ if (!IsWindow(lppd->hwndOwner)) {
+ return E_HANDLE;
+ }
+
+ return E_NOTIMPL;
}
diff --git a/reactos/dll/win32/comdlg32/printdlg16.c b/reactos/dll/win32/comdlg32/printdlg16.c
index 65921f6281b..b23ef0ba4f2 100644
--- a/reactos/dll/win32/comdlg32/printdlg16.c
+++ b/reactos/dll/win32/comdlg32/printdlg16.c
@@ -148,13 +148,13 @@ static LRESULT PRINTDLG_WMInitDialog16(HWND hDlg, WPARAM wParam, PRINT_PTRA16* p
pdm = GlobalLock16(lppd->hDevMode);
if(pdm) {
- switch (pdm->dmPrintQuality) {
+ switch (pdm->u1.s1.dmPrintQuality) {
case DMRES_HIGH : strcpy(buf,"High");break;
case DMRES_MEDIUM : strcpy(buf,"Medium");break;
case DMRES_LOW : strcpy(buf,"Low");break;
case DMRES_DRAFT : strcpy(buf,"Draft");break;
case 0 : strcpy(buf,"Default");break;
- default : sprintf(buf,"%ddpi",pdm->dmPrintQuality);break;
+ default : sprintf(buf,"%ddpi",pdm->u1.s1.dmPrintQuality);break;
}
GlobalUnlock16(lppd->hDevMode);
} else
@@ -327,7 +327,7 @@ static HGLOBAL16 PRINTDLG_GetDlgTemplate16(const PRINTDLG16 *lppd)
/***********************************************************************
* PrintDlg (COMMDLG.20)
*
- * Displays the the PRINT dialog box, which enables the user to specify
+ * Displays the PRINT dialog box, which enables the user to specify
* specific properties of the print job.
*
* RETURNS