Michael Stefaniuc : dmusic: Remove duplicated interface ID checks ( PVS-Studio).

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Tue Oct 28 23:33:48 2014 +0100

dmusic: Remove duplicated interface ID checks (PVS-Studio).

---

dlls/dmusic/port.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index ad61ba5..f886d52 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -49,9 +49,7 @@ static HRESULT WINAPI IDirectMusicDownloadedInstrumentImpl_QueryInterface(IDirec
 {
     TRACE("(%p, %s, %p)\n", iface, debugstr_dmguid(riid), ret_iface);

-    if (IsEqualIID(riid, &IID_IUnknown) ||
-        IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument) ||
-        IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument8))
+    if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicDownloadedInstrument))
     {
         IDirectMusicDownloadedInstrument_AddRef(iface);
         *ret_iface = iface;
@@ -132,19 +130,15 @@ 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) ||
-        IsEqualGUID(riid, &IID_IDirectMusicPort8)) {
+    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) ||
-               IsEqualGUID(riid, &IID_IDirectMusicPortDownload8)) {
+    } 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) ||
-               IsEqualGUID(riid, &IID_IDirectMusicThru8)) {
+    } else if (IsEqualGUID(riid, &IID_IDirectMusicThru)) {
         *ret_iface = &This->IDirectMusicThru_iface;
         IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface);
         return S_OK;