system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 11:34:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mmdevapi: Only return ACTIVE devices from GetDefaultAudioEndpoint.

Browse source 
This prevents invalid devices from being created if the user adds a
device, sets it as default, and then removes it.
This commit is contained in:
Andrew Eikum 2012-02-14 11:50:05 -06:00 committed by Alexandre Julliard
parent 4f5271a17f
commit f7d37b38fe
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/mmdevapi/devenum.c
View file

@ -942,7 +942,7 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa
if(RegOpenKeyW(HKEY_CURRENT_USER, reg_key, &key) == ERROR_SUCCESS){
const WCHAR *reg_x_name, *reg_vx_name;
WCHAR def_id[256];
DWORD size = sizeof(def_id);
DWORD size = sizeof(def_id), state;
if(flow == eRender){
reg_x_name = reg_out_nameW;
@ -957,8 +957,11 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa
(BYTE*)def_id, &size) == ERROR_SUCCESS){
hr = IMMDeviceEnumerator_GetDevice(iface, def_id, device);
if(SUCCEEDED(hr)){
RegCloseKey(key);
return S_OK;
if(SUCCEEDED(IMMDevice_GetState(*device, &state)) &&
state == DEVICE_STATE_ACTIVE){
RegCloseKey(key);
return S_OK;
}
}
TRACE("Unable to find voice device %s\n", wine_dbgstr_w(def_id));
@ -968,8 +971,11 @@ static HRESULT WINAPI MMDevEnum_GetDefaultAudioEndpoint(IMMDeviceEnumerator *ifa
(BYTE*)def_id, &size) == ERROR_SUCCESS){
hr = IMMDeviceEnumerator_GetDevice(iface, def_id, device);
if(SUCCEEDED(hr)){
RegCloseKey(key);
return S_OK;
if(SUCCEEDED(IMMDevice_GetState(*device, &state)) &&
state == DEVICE_STATE_ACTIVE){
RegCloseKey(key);
return S_OK;
}
}
TRACE("Unable to find device %s\n", wine_dbgstr_w(def_id));