ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d10core: COM cleanup for the ID3D10Query iface.

This commit is contained in:
Michael Stefaniuc 2011-06-02 11:24:44 +02:00 committed by Alexandre Julliard
parent db9823e02a
commit 2f76274df9
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/d3d10core/async.c
View File

@ -24,6 +24,11 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d10core); WINE_DEFAULT_DEBUG_CHANNEL(d3d10core);
static inline struct d3d10_query *impl_from_ID3D10Query(ID3D10Query *iface)
{
return CONTAINING_RECORD(iface, struct d3d10_query, ID3D10Query_iface);
}
/* IUnknown methods */ /* IUnknown methods */
static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object) static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface, REFIID riid, void **object)
@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_query_QueryInterface(ID3D10Query *iface,
static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface) static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface)
{ {
struct d3d10_query *This = (struct d3d10_query *)iface; struct d3d10_query *This = impl_from_ID3D10Query(iface);
ULONG refcount = InterlockedIncrement(&This->refcount); ULONG refcount = InterlockedIncrement(&This->refcount);
TRACE("%p increasing refcount to %u.\n", This, refcount); TRACE("%p increasing refcount to %u.\n", This, refcount);
@ -58,7 +63,7 @@ static ULONG STDMETHODCALLTYPE d3d10_query_AddRef(ID3D10Query *iface)
static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface) static ULONG STDMETHODCALLTYPE d3d10_query_Release(ID3D10Query *iface)
{ {
struct d3d10_query *This = (struct d3d10_query *)iface; struct d3d10_query *This = impl_from_ID3D10Query(iface);
ULONG refcount = InterlockedDecrement(&This->refcount); ULONG refcount = InterlockedDecrement(&This->refcount);
TRACE("%p decreasing refcount to %u.\n", This, refcount); TRACE("%p decreasing refcount to %u.\n", This, refcount);
@ -159,7 +164,7 @@ static const struct ID3D10QueryVtbl d3d10_query_vtbl =
HRESULT d3d10_query_init(struct d3d10_query *query) HRESULT d3d10_query_init(struct d3d10_query *query)
{ {
query->vtbl = &d3d10_query_vtbl; query->ID3D10Query_iface.lpVtbl = &d3d10_query_vtbl;
query->refcount = 1; query->refcount = 1;
return S_OK; return S_OK;

2
dlls/d3d10core/d3d10core_private.h
View File

@ -245,7 +245,7 @@ HRESULT d3d10_sampler_state_init(struct d3d10_sampler_state *state) DECLSPEC_HID
/* ID3D10Query */ /* ID3D10Query */
struct d3d10_query struct d3d10_query
{ {
const struct ID3D10QueryVtbl *vtbl; ID3D10Query ID3D10Query_iface;
LONG refcount; LONG refcount;
}; };

2
dlls/d3d10core/device.c
View File

@ -1084,7 +1084,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateQuery(ID3D10Device *iface,
} }
TRACE("Created query %p.\n", object); TRACE("Created query %p.\n", object);
*query = (ID3D10Query *)object; *query = &object->ID3D10Query_iface;
return S_OK; return S_OK;
} }