Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-20 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Changed to aligned alloc of Direct3D9 object

Browse source 
* More fields in IDirect3D9 structure

svn path=/trunk/; revision=31364
This commit is contained in:
Gregor Brunmar 2007-12-20 21:18:42 +00:00
parent 2d5dcf3064
commit 181f62fec0
5 changed files with 74 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/directx/d3d9/d3d9.rbuild
View file

@ -5,6 +5,8 @@
<library>advapi32</library>
<library>kernel32</library>
<library>user32</library>
<library>gdi32</library>
<library>uuid</library>
<library>dxguid</library>

65
reactos/dll/directx/d3d9/d3d9_helpers.c
View file

@ -9,11 +9,14 @@
#include "d3d9_helpers.h"
#include <stdio.h>
#include <ddraw.h>
#include <debug.h>
#include "d3d9_private.h"
#define MEM_ALIGNMENT 0x20
static LPCSTR D3dDebugRegPath = "Software\\Microsoft\\Direct3D";
static const GUID DISPLAY_GUID = { 0x67685559, 0x3106, 0x11D0, { 0xB9, 0x71, 0x00, 0xAA, 0x00, 0x34, 0x2F, 0x9F } };
LPDIRECT3D9_INT impl_from_IDirect3D9(LPDIRECT3D9 iface)
{
return (LPDIRECT3D9_INT)((ULONG_PTR)iface - FIELD_OFFSET(DIRECT3D9_INT, lpVtbl));
@ -67,9 +70,10 @@ HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9)
if (ppDirect3D9 == 0)
return DDERR_INVALIDPARAMS;
pDirect3D9 = HeapAlloc(GetProcessHeap(), 0, sizeof(DIRECT3D9_INT));
if (AlignedAlloc((LPVOID *)&pDirect3D9, sizeof(DIRECT3D9_INT)) != S_OK)
return DDERR_OUTOFMEMORY;
if (0 == pDirect3D9)
if (pDirect3D9 == 0)
return DDERR_OUTOFMEMORY;
pDirect3D9->unknown000007 = 0;
@ -86,11 +90,64 @@ HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9)
pDirect3D9->unknown004581 = 0;
pDirect3D9->unknown004582 = 0;
pDirect3D9->unknown004583 = 0;
pDirect3D9->unknown004589 = 0;
pDirect3D9->unknown004589 = 0x20;
pDirect3D9->lpInt = pDirect3D9;
pDirect3D9->unknown000007 = 1;
InitializeCriticalSection(&pDirect3D9->d3d9_cs);
memcpy(&pDirect3D9->DisplayGuid, &DISPLAY_GUID, sizeof(GUID));
*ppDirect3D9 = (LPDIRECT3D9)&pDirect3D9->lpVtbl;
return ERROR_SUCCESS;
}
HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize)
{
ULONG AddressOffset;
ULONG AlignedMask = MEM_ALIGNMENT - 1;
CHAR *AlignedPtr;
ULONG_PTR *AlignedOffsetPtr;
if (ppObject == 0)
return DDERR_INVALIDPARAMS;
if (dwSize == 0)
{
*ppObject = NULL;
return S_OK;
}
dwSize += MEM_ALIGNMENT;
AlignedPtr = (CHAR *)LocalAlloc(LMEM_ZEROINIT, dwSize);
if (AlignedPtr == 0)
return DDERR_OUTOFMEMORY;
AddressOffset = MEM_ALIGNMENT - ((ULONG)AlignedPtr & AlignedMask);
AlignedPtr += AddressOffset;
AlignedOffsetPtr = (ULONG_PTR *)(AlignedPtr - sizeof(ULONG));
*AlignedOffsetPtr = AddressOffset;
*ppObject = (ULONG_PTR *)AlignedPtr;
return S_OK;
}
VOID AlignedFree(IN OUT LPVOID pObject)
{
CHAR *NonAlignedPtr = pObject;
ULONG_PTR *AlignedPtr = pObject;
if (pObject == 0)
return;
NonAlignedPtr -= *(AlignedPtr - 1);
LocalFree(NonAlignedPtr);
}

7
reactos/dll/directx/d3d9/d3d9_helpers.h
View file

@ -22,4 +22,11 @@ HRESULT FormatDebugString(IN OUT LPSTR Buffer, IN LONG BufferSize, IN LPCSTR For
/* Creates a Direct3D9 object */
HRESULT CreateD3D9(OUT LPDIRECT3D9 *ppDirect3D9);
/* Allocates memory and returns an aligned pointer */
HRESULT AlignedAlloc(IN OUT LPVOID *ppObject, IN SIZE_T dwSize);
/* Frees memory allocated with AlignedAlloc */
VOID AlignedFree(IN OUT LPVOID pObject);
#endif // _D3D9_HELPERS_H_

2
reactos/dll/directx/d3d9/d3d9_impl.c
View file

@ -43,7 +43,7 @@ static ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9 iface)
EnterCriticalSection(&This->d3d9_cs);
/* TODO: Free resources here */
LeaveCriticalSection(&This->d3d9_cs);
HeapFree(GetProcessHeap(), 0, This);
AlignedFree(This);
}
return ref;

67
reactos/dll/directx/d3d9/d3d9_private.h
View file

@ -26,71 +26,10 @@ typedef struct _tagDIRECT3D9_INT_
/* 0x0020 */ DWORD dwProcessId;
/* 0x0024 */ struct _tagDIRECT3D9_INT_ *lpInt;
/* 0x0028 */ LONG dwRefCnt; /* Increases and decreases by AddRef() and Release() */
/* 0x002c */ DWORD unknown000011; /* 0x00000001 - Probably AdapterIndex */
/* 0x002c */ DWORD unknown000011; /* 0x00000001 - Probably NumDisplays */
/* 0x0030 */ GUID DisplayGuid; /*? Always {67685559-3106-11D0-B971-00AA00342F9F} ? */
/* 0x0040 */ CHAR DeviceName[16];
/* 0x0050 */ DWORD unknown000020;
/* 0x0054 */ DWORD unknown000021;
/* 0x0058 */ DWORD unknown000022;
/* 0x005c */ DWORD unknown000023;
/* 0x0060 */ DWORD unknown000024;
/* 0x0064 */ DWORD unknown000025;
/* 0x0068 */ DWORD unknown000026;
/* 0x006c */ DWORD unknown000027;
/* 0x0070 */ DWORD unknown000028;
/* 0x0074 */ DWORD unknown000029;
/* 0x0078 */ DWORD unknown000030;
/* 0x007c */ DWORD unknown000031;
/* 0x0080 */ DWORD unknown000032;
/* 0x0084 */ DWORD unknown000033;
/* 0x0088 */ DWORD unknown000034;
/* 0x008c */ DWORD unknown000035;
/* 0x0090 */ DWORD unknown000036;
/* 0x0094 */ DWORD unknown000037;
/* 0x0098 */ DWORD unknown000038;
/* 0x009c */ DWORD unknown000039;
/* 0x00a0 */ DWORD unknown000040;
/* 0x00a4 */ DWORD unknown000041;
/* 0x00a8 */ DWORD unknown000042;
/* 0x00ac */ DWORD unknown000043;
/* 0x00b0 */ DWORD unknown000044;
/* 0x00b4 */ DWORD unknown000045;
/* 0x00b8 */ DWORD unknown000046;
/* 0x00bc */ DWORD unknown000047;
/* 0x00c0 */ DWORD unknown000048;
/* 0x00c4 */ DWORD unknown000049;
/* 0x00c8 */ DWORD unknown000050;
/* 0x00cc */ DWORD unknown000051;
/* 0x00d0 */ DWORD unknown000052;
/* 0x00d4 */ DWORD unknown000053;
/* 0x00d8 */ DWORD unknown000054;
/* 0x00dc */ DWORD unknown000055;
/* 0x00e0 */ DWORD unknown000056;
/* 0x00e4 */ DWORD unknown000057;
/* 0x00e8 */ DWORD unknown000058;
/* 0x00ec */ DWORD unknown000059;
/* 0x00f0 */ DWORD unknown000060;
/* 0x00f4 */ DWORD unknown000061;
/* 0x00f8 */ DWORD unknown000062;
/* 0x00fc */ DWORD unknown000063;
/* 0x0100 */ DWORD unknown000064;
/* 0x0104 */ DWORD unknown000065;
/* 0x0108 */ DWORD unknown000066;
/* 0x010c */ DWORD unknown000067;
/* 0x0110 */ DWORD unknown000068;
/* 0x0114 */ DWORD unknown000069;
/* 0x0118 */ DWORD unknown000070;
/* 0x011c */ DWORD unknown000071;
/* 0x0120 */ DWORD unknown000072;
/* 0x0124 */ DWORD unknown000073;
/* 0x0128 */ DWORD unknown000074;
/* 0x012c */ DWORD unknown000075;
/* 0x0130 */ DWORD unknown000076;
/* 0x0134 */ DWORD unknown000077;
/* 0x0138 */ DWORD unknown000078;
/* 0x013c */ DWORD unknown000079;
/* 0x0140 */ DWORD unknown000080;
/* 0x0144 */ DWORD unknown000081; /*? 0x80000001 */
/* 0x0040 */ CHAR DeviceName[MAX_PATH];
/* 0x0144 */ DWORD StateFlags; /*? 0x80000001 */
/* 0x0148 */ DWORD unknown000082; /*? 0x00000001 */
/* 0x014c */ DWORD unknown000083;
/* 0x0150 */ DWORD unknown000084;