[MMDEVAPI] Sync with Wine Staging 1.9.4. CORE-10912

svn path=/trunk/; revision=70877

diff --git a/reactos/dll/win32/mmdevapi/devenum.c b/reactos/dll/win32/mmdevapi/devenum.c
index 7f1c1eb..344f2b2 100644 (file)
--- 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 f37dbb4..7c1bb66 100644 (file)
--- 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