ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d9: Don't return a pointer to the implementation in IDirect3DDevice9Impl_QueryInterface().

This commit is contained in:
Henri Verbeet 2012-04-02 22:42:22 +02:00 committed by Alexandre Julliard
parent cdd2d7f258
commit f47267ad55
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/d3d9/device.c
View File

@ -186,38 +186,39 @@ static inline IDirect3DDevice9Impl *impl_from_IDirect3DDevice9Ex(IDirect3DDevice
return CONTAINING_RECORD(iface, IDirect3DDevice9Impl, IDirect3DDevice9Ex_iface); return CONTAINING_RECORD(iface, IDirect3DDevice9Impl, IDirect3DDevice9Ex_iface);
} }
static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(IDirect3DDevice9Ex *iface, REFIID riid, void **out)
void **ppobj)
{ {
IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); if (IsEqualGUID(riid, &IID_IDirect3DDevice9)
|| IsEqualGUID(riid, &IID_IUnknown))
if (IsEqualGUID(riid, &IID_IUnknown) {
|| IsEqualGUID(riid, &IID_IDirect3DDevice9)) {
IDirect3DDevice9Ex_AddRef(iface); IDirect3DDevice9Ex_AddRef(iface);
*ppobj = This; *out = iface;
TRACE("Returning IDirect3DDevice9 interface at %p\n", *ppobj);
return S_OK; return S_OK;
} else if(IsEqualGUID(riid, &IID_IDirect3DDevice9Ex)) { }
if (IsEqualGUID(riid, &IID_IDirect3DDevice9Ex))
{
IDirect3DDevice9Impl *device = impl_from_IDirect3DDevice9Ex(iface);
/* Find out if the creating d3d9 interface was created with Direct3DCreate9Ex. /* Find out if the creating d3d9 interface was created with Direct3DCreate9Ex.
* It doesn't matter with which function the device was created. */ * It doesn't matter with which function the device was created. */
if (!device->d3d_parent->extended)
if (This->d3d_parent->extended)
{ {
*ppobj = iface; WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE.\n");
IDirect3DDevice9Ex_AddRef((IDirect3DDevice9Ex *) *ppobj); *out = NULL;
TRACE("Returning IDirect3DDevice9Ex interface at %p\n", *ppobj);
return S_OK;
} else {
WARN("IDirect3D9 instance wasn't created with CreateDirect3D9Ex, returning E_NOINTERFACE\n");
*ppobj = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
IDirect3DDevice9Ex_AddRef(iface);
*out = 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;
*out = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }