=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: dmusic: Fix compilation on systems that don't support nameless structs or unions.
Alexandre Julliard
julliard at winehq.org
Thu Jul 20 12:11:30 CDT 2017
Module: wine
Branch: stable
Commit: 72e183277239d6fd7a3e0c0ba4952486107078fa
URL: http://source.winehq.org/git/wine.git/?a=commit;h=72e183277239d6fd7a3e0c0ba4952486107078fa
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Thu May 11 09:35:33 2017 +0200
dmusic: Fix compilation on systems that don't support nameless structs or unions.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 829ef41481c6fe1a1254f769e554e73acd98e1ef)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
---
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 cfe03fc..99ab212 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 07da1ae..921e26c 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -720,18 +720,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);
More information about the wine-cvs
mailing list