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
7b28ae53
Commit
7b28ae53
authored
Jan 04, 2011
by
Francois Gouget
Committed by
Alexandre Julliard
Jan 04, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winemenubuilder: Fix compilation on systems that don't support nameless unions.
parent
ce3fcda1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
winemenubuilder.c
programs/winemenubuilder/winemenubuilder.c
+6
-5
No files found.
programs/winemenubuilder/winemenubuilder.c
View file @
7b28ae53
...
...
@@ -78,6 +78,7 @@
#endif
#define COBJMACROS
#define NONAMELESSUNION
#include <windows.h>
#include <shlobj.h>
...
...
@@ -2676,9 +2677,9 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
}
ps
[
0
].
ulKind
=
PRSPEC_PROPID
;
ps
[
0
].
propid
=
PID_IS_ICONFILE
;
ps
[
0
].
u
.
propid
=
PID_IS_ICONFILE
;
ps
[
1
].
ulKind
=
PRSPEC_PROPID
;
ps
[
1
].
propid
=
PID_IS_ICONINDEX
;
ps
[
1
].
u
.
propid
=
PID_IS_ICONINDEX
;
hr
=
url
->
lpVtbl
->
QueryInterface
(
url
,
&
IID_IPropertySetStorage
,
(
void
**
)
&
pPropSetStg
);
if
(
SUCCEEDED
(
hr
))
...
...
@@ -2689,9 +2690,9 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
hr
=
IPropertyStorage_ReadMultiple
(
pPropStg
,
2
,
ps
,
pv
);
if
(
SUCCEEDED
(
hr
))
{
icon_name
=
extract_icon
(
pv
[
0
].
pwszVal
,
pv
[
1
]
.
iVal
,
NULL
,
bWait
);
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
].
pwszVal
),
pv
[
1
]
.
iVal
,
icon_name
);
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
);
PropVariantClear
(
&
pv
[
0
]);
PropVariantClear
(
&
pv
[
1
]);
}
...
...
@@ -2710,7 +2711,7 @@ static BOOL InvokeShellLinkerForURL( IUniformResourceLocatorW *url, LPCWSTR link
goto
cleanup
;
}
WINE_ERR
(
"failed to extract icon from %s
\n
"
,
wine_dbgstr_w
(
pv
[
0
].
pwszVal
));
wine_dbgstr_w
(
pv
[
0
].
u
.
pwszVal
));
}
hSem
=
CreateSemaphoreA
(
NULL
,
1
,
1
,
"winemenubuilder_semaphore"
);
...
...
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