=?UTF-8?Q?Andr=C3=A9=20Hentschel=20?=: dmsynth: Fix compilation on systems that don't support nameless structs or unions.
Alexandre Julliard
julliard at winehq.org
Mon Nov 19 13:38:38 CST 2012
Module: wine
Branch: master
Commit: ac90476211c30a0db5b8c83d5a3279841f4dc119
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac90476211c30a0db5b8c83d5a3279841f4dc119
Author: André Hentschel <nerv at dawncrow.de>
Date: Sat Nov 17 22:48:01 2012 +0100
dmsynth: Fix compilation on systems that don't support nameless structs or unions.
---
dlls/dmsynth/synth.c | 20 +++++++++++---------
dlls/dmsynth/synthsink.c | 12 +++++++-----
2 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c
index f34594d..3ca5c53 100644
--- a/dlls/dmsynth/synth.c
+++ b/dlls/dmsynth/synth.c
@@ -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);
}
diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c
index 4d2001c..c5a1c7e 100644
--- a/dlls/dmsynth/synthsink.c
+++ b/dlls/dmsynth/synthsink.c
@@ -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);
}
More information about the wine-cvs
mailing list