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

Alexandre Julliard julliard at winehq.org
Tue May 1 13:12:13 CDT 2012


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Mon Apr 30 21:30:17 2012 +0200

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

---

 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 6387e2d..bbe7808 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -350,6 +350,7 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface,
 {
     struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface);
     struct wined3d_resource *sub_resource;
+    IDirect3DSurface9Impl *surface_impl;
     HRESULT hr;
 
     TRACE("iface %p, level %u, locked_rect %p, rect %p, flags %#x.\n",
@@ -359,8 +360,10 @@ static HRESULT WINAPI d3d9_texture_2d_LockRect(IDirect3DTexture9 *iface,
     if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level)))
         hr = D3DERR_INVALIDCALL;
     else
-        hr = IDirect3DSurface9_LockRect((IDirect3DSurface9 *)wined3d_resource_get_parent(sub_resource),
-                locked_rect, rect, flags);
+    {
+        surface_impl = wined3d_resource_get_parent(sub_resource);
+        hr = IDirect3DSurface9_LockRect(&surface_impl->IDirect3DSurface9_iface, locked_rect, rect, flags);
+    }
     wined3d_mutex_unlock();
 
     return hr;




More information about the wine-cvs mailing list