Christian Costa : dmusic: Rename params in SynthPortImpl_IDirectMusicPort_QueryInterface.

Alexandre Julliard julliard at winehq.org
Fri Sep 21 14:22:40 CDT 2012


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

Author: Christian Costa <titan.costa at gmail.com>
Date:   Fri Sep 21 11:47:06 2012 +0200

dmusic: Rename params in SynthPortImpl_IDirectMusicPort_QueryInterface.

---

 dlls/dmusic/port.c |   50 ++++++++++++++++++++++++++------------------------
 1 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index cfe4265..b6489a7 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -39,31 +39,33 @@ static inline SynthPortImpl *impl_from_SynthPortImpl_IDirectMusicThru(IDirectMus
 }
 
 /* SynthPortImpl IDirectMusicPort IUnknown part follows: */
-static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ppobj)
+static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_QueryInterface(LPDIRECTMUSICPORT iface, REFIID riid, LPVOID *ret_iface)
 {
-	SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface);
+    SynthPortImpl *This = impl_from_SynthPortImpl_IDirectMusicPort(iface);
 
-	TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
-
-	if (IsEqualIID (riid, &IID_IUnknown) ||
-	    IsEqualGUID(riid, &IID_IDirectMusicPort) ||
-	    IsEqualGUID(riid, &IID_IDirectMusicPort8)) {
-		*ppobj = &This->IDirectMusicPort_iface;
-		IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ppobj);
-		return S_OK;
-	} else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload) ||
-		   IsEqualGUID(riid, &IID_IDirectMusicPortDownload8)) {
-		*ppobj = &This->IDirectMusicPortDownload_iface;
-		IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ppobj);
-		return S_OK;
-	} else if (IsEqualGUID(riid, &IID_IDirectMusicThru) ||
-		   IsEqualGUID(riid, &IID_IDirectMusicThru8)) {
-		*ppobj = &This->IDirectMusicThru_iface;
-		IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ppobj);
-		return S_OK;
-	}
-	WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj);
-	return E_NOINTERFACE;
+    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)) {
+        *ret_iface = &This->IDirectMusicPort_iface;
+        IDirectMusicPort_AddRef((LPDIRECTMUSICPORT)*ret_iface);
+        return S_OK;
+    } else if (IsEqualGUID(riid, &IID_IDirectMusicPortDownload) ||
+               IsEqualGUID(riid, &IID_IDirectMusicPortDownload8)) {
+        *ret_iface = &This->IDirectMusicPortDownload_iface;
+        IDirectMusicPortDownload_AddRef((LPDIRECTMUSICPORTDOWNLOAD)*ret_iface);
+        return S_OK;
+    } else if (IsEqualGUID(riid, &IID_IDirectMusicThru) ||
+               IsEqualGUID(riid, &IID_IDirectMusicThru8)) {
+        *ret_iface = &This->IDirectMusicThru_iface;
+        IDirectMusicThru_AddRef((LPDIRECTMUSICTHRU)*ret_iface);
+        return S_OK;
+    }
+
+    WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface);
+
+    return E_NOINTERFACE;
 }
 
 static ULONG WINAPI SynthPortImpl_IDirectMusicPort_AddRef(LPDIRECTMUSICPORT iface)




More information about the wine-cvs mailing list