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

Alexandre Julliard julliard at winehq.org
Thu Apr 26 13:58:35 CDT 2012


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Wed Apr 25 21:24:20 2012 +0200

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

---

 dlls/d3d9/device.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 812de68..c5dc834 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -1691,6 +1691,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(IDirect3DDevice9Ex *iface,
 {
     IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface);
     struct wined3d_texture *wined3d_texture = NULL;
+    struct d3d9_texture *texture_impl;
     HRESULT hr;
 
     TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, ppTexture);
@@ -1703,7 +1704,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(IDirect3DDevice9Ex *iface,
     hr = wined3d_device_get_texture(This->wined3d_device, Stage, &wined3d_texture);
     if (SUCCEEDED(hr) && wined3d_texture)
     {
-        *ppTexture = wined3d_texture_get_parent(wined3d_texture);
+        texture_impl = wined3d_texture_get_parent(wined3d_texture);
+        *ppTexture = &texture_impl->IDirect3DBaseTexture9_iface;
         IDirect3DBaseTexture9_AddRef(*ppTexture);
         wined3d_texture_decref(wined3d_texture);
     }




More information about the wine-cvs mailing list