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

Alexandre Julliard julliard at winehq.org
Fri Apr 27 10:55:45 CDT 2012


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

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Apr 26 21:11:53 2012 +0200

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

---

 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 1f0f809..987867c 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2652,6 +2652,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(IDirect3DDevice9Ex *if
         IDirect3DPixelShader9 **shader)
 {
     IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface);
+    IDirect3DPixelShader9Impl *shader_impl;
     struct wined3d_shader *wined3d_shader;
 
     TRACE("iface %p, shader %p.\n", iface, shader);
@@ -2662,7 +2663,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(IDirect3DDevice9Ex *if
     wined3d_shader = wined3d_device_get_pixel_shader(This->wined3d_device);
     if (wined3d_shader)
     {
-        *shader = wined3d_shader_get_parent(wined3d_shader);
+        shader_impl = wined3d_shader_get_parent(wined3d_shader);
+        *shader = &shader_impl->IDirect3DPixelShader9_iface;
         IDirect3DPixelShader9_AddRef(*shader);
         wined3d_shader_decref(wined3d_shader);
     }




More information about the wine-cvs mailing list