d3d9: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture9::GetLevelDesc is…

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

d3d9: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture9::GetLevelDesc is…
5f6310ee · Józef Kucia · Alexandre Julliard · 5bd0070a · 5f6310ee
Commit 5f6310ee authored May 21, 2012 by Józef Kucia Committed by Alexandre Julliard May 22, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

texture.c dlls/d3d9/texture.c +8 -0

No files found.
--- 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