Henri Verbeet : d3d9: Properly retrieve an interface pointer in d3d9_texture_3d_LockBox().

Alexandre Julliard julliard at winehq.org
Thu May 3 14:23:46 CDT 2012


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed May  2 21:47:54 2012 +0200

d3d9: Properly retrieve an interface pointer in d3d9_texture_3d_LockBox().

---

 dlls/d3d9/texture.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index 8f83ef7..6544edc 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -1184,6 +1184,7 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface,
 {
     struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface);
     struct wined3d_resource *sub_resource;
+    IDirect3DVolume9Impl *volume_impl;
     HRESULT hr;
 
     TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n",
@@ -1193,8 +1194,10 @@ static HRESULT WINAPI d3d9_texture_3d_LockBox(IDirect3DVolumeTexture9 *iface,
     if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level)))
         hr = D3DERR_INVALIDCALL;
     else
-        hr = IDirect3DVolume9_LockBox((IDirect3DVolume9 *)wined3d_resource_get_parent(sub_resource),
-                locked_box, box, flags);
+    {
+        volume_impl = wined3d_resource_get_parent(sub_resource);
+        hr = IDirect3DVolume9_LockBox(&volume_impl->IDirect3DVolume9_iface, locked_box, box, flags);
+    }
     wined3d_mutex_unlock();
 
     return hr;




More information about the wine-cvs mailing list