Re: [PATCH 2/4] dsound: Use nameless unions.

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Tue, Mar 30, 2021 at 08:09:43PM +0200, Jacek Caban wrote:
> Signed-off-by: Jacek Caban
>
> dlls/dsound/Makefile.in   | 1 -
>  dlls/dsound/dsound_main.c | 6 +++---
>  dlls/dsound/primary.c     | 2 +-
>  dlls/dsound/propset.c     | 2 +-
>  4 files changed, 5 insertions(+), 6 deletions(-)
> diff --git a/dlls/dsound/Makefile.in b/dlls/dsound/Makefile.in
> index f9f61e501f0f..909b38c06328 100644
> --- a/dlls/dsound/Makefile.in
> +++ b/dlls/dsound/Makefile.in
> @@ -1,7 +1,6 @@
>  MODULE    = dsound.dll
>  IMPORTLIB = dsound
>  IMPORTS   = dxguid uuid winmm ole32 advapi32 user32
> -EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
>
> EXTRADLLFLAGS = -mno-cygwin
>
> diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
> index ca33ba480469..25c5f7bbf468 100644
> --- a/dlls/dsound/dsound_main.c
> +++ b/dlls/dsound/dsound_main.c
> @@ -213,7 +213,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps,
>          return hr;
>      }
> - CLSIDFromString(pv.u.pwszVal, guid);
> -
>
> CLSIDFromString(pv.pwszVal, guid);
>
> PropVariantClear(&pv);
> IPropertyStore_Release(ps);
>
> @@ -432,9 +432,9 @@ static BOOL send_device(IMMDevice *device, GUID *guid,
>      }
>  TRACE("Calling back with %s (%s)\n", wine_dbgstr_guid(guid),
> -
>        wine_dbgstr_w(pv.u.pwszVal));
> -
>        wine_dbgstr_w(pv.pwszVal));
>
> - keep_going = cb(guid, pv.u.pwszVal, wine_vxd_drv, user);
> -
>
> keep_going = cb(guid, pv.pwszVal, wine_vxd_drv, user);
>
> PropVariantClear(&pv);
> IPropertyStore_Release(ps);
>
> diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
> index 655f730b3754..e7da015a5335 100644
> --- a/dlls/dsound/primary.c
> +++ b/dlls/dsound/primary.c
> @@ -90,7 +90,7 @@ static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels)
>          return def;
>      }
> - phys_speakers = pv.u.ulVal;
> -
>
> phys_speakers = pv.ulVal;
>
> PropVariantClear(&pv);
> IPropertyStore_Release(store);
>
> diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c
> index f1f71bef135e..959256f8c4e0 100644
> --- a/dlls/dsound/propset.c
> +++ b/dlls/dsound/propset.c
> @@ -246,7 +246,7 @@ static HRESULT DSPROPERTY_DescriptionW(
>          return hr;
>      }
> - ppd->Description = strdupW(pv.u.pwszVal);
> - ppd->Description = strdupW(pv.pwszVal);
> ppd->Module = strdupW(wine_vxd_drv);
> ppd->Interface = strdupW(wInterface);
> ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;