dmusic: Check return codes and display name from port caps when enumerating microsoft synthetizer.

31bfc380 · Christian Costa · Alexandre Julliard · f13806e1 · 31bfc380
Commit 31bfc380 authored Mar 29, 2012 by Christian Costa Committed by Alexandre Julliard Apr 03, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

dmusic.c dlls/dmusic/dmusic.c +10 -6

No files found.
--- a/dlls/dmusic/dmusic.c
+++ b/dlls/dmusic/dmusic.c
@@ -138,12 +138,16 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind
    if (index == (nb_midi_in + nb_midi_out + 1))
    {
-        IDirectMusicSynth8* synth;
+        IDirectMusicSynth8* synth = NULL;
-        TRACE("Enumerating port: 'Microsoft Software Synthesizer'\n");
+        HRESULT hr;
-        CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth);
+        hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth);
-        IDirectMusicSynth8_GetPortCaps(synth, port_caps);
+        if (SUCCEEDED(hr))
-        IDirectMusicSynth8_Release(synth);
+            IDirectMusicSynth8_GetPortCaps(synth, port_caps);
-        return S_OK;
+        if (SUCCEEDED(hr))
+            TRACE("Enumerating port: %s\n", debugstr_w(port_caps->wszDescription));
+        if (synth)
+            IDirectMusicSynth8_Release(synth);
+        return hr;
    }
    return S_FALSE;