From 8db93e2a551d973f79ece1faa9cea29e5caa3984 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 27 Mar 2012 20:35:51 +0200 Subject: [PATCH] d3d9: Don't return a pointer to the implementation in IDirect3DVolumeTexture9Impl_QueryInterface(). --- dlls/d3d9/volumetexture.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index d6d625b559e..03a467f0a1a 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -32,20 +32,20 @@ static inline IDirect3DVolumeTexture9Impl *impl_from_IDirect3DVolumeTexture9(IDi static HRESULT WINAPI IDirect3DVolumeTexture9Impl_QueryInterface(IDirect3DVolumeTexture9 *iface, REFIID riid, void **ppobj) { - IDirect3DVolumeTexture9Impl *This = impl_from_IDirect3DVolumeTexture9(iface); - TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); - if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IDirect3DResource9) - || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) - || IsEqualGUID(riid, &IID_IDirect3DVolumeTexture9)) { + if (IsEqualGUID(riid, &IID_IDirect3DVolumeTexture9) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DVolumeTexture9_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; } -- 2.11.4.GIT