Module: wine Branch: master Commit: 5bc8c5d347423187af86323efddf74b5eb6e8db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc8c5d347423187af86323efd...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Tue Apr 17 20:49:12 2012 +0200
d3d8: Properly retrieve an interface pointer in d3d8_texture_2d_LockRect().
---
dlls/d3d8/texture.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 5b4278a..3f9339e 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -300,6 +300,7 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface8Impl *surface_impl; HRESULT hr;
TRACE("iface %p, level %u, locked_rect %p, rect %p, flags %#x.\n", @@ -309,8 +310,10 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DSurface8_LockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource), - locked_rect, rect, flags); + { + surface_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DSurface8_LockRect(&surface_impl->IDirect3DSurface8_iface, locked_rect, rect, flags); + } wined3d_mutex_unlock();
return hr;