Michael Stefaniuc : qedit: Return the correct iface in IEnumPins_QueryInterface().
Alexandre Julliard
julliard at winehq.org
Wed Feb 12 13:44:38 CST 2014
Module: wine
Branch: master
Commit: ec9d32adf88eecc898916488bbcb647d9ff46a99
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec9d32adf88eecc898916488bbcb647d9ff46a99
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Wed Feb 12 01:07:08 2014 +0100
qedit: Return the correct iface in IEnumPins_QueryInterface().
---
dlls/qedit/samplegrabber.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c
index 046f912..de3d797 100644
--- a/dlls/qedit/samplegrabber.c
+++ b/dlls/qedit/samplegrabber.c
@@ -79,20 +79,18 @@ Fixed_IEnumPins_Release(IEnumPins *iface)
}
/* IUnknown */
-static HRESULT WINAPI
-Fixed_IEnumPins_QueryInterface(IEnumPins *iface, REFIID riid, void **ppvObject)
+static HRESULT WINAPI Fixed_IEnumPins_QueryInterface(IEnumPins *iface, REFIID riid,
+ void **ret_iface)
{
- PE_Impl *This = (PE_Impl *)iface;
- TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject);
+ TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ret_iface);
- if (IsEqualIID(riid, &IID_IUnknown) ||
- IsEqualIID(riid, &IID_IEnumPins)) {
- Fixed_IEnumPins_AddRef(iface);
- *ppvObject = This->pins;
+ if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IEnumPins)) {
+ IEnumPins_AddRef(iface);
+ *ret_iface = iface;
return S_OK;
}
- *ppvObject = NULL;
- WARN("(%p, %s,%p): not found\n", This, debugstr_guid(riid), ppvObject);
+ *ret_iface = NULL;
+ WARN("(%p, %s, %p): not found\n", iface, debugstr_guid(riid), ret_iface);
return E_NOINTERFACE;
}
More information about the wine-cvs
mailing list