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>
This commit is contained in:
parent
7c62e6b169
commit
0536299a99
|
@ -1,7 +1,6 @@
|
||||||
MODULE = dsound.dll
|
MODULE = dsound.dll
|
||||||
IMPORTLIB = dsound
|
IMPORTLIB = dsound
|
||||||
IMPORTS = dxguid uuid winmm ole32 advapi32 user32
|
IMPORTS = dxguid uuid winmm ole32 advapi32 user32
|
||||||
EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
|
|
||||||
|
|
||||||
EXTRADLLFLAGS = -mno-cygwin
|
EXTRADLLFLAGS = -mno-cygwin
|
||||||
|
|
||||||
|
|
|
@ -213,7 +213,7 @@ static HRESULT get_mmdevice_guid(IMMDevice *device, IPropertyStore *ps,
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
CLSIDFromString(pv.u.pwszVal, guid);
|
CLSIDFromString(pv.pwszVal, guid);
|
||||||
|
|
||||||
PropVariantClear(&pv);
|
PropVariantClear(&pv);
|
||||||
IPropertyStore_Release(ps);
|
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),
|
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);
|
PropVariantClear(&pv);
|
||||||
IPropertyStore_Release(ps);
|
IPropertyStore_Release(ps);
|
||||||
|
|
|
@ -90,7 +90,7 @@ static DWORD DSOUND_FindSpeakerConfig(IMMDevice *mmdevice, int channels)
|
||||||
return def;
|
return def;
|
||||||
}
|
}
|
||||||
|
|
||||||
phys_speakers = pv.u.ulVal;
|
phys_speakers = pv.ulVal;
|
||||||
|
|
||||||
PropVariantClear(&pv);
|
PropVariantClear(&pv);
|
||||||
IPropertyStore_Release(store);
|
IPropertyStore_Release(store);
|
||||||
|
|
|
@ -246,7 +246,7 @@ static HRESULT DSPROPERTY_DescriptionW(
|
||||||
return hr;
|
return hr;
|
||||||
}
|
}
|
||||||
|
|
||||||
ppd->Description = strdupW(pv.u.pwszVal);
|
ppd->Description = strdupW(pv.pwszVal);
|
||||||
ppd->Module = strdupW(wine_vxd_drv);
|
ppd->Module = strdupW(wine_vxd_drv);
|
||||||
ppd->Interface = strdupW(wInterface);
|
ppd->Interface = strdupW(wInterface);
|
||||||
ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;
|
ppd->Type = DIRECTSOUNDDEVICE_TYPE_VXD;
|
||||||
|
|
Loading…
Reference in New Issue