[PATCH] dmusic: Fix compilation on systems that don't support nameless structs or unions.
Józef Kucia
jkucia at codeweavers.com
Thu May 11 02:35:33 CDT 2017
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/dmusic/dmusic_private.h | 2 ++
dlls/dmusic/port.c | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h
index 053d24f..8c77715 100644
--- a/dlls/dmusic/dmusic_private.h
+++ b/dlls/dmusic/dmusic_private.h
@@ -25,6 +25,8 @@
#include <stdarg.h>
#define COBJMACROS
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
#include "windef.h"
#include "winbase.h"
diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index 5f4d918..f2f7599 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -766,18 +766,18 @@ static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *p
ULONG prop_len, void *data, ULONG data_len, ULONG *ret_len)
{
TRACE("(%p)->(%p, %u, %p, %u, %p)\n", iface, prop, prop_len, data, data_len, ret_len);
- TRACE("prop = %s - %u - %u\n", debugstr_guid(&prop->Set), prop->Id, prop->Flags);
+ TRACE("prop = %s - %u - %u\n", debugstr_guid(&prop->u.s.Set), prop->u.s.Id, prop->u.s.Flags);
- if (prop->Flags != KSPROPERTY_TYPE_GET)
+ if (prop->u.s.Flags != KSPROPERTY_TYPE_GET)
{
- FIXME("prop flags %u not yet supported\n", prop->Flags);
+ FIXME("prop flags %u not yet supported\n", prop->u.s.Flags);
return S_FALSE;
}
if (data_len < sizeof(DWORD))
return E_NOT_SUFFICIENT_BUFFER;
- FIXME("Unknown property %s\n", debugstr_guid(&prop->Set));
+ FIXME("Unknown property %s\n", debugstr_guid(&prop->u.s.Set));
*(DWORD*)data = FALSE;
*ret_len = sizeof(DWORD);
--
2.10.2
More information about the wine-patches
mailing list