Jacek Caban : winmm: Use nameless unions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 19ca8c7f30c48f7eebea9267a763f24f48ec0c01
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=19ca8c7f30c48f7eebea9267a763f24f48ec0c01

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Mar 24 18:37:02 2021 +0100

winmm: Use nameless unions.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winmm/Makefile.in | 2 +-
 dlls/winmm/lolvldrv.c  | 4 ++--
 dlls/winmm/waveform.c  | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in
index d003a53afe4..c05115d5c58 100644
--- a/dlls/winmm/Makefile.in
+++ b/dlls/winmm/Makefile.in
@@ -1,4 +1,4 @@
-EXTRADEFS = -D_WINMM_ -DWINE_NO_NAMELESS_EXTENSION
+EXTRADEFS = -D_WINMM_
 MODULE    = winmm.dll
 IMPORTLIB = winmm
 IMPORTS   = uuid user32 advapi32 ole32 msacm32
diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c
index d5efc7f6b9f..d3bd5536976 100644
--- a/dlls/winmm/lolvldrv.c
+++ b/dlls/winmm/lolvldrv.c
@@ -532,10 +532,10 @@ static void MMDRV_Init(void)
         goto exit;
     }
 
-    size = WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1,
+    size = WideCharToMultiByte(CP_ACP, 0, pv.pwszVal, -1,
             NULL, 0, NULL, NULL);
     drvA = HeapAlloc(GetProcessHeap(), 0, size);
-    WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, drvA, size, NULL, NULL);
+    WideCharToMultiByte(CP_ACP, 0, pv.pwszVal, -1, drvA, size, NULL, NULL);
 
     MMDRV_Install(drvA, drvA, FALSE);
 
diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c
index 37dfc919174..1159b48b483 100644
--- a/dlls/winmm/waveform.c
+++ b/dlls/winmm/waveform.c
@@ -422,7 +422,7 @@ static HRESULT WINMM_GetFriendlyName(IMMDevice *device, WCHAR *out,
         return hr;
     }
 
-    lstrcpynW(out, var.u.pwszVal, outlen);
+    lstrcpynW(out, var.pwszVal, outlen);
 
     PropVariantClear(&var);
 
@@ -2368,7 +2368,7 @@ static LRESULT DRV_QueryDeviceInterface(WINMM_QueryInterfaceInfo *info)
         return MMSYSERR_ERROR;
     }
 
-    len_bytes = (lstrlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR);
+    len_bytes = (lstrlenW(pv.pwszVal) + 1) * sizeof(WCHAR);
 
     if(info->str){
         if(len_bytes > *info->len_bytes){
@@ -2378,7 +2378,7 @@ static LRESULT DRV_QueryDeviceInterface(WINMM_QueryInterfaceInfo *info)
             return MMSYSERR_INVALPARAM;
         }
 
-        memcpy(info->str, pv.u.pwszVal, len_bytes);
+        memcpy(info->str, pv.pwszVal, len_bytes);
     }else
         *info->len_bytes = len_bytes;