Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DQuery9Impl_QueryInterface ().
Alexandre Julliard
julliard at winehq.org
Mon Apr 2 13:14:49 CDT 2012
Module: wine
Branch: master
Commit: a84eaf3d2236836ea0fec6fce5ee216da38d7260
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a84eaf3d2236836ea0fec6fce5ee216da38d7260
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Sun Apr 1 13:12:05 2012 +0200
d3d9: Don't return a pointer to the implementation in IDirect3DQuery9Impl_QueryInterface().
---
dlls/d3d9/query.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c
index 4252332..9617fa3 100644
--- a/dlls/d3d9/query.c
+++ b/dlls/d3d9/query.c
@@ -33,18 +33,18 @@ static inline IDirect3DQuery9Impl *impl_from_IDirect3DQuery9(IDirect3DQuery9 *if
static HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(IDirect3DQuery9 *iface, REFIID riid,
void **ppobj)
{
- IDirect3DQuery9Impl *This = impl_from_IDirect3DQuery9(iface);
-
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);
- if (IsEqualGUID(riid, &IID_IUnknown)
- || IsEqualGUID(riid, &IID_IDirect3DQuery9)) {
+ if (IsEqualGUID(riid, &IID_IDirect3DQuery9)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
IDirect3DQuery9_AddRef(iface);
- *ppobj = This;
+ *ppobj = iface;
return S_OK;
}
- WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj);
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
*ppobj = NULL;
return E_NOINTERFACE;
}
More information about the wine-cvs
mailing list