From e1b8573ee80a1c876a0d8a433877456bbc14a4f7 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Wed, 28 Mar 2012 20:22:40 +0200 Subject: [PATCH] d3d9: Don't return a pointer to the implementation in IDirect3DTexture9Impl_QueryInterface(). --- dlls/d3d9/texture.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 49a0fe697f9..12da634d222 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -33,20 +33,20 @@ static inline IDirect3DTexture9Impl *impl_from_IDirect3DTexture9(IDirect3DTextur static HRESULT WINAPI IDirect3DTexture9Impl_QueryInterface(IDirect3DTexture9 *iface, REFIID riid, void **ppobj) { - IDirect3DTexture9Impl *This = impl_from_IDirect3DTexture9(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_IDirect3DTexture9)) { + if (IsEqualGUID(riid, &IID_IDirect3DTexture9) + || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) + || IsEqualGUID(riid, &IID_IDirect3DResource9) + || IsEqualGUID(riid, &IID_IUnknown)) + { IDirect3DTexture9_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