[PATCH 1/4] shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE
Alex Henrie
alexhenrie24 at gmail.com
Tue Aug 14 23:09:56 CDT 2018
Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
This is the icon used for unrecognized files.
---
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 d55bde9bd7..6107e0c33b 100644
--- a/dlls/shell32/iconcache.c
+++ b/dlls/shell32/iconcache.c
@@ -467,8 +467,8 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context
shell_imagelists[i] = ImageList_Create(sizes[i].cx, sizes[i].cy, ILC_COLOR32 | ILC_MASK, 0, 0x20);
ImageList_SetBkColor(shell_imagelists[i], CLR_NONE);
- /* Load the document icon, which is used as the default if an icon isn't found. */
- if (!(hicons[i] = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_DOCUMENT),
+ /* Load the generic file icon, which is used as the default if an icon isn't found. */
+ if (!(hicons[i] = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_FILE),
IMAGE_ICON, sizes[i].cx, sizes[i].cy, LR_SHARED)))
{
failed = TRUE;
@@ -477,12 +477,12 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context
if (failed)
{
- 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, hicons, 0);
- SIC_IconAppend(swShell32Name, -IDI_SHELL_DOCUMENT, hicons, 0);
+ SIC_IconAppend(swShell32Name, IDI_SHELL_FILE - 1, hicons, 0);
+ SIC_IconAppend(swShell32Name, -IDI_SHELL_FILE, hicons, 0);
TRACE("small list=%p, large list=%p\n", shell_imagelists[SHIL_SMALL], shell_imagelists[SHIL_LARGE]);
@@ -1014,7 +1014,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 084b052978..992c70fd07 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -418,8 +418,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 1518de57ff..cf43d4a927 100644
--- a/dlls/shell32/shresdef.h
+++ b/dlls/shell32/shresdef.h
@@ -169,7 +169,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
--
2.18.0
More information about the wine-devel
mailing list