Module: wine Branch: master Commit: 29191436b4e3d822c87df80f3dfe4ae7805ac47d URL: https://gitlab.winehq.org/wine/wine/-/commit/29191436b4e3d822c87df80f3dfe4ae...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Aug 15 17:27:45 2023 +0200
mmdevapi: Use nameless unions/structs.
---
dlls/mmdevapi/devenum.c | 7 +++---- dlls/mmdevapi/spatialaudio.c | 1 - 2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 6344ec66d34..b87b082e6ef 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -18,7 +18,6 @@
#include <stdarg.h>
-#define NONAMELESSUNION #define COBJMACROS #include "windef.h" #include "winbase.h" @@ -1546,13 +1545,13 @@ static ULONG WINAPI PB_Release(IPropertyBag *iface) static HRESULT WINAPI PB_Read(IPropertyBag *iface, LPCOLESTR name, VARIANT *var, IErrorLog *log) { IPropertyBagImpl *This = impl_from_IPropertyBag(iface); - TRACE("Trying to read %s, type %u\n", debugstr_w(name), var->n1.n2.vt); + TRACE("Trying to read %s, type %u\n", debugstr_w(name), var->vt); if (!lstrcmpW(name, L"DSGuid")) { WCHAR guidstr[39]; StringFromGUID2(&This->devguid, guidstr,ARRAY_SIZE(guidstr)); - var->n1.n2.vt = VT_BSTR; - var->n1.n2.n3.bstrVal = SysAllocString(guidstr); + var->vt = VT_BSTR; + var->bstrVal = SysAllocString(guidstr); return S_OK; } ERR("Unknown property '%s' queried\n", debugstr_w(name)); diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index 8feb8e66ed2..9bd14038e1d 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -17,7 +17,6 @@ */
#define COBJMACROS -#define NONAMELESSUNION
#include <stdarg.h>