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
ac904762
Commit
ac904762
authored
Nov 17, 2012
by
André Hentschel
Committed by
Alexandre Julliard
Nov 19, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dmsynth: Fix compilation on systems that don't support nameless structs or unions.
parent
ed4ce217
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
14 deletions
+18
-14
synth.c
dlls/dmsynth/synth.c
+11
-9
synthsink.c
dlls/dmsynth/synthsink.c
+7
-5
No files found.
dlls/dmsynth/synth.c
View file @
ac904762
...
...
@@ -21,6 +21,8 @@
#define COBJMACROS
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "objbase.h"
#include "initguid.h"
#include "dmksctrl.h"
...
...
@@ -418,45 +420,45 @@ static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPR
{
TRACE
(
"(%p)->(%p, %u, %p, %u, %p)
\n
"
,
iface
,
Property
,
PropertyLength
,
PropertyData
,
DataLength
,
BytesReturned
);
TRACE
(
"Property = %s - %u - %u
\n
"
,
debugstr_guid
(
&
Property
->
Set
),
Property
->
Id
,
Property
->
Flags
);
TRACE
(
"Property = %s - %u - %u
\n
"
,
debugstr_guid
(
&
Property
->
u
.
s
.
Set
),
Property
->
u
.
s
.
Id
,
Property
->
u
.
s
.
Flags
);
if
(
Property
->
Flags
!=
KSPROPERTY_TYPE_GET
)
if
(
Property
->
u
.
s
.
Flags
!=
KSPROPERTY_TYPE_GET
)
{
FIXME
(
"Property flags %u not yet supported
\n
"
,
Property
->
Flags
);
FIXME
(
"Property flags %u not yet supported
\n
"
,
Property
->
u
.
s
.
Flags
);
return
S_FALSE
;
}
if
(
DataLength
<
sizeof
(
DWORD
))
return
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
);
if
(
IsEqualGUID
(
&
Property
->
Set
,
&
GUID_DMUS_PROP_INSTRUMENT2
))
if
(
IsEqualGUID
(
&
Property
->
u
.
s
.
Set
,
&
GUID_DMUS_PROP_INSTRUMENT2
))
{
*
(
DWORD
*
)
PropertyData
=
TRUE
;
*
BytesReturned
=
sizeof
(
DWORD
);
}
else
if
(
IsEqualGUID
(
&
Property
->
Set
,
&
GUID_DMUS_PROP_DLS2
))
else
if
(
IsEqualGUID
(
&
Property
->
u
.
s
.
Set
,
&
GUID_DMUS_PROP_DLS2
))
{
*
(
DWORD
*
)
PropertyData
=
TRUE
;
*
BytesReturned
=
sizeof
(
DWORD
);
}
else
if
(
IsEqualGUID
(
&
Property
->
Set
,
&
GUID_DMUS_PROP_GM_Hardware
))
else
if
(
IsEqualGUID
(
&
Property
->
u
.
s
.
Set
,
&
GUID_DMUS_PROP_GM_Hardware
))
{
*
(
DWORD
*
)
PropertyData
=
FALSE
;
*
BytesReturned
=
sizeof
(
DWORD
);
}
else
if
(
IsEqualGUID
(
&
Property
->
Set
,
&
GUID_DMUS_PROP_GS_Hardware
))
else
if
(
IsEqualGUID
(
&
Property
->
u
.
s
.
Set
,
&
GUID_DMUS_PROP_GS_Hardware
))
{
*
(
DWORD
*
)
PropertyData
=
FALSE
;
*
BytesReturned
=
sizeof
(
DWORD
);
}
else
if
(
IsEqualGUID
(
&
Property
->
Set
,
&
GUID_DMUS_PROP_XG_Hardware
))
else
if
(
IsEqualGUID
(
&
Property
->
u
.
s
.
Set
,
&
GUID_DMUS_PROP_XG_Hardware
))
{
*
(
DWORD
*
)
PropertyData
=
FALSE
;
*
BytesReturned
=
sizeof
(
DWORD
);
}
else
{
FIXME
(
"Unknown property %s
\n
"
,
debugstr_guid
(
&
Property
->
Set
));
FIXME
(
"Unknown property %s
\n
"
,
debugstr_guid
(
&
Property
->
u
.
s
.
Set
));
*
(
DWORD
*
)
PropertyData
=
FALSE
;
*
BytesReturned
=
sizeof
(
DWORD
);
}
...
...
dlls/dmsynth/synthsink.c
View file @
ac904762
...
...
@@ -19,6 +19,8 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#define NONAMELESSUNION
#define NONAMELESSSTRUCT
#include "dmsynth_private.h"
#include "initguid.h"
#include "uuids.h"
...
...
@@ -212,25 +214,25 @@ static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, P
{
TRACE
(
"(%p)->(%p, %u, %p, %u, %p)
\n
"
,
iface
,
Property
,
PropertyLength
,
PropertyData
,
DataLength
,
BytesReturned
);
TRACE
(
"Property = %s - %u - %u
\n
"
,
debugstr_guid
(
&
Property
->
Set
),
Property
->
Id
,
Property
->
Flags
);
TRACE
(
"Property = %s - %u - %u
\n
"
,
debugstr_guid
(
&
Property
->
u
.
s
.
Set
),
Property
->
u
.
s
.
Id
,
Property
->
u
.
s
.
Flags
);
if
(
Property
->
Flags
!=
KSPROPERTY_TYPE_GET
)
if
(
Property
->
u
.
s
.
Flags
!=
KSPROPERTY_TYPE_GET
)
{
FIXME
(
"Property flags %u not yet supported
\n
"
,
Property
->
Flags
);
FIXME
(
"Property flags %u not yet supported
\n
"
,
Property
->
u
.
s
.
Flags
);
return
S_FALSE
;
}
if
(
DataLength
<
sizeof
(
DWORD
))
return
HRESULT_FROM_WIN32
(
ERROR_INSUFFICIENT_BUFFER
);
if
(
IsEqualGUID
(
&
Property
->
Set
,
&
GUID_DMUS_PROP_SinkUsesDSound
))
if
(
IsEqualGUID
(
&
Property
->
u
.
s
.
Set
,
&
GUID_DMUS_PROP_SinkUsesDSound
))
{
*
(
DWORD
*
)
PropertyData
=
TRUE
;
*
BytesReturned
=
sizeof
(
DWORD
);
}
else
{
FIXME
(
"Unknown property %s
\n
"
,
debugstr_guid
(
&
Property
->
Set
));
FIXME
(
"Unknown property %s
\n
"
,
debugstr_guid
(
&
Property
->
u
.
s
.
Set
));
*
(
DWORD
*
)
PropertyData
=
FALSE
;
*
BytesReturned
=
sizeof
(
DWORD
);
}
...
...
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