Skip to content

W
wine-cw
Commit 1610c80a authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

winealsa: Use nameless unions.

Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAndrew Eikum <aeikum@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ac23adbd
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 10 deletions
dlls/winealsa.drv/Makefile.in
View file @ 1610c80a
......@@ -2,7 +2,6 @@ MODULE = winealsa.drv
IMPORTS = uuid ole32 advapi32
DELAYIMPORTS = winmm
EXTRALIBS = $(ALSA_LIBS)
EXTRADEFS = -DWINE_NO_NAMELESS_EXTENSION
C_SRCS = \
midi.c \
......
dlls/winealsa.drv/mmdevdrv.c
View file @ 1610c80a
......@@ -4324,15 +4324,15 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI
serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7];
out->vt = VT_LPWSTR;
out->u.pwszVal = CoTaskMemAlloc(128 * sizeof(WCHAR));
out->pwszVal = CoTaskMemAlloc(128 * sizeof(WCHAR));
if(!out->u.pwszVal)
if(!out->pwszVal)
return E_OUTOFMEMORY;
if(connection == AudioDeviceConnectionType_USB)
sprintfW( out->u.pwszVal, usbformatW, vendor_id, product_id, device, serial_number);
sprintfW( out->pwszVal, usbformatW, vendor_id, product_id, device, serial_number);
else if(connection == AudioDeviceConnectionType_PCI)
sprintfW( out->u.pwszVal, pciformatW, vendor_id, product_id, device, serial_number);
sprintfW( out->pwszVal, pciformatW, vendor_id, product_id, device, serial_number);
return S_OK;
}
......@@ -4356,15 +4356,15 @@ HRESULT WINAPI AUDDRV_GetPropValue(GUID *guid, const PROPERTYKEY *prop, PROPVARI
out->vt = VT_UI4;
if (num_speakers > 6)
out->u.ulVal = KSAUDIO_SPEAKER_STEREO;
out->ulVal = KSAUDIO_SPEAKER_STEREO;
else if (num_speakers == 6)
out->u.ulVal = KSAUDIO_SPEAKER_5POINT1;
out->ulVal = KSAUDIO_SPEAKER_5POINT1;
else if (num_speakers >= 4)
out->u.ulVal = KSAUDIO_SPEAKER_QUAD;
out->ulVal = KSAUDIO_SPEAKER_QUAD;
else if (num_speakers >= 2)
out->u.ulVal = KSAUDIO_SPEAKER_STEREO;
out->ulVal = KSAUDIO_SPEAKER_STEREO;
else if (num_speakers == 1)
out->u.ulVal = KSAUDIO_SPEAKER_MONO;
out->ulVal = KSAUDIO_SPEAKER_MONO;
return S_OK;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment