From 8abbe01e6c23e90bc90c55158aebeac2fede3244 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 3 Mar 2016 13:39:42 +0000 Subject: [PATCH] [MMDEVAPI] Sync with Wine Staging 1.9.4. CORE-10912 svn path=/trunk/; revision=70877 --- reactos/dll/win32/mmdevapi/devenum.c | 8 +++++++- reactos/media/doc/README.WINE | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/reactos/dll/win32/mmdevapi/devenum.c b/reactos/dll/win32/mmdevapi/devenum.c index 7f1c1ebddac..344f2b241a4 100644 --- a/reactos/dll/win32/mmdevapi/devenum.c +++ b/reactos/dll/win32/mmdevapi/devenum.c @@ -1047,9 +1047,15 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA for (i = 0; i < MMDevice_count; ++i) { + HRESULT hr; WCHAR *str; dev = &MMDevice_head[i]->IMMDevice_iface; - IMMDevice_GetId(dev, &str); + hr = IMMDevice_GetId(dev, &str); + if (FAILED(hr)) + { + WARN("GetId failed: %08x\n", hr); + continue; + } if (str && !lstrcmpW(str, name)) { diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index f37dbb4d2aa..7c1bb66fec2 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -99,7 +99,7 @@ reactos/dll/win32/mciseq # Synced to WineStaging-1.7.55 reactos/dll/win32/mciwave # Synced to WineStaging-1.7.55 reactos/dll/win32/mgmtapi # Synced to WineStaging-1.7.55 reactos/dll/win32/mlang # Synced to WineStaging-1.7.55 -reactos/dll/win32/mmdevapi # Synced to WineStaging-1.7.55 +reactos/dll/win32/mmdevapi # Synced to WineStaging-1.9.4 reactos/dll/win32/mpr # Synced to WineStaging-1.7.55 reactos/dll/win32/mprapi # Synced to WineStaging-1.7.55 reactos/dll/win32/msacm32 # Synced to WineStaging-1.7.55