Commit 8e40db27 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

d3d9: Don't return a pointer to the implementation in…

d3d9: Don't return a pointer to the implementation in IDirect3DVertexDeclaration9Impl_QueryInterface().
parent 12369f9f
...@@ -194,20 +194,22 @@ HRESULT vdecl_convert_fvf( ...@@ -194,20 +194,22 @@ HRESULT vdecl_convert_fvf(
} }
/* IDirect3DVertexDeclaration9 IUnknown parts follow: */ /* IDirect3DVertexDeclaration9 IUnknown parts follow: */
static HRESULT WINAPI IDirect3DVertexDeclaration9Impl_QueryInterface(LPDIRECT3DVERTEXDECLARATION9 iface, REFIID riid, LPVOID* ppobj) { static HRESULT WINAPI IDirect3DVertexDeclaration9Impl_QueryInterface(IDirect3DVertexDeclaration9 *iface,
IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface; REFIID riid, void **out)
{
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
if (IsEqualGUID(riid, &IID_IUnknown) if (IsEqualGUID(riid, &IID_IDirect3DVertexDeclaration9)
|| IsEqualGUID(riid, &IID_IDirect3DVertexDeclaration9)) { || IsEqualGUID(riid, &IID_IUnknown))
{
IDirect3DVertexDeclaration9_AddRef(iface); IDirect3DVertexDeclaration9_AddRef(iface);
*ppobj = This; *out = iface;
return S_OK; 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;
*out = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment