Józef Kucia : d3d9: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture9:: GetCubeMapSurface is called with invalid level.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: cd4b973d59f4d94c89b49805a73dbad4c807ca4c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=cd4b973d59f4d94c89b49805a7...

Author: Józef Kucia 
Date:   Mon May 21 23:10:46 2012 +0200

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

---

dlls/d3d9/texture.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index 0594c20..3d07b1c 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -750,11 +750,19 @@ static HRESULT WINAPI d3d9_texture_cube_GetCubeMapSurface(IDirect3DCubeTexture9
     struct wined3d_resource *sub_resource;
     IDirect3DSurface9Impl *surface_impl;
     UINT sub_resource_idx;
+    DWORD level_count;

TRACE("iface %p, face %#x, level %u, surface %p.\n", iface, face, level, surface);

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)))
     {
         wined3d_mutex_unlock();