Alex Henrie : shell32: Add remaining folder icons.
Alexandre Julliard
julliard at winehq.org
Thu Nov 29 15:09:34 CST 2018
Module: wine
Branch: stable
Commit: 1667b0f7097f172d706ab432ace6896672d0ddc1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1667b0f7097f172d706ab432ace6896672d0ddc1
Author: Alex Henrie <alexhenrie24 at gmail.com>
Date: Tue Aug 28 23:47:34 2018 -0600
shell32: Add remaining folder icons.
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 5e53fb4bdf2d90b3ce276ca817f5383a76c75449)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/shell32/shell32.rc | 36 ++++++++++++++++++++++++++++++++++++
dlls/shell32/shresdef.h | 10 ++++++++++
2 files changed, 46 insertions(+)
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index fa55566..1a273a6 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -720,12 +720,28 @@ IDI_SHELL_NETWORK_FAX ICON resources/printer.ico
IDI_SHELL_RESTRICTED ICON resources/restricted.ico
/* FIXME: Following resource is not yet added */
+/* @makedep: resources/folder.ico */
+IDI_SHELL_DEFAULT_FOLDER ICON resources/folder.ico
+
+/* FIXME: Following resource is not yet added */
/* @makedep: resources/security.ico */
IDI_SHELL_USERS ICON resources/security.ico
/* @makedep: resources/mydocs.ico */
IDI_SHELL_MY_DOCUMENTS ICON resources/mydocs.ico
+/* FIXME: Following resource is not yet added */
+/* @makedep: resources/mydocs.ico */
+IDI_SHELL_MY_PICTURES ICON resources/mydocs.ico
+
+/* FIXME: Following resource is not yet added */
+/* @makedep: resources/mydocs.ico */
+IDI_SHELL_MY_MUSIC ICON resources/mydocs.ico
+
+/* FIXME: Following resource is not yet added */
+/* @makedep: resources/mydocs.ico */
+IDI_SHELL_MY_VIDEOS ICON resources/mydocs.ico
+
/* @makedep: resources/rename.ico */
IDI_SHELL_RENAME ICON resources/rename.ico
@@ -736,6 +752,18 @@ IDI_SHELL_COPY ICON resources/copy.ico
IDI_SHELL_EMPTY_RECYCLE_BIN2 ICON resources/trash_file.ico
/* FIXME: Following resource is not yet added */
+/* @makedep: resources/folder.ico */
+IDI_SHELL_NEW_NETWORK_FOLDER ICON resources/folder.ico
+
+/* FIXME: Following resource is not yet added */
+/* @makedep: resources/folder.ico */
+IDI_SHELL_TO_FOLDER ICON resources/folder.ico
+
+/* FIXME: Following resource is not yet added */
+/* @makedep: resources/folder.ico */
+IDI_SHELL_SHARED_FOLDER ICON resources/folder.ico
+
+/* FIXME: Following resource is not yet added */
/* @makedep: resources/security.ico */
IDI_SHELL_USERS_XP ICON resources/security.ico
@@ -746,9 +774,17 @@ IDI_SHELL_USERS_XP2 ICON resources/security.ico
/* @makedep: resources/optical_disc.ico */
IDI_SHELL_OPTICAL_DISC ICON resources/optical_disc.ico
+/* FIXME: Following resource is not yet added */
+/* @makedep: resources/folder.ico */
+IDI_SHELL_NEW_FOLDER ICON resources/folder.ico
+
/* @makedep: resources/favorites.ico */
IDI_SHELL_FAVORITES_SMALL ICON resources/favorites.ico
+/* FIXME: Following resource is not yet added */
+/* @makedep: resources/folder.ico */
+IDI_SHELL_APP_FOLDER_SMALL ICON resources/folder.ico
+
/* @makedep: resources/restricted.ico */
IDI_SHELL_RESTRICTED2 ICON resources/restricted.ico
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index df5f719..1502337 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -282,16 +282,26 @@
#define IDI_SHELL_DEFAULT_NETWORK_FAX 198
#define IDI_SHELL_NETWORK_FAX 199
#define IDI_SHELL_RESTRICTED 200
+/* 201 - 209 not used on Windows */
+#define IDI_SHELL_DEFAULT_FOLDER 210
/* 211 - 219 not used on Windows */
#define IDI_SHELL_USERS 220
#define IDI_SHELL_MY_DOCUMENTS 235
+#define IDI_SHELL_MY_PICTURES 236
+#define IDI_SHELL_MY_MUSIC 237
+#define IDI_SHELL_MY_VIDEOS 238
#define IDI_SHELL_RENAME 242
#define IDI_SHELL_COPY 243
#define IDI_SHELL_EMPTY_RECYCLE_BIN2 254
+#define IDI_SHELL_NEW_NETWORK_FOLDER 258
+#define IDI_SHELL_TO_FOLDER 264
+#define IDI_SHELL_SHARED_FOLDER 267
#define IDI_SHELL_USERS_XP 269
#define IDI_SHELL_USERS_XP2 279
#define IDI_SHELL_OPTICAL_DISC 302
+#define IDI_SHELL_NEW_FOLDER 319
#define IDI_SHELL_FAVORITES_SMALL 322
+#define IDI_SHELL_APP_FOLDER_SMALL 326
#define IDI_SHELL_RESTRICTED2 338
/*
More information about the wine-cvs
mailing list