ddraw: The texture interfaces can't be queried from version 7 surfaces.

This commit is contained in:
Henri Verbeet 2012-04-01 13:12:02 +02:00 committed by Alexandre Julliard
parent 8481625fa4
commit 7dd4f439e3
1 changed files with 10 additions and 10 deletions

View File

@ -222,21 +222,21 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface,
return E_NOINTERFACE;
}
if (IsEqualGUID( &IID_IDirect3DTexture2, riid)
|| IsEqualGUID(&IID_IDirect3DTexture, riid))
if (This->version != 7)
{
if (IsEqualGUID(&IID_IDirect3DTexture2, riid))
{
IDirect3DTexture2_AddRef(&This->IDirect3DTexture2_iface);
*obj = &This->IDirect3DTexture2_iface;
return S_OK;
}
if (IsEqualGUID( &IID_IDirect3DTexture, riid ))
{
IDirect3DTexture2_AddRef(&This->IDirect3DTexture_iface);
*obj = &This->IDirect3DTexture_iface;
TRACE(" returning Direct3DTexture interface at %p.\n", *obj);
return S_OK;
}
else
{
*obj = &This->IDirect3DTexture2_iface;
TRACE(" returning Direct3DTexture2 interface at %p.\n", *obj);
}
IUnknown_AddRef( (IUnknown *) *obj);
return S_OK;
}
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));