From 30c3e84ee5691315e50790337ed80941cb6aea3c Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Sun, 25 Mar 2012 20:56:27 +0200 Subject: [PATCH] d3d8: Don't return a pointer to the implementation in IDirect3DSurface8Impl_QueryInterface(). --- dlls/d3d8/surface.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 87c072a13e2..fc212ea44d3 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -33,19 +33,19 @@ static inline IDirect3DSurface8Impl *impl_from_IDirect3DSurface8(IDirect3DSurfac static HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(IDirect3DSurface8 *iface, REFIID riid, void **ppobj) { - IDirect3DSurface8Impl *This = impl_from_IDirect3DSurface8(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_IDirect3DSurface8)) { + if (IsEqualGUID(riid, &IID_IDirect3DSurface8) + || 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; }