Michael Stefaniuc : d3d10core: COM cleanup for the ID3D10PixelShader iface.

[Alexandre Julliard]

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

Author: Michael Stefaniuc <mstefani(a)redhat.de>
Date:   Tue Jul 12 01:56:39 2011 +0200

d3d10core: COM cleanup for the ID3D10PixelShader iface.

---

 dlls/d3d10core/d3d10core_private.h |    2 +-
 dlls/d3d10core/device.c            |    2 +-
 dlls/d3d10core/shader.c            |    8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h
index 17c3bae..457ba09 100644
--- a/dlls/d3d10core/d3d10core_private.h
+++ b/dlls/d3d10core/d3d10core_private.h
@@ -194,7 +194,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct
 /* ID3D10PixelShader */
 struct d3d10_pixel_shader
 {
-    const struct ID3D10PixelShaderVtbl *vtbl;
+    ID3D10PixelShader ID3D10PixelShader_iface;
     LONG refcount;
 
     struct wined3d_shader *wined3d_shader;
diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c
index 149afa9..4df04f1 100644
--- a/dlls/d3d10core/device.c
+++ b/dlls/d3d10core/device.c
@@ -952,7 +952,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device *if
     }
 
     TRACE("Created pixel shader %p.\n", object);
-    *shader = (ID3D10PixelShader *)object;
+    *shader = &object->ID3D10PixelShader_iface;
 
     return S_OK;
 }
diff --git a/dlls/d3d10core/shader.c b/dlls/d3d10core/shader.c
index 79131e1..57c26bc 100644
--- a/dlls/d3d10core/shader.c
+++ b/dlls/d3d10core/shader.c
@@ -421,7 +421,7 @@ HRESULT d3d10_geometry_shader_init(struct d3d10_geometry_shader *shader, struct
 
 static inline struct d3d10_pixel_shader *impl_from_ID3D10PixelShader(ID3D10PixelShader *iface)
 {
-    return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, vtbl);
+    return CONTAINING_RECORD(iface, struct d3d10_pixel_shader, ID3D10PixelShader_iface);
 }
 
 /* IUnknown methods */
@@ -448,7 +448,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_pixel_shader_QueryInterface(ID3D10PixelSh
 
 static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *iface)
 {
-    struct d3d10_pixel_shader *This = (struct d3d10_pixel_shader *)iface;
+    struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface);
     ULONG refcount = InterlockedIncrement(&This->refcount);
 
     TRACE("%p increasing refcount to %u\n", This, refcount);
@@ -461,7 +461,7 @@ static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_AddRef(ID3D10PixelShader *ifac
 
 static ULONG STDMETHODCALLTYPE d3d10_pixel_shader_Release(ID3D10PixelShader *iface)
 {
-    struct d3d10_pixel_shader *This = (struct d3d10_pixel_shader *)iface;
+    struct d3d10_pixel_shader *This = impl_from_ID3D10PixelShader(iface);
     ULONG refcount = InterlockedDecrement(&This->refcount);
 
     TRACE("%p decreasing refcount to %u\n", This, refcount);
@@ -536,7 +536,7 @@ HRESULT d3d10_pixel_shader_init(struct d3d10_pixel_shader *shader, struct d3d10_
     struct d3d10_shader_info shader_info;
     HRESULT hr;
 
-    shader->vtbl = &d3d10_pixel_shader_vtbl;
+    shader->ID3D10PixelShader_iface.lpVtbl = &d3d10_pixel_shader_vtbl;
     shader->refcount = 1;
 
     shader_info.output_signature = &shader->output_signature;