d3dcompiler: Use an iface instead of a vtbl pointer in d3dcompiler_blob.

This commit is contained in:
Rico Schüller 2010-12-21 11:05:49 +01:00 committed by Alexandre Julliard
parent c1c92d07d7
commit 806961ec28
2 changed files with 11 additions and 6 deletions

View File

@ -26,6 +26,11 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler);
static inline struct d3dcompiler_blob *impl_from_ID3DBlob(ID3DBlob *iface)
{
return CONTAINING_RECORD(iface, struct d3dcompiler_blob, ID3DBlob_iface);
}
/* IUnknown methods */
static HRESULT STDMETHODCALLTYPE d3dcompiler_blob_QueryInterface(ID3DBlob *iface, REFIID riid, void **object)
@ -48,7 +53,7 @@ static HRESULT STDMETHODCALLTYPE d3dcompiler_blob_QueryInterface(ID3DBlob *iface
static ULONG STDMETHODCALLTYPE d3dcompiler_blob_AddRef(ID3DBlob *iface)
{
struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface;
struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface);
ULONG refcount = InterlockedIncrement(&blob->refcount);
TRACE("%p increasing refcount to %u\n", blob, refcount);
@ -58,7 +63,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_AddRef(ID3DBlob *iface)
static ULONG STDMETHODCALLTYPE d3dcompiler_blob_Release(ID3DBlob *iface)
{
struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface;
struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface);
ULONG refcount = InterlockedDecrement(&blob->refcount);
TRACE("%p decreasing refcount to %u\n", blob, refcount);
@ -76,7 +81,7 @@ static ULONG STDMETHODCALLTYPE d3dcompiler_blob_Release(ID3DBlob *iface)
static void * STDMETHODCALLTYPE d3dcompiler_blob_GetBufferPointer(ID3DBlob *iface)
{
struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface;
struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface);
TRACE("iface %p\n", iface);
@ -85,7 +90,7 @@ static void * STDMETHODCALLTYPE d3dcompiler_blob_GetBufferPointer(ID3DBlob *ifac
static SIZE_T STDMETHODCALLTYPE d3dcompiler_blob_GetBufferSize(ID3DBlob *iface)
{
struct d3dcompiler_blob *blob = (struct d3dcompiler_blob *)iface;
struct d3dcompiler_blob *blob = impl_from_ID3DBlob(iface);
TRACE("iface %p\n", iface);
@ -105,7 +110,7 @@ static const struct ID3D10BlobVtbl d3dcompiler_blob_vtbl =
HRESULT d3dcompiler_blob_init(struct d3dcompiler_blob *blob, SIZE_T data_size)
{
blob->vtbl = &d3dcompiler_blob_vtbl;
blob->ID3DBlob_iface.lpVtbl = &d3dcompiler_blob_vtbl;
blob->refcount = 1;
blob->size = data_size;

View File

@ -44,7 +44,7 @@ const char *debug_d3dcompiler_d3d_blob_part(D3D_BLOB_PART part) DECLSPEC_HIDDEN;
/* ID3DBlob */
struct d3dcompiler_blob
{
const struct ID3D10BlobVtbl *vtbl;
ID3DBlob ID3DBlob_iface;
LONG refcount;
SIZE_T size;