Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
d52e0478
Commit
d52e0478
authored
25 years ago
by
Juergen Schmied
Committed by
Alexandre Julliard
25 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix for OpenIcon.
parent
2ff02949
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/shell32/folders.c
+1
-1
1 addition, 1 deletion
dlls/shell32/folders.c
dlls/shell32/iconcache.c
+17
-8
17 additions, 8 deletions
dlls/shell32/iconcache.c
with
18 additions
and
9 deletions
dlls/shell32/folders.c
+
1
−
1
View file @
d52e0478
...
...
@@ -191,7 +191,7 @@ static HRESULT WINAPI IExtractIconA_fnGetIconLocation(
else
{
lstrcpynA
(
szIconFile
,
"shell32.dll"
,
cchMax
);
*
piIndex
=
3
;
*
piIndex
=
(
uFlags
&
GIL_OPENICON
)
?
4
:
3
;
}
}
else
/* object is file */
...
...
This diff is collapsed.
Click to expand it.
dlls/shell32/iconcache.c
+
17
−
8
View file @
d52e0478
...
...
@@ -614,7 +614,8 @@ BOOL SIC_Initialize(void)
return
TRUE
;
InitializeCriticalSection
(
&
SHELL32_SicCS
);
MakeCriticalSectionGlobal
(
&
SHELL32_SicCS
);
sic_hdpa
=
pDPA_Create
(
16
);
if
(
!
sic_hdpa
)
...
...
@@ -672,6 +673,7 @@ void SIC_Destroy(void)
sic_hdpa
=
NULL
;
LeaveCriticalSection
(
&
SHELL32_SicCS
);
DeleteCriticalSection
(
&
SHELL32_SicCS
);
}
/*************************************************************************
* Shell_GetImageList [SHELL32.71]
...
...
@@ -698,23 +700,30 @@ BOOL WINAPI Shell_GetImageList(HIMAGELIST * lpBigList, HIMAGELIST * lpSmallList)
* sh [IN] IShellFolder
* pidl [IN]
* bBigIcon [IN]
* uFlags [IN] GIL_*
* pIndex [OUT] index within the SIC
*
*/
BOOL
PidlToSicIndex
(
IShellFolder
*
sh
,
LPITEMIDLIST
pidl
,
BOOL
bBigIcon
,
UINT
*
pIndex
)
BOOL
PidlToSicIndex
(
IShellFolder
*
sh
,
LPITEMIDLIST
pidl
,
BOOL
bBigIcon
,
UINT
uFlags
,
UINT
*
pIndex
)
{
IExtractIcon
*
ei
;
IExtractIcon
A
*
ei
;
char
szIconFile
[
MAX_PATH
];
/* file containing the icon */
INT
iSourceIndex
;
/* index or resID(negated) in this file */
BOOL
ret
=
FALSE
;
UINT
dwFlags
=
0
;
TRACE
(
"sf=%p pidl=%p
\n
"
,
sh
,
pidl
);
TRACE
(
"sf=%p pidl=%p
%s
\n
"
,
sh
,
pidl
,
bBigIcon
?
"Big"
:
"Small"
);
if
(
SUCCEEDED
(
IShellFolder_GetUIObjectOf
(
sh
,
0
,
1
,
&
pidl
,
&
IID_IExtractIconA
,
0
,
(
void
**
)
&
ei
)))
{
if
(
NOERROR
==
IExtractIconA_GetIconLocation
(
ei
,
0
,
szIconFile
,
MAX_PATH
,
&
iSourceIndex
,
&
dwFlags
))
{
*
pIndex
=
SIC_GetIconIndex
(
szIconFile
,
iSourceIndex
);
if
(
SUCCEEDED
(
IExtractIconA_GetIconLocation
(
ei
,
uFlags
,
szIconFile
,
MAX_PATH
,
&
iSourceIndex
,
&
dwFlags
)))
{
*
pIndex
=
SIC_GetIconIndex
(
szIconFile
,
iSourceIndex
);
ret
=
TRUE
;
}
IExtractIconA_Release
(
ei
);
...
...
@@ -744,8 +753,8 @@ UINT WINAPI SHMapPIDLToSystemImageListIndex(LPSHELLFOLDER sh, LPITEMIDLIST pidl,
pdump
(
pidl
);
if
(
pIndex
)
PidlToSicIndex
(
sh
,
pidl
,
1
,
pIndex
);
PidlToSicIndex
(
sh
,
pidl
,
0
,
&
Index
);
PidlToSicIndex
(
sh
,
pidl
,
1
,
0
,
pIndex
);
PidlToSicIndex
(
sh
,
pidl
,
0
,
0
,
&
Index
);
return
Index
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment