Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-12 14:16:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Made it possible to include both d3d9types.h and ddrawgdi.h at the same time

Browse source 
svn path=/trunk/; revision=32248
This commit is contained in:
Gregor Brunmar 2008-02-10 07:30:27 +00:00
parent 412242bf24
commit 7f15e53fd8
5 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/directx/ddraw/startup.c
View file

@ -9,7 +9,6 @@
*/ */
#include "rosdraw.h" #include "rosdraw.h"
#include "ddrawgdi.h"
DDRAWI_DIRECTDRAW_GBL ddgbl; DDRAWI_DIRECTDRAW_GBL ddgbl;
DDRAWI_DDRAWSURFACE_GBL ddSurfGbl; DDRAWI_DDRAWSURFACE_GBL ddSurfGbl;

1
reactos/dll/win32/gdi32/misc/gdientry.c
View file

@ -15,6 +15,7 @@
#include <ddrawint.h> #include <ddrawint.h>
#include <ddrawgdi.h> #include <ddrawgdi.h>
#include <ntgdi.h> #include <ntgdi.h>
#include <d3dhal.h>
/* DATA **********************************************************************/ /* DATA **********************************************************************/

1
reactos/dll/win32/gdi32/misc/historic.c
View file

@ -14,6 +14,7 @@
#include <ddrawint.h> #include <ddrawint.h>
#include <ddrawgdi.h> #include <ddrawgdi.h>
#include <ntgdi.h> #include <ntgdi.h>
#include <d3dhal.h>
/* /*
* @implemented * @implemented

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

@ -59,7 +59,12 @@ typedef struct _D3DHAL_GLOBALDRIVERDATA {
DWORD dwNumClipVertices; DWORD dwNumClipVertices;
DWORD dwNumTextureFormats; DWORD dwNumTextureFormats;
LPDDSURFACEDESC lpTextureFormats; LPDDSURFACEDESC lpTextureFormats;
} D3DHAL_GLOBALDRIVERDATA,*LPD3DHAL_GLOBALDRIVERDATA; } D3DHAL_GLOBALDRIVERDATA;
#ifndef D3DHAL_GLOBALDRIVERDATA_DEFINED
typedef D3DHAL_GLOBALDRIVERDATA *LPD3DHAL_GLOBALDRIVERDATA;
#define D3DHAL_GLOBALDRIVERDATA_DEFINED
#endif
typedef struct _D3DHAL_D3DEXTENDEDCAPS { typedef struct _D3DHAL_D3DEXTENDEDCAPS {
DWORD dwSize; DWORD dwSize;
@ -159,7 +164,12 @@ typedef struct _D3DHAL_CALLBACKS {
DWORD dwReserved7; DWORD dwReserved7;
DWORD dwReserved8; DWORD dwReserved8;
DWORD dwReserved9; DWORD dwReserved9;
} D3DHAL_CALLBACKS,*LPD3DHAL_CALLBACKS; } D3DHAL_CALLBACKS;
#ifndef D3DHAL_CALLBACKS_DEFINED
typedef D3DHAL_CALLBACKS *LPD3DHAL_CALLBACKS;
#define D3DHAL_CALLBACKS_DEFINED
#endif
typedef struct _D3DHAL_SETRENDERTARGETDATA *LPD3DHAL_SETRENDERTARGETDATA; typedef struct _D3DHAL_SETRENDERTARGETDATA *LPD3DHAL_SETRENDERTARGETDATA;
typedef struct _D3DHAL_CLEARDATA *LPD3DHAL_CLEARDATA; typedef struct _D3DHAL_CLEARDATA *LPD3DHAL_CLEARDATA;

10
reactos/include/psdk/ddrawgdi.h
View file

@ -19,7 +19,6 @@
#ifndef _DDRAWGDI_ #ifndef _DDRAWGDI_
#define _DDRAWGDI_ #define _DDRAWGDI_
#include <d3dhal.h>
/* Define the real export names */ /* Define the real export names */
#define DdCreateDirectDrawObject GdiEntry1 #define DdCreateDirectDrawObject GdiEntry1
@ -39,6 +38,15 @@
#define DdSetGammaRamp GdiEntry15 #define DdSetGammaRamp GdiEntry15
#define DdSwapTextureHandles GdiEntry16 #define DdSwapTextureHandles GdiEntry16
#ifndef D3DHAL_CALLBACKS_DEFINED
typedef struct _D3DHAL_CALLBACKS FAR *LPD3DHAL_CALLBACKS;
#define D3DHAL_CALLBACKS_DEFINED
#endif
#ifndef D3DHAL_GLOBALDRIVERDATA_DEFINED
typedef struct _D3DHAL_GLOBALDRIVERDATA FAR *LPD3DHAL_GLOBALDRIVERDATA;
#define D3DHAL_GLOBALDRIVERDATA_DEFINED
#endif
BOOL BOOL
STDCALL STDCALL