Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-12 17:16:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed duplicate typedef in DirectX headers for real this time :)

Browse source 
svn path=/trunk/; revision=32404
This commit is contained in:
Gregor Brunmar 2008-02-17 14:51:26 +00:00
parent 751b0ea821
commit aa6f9c2d05
2 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/include/ddk/ddrawint.h
View file

@ -68,7 +68,10 @@ typedef struct _DD_VIDEOPORT_LOCAL *PDD_VIDEOPORT_LOCAL;
/* _DD_GETHEAPALIGNMENTDATA is defined in dmemmgr.h */ /* _DD_GETHEAPALIGNMENTDATA is defined in dmemmgr.h */
/************************************************************************/ /************************************************************************/
struct _DD_GETHEAPALIGNMENTDATA; struct _DD_GETHEAPALIGNMENTDATA;
#ifndef DD_GETHEAPALIGNMENTDATA_DECLARED
typedef struct _DD_GETHEAPALIGNMENTDATA *PDD_GETHEAPALIGNMENTDATA; typedef struct _DD_GETHEAPALIGNMENTDATA *PDD_GETHEAPALIGNMENTDATA;
#define DD_GETHEAPALIGNMENTDATA_DECLARED
#endif
/************************************************************************/ /************************************************************************/
/* Video memory info structures */ /* Video memory info structures */

14
reactos/include/ddk/dmemmgr.h
View file

@ -126,6 +126,20 @@ typedef struct _VMEMHEAP
DWORD dwAgpCommitMaskSize; DWORD dwAgpCommitMaskSize;
} VMEMHEAP, *LPVMEMHEAP; } VMEMHEAP, *LPVMEMHEAP;
typedef struct _DD_GETHEAPALIGNMENTDATA
{
ULONG_PTR dwInstance;
DWORD dwHeap;
HRESULT ddRVal;
VOID* GetHeapAlignment;
HEAPALIGNMENT Alignment;
} DD_GETHEAPALIGNMENTDATA;
#ifndef DD_GETHEAPALIGNMENTDATA_DECLARED
typedef DD_GETHEAPALIGNMENTDATA *PDD_GETHEAPALIGNMENTDATA;
#define DD_GETHEAPALIGNMENTDATA_DECLARED
#endif
extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr); extern void WINAPI VidMemFree( LPVMEMHEAP pvmh, FLATPTR ptr);
extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height); extern FLATPTR WINAPI VidMemAlloc( LPVMEMHEAP pvmh, DWORD width, DWORD height);