Henri Verbeet : d3drm: Compare with the correct IID in IDirect3DRMVisualArrayImpl_QueryInterface( ).
Alexandre Julliard
julliard at winehq.org
Wed Oct 9 14:22:14 CDT 2013
Module: wine
Branch: master
Commit: cd16932bf35846032ec6097d169a73f8b65fdec9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd16932bf35846032ec6097d169a73f8b65fdec9
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Oct 9 10:39:39 2013 +0200
d3drm: Compare with the correct IID in IDirect3DRMVisualArrayImpl_QueryInterface().
---
dlls/d3drm/frame.c | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c
index fb0c22d..4d8867e 100644
--- a/dlls/d3drm/frame.c
+++ b/dlls/d3drm/frame.c
@@ -215,24 +215,21 @@ static HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj)
return S_OK;
}
-/*** IUnknown methods ***/
-static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisualArray* iface,
- REFIID riid, void** ret_iface)
+static HRESULT WINAPI IDirect3DRMVisualArrayImpl_QueryInterface(IDirect3DRMVisualArray *iface, REFIID riid, void **out)
{
- TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface);
+ TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
- if (IsEqualGUID(riid, &IID_IUnknown) ||
- IsEqualGUID(riid, &IID_IDirect3DRMFrameArray))
+ if (IsEqualGUID(riid, &IID_IDirect3DRMVisualArray)
+ || IsEqualGUID(riid, &IID_IUnknown))
{
- *ret_iface = iface;
IDirect3DRMVisualArray_AddRef(iface);
+ *out = iface;
return S_OK;
}
- *ret_iface = NULL;
-
- WARN("Interface %s not implemented\n", debugstr_guid(riid));
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+ *out = NULL;
return E_NOINTERFACE;
}
More information about the wine-cvs
mailing list