Christian Costa : dmusic: Cleanup IDirectMusic8Impl_QueryInterface.
Alexandre Julliard
julliard at winehq.org
Thu May 24 14:58:13 CDT 2012
Module: wine
Branch: master
Commit: 2024e241ffa1bc7ad2c291b945ba1d61d6505710
URL: http://source.winehq.org/git/wine.git/?a=commit;h=2024e241ffa1bc7ad2c291b945ba1d61d6505710
Author: Christian Costa <titan.costa at gmail.com>
Date: Thu May 24 08:50:32 2012 +0200
dmusic: Cleanup IDirectMusic8Impl_QueryInterface.
---
dlls/dmusic/dmusic.c | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c
index 8afe2cc..9c93ba8 100644
--- a/dlls/dmusic/dmusic.c
+++ b/dlls/dmusic/dmusic.c
@@ -31,22 +31,27 @@ static inline IDirectMusic8Impl *impl_from_IDirectMusic8(IDirectMusic8 *iface)
}
/* IDirectMusic8Impl IUnknown part: */
-static HRESULT WINAPI IDirectMusic8Impl_QueryInterface(LPDIRECTMUSIC8 iface, REFIID riid, LPVOID *ppobj)
+static HRESULT WINAPI IDirectMusic8Impl_QueryInterface(LPDIRECTMUSIC8 iface, REFIID riid, LPVOID *ret_iface)
{
- IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface);
- TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj);
-
- if (IsEqualIID (riid, &IID_IUnknown) ||
- IsEqualIID (riid, &IID_IDirectMusic) ||
- IsEqualIID (riid, &IID_IDirectMusic2) ||
- IsEqualIID (riid, &IID_IDirectMusic8)) {
- IUnknown_AddRef(iface);
- *ppobj = This;
- return S_OK;
- }
+ IDirectMusic8Impl *This = impl_from_IDirectMusic8(iface);
- WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ppobj);
- return E_NOINTERFACE;
+ TRACE("(%p)->(%s, %p)\n", iface, debugstr_dmguid(riid), ret_iface);
+
+ if (IsEqualIID (riid, &IID_IUnknown) ||
+ IsEqualIID (riid, &IID_IDirectMusic) ||
+ IsEqualIID (riid, &IID_IDirectMusic2) ||
+ IsEqualIID (riid, &IID_IDirectMusic8))
+ {
+ IDirectMusic8_AddRef(iface);
+ *ret_iface = iface;
+ return S_OK;
+ }
+
+ *ret_iface = NULL;
+
+ WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface);
+
+ return E_NOINTERFACE;
}
static ULONG WINAPI IDirectMusic8Impl_AddRef(LPDIRECTMUSIC8 iface)
More information about the wine-cvs
mailing list