Alex Henrie : shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE.
Alexandre Julliard
julliard at winehq.org
Thu Nov 29 15:09:31 CST 2018
Module: wine
Branch: stable
Commit: f91fdd57c5d53b1104162afeac49255772b03342
URL: https://source.winehq.org/git/wine.git/?a=commit;h=f91fdd57c5d53b1104162afeac49255772b03342
Author: Alex Henrie <alexhenrie24 at gmail.com>
Date: Tue Aug 14 22:09:56 2018 -0600
shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE.
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 4b5d0f2f43ad1d34b1e3fb4424615c918487e68c)
Conflicts:
dlls/shell32/iconcache.c
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
dlls/shell32/iconcache.c | 12 ++++++------
dlls/shell32/shell32.rc | 3 ++-
dlls/shell32/shresdef.h | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c
index fc4e703..2c7f84e 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -467,19 +467,19 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context
ImageList_SetBkColor(ShellBigIconList, CLR_NONE);
/* Load the document icon, which is used as the default if an icon isn't found. */
- hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT),
+ hSm = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_FILE),
IMAGE_ICON, cx_small, cy_small, LR_SHARED);
- hLg = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT),
+ hLg = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_FILE),
IMAGE_ICON, cx_large, cy_large, LR_SHARED);
if (!hSm || !hLg)
{
- FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n");
+ FIXME("Failed to load IDI_SHELL_FILE icon!\n");
return FALSE;
}
- SIC_IconAppend (swShell32Name, IDI_SHELL_DOCUMENT-1, hSm, hLg, 0);
- SIC_IconAppend (swShell32Name, -IDI_SHELL_DOCUMENT, hSm, hLg, 0);
+ SIC_IconAppend (swShell32Name, IDI_SHELL_FILE-1, hSm, hLg, 0);
+ SIC_IconAppend (swShell32Name, -IDI_SHELL_FILE, hSm, hLg, 0);
TRACE("hIconSmall=%p hIconBig=%p\n",ShellSmallIconList, ShellBigIconList);
@@ -1005,7 +1005,7 @@ HRESULT WINAPI SHGetStockIconInfo(SHSTOCKICONID id, UINT flags, SHSTOCKICONINFO
GetSystemDirectoryW(sii->szPath, MAX_PATH);
/* no icons defined: use default */
- sii->iIcon = -IDI_SHELL_DOCUMENT;
+ sii->iIcon = -IDI_SHELL_FILE;
lstrcatW(sii->szPath, shell32dll);
if (flags)
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 6585416..463a187 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -352,8 +352,9 @@ BEGIN
VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY
END
+/* FIXME: Following resource is not yet added */
/* @makedep: document.ico */
-IDI_SHELL_DOCUMENT ICON document.ico
+IDI_SHELL_FILE ICON document.ico
/* @makedep: folder.ico */
IDI_SHELL_FOLDER ICON folder.ico
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
index 183a75e..85c1684 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -165,7 +165,7 @@
#define IDD_TITLE 0x3742
#define IDD_TREEVIEW 0x3741
-#define IDI_SHELL_DOCUMENT 1
+#define IDI_SHELL_FILE 1
#define IDI_SHELL_FOLDER 4
#define IDI_SHELL_FOLDER_OPEN 5
#define IDI_SHELL_5_12_FLOPPY 6
More information about the wine-cvs
mailing list