Module: wine Branch: master Commit: 2bf29480c51a7fff73433978e79a785bedd06aea URL: https://gitlab.winehq.org/wine/wine/-/commit/2bf29480c51a7fff73433978e79a785...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Jul 12 15:47:23 2023 +0200
dmsynth: Use nameless unions/structs.
---
dlls/dmsynth/synth.c | 21 +++++++++------------ dlls/dmsynth/synthsink.c | 12 +++++------- 2 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 3631bcfe784..b579c15c66e 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -20,9 +20,6 @@ */
#define COBJMACROS - -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "objbase.h" #include "initguid.h" #include "dmksctrl.h" @@ -656,45 +653,45 @@ static HRESULT WINAPI DMSynthImpl_IKsControl_KsProperty(IKsControl* iface, PKSPR { TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned);
- TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags); + TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags);
- if (Property->u.s.Flags != KSPROPERTY_TYPE_GET) + if (Property->Flags != KSPROPERTY_TYPE_GET) { - FIXME("Property flags %lu not yet supported\n", Property->u.s.Flags); + FIXME("Property flags %lu not yet supported\n", Property->Flags); return S_FALSE; }
if (DataLength < sizeof(DWORD)) return E_NOT_SUFFICIENT_BUFFER;
- if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_INSTRUMENT2)) + if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_INSTRUMENT2)) { *(DWORD*)PropertyData = TRUE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_DLS2)) + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_DLS2)) { *(DWORD*)PropertyData = TRUE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_GM_Hardware)) + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_GM_Hardware)) { *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_GS_Hardware)) + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_GS_Hardware)) { *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } - else if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_XG_Hardware)) + else if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_XG_Hardware)) { *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } else { - FIXME("Unknown property %s\n", debugstr_guid(&Property->u.s.Set)); + FIXME("Unknown property %s\n", debugstr_guid(&Property->Set)); *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); } diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index a277a05bafb..825ad86013c 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -19,8 +19,6 @@ * 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" @@ -245,25 +243,25 @@ static HRESULT WINAPI DMSynthSinkImpl_IKsControl_KsProperty(IKsControl* iface, P { TRACE("(%p, %p, %lu, %p, %lu, %p)\n", iface, Property, PropertyLength, PropertyData, DataLength, BytesReturned);
- TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->u.s.Set), Property->u.s.Id, Property->u.s.Flags); + TRACE("Property = %s - %lu - %lu\n", debugstr_guid(&Property->Set), Property->Id, Property->Flags);
- if (Property->u.s.Flags != KSPROPERTY_TYPE_GET) + if (Property->Flags != KSPROPERTY_TYPE_GET) { - FIXME("Property flags %lu not yet supported\n", Property->u.s.Flags); + FIXME("Property flags %lu not yet supported\n", Property->Flags); return S_FALSE; }
if (DataLength < sizeof(DWORD)) return E_NOT_SUFFICIENT_BUFFER;
- if (IsEqualGUID(&Property->u.s.Set, &GUID_DMUS_PROP_SinkUsesDSound)) + if (IsEqualGUID(&Property->Set, &GUID_DMUS_PROP_SinkUsesDSound)) { *(DWORD*)PropertyData = TRUE; *BytesReturned = sizeof(DWORD); } else { - FIXME("Unknown property %s\n", debugstr_guid(&Property->u.s.Set)); + FIXME("Unknown property %s\n", debugstr_guid(&Property->Set)); *(DWORD*)PropertyData = FALSE; *BytesReturned = sizeof(DWORD); }