From 74c2ddc908dd862800644463edaf0028e9425ba0 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 10 Apr 2012 22:06:22 +0200 Subject: [PATCH] d3dx9: Don't return a pointer to the implementation in ID3DXFontImpl_QueryInterface(). --- dlls/d3dx9_36/font.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index a27f80aec16..1904c68e29c 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -43,17 +43,21 @@ static inline ID3DXFontImpl *impl_from_ID3DXFont(ID3DXFont *iface) return CONTAINING_RECORD(iface, ID3DXFontImpl, ID3DXFont_iface); } -static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid, void **object) +static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid, void **out) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - TRACE("(%p): QueryInterface from %s\n", This, debugstr_guid(riid)); - if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXFont)) { + if (IsEqualGUID(riid, &IID_ID3DXFont) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *object=This; + *out = iface; return S_OK; } - WARN("(%p)->(%s, %p): not found\n", iface, debugstr_guid(riid), *object); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; } -- 2.11.4.GIT