Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
df3c5cfd
Commit
df3c5cfd
authored
Dec 24, 1998
by
Juergen Schmied
Committed by
Alexandre Julliard
Dec 24, 1998
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes crash when running without external shell32.dll.
parent
bf6ee621
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
11 deletions
+5
-11
iconcache.c
dlls/shell32/iconcache.c
+5
-11
No files found.
dlls/shell32/iconcache.c
View file @
df3c5cfd
...
...
@@ -462,14 +462,6 @@ static INT32 SIC_IconAppend (LPCSTR sSourceFile, INT32 dwSourceIndex, HICON32 hS
lpsice
->
sSourceFile
=
HEAP_strdupA
(
GetProcessHeap
(),
0
,
sSourceFile
);
lpsice
->
dwSourceIndex
=
dwSourceIndex
;
/* index = pDPA_Search (hdpa, lpsice, -1, SIC_CompareEntrys, 0, 0);
if ( INVALID_INDEX != index )
{ TRACE(shell, "-- allready inserted\n");
SHFree(lpsice);
return index;
}
*/
index
=
pDPA_InsertPtr
(
hdpa
,
0x7fff
,
lpsice
);
if
(
INVALID_INDEX
==
index
)
{
SHFree
(
lpsice
);
...
...
@@ -512,16 +504,18 @@ static INT32 SIC_LoadIcon (LPCSTR sSourceFile, INT32 dwSourceIndex)
* look in the cache for a proper icon. if not available the icon is taken
* from the file and cached
*/
INT32
SIC_GetIconIndex
(
LPCSTR
sSourceFile
,
INT32
dwSourceIndex
)
static
INT32
SIC_GetIconIndex
(
LPCSTR
sSourceFile
,
INT32
dwSourceIndex
)
{
SIC_ENTRY
sice
;
INT32
index
;
INT32
index
=
INVALID_INDEX
;
TRACE
(
shell
,
"%s %i
\n
"
,
sSourceFile
,
dwSourceIndex
);
sice
.
sSourceFile
=
sSourceFile
;
sice
.
dwSourceIndex
=
dwSourceIndex
;
index
=
pDPA_Search
(
hdpa
,
&
sice
,
-
1
,
SIC_CompareEntrys
,
0
,
0
);
if
(
NULL
!=
pDPA_GetPtr
(
hdpa
,
0
))
{
index
=
pDPA_Search
(
hdpa
,
&
sice
,
-
1L
,
SIC_CompareEntrys
,
0
,
0
);
}
if
(
INVALID_INDEX
==
index
)
{
return
SIC_LoadIcon
(
sSourceFile
,
dwSourceIndex
);
...
...
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