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

[Alexandre Julliard]

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

Author: Michael Stefaniuc 
Date:   Thu Jun  2 11:22:49 2011 +0200

d3d10core: COM cleanup for the ID3D10RasterizerState iface.

---

dlls/d3d10core/d3d10core_private.h |    2 +-
 dlls/d3d10core/device.c            |    2 +-
 dlls/d3d10core/state.c             |   11 ++++++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h
index 6be41cf..32d485d 100644
--- a/dlls/d3d10core/d3d10core_private.h
+++ b/dlls/d3d10core/d3d10core_private.h
@@ -227,7 +227,7 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state) DE
 /* ID3D10RasterizerState */
 struct d3d10_rasterizer_state
 {
-    const struct ID3D10RasterizerStateVtbl *vtbl;
+    ID3D10RasterizerState ID3D10RasterizerState_iface;
     LONG refcount;
 };

diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c
index 9dae3aa..3523fe0 100644
--- a/dlls/d3d10core/device.c
+++ b/dlls/d3d10core/device.c
@@ -1026,7 +1026,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device
     }

TRACE("Created rasterizer state %p.\n", object);
-    *rasterizer_state = (ID3D10RasterizerState *)object;
+    *rasterizer_state = &object->ID3D10RasterizerState_iface;

return S_OK;
 }
diff --git a/dlls/d3d10core/state.c b/dlls/d3d10core/state.c
index 6fc7f17..4e77b1d 100644
--- a/dlls/d3d10core/state.c
+++ b/dlls/d3d10core/state.c
@@ -256,6 +256,11 @@ HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state)
     return S_OK;
 }

+static inline struct d3d10_rasterizer_state *impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface)
+{
+    return CONTAINING_RECORD(iface, struct d3d10_rasterizer_state, ID3D10RasterizerState_iface);
+}
+
 /* IUnknown methods */

static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10RasterizerState *iface,
@@ -280,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10Ras

static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerState *iface)
 {
-    struct d3d10_rasterizer_state *This = (struct d3d10_rasterizer_state *)iface;
+    struct d3d10_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface);
     ULONG refcount = InterlockedIncrement(&This->refcount);

TRACE("%p increasing refcount to %u.\n", This, refcount);
@@ -290,7 +295,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerSta

static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface)
 {
-    struct d3d10_rasterizer_state *This = (struct d3d10_rasterizer_state *)iface;
+    struct d3d10_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface);
     ULONG refcount = InterlockedDecrement(&This->refcount);

TRACE("%p decreasing refcount to %u.\n", This, refcount);
@@ -361,7 +366,7 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl =

HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state)
 {
-    state->vtbl = &d3d10_rasterizer_state_vtbl;
+    state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl;
     state->refcount = 1;

return S_OK;