Michael Stefaniuc : dmusic: Simplify the IDirectMusicPort_QueryInterface implementation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ca87c493902e2e1fe18d1711bd3783fc75c445cc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ca87c493902e2e1fe18d1711bd...

Author: Michael Stefaniuc 
Date:   Wed Oct  5 10:28:22 2016 +0200

dmusic: Simplify the IDirectMusicPort_QueryInterface implementation.

Signed-off-by: Michael Stefaniuc 
Signed-off-by: Alexandre Julliard

---

dlls/dmusic/port.c | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index d919c10..95db9e0 100644
--- 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);
-        return S_OK;
-    } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload)) {
+    else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload))
         *ret_iface = &This->IDirectMusicPortDownload_iface;
-        IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ret_iface);
-        return S_OK;
-    } else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) {
+    else if (IsEqualGUID(riid, &IID_IDirectMusicThru))
         *ret_iface = &This->IDirectMusicThru_iface;
-        IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface);
-        return S_OK;
+    else {
+        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)