mmdevapi: Only return ACTIVE devices from GetDefaultAudioEndpoint.

This prevents invalid devices from being created if the user adds a device, sets it as default, and then removes it.

mmdevapi: Only return ACTIVE devices from GetDefaultAudioEndpoint.
f7d37b38 · Andrew Eikum · Alexandre Julliard · 4f5271a1 · f7d37b38
Commit f7d37b38 authored Feb 14, 2012 by Andrew Eikum Committed by Alexandre Julliard Feb 15, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 5 deletions

devenum.c dlls/mmdevapi/devenum.c +11 -5

No files found.
--- a/dlls/mmdevapi/devenum.c
+++ b/dlls/mmdevapi/devenum.c
@@ -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);
+                if(SUCCEEDED(IMMDevice_GetState(*device, &state)) &&
-                return S_OK;
+                        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);
+                if(SUCCEEDED(IMMDevice_GetState(*device, &state)) &&
-                return S_OK;
+                        state == DEVICE_STATE_ACTIVE){
+                    RegCloseKey(key);
+                    return S_OK;
+                }
            }
            TRACE("Unable to find device %s\n", wine_dbgstr_w(def_id));