Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DTexture8Impl_QueryInterface ().
Alexandre Julliard
julliard at winehq.org
Thu Mar 15 15:35:19 CDT 2012
Module: wine
Branch: master
Commit: 42672f6dbe28006d7685d2fa88c5e2db37d4ff16
URL: http://source.winehq.org/git/wine.git/?a=commit;h=42672f6dbe28006d7685d2fa88c5e2db37d4ff16
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Mar 14 22:04:30 2012 +0100
d3d8: Don't return a pointer to the implementation in IDirect3DTexture8Impl_QueryInterface().
---
dlls/d3d8/texture.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c
index f3f2b20..b1eb69a 100644
--- a/dlls/d3d8/texture.c
+++ b/dlls/d3d8/texture.c
@@ -32,20 +32,20 @@ static inline IDirect3DTexture8Impl *impl_from_IDirect3DTexture8(IDirect3DTextur
static HRESULT WINAPI IDirect3DTexture8Impl_QueryInterface(IDirect3DTexture8 *iface, REFIID riid,
void **ppobj)
{
- IDirect3DTexture8Impl *This = impl_from_IDirect3DTexture8(iface);
-
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);
- if (IsEqualGUID(riid, &IID_IUnknown)
- || IsEqualGUID(riid, &IID_IDirect3DResource8)
- || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8)
- || IsEqualGUID(riid, &IID_IDirect3DTexture8)) {
+ if (IsEqualGUID(riid, &IID_IDirect3DTexture8)
+ || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8)
+ || IsEqualGUID(riid, &IID_IDirect3DResource8)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
IUnknown_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