ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE.

Browse Source 
Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alex Henrie 2018-08-14 22:09:56 -06:00 committed by Alexandre Julliard
parent 25ba7708d3
commit 4b5d0f2f43
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/shell32/iconcache.c
View File

@ -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); shell_imagelists[i] = ImageList_Create(sizes[i].cx, sizes[i].cy, ILC_COLOR32 | ILC_MASK, 0, 0x20);
ImageList_SetBkColor(shell_imagelists[i], CLR_NONE); ImageList_SetBkColor(shell_imagelists[i], CLR_NONE);
/* Load the document icon, which is used as the default if an icon isn't found. */ /* 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_DOCUMENT), if (!(hicons[i] = LoadImageA(shell32_hInstance, MAKEINTRESOURCEA(IDI_SHELL_FILE),
IMAGE_ICON, sizes[i].cx, sizes[i].cy, LR_SHARED))) IMAGE_ICON, sizes[i].cx, sizes[i].cy, LR_SHARED)))
{ {
failed = TRUE; failed = TRUE;
@ -477,12 +477,12 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context
if (failed) if (failed)
{ {
FIXME("Failed to load IDI_SHELL_DOCUMENT icon!\n"); FIXME("Failed to load IDI_SHELL_FILE icon!\n");
return FALSE; return FALSE;
} }
SIC_IconAppend(swShell32Name, IDI_SHELL_DOCUMENT - 1, hicons, 0); SIC_IconAppend(swShell32Name, IDI_SHELL_FILE - 1, hicons, 0);
SIC_IconAppend(swShell32Name, -IDI_SHELL_DOCUMENT, 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]); 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); GetSystemDirectoryW(sii->szPath, MAX_PATH);
/* no icons defined: use default */ /* no icons defined: use default */
sii->iIcon = -IDI_SHELL_DOCUMENT; sii->iIcon = -IDI_SHELL_FILE;
lstrcatW(sii->szPath, shell32dll); lstrcatW(sii->szPath, shell32dll);
if (flags) if (flags)

3
dlls/shell32/shell32.rc
View File

@ -418,8 +418,9 @@ BEGIN
VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY VK_F5, FCIDM_SHVIEW_REFRESH, VIRTKEY
END END
/* FIXME: Following resource is not yet added */
/* @makedep: document.ico */ /* @makedep: document.ico */
IDI_SHELL_DOCUMENT ICON document.ico IDI_SHELL_FILE ICON document.ico
/* @makedep: folder.ico */ /* @makedep: folder.ico */
IDI_SHELL_FOLDER ICON folder.ico IDI_SHELL_FOLDER ICON folder.ico

2
dlls/shell32/shresdef.h
View File

@ -169,7 +169,7 @@
#define IDD_TITLE 0x3742 #define IDD_TITLE 0x3742
#define IDD_TREEVIEW 0x3741 #define IDD_TREEVIEW 0x3741
#define IDI_SHELL_DOCUMENT 1 #define IDI_SHELL_FILE 1
#define IDI_SHELL_FOLDER 4 #define IDI_SHELL_FOLDER 4
#define IDI_SHELL_FOLDER_OPEN 5 #define IDI_SHELL_FOLDER_OPEN 5
#define IDI_SHELL_5_12_FLOPPY 6 #define IDI_SHELL_5_12_FLOPPY 6