Module: wine Branch: master Commit: 0536299a9981246425785f2501b7894af08da854 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0536299a9981246425785f250...
Author: Jacek Caban jacek@codeweavers.com Date: Tue Mar 30 20:09:43 2021 +0200
dsound: Use nameless unions.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Andrew Eikum aeikum@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
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 f9f61e501f0..909b38c0632 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 ca33ba48046..25c5f7bbf46 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 655f730b375..e7da015a533 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 f1f71bef135..959256f8c4e 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;