Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DVertexShader9 iface.

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Wed Jul  6 13:23:44 2011 +0200

d3d9: COM cleanup for the IDirect3DVertexShader9 iface.

---

dlls/d3d9/d3d9_private.h |    3 +--
 dlls/d3d9/device.c       |    2 +-
 dlls/d3d9/shader.c       |   15 +++++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h
index 78e497f..7cd11ee 100644
--- a/dlls/d3d9/d3d9_private.h
+++ b/dlls/d3d9/d3d9_private.h
@@ -407,8 +407,7 @@ HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration9Impl *declaration,
  * IDirect3DVertexShader implementation structure
  */
 typedef struct IDirect3DVertexShader9Impl {
-  /* IUnknown fields */
-  const IDirect3DVertexShader9Vtbl *lpVtbl;
+  IDirect3DVertexShader9 IDirect3DVertexShader9_iface;
   LONG ref;
   struct wined3d_shader *wined3d_shader;
   IDirect3DDevice9Ex *parentDevice;
diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c
index 46f71ca..8646eb2 100644
--- a/dlls/d3d9/device.c
+++ b/dlls/d3d9/device.c
@@ -2289,7 +2289,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(IDirect3DDevice9Ex
     }

TRACE("Created vertex shader %p.\n", object);
-    *shader = (IDirect3DVertexShader9 *)object;
+    *shader = &object->IDirect3DVertexShader9_iface;

return D3D_OK;
 }
diff --git a/dlls/d3d9/shader.c b/dlls/d3d9/shader.c
index a063b0c..7da93c0 100644
--- a/dlls/d3d9/shader.c
+++ b/dlls/d3d9/shader.c
@@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9);

static inline IDirect3DVertexShader9Impl *impl_from_IDirect3DVertexShader9(IDirect3DVertexShader9 *iface)
 {
-    return CONTAINING_RECORD(iface, IDirect3DVertexShader9Impl, lpVtbl);
+    return CONTAINING_RECORD(iface, IDirect3DVertexShader9Impl, IDirect3DVertexShader9_iface);
 }

static HRESULT WINAPI d3d9_vertexshader_QueryInterface(IDirect3DVertexShader9 *iface, REFIID riid, void **object)
@@ -48,7 +48,7 @@ static HRESULT WINAPI d3d9_vertexshader_QueryInterface(IDirect3DVertexShader9 *i

static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface)
 {
-    IDirect3DVertexShader9Impl *shader = (IDirect3DVertexShader9Impl *)iface;
+    IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface);
     ULONG refcount = InterlockedIncrement(&shader->ref);

TRACE("%p increasing refcount to %u.\n", iface, refcount);
@@ -66,7 +66,7 @@ static ULONG WINAPI d3d9_vertexshader_AddRef(IDirect3DVertexShader9 *iface)

static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface)
 {
-    IDirect3DVertexShader9Impl *shader = (IDirect3DVertexShader9Impl *)iface;
+    IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface);
     ULONG refcount = InterlockedDecrement(&shader->ref);

TRACE("%p decreasing refcount to %u.\n", iface, refcount);
@@ -88,9 +88,11 @@ static ULONG WINAPI d3d9_vertexshader_Release(IDirect3DVertexShader9 *iface)

static HRESULT WINAPI d3d9_vertexshader_GetDevice(IDirect3DVertexShader9 *iface, IDirect3DDevice9 **device)
 {
+    IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface);
+
     TRACE("iface %p, device %p.\n", iface, device);

-    *device = (IDirect3DDevice9 *)((IDirect3DVertexShader9Impl *)iface)->parentDevice;
+    *device = (IDirect3DDevice9 *)shader->parentDevice;
     IDirect3DDevice9_AddRef(*device);

TRACE("Returning device %p.\n", *device);
@@ -101,12 +103,13 @@ static HRESULT WINAPI d3d9_vertexshader_GetDevice(IDirect3DVertexShader9 *iface,
 static HRESULT WINAPI d3d9_vertexshader_GetFunction(IDirect3DVertexShader9 *iface,
         void *data, UINT *data_size)
 {
+    IDirect3DVertexShader9Impl *shader = impl_from_IDirect3DVertexShader9(iface);
     HRESULT hr;

TRACE("iface %p, data %p, data_size %p.\n", iface, data, data_size);

wined3d_mutex_lock();
-    hr = wined3d_shader_get_byte_code(((IDirect3DVertexShader9Impl *)iface)->wined3d_shader, data, data_size);
+    hr = wined3d_shader_get_byte_code(shader->wined3d_shader, data, data_size);
     wined3d_mutex_unlock();

return hr;
@@ -138,7 +141,7 @@ HRESULT vertexshader_init(IDirect3DVertexShader9Impl *shader, IDirect3DDevice9Im
     HRESULT hr;

shader->ref = 1;
-    shader->lpVtbl = &d3d9_vertexshader_vtbl;
+    shader->IDirect3DVertexShader9_iface.lpVtbl = &d3d9_vertexshader_vtbl;

wined3d_mutex_lock();
     hr = wined3d_shader_create_vs(device->wined3d_device, byte_code, NULL,