=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8:: GetLevelDesc is called with invalid level.

Alexandre Julliard julliard at winehq.org
Wed May 23 13:22:54 CDT 2012


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

Author: Józef Kucia <joseph.kucia at gmail.com>
Date:   Tue May 22 22:19:33 2012 +0200

d3d8: Return D3DERR_INVALIDCALL when IDirect3DCubeTexture8::GetLevelDesc is called with invalid level.

---

 dlls/d3d8/texture.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c
index 14f8207..59bc693 100644
--- a/dlls/d3d8/texture.c
+++ b/dlls/d3d8/texture.c
@@ -628,6 +628,12 @@ static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *ifac
     TRACE("iface %p, level %u, desc %p.\n", iface, level, desc);
 
     wined3d_mutex_lock();
+    if (level >= wined3d_texture_get_level_count(texture->wined3d_texture))
+    {
+        wined3d_mutex_unlock();
+        return D3DERR_INVALIDCALL;
+    }
+
     if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level)))
         hr = D3DERR_INVALIDCALL;
     else




More information about the wine-cvs mailing list