From 9d5413012862a3f4c008d911f36d4fff57859c9d Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 2 Apr 2012 22:42:23 +0200 Subject: [PATCH] d3d9: Don't return a pointer to the implementation in IDirect3DCubeTexture9Impl_QueryInterface(). --- dlls/d3d9/cubetexture.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 349f79082e8..e7df0e1c179 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -34,20 +34,20 @@ static inline IDirect3DCubeTexture9Impl *impl_from_IDirect3DCubeTexture9(IDirect static HRESULT WINAPI IDirect3DCubeTexture9Impl_QueryInterface(IDirect3DCubeTexture9 *iface, REFIID riid, void **ppobj) { - IDirect3DCubeTexture9Impl *This = impl_from_IDirect3DCubeTexture9(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_IDirect3DCubeTexture9)) { + if (IsEqualGUID(riid, &IID_IDirect3DCubeTexture9) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DCubeTexture9_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; }