diff --git a/dlls/shell32/.gitignore b/dlls/shell32/.gitignore index 41e0c95fd91..a37cbca1ead 100644 --- a/dlls/shell32/.gitignore +++ b/dlls/shell32/.gitignore @@ -1,6 +1,7 @@ Makefile authors.c cdrom.ico +delete.ico desktop.ico document.ico drive.ico diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index 940f6c95855..cd9066e29af 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -55,6 +55,7 @@ RC_BINSRC = shres.rc RC_BINARIES = \ cdrom.ico \ desktop.ico \ + delete.ico \ document.ico \ drive.ico \ floppy.ico \ diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 90cf9e26309..49fa995b267 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -74,22 +74,26 @@ typedef struct static BOOL SHELL_ConfirmIDs(int nKindOfDialog, SHELL_ConfirmIDstruc *ids) { - ids->hIconInstance = NULL; - ids->icon_resource_id = IDI_WARNING; + ids->hIconInstance = shell32_hInstance; switch (nKindOfDialog) { case ASK_DELETE_FILE: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ids->caption_resource_id = IDS_DELETEITEM_CAPTION; ids->text_resource_id = IDS_DELETEITEM_TEXT; return TRUE; case ASK_DELETE_FOLDER: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION; ids->text_resource_id = IDS_DELETEITEM_TEXT; return TRUE; case ASK_DELETE_MULTIPLE_ITEM: + ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE; ids->caption_resource_id = IDS_DELETEITEM_CAPTION; ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT; return TRUE; case ASK_OVERWRITE_FILE: + ids->hIconInstance = NULL; + ids->icon_resource_id = IDI_WARNING; ids->caption_resource_id = IDS_OVERWRITEFILE_CAPTION; ids->text_resource_id = IDS_OVERWRITEFILE_TEXT; return TRUE; diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc index 3111988d695..4d83f2a0c91 100644 --- a/dlls/shell32/shres.rc +++ b/dlls/shell32/shres.rc @@ -10531,6 +10531,199 @@ IDI_SHELL_DESKTOP ICON desktop.ico 'FF FF FF FF FF FF' } */ +/* BINRES delete.ico */ +IDI_SHELL_CONFIRM_DELETE ICON delete.ico +/* { + '00 00 01 00 02 00 20 20 10 00 01 00 04 00 E8 02' + '00 00 26 00 00 00 20 20 00 00 01 00 08 00 A8 08' + '00 00 0E 03 00 00 28 00 00 00 20 00 00 00 40 00' + '00 00 01 00 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 00 00 03' + '00 00 39 3C 3A 00 A9 58 58 00 2F 2E EA 00 03 80' + '7F 00 BB 85 88 00 9D A4 AC 00 94 AD CD 00 BB C4' + 'C4 00 B5 D2 EB 00 CE CB F8 00 DB DE DC 00 01 FF' + 'FF 00 DA E7 F2 00 FB FF FC 00 00 00 00 00 FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FF 00 0F 00 0F 00 0F 00 0F FF FF FF FF' + 'FF FF FF FF 0B 0F 09 0F 07 0F 07 0F FF FF FF FF' + 'FF FF FF FF 0B 0F 0D 0F 09 0F 09 0F FF FF FF FF' + 'FF FF FF FF 0B 00 0D 0D 09 0F 09 00 0F FF FF FF' + 'FF FF FF FF 0B 0E 0D 0D 0D 0F 09 07 0F FF FF FF' + 'FF FF FF FF 0B 0E 0D 0D 0D 00 09 07 0F FF 00 00' + '00 00 00 00 0B 0E 0E 0E 0D 0D 09 07 00 0F 4E 44' + '44 44 44 44 0D 0E 0E 0D 0D 0D 0D 07 04 40 4E EC' + 'EC EC EC EC 0B EE EE EE ED DD AD 99 0C 40 4E CE' + 'CE CE CE C3 33 33 33 EE ED DD ED D7 0E 40 4E EC' + 'EC EC EC 33 3A EA 33 3E EE DE DD D8 0C 40 4E CE' + 'CE CE C3 33 3E EE 33 33 25 2E DD D7 0E 40 4E EC' + 'EC EC E3 33 3A EA 33 33 EE ED DD B8 0C 40 4E CE' + 'CE CE C3 33 33 33 33 33 EE EE ED D6 0E 40 4E EC' + 'EC EC E3 33 33 E3 33 33 25 25 2D 86 0C 40 4E CE' + 'CE CE C3 33 3E EE 33 33 EE EE B8 66 0E 40 4E EC' + 'EC EC E3 33 3E EE 33 33 EE E1 11 00 0C 40 4E CE' + 'CE CE C3 33 3E EE 33 33 25 E1 BE 86 0E 40 4E EC' + 'EC EC EC 33 3A AA 33 3E EE B1 E8 60 EC 40 4E CE' + 'CE CE CE C3 33 33 33 EE EB B0 86 0E CE 40 4E EC' + 'EC EC EC EC 1E BB BB DB D8 80 60 EC EC 40 4E CE' + 'CE CE CE CE 11 11 11 10 00 00 0E CE CE 40 4E EE' + 'EE EE EE EE EE EE EE EE EE EE EE EE EE 0F 4C 8C' + '8C 8C 8C 8C 8C 8C 8C 84 44 44 44 44 40 FF 4E EC' + 'EC EC EC EC EC EC EC 40 FF FF FF FF FF FF F4 EE' + 'CE CE CE CE CE CE C4 0F FF FF FF FF FF FF FF 4E' + 'EC EC EC EC EC EC 40 FF FF FF FF FF FF FF FF F4' + 'EE EE EE EE EE E4 0F FF FF FF FF FF FF FF FF FF' + '44 44 44 44 44 40 FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF FF' + 'FF FF FF F1 11 1F FF F1 11 1F FF F1 11 1F FF F0' + '01 07 FF F0 01 07 FF F0 00 07 00 00 00 01 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 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 0F FF 80 00 1F FF C0 00 3F FF E0 00' + '7F FF F0 00 FF FF FF FF FF FF FF FF FF FF 28 00' + '00 00 20 00 00 00 40 00 00 00 01 00 08 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 02 02 02 00 06 06' + '06 00 08 08 08 00 10 10 10 00 14 14 14 00 18 18' + '18 00 21 21 21 00 29 29 29 00 31 31 31 00 3A 3A' + '3A 00 3E 3E 3E 00 42 42 42 00 4A 4A 4A 00 4C 4C' + '4C 00 53 53 53 00 A9 58 5A 00 33 33 E7 00 7A 7F' + '85 00 00 9C 9C 00 BD 85 88 00 98 98 98 00 97 9B' + 'A0 00 8E A8 C9 00 A9 B1 B8 00 93 AC CB 00 98 98' + 'F2 00 AB B2 BB 00 B4 B4 B4 00 99 B0 CC 00 9F B4' + 'CE 00 AC B8 C6 00 A5 B8 CF 00 A6 B8 CF 00 AB BC' + 'D0 00 63 CE CE 00 B1 C0 D2 00 C6 C6 C6 00 C9 C9' + 'C9 00 C1 C8 D0 00 BE C8 D6 00 C4 CB CF 00 A6 C5' + 'E8 00 AD C9 EA 00 CA D0 D8 00 B4 CE EC 00 D6 D6' + 'D6 00 CB CB F8 00 BC D3 EE 00 C0 D6 EF 00 C3 D8' + 'EF 00 C3 D8 F0 00 DE DE DE 00 C7 DA F1 00 E0 E0' + 'E0 00 DB E0 E4 00 A8 DC FF 00 E1 E1 E1 00 D5 DF' + 'EA 00 CB DD F2 00 CE DF F2 00 D1 E1 F3 00 D2 E1' + 'F3 00 D2 E1 F4 00 D5 E3 F4 00 D6 E4 F4 00 D9 E6' + 'F5 00 DB E8 F6 00 DC E8 F6 00 EC EC EC 00 E1 EB' + 'F7 00 E2 EC F7 00 EC EE F0 00 E4 ED F8 00 E7 EF' + 'F9 00 E8 F0 F9 00 EA F0 F9 00 EB F2 FA 00 9C FF' + 'FF 00 EE F3 FB 00 EE F4 FA 00 F1 F6 FB 00 F1 F6' + 'FC 00 F3 F7 FB 00 F5 F8 FC 00 F7 FA FD 00 F8 FA' + 'FD 00 F9 FB FD 00 FA FC FD 00 FB FC FE 00 FD FD' + 'FD 00 FB FD FE 00 FE FE FE 00 FE FE FF 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 2C 00 00 00 28 00 00 00 21 00 00 00 17' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 34 00 00 00 43 00 00 00 31 00 00 00 2A' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 34 00 00 00 47 00 40 00 35 00 00 00 2B' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 01 34 00 55 00 4C 00 44 00 3C 00 00 00 2D' + '00 19 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 34 00 5D 00 52 00 49 00 41 00 00 00 30' + '00 1D 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 34 00 5E 00 56 00 4D 00 42 00 3D 00 32' + '00 1E 00 00 00 00 13 23 13 13 13 13 13 13 13 13' + '13 13 02 34 00 5E 00 5C 00 51 00 42 00 41 00 3B' + '00 20 00 13 13 00 13 5E 4E 38 4E 38 4E 38 4E 38' + '4E 38 02 34 5E 5E 5E 5C 57 53 51 46 42 42 3D 3B' + '33 20 00 38 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 4E' + '4E 11 11 11 11 11 11 11 5E 5C 53 4A 46 42 42 3F' + '3B 22 00 38 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 4E' + '11 11 11 1A 5E 1A 11 11 11 5E 58 53 4A 46 42 42' + '3E 24 00 38 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 11' + '11 11 11 5E 5E 5E 11 11 11 11 10 14 10 4A 46 42' + '42 1F 00 38 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 11' + '11 11 11 1A 5E 1A 11 11 11 11 5E 59 54 50 4A 46' + '42 1F 00 38 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 11' + '11 11 11 11 11 11 11 11 11 11 5E 5E 5B 54 4F 4B' + '3A 1B 00 4E 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 11' + '11 11 11 11 5E 11 11 11 11 11 10 14 10 14 10 37' + '27 16 00 38 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 11' + '11 11 11 5E 5E 5E 11 11 11 11 5E 5E 5E 5A 48 29' + '18 12 00 4E 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 11' + '11 11 11 5E 5E 5E 11 11 11 11 5E 5E 5E 0F 0B 08' + '05 00 00 38 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 11' + '11 11 11 5E 5E 5E 11 11 11 11 10 14 5E 0B 36 5E' + '26 15 00 4E 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 4E' + '11 11 11 2F 2F 2F 11 11 11 5E 5E 5E 45 08 5E 26' + '15 00 4E 38 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 4E' + '4E 11 11 11 11 11 11 11 5E 5E 5E 45 39 05 26 15' + '00 4E 4E 4E 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 4E' + '4E 4E 0E 34 34 34 34 34 34 34 2E 25 1C 00 15 00' + '4E 4E 4E 38 13 00 13 5E 4E 4E 4E 4E 4E 4E 4E 4E' + '4E 4E 0F 0D 0C 0C 0A 09 08 07 06 04 03 00 00 4E' + '4E 4E 4E 4E 13 00 13 5E 5E 5E 5E 5E 5E 5E 5E 5E' + '5E 5E 5E 5E 5E 5E 5E 5E 5E 5E 5E 5E 5E 5E 5E 5E' + '5E 5E 5E 5E 00 00 13 23 23 23 23 23 23 23 23 23' + '23 23 23 23 23 23 23 23 23 13 13 13 13 13 13 13' + '13 13 13 00 00 00 13 5E 4E 4E 4E 4E 4E 4E 4E 4E' + '4E 4E 4E 4E 4E 38 4E 38 13 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 13 5E 4E 4E 4E 4E 4E 4E 4E' + '4E 4E 4E 4E 4E 4E 38 13 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 13 5E 4E 4E 4E 4E 4E 4E' + '4E 4E 4E 4E 4E 38 13 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 13 5E 5E 5E 5E 5E 5E' + '5E 5E 5E 5E 5E 13 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 13 13 13 13 13 13' + '13 13 13 13 13 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 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 F1 11 1F FF F1' + '11 1F FF F1 01 1F FF F0 01 07 FF F0 01 07 FF F0' + '00 07 00 00 00 01 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00' + '00 00 00 00 00 00 00 00 00 00 00 00 00 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 0F FF 80 00' + '1F FF C0 00 3F FF E0 00 7F FF F0 00 FF FF FF FF' + 'FF FF FF FF FF FF' +} */ + /* BINRES mydocs.ico */ IDI_SHELL_MY_DOCUMENTS ICON mydocs.ico /* { diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 077d1cc496f..aa95d33860f 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -117,6 +117,7 @@ #define IDI_SHELL_CONTROL_PANEL 36 #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 +#define IDI_SHELL_CONFIRM_DELETE 77 #define IDI_SHELL_MY_DOCUMENTS 235 /*