Henri Verbeet : d3d8: Don' t return a pointer to the implementation in IDirect3DVolumeTexture8Impl_QueryInterface ().
Alexandre Julliard
julliard at winehq.org
Thu Mar 15 15:35:19 CDT 2012
Module: wine
Branch: master
Commit: 8c2d44cafeaaeecca73346aaf0f0cbf9614abbf4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2d44cafeaaeecca73346aaf0f0cbf9614abbf4
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Mar 14 22:04:28 2012 +0100
d3d8: Don't return a pointer to the implementation in IDirect3DVolumeTexture8Impl_QueryInterface().
---
dlls/d3d8/volumetexture.c | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c
index a713f16..3d51734 100644
--- a/dlls/d3d8/volumetexture.c
+++ b/dlls/d3d8/volumetexture.c
@@ -31,20 +31,20 @@ static inline IDirect3DVolumeTexture8Impl *impl_from_IDirect3DVolumeTexture8(IDi
static HRESULT WINAPI IDirect3DVolumeTexture8Impl_QueryInterface(IDirect3DVolumeTexture8 *iface,
REFIID riid, void **ppobj)
{
- IDirect3DVolumeTexture8Impl *This = impl_from_IDirect3DVolumeTexture8(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_IDirect3DVolumeTexture8)) {
+ if (IsEqualGUID(riid, &IID_IDirect3DVolumeTexture8)
+ || 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