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

d3d9: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture9::GetCubeMapSurface is called with invalid level.

Browse Source
This commit is contained in:
Józef Kucia 2012-05-21 23:10:46 +02:00 committed by Alexandre Julliard
parent 5f6310ee45
commit cd4b973d59
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/d3d9/texture.c
View File

@ -750,11 +750,19 @@ static HRESULT WINAPI d3d9_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture9
struct wined3d_resource *sub_resource; struct wined3d_resource *sub_resource;
IDirect3DSurface9Impl *surface_impl; IDirect3DSurface9Impl *surface_impl;
UINT sub_resource_idx; UINT sub_resource_idx;
DWORD level_count;
TRACE("iface %p, face %#x, level %u, surface %p.\n", iface, face, level, surface); TRACE("iface %p, face %#x, level %u, surface %p.\n", iface, face, level, surface);
wined3d_mutex_lock(); wined3d_mutex_lock();
sub_resource_idx = wined3d_texture_get_level_count(texture->wined3d_texture) * face + level; level_count = wined3d_texture_get_level_count(texture->wined3d_texture);
if (level >= level_count)
{
wined3d_mutex_unlock();
return D3DERR_INVALIDCALL;
}
sub_resource_idx = level_count * face + level;
if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx))) if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, sub_resource_idx)))
{ {
wined3d_mutex_unlock(); wined3d_mutex_unlock();