dmusic: Simplify the IDirectMusicPort_QueryInterface implementation.

Signed-off-by: Michael Stefaniuc <mstefani@redhat.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dmusic: Simplify the IDirectMusicPort_QueryInterface implementation.
ca87c493 · Michael Stefaniuc · Alexandre Julliard · 1dc5cc34 · ca87c493
Commit ca87c493 authored Oct 05, 2016 by Michael Stefaniuc Committed by Alexandre Julliard Oct 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 11 deletions

port.c dlls/dmusic/port.c +9 -11

No files found.
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -130,23 +130,21 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSI
    TRACE("(%p/%p)->(%s, %p)\n", iface, This, debugstr_dmguid(riid), ret_iface);
-    if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort)) {
+    if (IsEqualIID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirectMusicPort))
        *ret_iface = &This->IDirectMusicPort_iface;
-        IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ret_iface);
+    else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload))
-        return S_OK;
-    } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) {
        *ret_iface = &This->IDirectMusicPortDownload_iface;
-        IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ret_iface);
+    else if (IsEqualGUID(riid, &IID_IDirectMusicThru))
-        return S_OK;
-    } else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) {
        *ret_iface = &This->IDirectMusicThru_iface;
-        IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface);
+    else {
-        return S_OK;
+        WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface);
+        *ret_iface = NULL;
+        return E_NOINTERFACE;
    }
-    WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface);
+    IUnknown_AddRef((IUnknown*)*ret_iface);
-    return E_NOINTERFACE;
+    return S_OK;
 }
 static ULONG WINAPI SynthPortImpl_IDirectMusicPort_AddRef(LPDIRECTMUSICPORT iface)