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
b8ee4458
Commit
b8ee4458
authored
Sep 19, 2012
by
Per Johansson
Committed by
Alexandre Julliard
Sep 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemenubuilder: Don't treat empty string as a valid icon file name.
parent
43950079
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
winemenubuilder.c
programs/winemenubuilder/winemenubuilder.c
+4
-2
No files found.
programs/winemenubuilder/winemenubuilder.c
View file @
b8ee4458
...
...
@@ -2978,6 +2978,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
PROPSPEC
ps
[
2
];
PROPVARIANT
pv
[
2
];
char
*
start_path
=
NULL
;
BOOL
has_icon
=
FALSE
;
if
(
!
link
)
{
...
...
@@ -3041,8 +3042,9 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
hr
=
IPropertyStorage_ReadMultiple
(
pPropStg
,
2
,
ps
,
pv
);
if
(
SUCCEEDED
(
hr
))
{
if
(
pv
[
0
].
vt
==
VT_LPWSTR
&&
pv
[
0
].
u
.
pwszVal
)
if
(
pv
[
0
].
vt
==
VT_LPWSTR
&&
pv
[
0
].
u
.
pwszVal
&&
pv
[
0
].
u
.
pwszVal
[
0
]
)
{
has_icon
=
TRUE
;
icon_name
=
extract_icon
(
pv
[
0
].
u
.
pwszVal
,
pv
[
1
].
u
.
iVal
,
NULL
,
bWait
);
WINE_TRACE
(
"URL icon path: %s icon index: %d icon name: %s
\n
"
,
wine_dbgstr_w
(
pv
[
0
].
u
.
pwszVal
),
pv
[
1
].
u
.
iVal
,
icon_name
);
...
...
@@ -3056,7 +3058,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
}
/* fail - try once again after parent process exit */
if
(
!
icon_name
)
if
(
has_icon
&&
!
icon_name
)
{
if
(
bWait
)
{
...
...
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