Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
4b5d0f2f
Commit
4b5d0f2f
authored
Aug 14, 2018
by
Alex Henrie
Committed by
Alexandre Julliard
Aug 17, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shell32: Rename IDI_SHELL_DOCUMENT to IDI_SHELL_FILE.
Signed-off-by:
Alex Henrie
<
alexhenrie24@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
25ba7708
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
8 deletions
+9
-8
iconcache.c
dlls/shell32/iconcache.c
+6
-6
shell32.rc
dlls/shell32/shell32.rc
+2
-1
shresdef.h
dlls/shell32/shresdef.h
+1
-1
No files found.
dlls/shell32/iconcache.c
View file @
4b5d0f2f
...
@@ -467,8 +467,8 @@ static BOOL WINAPI SIC_Initialize( INIT_ONCE *once, void *param, void **context
...
@@ -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
...
@@ -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
...
@@ -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
)
...
...
dlls/shell32/shell32.rc
View file @
4b5d0f2f
...
@@ -418,8 +418,9 @@ BEGIN
...
@@ -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
...
...
dlls/shell32/shresdef.h
View file @
4b5d0f2f
...
@@ -169,7 +169,7 @@
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment