Module: wine Branch: master Commit: 43ed6c6d670910f001ae4aa20c312a85c7316141 URL: https://gitlab.winehq.org/wine/wine/-/commit/43ed6c6d670910f001ae4aa20c312a8...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Jul 12 15:47:38 2023 +0200
dmusic: Use nameless unions/structs.
---
dlls/dmusic/dmusic_private.h | 3 --- dlls/dmusic/port.c | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 1b91f4bac94..d6abf1d1f81 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -25,9 +25,6 @@ #include <stdarg.h>
#define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 8549c62c4b1..225191d5905 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -725,18 +725,18 @@ static HRESULT WINAPI IKsControlImpl_KsProperty(IKsControl *iface, KSPROPERTY *p ULONG prop_len, void *data, ULONG data_len, ULONG *ret_len) { TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, prop, prop_len, data, data_len, ret_len); - TRACE("prop = %s - %lu - %lu\n", debugstr_guid(&prop->u.s.Set), prop->u.s.Id, prop->u.s.Flags); + TRACE("prop = %s - %lu - %lu\n", debugstr_guid(&prop->Set), prop->Id, prop->Flags);
- if (prop->u.s.Flags != KSPROPERTY_TYPE_GET) + if (prop->Flags != KSPROPERTY_TYPE_GET) { - FIXME("prop flags %lu not yet supported\n", prop->u.s.Flags); + FIXME("prop flags %lu not yet supported\n", prop->Flags); return S_FALSE; }
if (data_len < sizeof(DWORD)) return E_NOT_SUFFICIENT_BUFFER;
- FIXME("Unknown property %s\n", debugstr_guid(&prop->u.s.Set)); + FIXME("Unknown property %s\n", debugstr_guid(&prop->Set)); *(DWORD*)data = FALSE; *ret_len = sizeof(DWORD);