d3d10core: COM cleanup for the ID3D10DepthStencilState iface.

This commit is contained in:
Michael Stefaniuc 2011-06-02 11:21:30 +02:00 committed by Alexandre Julliard
parent e6b29add01
commit 815470e68b
3 changed files with 10 additions and 5 deletions

View File

@ -218,7 +218,7 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state) DECLSPEC_HIDDEN;
/* ID3D10DepthStencilState */
struct d3d10_depthstencil_state
{
const struct ID3D10DepthStencilStateVtbl *vtbl;
ID3D10DepthStencilState ID3D10DepthStencilState_iface;
LONG refcount;
};

View File

@ -997,7 +997,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Devi
}
TRACE("Created depthstencil state %p.\n", object);
*depth_stencil_state = (ID3D10DepthStencilState *)object;
*depth_stencil_state = &object->ID3D10DepthStencilState_iface;
return S_OK;
}

View File

@ -140,6 +140,11 @@ HRESULT d3d10_blend_state_init(struct d3d10_blend_state *state)
return S_OK;
}
static inline struct d3d10_depthstencil_state *impl_from_ID3D10DepthStencilState(ID3D10DepthStencilState *iface)
{
return CONTAINING_RECORD(iface, struct d3d10_depthstencil_state, ID3D10DepthStencilState_iface);
}
/* IUnknown methods */
static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_QueryInterface(ID3D10DepthStencilState *iface,
@ -164,7 +169,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_depthstencil_state_QueryInterface(ID3D10D
static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_AddRef(ID3D10DepthStencilState *iface)
{
struct d3d10_depthstencil_state *This = (struct d3d10_depthstencil_state *)iface;
struct d3d10_depthstencil_state *This = impl_from_ID3D10DepthStencilState(iface);
ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u.\n", This, refcount);
@ -174,7 +179,7 @@ static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_AddRef(ID3D10DepthStenci
static ULONG STDMETHODCALLTYPE d3d10_depthstencil_state_Release(ID3D10DepthStencilState *iface)
{
struct d3d10_depthstencil_state *This = (struct d3d10_depthstencil_state *)iface;
struct d3d10_depthstencil_state *This = impl_from_ID3D10DepthStencilState(iface);
ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u.\n", This, refcount);
@ -245,7 +250,7 @@ static const struct ID3D10DepthStencilStateVtbl d3d10_depthstencil_state_vtbl =
HRESULT d3d10_depthstencil_state_init(struct d3d10_depthstencil_state *state)
{
state->vtbl = &d3d10_depthstencil_state_vtbl;
state->ID3D10DepthStencilState_iface.lpVtbl = &d3d10_depthstencil_state_vtbl;
state->refcount = 1;
return S_OK;