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
3cac7e1d
Commit
3cac7e1d
authored
Mar 31, 2022
by
Sven Baars
Committed by
Alexandre Julliard
Mar 31, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemenubuilder: Use the full path name when extracting an icon.
Signed-off-by:
Sven Baars
<
sbaars@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8a17ad4b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
3 deletions
+12
-3
winemenubuilder.c
programs/winemenubuilder/winemenubuilder.c
+12
-3
No files found.
programs/winemenubuilder/winemenubuilder.c
View file @
3cac7e1d
...
...
@@ -1146,16 +1146,25 @@ static WCHAR *extract_icon(LPCWSTR icoPathW, int index, const WCHAR *destFilenam
int
numEntries
;
HRESULT
hr
;
WCHAR
*
nativeIdentifier
=
NULL
;
WCHAR
fullPathW
[
MAX_PATH
];
DWORD
len
;
WINE_TRACE
(
"path=[%s] index=%d destFilename=[%s]
\n
"
,
wine_dbgstr_w
(
icoPathW
),
index
,
wine_dbgstr_w
(
destFilename
));
hr
=
open_icon
(
icoPathW
,
index
,
bWait
,
&
stream
,
&
pIconDirEntries
,
&
numEntries
);
len
=
GetFullPathNameW
(
icoPathW
,
MAX_PATH
,
fullPathW
,
NULL
);
if
(
len
==
0
||
len
>
MAX_PATH
)
{
WINE_WARN
(
"GetFullPathName failed
\n
"
);
return
NULL
;
}
hr
=
open_icon
(
fullPathW
,
index
,
bWait
,
&
stream
,
&
pIconDirEntries
,
&
numEntries
);
if
(
FAILED
(
hr
))
{
WINE_WARN
(
"opening icon %s index %d failed, hr=0x%08lX
\n
"
,
wine_dbgstr_w
(
ico
PathW
),
index
,
hr
);
WINE_WARN
(
"opening icon %s index %d failed, hr=0x%08lX
\n
"
,
wine_dbgstr_w
(
full
PathW
),
index
,
hr
);
goto
end
;
}
hr
=
platform_write_icon
(
stream
,
pIconDirEntries
,
numEntries
,
index
,
ico
PathW
,
destFilename
,
&
nativeIdentifier
);
hr
=
platform_write_icon
(
stream
,
pIconDirEntries
,
numEntries
,
index
,
full
PathW
,
destFilename
,
&
nativeIdentifier
);
if
(
FAILED
(
hr
))
WINE_WARN
(
"writing icon failed, error 0x%08lX
\n
"
,
hr
);
...
...
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