shell32: Add trashing confirmations.
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index 5241cbe..4ab01f1 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -68,7 +68,8 @@
printer.ico \
ramdisk.ico \
searching.avi \
- shortcut.ico
+ shortcut.ico \
+ trash_file.ico
C_SRCS16 = shell.c
RC_SRCS16 = version16.rc
diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc
index 2cf8047..a068538 100644
--- a/dlls/shell32/shell32_En.rc
+++ b/dlls/shell32/shell32_En.rc
@@ -165,6 +165,9 @@
IDS_DELETEITEM_TEXT "Are you sure you want to delete '%1'?"
IDS_DELETEMULTIPLE_TEXT "Are you sure you want to delete these %1 items?"
IDS_DELETESELECTED_TEXT "Are you sure you want to delete the selected item(s)?"
+ IDS_TRASHITEM_TEXT "Are you sure that you want to send '%1' to the Trash?"
+ IDS_TRASHFOLDER_TEXT "Are you sure that you want to send '%1' and all it's content to the Trash?"
+ IDS_TRASHMULTIPLE_TEXT "Are you sure that you want to send these %1 items to the Trash?"
IDS_OVERWRITEFILE_TEXT "OverWrite File %1?"
IDS_OVERWRITEFILE_CAPTION "Confirm File OverWrite"
diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index 1ba0126..ab52096 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -148,6 +148,9 @@
#define ASK_CREATE_FOLDER 4
#define ASK_OVERWRITE_FILE 5
#define ASK_DELETE_SELECTED 6
+#define ASK_TRASH_FILE 7
+#define ASK_TRASH_FOLDER 8
+#define ASK_TRASH_MULTIPLE_ITEM 9
BOOL SHELL_DeleteDirectoryW(HWND hwnd, LPCWSTR pwszDir, BOOL bShowUI);
BOOL SHELL_ConfirmDialogW(HWND hWnd, int nKindOfDialog, LPCWSTR szDir);
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index e1d7ba9..d744689 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -91,6 +91,21 @@
ids->caption_resource_id = IDS_DELETEITEM_CAPTION;
ids->text_resource_id = IDS_DELETEMULTIPLE_TEXT;
return TRUE;
+ case ASK_TRASH_FILE:
+ ids->icon_resource_id = IDI_SHELL_TRASH_FILE;
+ ids->caption_resource_id = IDS_DELETEITEM_CAPTION;
+ ids->text_resource_id = IDS_TRASHITEM_TEXT;
+ return TRUE;
+ case ASK_TRASH_FOLDER:
+ ids->icon_resource_id = IDI_SHELL_TRASH_FILE;
+ ids->caption_resource_id = IDS_DELETEFOLDER_CAPTION;
+ ids->text_resource_id = IDS_TRASHFOLDER_TEXT;
+ return TRUE;
+ case ASK_TRASH_MULTIPLE_ITEM:
+ ids->icon_resource_id = IDI_SHELL_TRASH_FILE;
+ ids->caption_resource_id = IDS_DELETEITEM_CAPTION;
+ ids->text_resource_id = IDS_TRASHMULTIPLE_TEXT;
+ return TRUE;
case ASK_DELETE_SELECTED:
ids->icon_resource_id = IDI_SHELL_CONFIRM_DELETE;
ids->caption_resource_id = IDS_DELETEITEM_CAPTION;
@@ -1061,7 +1076,7 @@
return ERROR_SUCCESS;
}
-static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, FILE_LIST *flFrom)
+static BOOL confirm_delete_list(HWND hWnd, DWORD fFlags, BOOL fTrash, FILE_LIST *flFrom)
{
if (flFrom->dwNumFiles > 1)
{
@@ -1069,16 +1084,16 @@
const WCHAR format[] = {'%','d',0};
wnsprintfW(tmp, sizeof(tmp)/sizeof(tmp[0]), format, flFrom->dwNumFiles);
- return SHELL_ConfirmDialogW(hWnd, ASK_DELETE_MULTIPLE_ITEM, tmp);
+ return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_MULTIPLE_ITEM:ASK_DELETE_MULTIPLE_ITEM), tmp);
}
else
{
FILE_ENTRY *fileEntry = &flFrom->feFiles[0];
if (IsAttribFile(fileEntry->attributes))
- return SHELL_ConfirmDialogW(hWnd, ASK_DELETE_FILE, fileEntry->szFullPath);
+ return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_FILE:ASK_DELETE_FILE), fileEntry->szFullPath);
else if (!(fFlags & FOF_FILESONLY && fileEntry->bFromWildcard))
- return SHELL_ConfirmDialogW(hWnd, ASK_DELETE_FOLDER, fileEntry->szFullPath);
+ return SHELL_ConfirmDialogW(hWnd, (fTrash?ASK_TRASH_FOLDER:ASK_DELETE_FOLDER), fileEntry->szFullPath);
}
return TRUE;
}
@@ -1094,7 +1109,7 @@
return ERROR_SUCCESS;
if (!(lpFileOp->fFlags & FOF_NOCONFIRMATION) || (lpFileOp->fFlags & FOF_WANTNUKEWARNING))
- if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, flFrom))
+ if (!confirm_delete_list(lpFileOp->hwnd, lpFileOp->fFlags, FALSE, flFrom))
{
lpFileOp->fAnyOperationsAborted = TRUE;
return 0;
diff --git a/dlls/shell32/shres.rc b/dlls/shell32/shres.rc
index a3a38d6..c4f982b 100644
--- a/dlls/shell32/shres.rc
+++ b/dlls/shell32/shres.rc
@@ -10531,6 +10531,351 @@
'FF FF FF FF FF FF'
} */
+/* BINRES trash_file.ico */
+IDI_SHELL_TRASH_FILE ICON trash_file.ico
+/* {
+ '00 00 01 00 02 00 10 10 00 00 01 00 20 00 68 04'
+ '00 00 26 00 00 00 20 20 00 00 01 00 20 00 A8 10'
+ '00 00 8E 04 00 00 28 00 00 00 10 00 00 00 20 00'
+ '00 00 01 00 20 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 3F 00 00 00 AF 00 00 00 DF 00 00 00 CF 00 00'
+ '00 AF 00 00 00 6F 00 00 00 2F 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 5F 2A 2A'
+ '2A FF A6 A6 A6 FF B1 B1 B1 FF A5 A5 A5 FF 86 86'
+ '86 FF 5C 5C 5C FF 33 33 33 FF 00 00 00 CF 00 00'
+ '00 0F 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 3F 2A 2A 2A FF D2 D2'
+ 'D2 FF CE CE CE FF B1 B1 B1 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A6 A6 A6 FF B4 B4 B4 FF 55 55 55 FF 00 00'
+ '00 6F 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 7F 9A 9A 9A FF E0 E0'
+ 'E0 FF CE CE CE FF B1 B1 B1 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF B5 B5 B5 FF 87 87 87 FF 00 00'
+ '00 9F 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 BF B6 B6 B6 FF E0 E0'
+ 'E0 FF CE CE CE FF B1 B1 B1 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF B3 B3 B3 FF B6 B6 B6 FF 00 00'
+ '00 CF 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 EF E1 E1 E1 FF E0 E0'
+ 'E0 FF CE CE CE FF B1 B1 B1 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF B0 B0 B0 FF B8 B8 B8 FF 14 14'
+ '14 FF 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 1F 38 38 38 FF E1 E1 E1 FF D4 D1'
+ 'CF FF A6 9E 96 FF 8A 81 79 FF 81 79 71 FF 8E 89'
+ '84 FF A0 9F 9E FF AE AE AE FF BF BF BF FF 33 33'
+ '33 FF 00 00 00 3F 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 3F 62 62 62 FF AF A5 9A FF A2 84'
+ '66 FF 99 7C 60 FF 93 77 5B FF 88 6E 54 FF 7A 63'
+ '4C FF 77 61 4B FF 7D 6C 5B FF 8E 84 7A FF 4E 4C'
+ '4A FF 00 00 00 6F 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 7F 54 49 3D FF 90 76 5D FF A1 91'
+ '82 FF C2 BB B4 FF AC A6 A1 FF C3 BE B9 FF B3 AA'
+ 'A1 FF 99 8A 7C FF 85 6F 59 FF 8B 71 57 FF 5E 4C'
+ '3B FF 00 00 00 8F 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 AF 6C 59 45 FF BB B4 AC FF BA BA'
+ 'BA FF A7 A7 A7 FF 15 15 15 FF B1 B1 B1 FF D7 D7'
+ 'D7 FF CC CC CC FF CA CA CA FF C8 C4 C1 FF 8E 82'
+ '76 FF 12 12 12 BF 00 00 00 00 00 00 00 00 00 00'
+ '00 00 20 20 20 DF BB B4 AC FF 6F 6F 6F FF CD CD'
+ 'CD FF D0 D0 D0 FF 4C 4C 4C FF 7F 7F 7F FF FE FE'
+ 'FE FF FB FB FB FF E4 E4 E4 FF 48 48 48 FF B6 B6'
+ 'B6 FF 38 38 38 FF 00 00 00 00 00 00 00 00 00 00'
+ '00 00 38 38 38 FF B6 B6 B6 FF 00 00 00 FF 56 56'
+ '56 FF AC AC AC FF 9B 9B 9B FF 2F 2F 2F FF 8F 8F'
+ '8F FF 2F 2F 2F FF 00 00 00 FF 58 58 58 FF D2 D2'
+ 'D2 FF 20 20 20 DF 00 00 00 00 00 00 00 00 00 00'
+ '00 00 12 12 12 BF B6 B6 B6 FF C4 C4 C4 FF 7E 7E'
+ '7E FF 46 46 46 FF 1C 1C 1C FF 00 00 00 FF 12 10'
+ '0E FF 67 5B 50 FF 9F 99 94 FF D2 D2 D2 FF 2D 2D'
+ '2D EF 00 00 00 2F 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 0F 00 00 00 9F 3C 3C 3C EF 70 70'
+ '70 FF A8 A8 A8 FF E1 E1 E1 FF B6 B6 B6 FF C5 C1'
+ 'BD FF E1 E1 E1 FF A8 A8 A8 FF 2D 2D 2D EF 00 00'
+ '00 2F 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 2F 00 00 00 6F 00 00 00 AF 4B 4B 4B BF 3C 3C'
+ '3C EF 25 25 25 BF 00 00 00 7F 00 00 00 0F 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 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 F0 1F 00 00 E0 0F 00 00 E0 0F 00 00 E0 0F'
+ '00 00 E0 07 00 00 C0 07 00 00 C0 07 00 00 C0 07'
+ '00 00 C0 07 00 00 C0 03 00 00 80 07 00 00 C0 0F'
+ '00 00 F0 1F 00 00 FF FF 00 00 FF FF 00 00 28 00'
+ '00 00 20 00 00 00 40 00 00 00 01 00 20 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 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 00 00 00 3F 00 00'
+ '00 6F 00 00 00 7F 00 00 00 5F 00 00 00 3F 00 00'
+ '00 0F 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 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 00 00 00 7F 1A 1A 1A EF 46 46 46 FF 57 57'
+ '57 FF 52 52 52 FF 52 52 52 FF 3D 3D 3D FF 14 14'
+ '14 FF 00 00 00 CF 00 00 00 8F 00 00 00 4F 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 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 00 00'
+ '00 CF 7A 7A 7A FF CC CC CC FF BE BE BE FF AF AF'
+ 'AF FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF 90 90 90 FF 67 67 67 FF 3D 3D 3D FF 14 14'
+ '14 FF 00 00 00 9F 00 00 00 1F 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 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 00 00 00 CF 8C 8C'
+ '8C FF DA DA DA FF CC CC CC FF BE BE BE FF AF AF'
+ 'AF FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF A5 A5 A5 FF A9 A9 A9 FF AB AB'
+ 'AB FF 67 67 67 FF 0B 0B 0B EF 00 00 00 0F 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 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 00 00 00 CF 8C 8C 8C FF E1 E1'
+ 'E1 FF DA DA DA FF CC CC CC FF BE BE BE FF AF AF'
+ 'AF FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF A5 A5 A5 FF AC AC AC FF B8 B8'
+ 'B8 FF B6 B6 B6 FF 48 48 48 FF 00 00 00 6F 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 5F 62 62 62 FF E1 E1 E1 FF E1 E1'
+ 'E1 FF DA DA DA FF CC CC CC FF BE BE BE FF AF AF'
+ 'AF FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF A5 A5 A5 FF AB AB AB FF B7 B7'
+ 'B7 FF BE BE BE FF 7D 7D 7D FF 00 00 00 9F 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 7F 9A 9A 9A FF E1 E1 E1 FF E1 E1'
+ 'E1 FF DA DA DA FF CC CC CC FF BE BE BE FF AF AF'
+ 'AF FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF A5 A5 A5 FF A9 A9 A9 FF B6 B6'
+ 'B6 FF BD BD BD FF A2 A2 A2 FF 00 00 00 BF 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 BF C4 C4 C4 FF E1 E1 E1 FF E1 E1'
+ 'E1 FF DA DA DA FF CC CC CC FF BE BE BE FF AF AF'
+ 'AF FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF A5 A5 A5 FF A7 A7 A7 FF B5 B5'
+ 'B5 FF BC BC BC FF B3 B3 B3 FF 0A 0A 0A 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 EF E1 E1 E1 FF E1 E1 E1 FF E1 E1'
+ 'E1 FF DA DA DA FF CC CC CC FF BE BE BE FF AF AF'
+ 'AF FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF A5 A5 A5 FF A7 A7 A7 FF B4 B4'
+ 'B4 FF BC BC BC FF B7 B7 B7 FF 29 29 29 FF 00 00'
+ '00 2F 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 1F 38 38 38 FF E1 E1 E1 FF E1 E1 E1 FF E1 E1'
+ 'E1 FF DA DA DA FF CC CC CC FF BE BE BE FF AF AF'
+ 'AF FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF B3 B3'
+ 'B3 FF BB BB BB FF BC BC BC FF 52 52 52 FF 00 00'
+ '00 5F 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 4F 62 62 62 FF E1 E1 E1 FF E1 E1 E1 FF E1 E1'
+ 'E1 FF DA DA DA FF CC CC CC FF BE BE BE FF AF AF'
+ 'AF FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF B2 B2'
+ 'B2 FF BA BA BA FF C1 C1 C1 FF 71 71 71 FF 00 00'
+ '00 8F 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 7F 8C 8C 8C FF E1 E1 E1 FF E1 E1 E1 FF E1 E1'
+ 'E1 FF DA DA DA FF CC CC CC FF BE BE BE FF AF AF'
+ 'AF FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5'
+ 'A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF AF AF'
+ 'AF FF B9 B9 B9 FF C0 C0 C0 FF 96 96 96 FF 00 00'
+ '00 BF 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 AF B6 B6 B6 FF E1 E1 E1 FF E1 E1 E1 FF E1 E1'
+ 'E1 FF DA DA DA FF BB B8 B4 FF A4 9E 99 FF 89 80'
+ '78 FF 81 79 71 FF 8A 84 7E FF 93 8F 8B FF A5 A5'
+ 'A5 FF A5 A5 A5 FF A5 A5 A5 FF A5 A5 A5 FF AE AE'
+ 'AE FF B8 B8 B8 FF BF BF BF FF B1 B1 B1 FF 0A 0A'
+ '0A 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 DF E1 E1 E1 FF E1 E1 E1 FF D4 D2 CF FF A7 99'
+ '8B FF 9B 81 67 FF 9C 7E 61 FF 99 7B 5E FF 9B 7C'
+ '5E FF 92 75 59 FF 88 6D 53 FF 81 68 50 FF 74 5E'
+ '49 FF 78 6A 5C FF 81 79 71 FF 93 8F 8B FF AC AC'
+ 'AC FF B7 B7 B7 FF BF BF BF FF B4 B4 B4 FF 29 29'
+ '29 FF 00 00 00 1F 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 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 2A 2A'
+ '2A FF E1 E1 E1 FF CE CA C6 FF 9B 81 68 FF C2 9C'
+ '76 FF C2 9B 75 FF B5 91 6E FF A8 86 66 FF 98 7A'
+ '5C FF 8B 70 55 FF 92 75 59 FF 92 75 59 FF 92 75'
+ '59 FF 92 75 59 FF 8E 72 57 FF 81 68 50 FF 78 61'
+ '4C FF 85 75 66 FF 94 8B 82 FF B2 AF AD FF 48 48'
+ '48 FF 00 00 00 4F 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 3F 54 54'
+ '54 FF CE CA C6 FF 9F 85 6A FF C7 A0 79 FF B0 8E'
+ '6D FF 97 7D 65 FF 97 88 7A FF A2 99 90 FF A1 99'
+ '91 FF A3 9C 95 FF 9B 93 8B FF 8A 7F 74 FF 7A 68'
+ '56 FF 7A 63 4C FF 88 6D 53 FF 92 75 59 FF 96 78'
+ '5B FF A0 80 61 FF A3 83 63 FF 8D 72 58 FF 41 38'
+ '2E FF 00 00 00 7F 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 7F 6C 68'
+ '64 FF 9F 85 6A FF BD 99 74 FF 98 82 6C FF C2 BB'
+ 'B4 FF E0 E0 E0 FF D2 D2 D2 FF C1 C1 C1 FF 70 70'
+ '70 FF BB BB BB FF C3 C3 C3 FF D1 D1 D1 FF E1 E1'
+ 'E1 FF CC CA C8 FF AB A5 9F FF 8E 83 78 FF 7C 69'
+ '57 FF 86 6D 54 FF 9B 7D 5F FF AD 8A 69 FF 75 5E'
+ '47 FF 00 00 00 AF 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 AF 79 63'
+ '4C FF B9 95 72 FF 95 82 70 FF DA D9 D8 FF BE BE'
+ 'BE FF 92 92 92 FF 8B 8B 8B FF 8E 8E 8E FF 12 12'
+ '12 FF B9 B9 B9 FF CE CE CE FF C5 C5 C5 FF B5 B5'
+ 'B5 FF B6 B6 B6 FF BD BD BD FF D1 D1 D1 FF E1 E1'
+ 'E1 FF CD CB C9 FF AF A9 A2 FF 8B 7B 6B FF 84 6B'
+ '52 FF 00 00 00 DF 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 CF B9 95'
+ '72 FF 95 82 70 FF DA D9 D8 FF BF BF BF FF A3 A3'
+ 'A3 FF B1 B1 B1 FF B1 B1 B1 FF AC AC AC FF 3A 3A'
+ '3A FF 8A 8A 8A FF F3 F3 F3 FF ED ED ED FF E6 E6'
+ 'E6 FF E0 E0 E0 FF D6 D6 D6 FF C1 C1 C1 FF B1 B1'
+ 'B1 FF AF AF AF FF A7 A7 A7 FF E1 E1 E1 FF AC A7'
+ 'A2 FF 1B 18 15 FF 00 00 00 0F 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 1C 17 12 FF 95 82'
+ '70 FF DA D9 D8 FF 99 99 99 FF AE AE AE FF C1 C1'
+ 'C1 FF C1 C1 C1 FF C1 C1 C1 FF C1 C1 C1 FF 6A 6A'
+ '6A FF 3F 3F 3F FF FE FE FE FF FD FD FD FF F9 F9'
+ 'F9 FF F4 F4 F4 FF EE EE EE FF E8 E8 E8 FF E2 E2'
+ 'E2 FF DC DC DC FF 87 87 87 FF 3A 3A 3A FF D0 D0'
+ 'D0 FF 5E 5E 5E FF 00 00 00 4F 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 3F 39 37 34 FF DA D9'
+ 'D8 FF 8C 8C 8C FF 4F 4F 4F FF D1 D1 D1 FF D1 D1'
+ 'D1 FF D1 D1 D1 FF D1 D1 D1 FF D1 D1 D1 FF B0 B0'
+ 'B0 FF 00 00 00 FF FF FF FF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FD FD FD FF FB FB FB FF F6 F6'
+ 'F6 FF F0 F0 F0 FF CD CD CD FF 00 00 00 FF 92 8C'
+ '87 FF 9A 9A 9A FF 00 00 00 7F 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 6F 7E 7E 7E FF AE AD'
+ 'AC FF 05 05 05 FF A9 A9 A9 FF E1 E1 E1 FF E1 E1'
+ 'E1 FF E1 E1 E1 FF E1 E1 E1 FF E1 E1 E1 FF D1 D1'
+ 'D1 FF 22 22 22 FF AF AF AF FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF FF FF FF FF FF FF FF FF AF AF'
+ 'AF FF 6E 6E 6E FF 1F 1F 1F FF 08 07 06 FF B0 AF'
+ 'AE FF 62 62 62 FF 00 00 00 5F 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 7F 8C 8C 8C FF B9 AE'
+ 'A4 FF 45 3B 31 FF 0A 08 07 FF 39 39 39 FF 8F 8F'
+ '8F FF E6 E6 E6 FF E6 E6 E6 FF E6 E6 E6 FF E3 E3'
+ 'E3 FF 53 53 53 FF 6F 6F 6F FF FF FF FF FF EF EF'
+ 'EF FF 9F 9F 9F FF 4F 4F 4F FF 0F 0F 0F FF 1E 1E'
+ '1E FF 25 23 22 FF 79 67 58 FF C4 BC B4 FF B6 B6'
+ 'B6 FF 11 11 11 CF 00 00 00 0F 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 2F 38 38 38 FF DD DB'
+ 'DA FF BE AC 9B FF A7 8E 77 FF 71 60 51 FF 23 1D'
+ '18 FF 0E 0E 0E FF 64 64 64 FF BA BA BA FF E6 E6'
+ 'E6 FF 8F 8F 8F FF 1F 1F 1F FF 2F 2F 2F FF 00 00'
+ '00 FF 37 37 37 FF 52 52 52 FF 69 69 69 FF 7A 70'
+ '66 FF A5 8E 78 FF CD C3 BA FF B6 B6 B6 FF 0F 0F'
+ '0F EF 00 00 00 2F 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 8F 46 46'
+ '46 FF C4 C4 C4 FF DB D5 D0 FF D2 C3 B6 FF CD B7'
+ 'A2 FF A5 8C 75 FF 4E 42 37 FF 0D 0B 09 FF 2B 2B'
+ '2B FF 8E 8E 8E FF 47 47 47 FF 1C 1C 1C FF 5F 54'
+ '49 FF 8B 7C 6D FF A3 8E 7A FF C2 A5 8B FF CA AE'
+ '94 FF D6 CB C1 FF B6 B6 B6 FF 0F 0F 0F EF 00 00'
+ '00 2F 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 4F 00 00 00 CF 46 46 46 FF 7E 7E 7E FF B6 B6'
+ 'B6 FF E1 E1 E1 FF DE D6 CF FF D0 C1 B4 FF 8D 80'
+ '74 FF 3A 31 29 FF 0E 0E 0E FF 00 00 00 FF D3 B3'
+ '96 FF E1 BE 9F FF E0 C0 A3 FF DE C9 B6 FF DF DB'
+ 'D8 FF A8 A8 A8 FF 0F 0F 0F EF 00 00 00 2F 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 1F 00 00 00 5F 00 00'
+ '00 9F 10 10 10 DF 46 46 46 FF 7E 7E 7E FF B6 B6'
+ 'B6 FF E1 E1 E1 FF C5 C3 C1 FF B7 B5 B3 FF E4 DB'
+ 'D3 FF E2 DE DA FF E1 E1 E1 FF 9A 9A 9A FF 54 54'
+ '54 FF 00 00 00 BF 00 00 00 0F 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 1F 00 00 00 5F 00 00'
+ '00 9F 10 10 10 DF 38 38 38 FF 38 38 38 FF 38 38'
+ '38 FF 2A 2A 2A FF 00 00 00 DF 00 00 00 9F 00 00'
+ '00 3F 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00'
+ '00 00 00 00 00 00 00 00 00 00 00 00 00 00 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 F8'
+ '1F FF FF E0 01 FF FF C0 00 FF FF 80 00 7F FF 00'
+ '00 7F FF 00 00 7F FF 00 00 3F FF 00 00 3F FE 00'
+ '00 3F FE 00 00 3F FE 00 00 3F FE 00 00 1F FE 00'
+ '00 1F FC 00 00 1F FC 00 00 1F FC 00 00 1F FC 00'
+ '00 1F FC 00 00 0F F8 00 00 0F F8 00 00 0F F8 00'
+ '00 0F F8 00 00 1F F8 00 00 3F FC 00 00 7F FF 00'
+ '00 FF FF F0 01 FF FF FF 0F FF FF FF FF FF FF FF'
+ 'FF FF FF FF FF FF'
+} */
+
/* BINRES delete.ico */
IDI_SHELL_CONFIRM_DELETE ICON delete.ico
/* {
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index 53455ed..2f85532 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -44,16 +44,6 @@
#define IDS_VIEW_LIST 26
#define IDS_VIEW_DETAILS 27
-#define IDS_CREATEFOLDER_DENIED 30
-#define IDS_CREATEFOLDER_CAPTION 31
-#define IDS_DELETEITEM_CAPTION 32
-#define IDS_DELETEFOLDER_CAPTION 33
-#define IDS_DELETEITEM_TEXT 34
-#define IDS_DELETEMULTIPLE_TEXT 35
-#define IDS_OVERWRITEFILE_CAPTION 36
-#define IDS_OVERWRITEFILE_TEXT 37
-#define IDS_DELETESELECTED_TEXT 38
-
#define IDS_RESTART_TITLE 40
#define IDS_RESTART_PROMPT 41
#define IDS_SHUTDOWN_TITLE 42
@@ -87,6 +77,19 @@
#define IDS_COMMON_VIDEO 70
#define IDS_CDBURN_AREA 71
+#define IDS_CREATEFOLDER_DENIED 128
+#define IDS_CREATEFOLDER_CAPTION 129
+#define IDS_DELETEITEM_CAPTION 130
+#define IDS_DELETEFOLDER_CAPTION 131
+#define IDS_DELETEITEM_TEXT 132
+#define IDS_DELETEMULTIPLE_TEXT 133
+#define IDS_OVERWRITEFILE_CAPTION 134
+#define IDS_OVERWRITEFILE_TEXT 135
+#define IDS_DELETESELECTED_TEXT 136
+#define IDS_TRASHFOLDER_TEXT 137
+#define IDS_TRASHITEM_TEXT 138
+#define IDS_TRASHMULTIPLE_TEXT 139
+
/* browse for folder dialog box */
#define IDD_STATUS 0x3743
#define IDD_TITLE 0x3742
@@ -118,7 +121,8 @@
#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_TRASH_FILE 142
+#define IDI_SHELL_CONFIRM_DELETE 161
#define IDI_SHELL_MY_DOCUMENTS 235
/*
