From 5f6310ee45034fe126c3d30b16ce61bb5969b5bc Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B3zef=20Kucia?= Date: Mon, 21 May 2012 23:10:45 +0200 Subject: [PATCH] d3d9: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture9::GetLevelDesc is called with invalid level. --- dlls/d3d9/texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index f453f90d8f2..0594c207dff 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -710,10 +710,18 @@ static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *ifac struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); struct wined3d_resource *sub_resource; HRESULT hr = D3D_OK; + DWORD level_count; TRACE("iface %p, level %u, desc %p.\n", iface, level, desc); wined3d_mutex_lock(); + level_count = wined3d_texture_get_level_count(texture->wined3d_texture); + if (level >= level_count) + { + wined3d_mutex_unlock(); + return D3DERR_INVALIDCALL; + } + if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else -- 2.11.4.GIT