Commit 62c1fb09 authored by Rico Schüller's avatar Rico Schüller Committed by Alexandre Julliard

d3dx9: Remove typedef from ID3DXBufferImpl.

parent 98001ca8
...@@ -30,23 +30,23 @@ ...@@ -30,23 +30,23 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3dx); WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
typedef struct ID3DXBufferImpl struct ID3DXBufferImpl
{ {
ID3DXBuffer ID3DXBuffer_iface; ID3DXBuffer ID3DXBuffer_iface;
LONG ref; LONG ref;
DWORD *buffer; DWORD *buffer;
DWORD bufferSize; DWORD bufferSize;
} ID3DXBufferImpl; };
static inline ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface) static inline struct ID3DXBufferImpl *impl_from_ID3DXBuffer(ID3DXBuffer *iface)
{ {
return CONTAINING_RECORD(iface, ID3DXBufferImpl, ID3DXBuffer_iface); return CONTAINING_RECORD(iface, struct ID3DXBufferImpl, ID3DXBuffer_iface);
} }
static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID riid, void **ppobj) static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID riid, void **ppobj)
{ {
ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface);
if (IsEqualGUID(riid, &IID_IUnknown) if (IsEqualGUID(riid, &IID_IUnknown)
|| IsEqualGUID(riid, &IID_ID3DXBuffer)) || IsEqualGUID(riid, &IID_ID3DXBuffer))
...@@ -62,7 +62,7 @@ static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID ...@@ -62,7 +62,7 @@ static HRESULT WINAPI ID3DXBufferImpl_QueryInterface(ID3DXBuffer *iface, REFIID
static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface) static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface)
{ {
ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface);
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) : AddRef from %d\n", This, ref - 1); TRACE("(%p) : AddRef from %d\n", This, ref - 1);
...@@ -72,7 +72,7 @@ static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface) ...@@ -72,7 +72,7 @@ static ULONG WINAPI ID3DXBufferImpl_AddRef(ID3DXBuffer *iface)
static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface) static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface)
{ {
ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface);
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) : ReleaseRef to %d\n", This, ref); TRACE("(%p) : ReleaseRef to %d\n", This, ref);
...@@ -87,13 +87,13 @@ static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface) ...@@ -87,13 +87,13 @@ static ULONG WINAPI ID3DXBufferImpl_Release(ID3DXBuffer *iface)
static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(ID3DXBuffer *iface) static LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(ID3DXBuffer *iface)
{ {
ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface);
return This->buffer; return This->buffer;
} }
static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(ID3DXBuffer *iface) static DWORD WINAPI ID3DXBufferImpl_GetBufferSize(ID3DXBuffer *iface)
{ {
ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface); struct ID3DXBufferImpl *This = impl_from_ID3DXBuffer(iface);
return This->bufferSize; return This->bufferSize;
} }
...@@ -108,7 +108,7 @@ const ID3DXBufferVtbl D3DXBuffer_Vtbl = ...@@ -108,7 +108,7 @@ const ID3DXBufferVtbl D3DXBuffer_Vtbl =
HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer) HRESULT WINAPI D3DXCreateBuffer(DWORD NumBytes, LPD3DXBUFFER* ppBuffer)
{ {
ID3DXBufferImpl *object; struct ID3DXBufferImpl *object;
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (object == NULL) if (object == NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment