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

d3dx8: Initialize the matrix stack in D3DXCreateMatrixStack(). 

Based on a patchset by David Adam.
This commit is contained in:
Henri Verbeet 2008-10-29 16:34:21 +01:00 committed by Alexandre Julliard
parent 3eac8afba5
commit bd6a8870e2
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3dx8/d3dx8_private.h
View File

@ -86,7 +86,8 @@ struct ID3DXMatrixStackImpl
LONG ref; LONG ref;
/* ID3DXMatrixStack fields */ /* ID3DXMatrixStack fields */
int current; unsigned int current;
unsigned int stack_size;
D3DXMATRIX *stack; D3DXMATRIX *stack;
}; };

24
dlls/d3dx8/math.c
View File

@ -581,10 +581,14 @@ D3DXMATRIX* WINAPI D3DXMatrixTranspose(D3DXMATRIX *pout, CONST D3DXMATRIX *pm)
/*_________________D3DXMatrixStack____________________*/ /*_________________D3DXMatrixStack____________________*/
static const unsigned int INITIAL_STACK_SIZE = 32;
HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack) HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack)
{ {
ID3DXMatrixStackImpl* object; ID3DXMatrixStackImpl* object;
TRACE("flags %#x, ppstack %p\n", flags, ppstack);
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXMatrixStackImpl)); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXMatrixStackImpl));
if ( object == NULL ) if ( object == NULL )
{ {
@ -593,7 +597,21 @@ HRESULT WINAPI D3DXCreateMatrixStack(DWORD flags, LPD3DXMATRIXSTACK* ppstack)
} }
object->lpVtbl = &ID3DXMatrixStack_Vtbl; object->lpVtbl = &ID3DXMatrixStack_Vtbl;
object->ref = 1; object->ref = 1;
object->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_STACK_SIZE * sizeof(D3DXMATRIX));
if (!object->stack)
{
HeapFree(GetProcessHeap(), 0, object);
*ppstack = NULL;
return E_OUTOFMEMORY;
}
object->current = 0; object->current = 0;
object->stack_size = INITIAL_STACK_SIZE;
D3DXMatrixIdentity(&object->stack[0]);
TRACE("Created matrix stack %p\n", object);
*ppstack = (LPD3DXMATRIXSTACK)object; *ppstack = (LPD3DXMATRIXSTACK)object;
return D3D_OK; return D3D_OK;
} }
@ -624,7 +642,11 @@ static ULONG WINAPI ID3DXMatrixStackImpl_Release(ID3DXMatrixStack* iface)
{ {
ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface; ID3DXMatrixStackImpl *This = (ID3DXMatrixStackImpl *)iface;
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&This->ref);
if ( !ref ) HeapFree(GetProcessHeap(), 0, This); if (!ref)
{
HeapFree(GetProcessHeap(), 0, This->stack);
HeapFree(GetProcessHeap(), 0, This);
}
TRACE("(%p) : ReleaseRef to %d\n", This, ref); TRACE("(%p) : ReleaseRef to %d\n", This, ref);
return ref; return ref;
} }