[gbrunmar] 32248: * Made it possible to include both d3d9types.h and ddrawgdi.h at the same time

Author: gbrunmar
Date: Sun Feb 10 10:30:27 2008
New Revision: 32248

URL: http://svn.reactos.org/svn/reactos?rev=32248&view=rev
Log:
* Made it possible to include both d3d9types.h and ddrawgdi.h at the same time

Modified:
    trunk/reactos/dll/directx/ddraw/startup.c
    trunk/reactos/dll/win32/gdi32/misc/gdientry.c
    trunk/reactos/dll/win32/gdi32/misc/historic.c
    trunk/reactos/include/ddk/d3dhal.h
    trunk/reactos/include/psdk/ddrawgdi.h

Modified: trunk/reactos/dll/directx/ddraw/startup.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/startup.c...
==============================================================================
--- trunk/reactos/dll/directx/ddraw/startup.c (original)
+++ trunk/reactos/dll/directx/ddraw/startup.c Sun Feb 10 10:30:27 2008
@@ -9,7 +9,6 @@
  */

#include "rosdraw.h"
-#include "ddrawgdi.h"

DDRAWI_DIRECTDRAW_GBL ddgbl;
 DDRAWI_DDRAWSURFACE_GBL ddSurfGbl;

Modified: trunk/reactos/dll/win32/gdi32/misc/gdientry.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/gdient...
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/gdientry.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/gdientry.c Sun Feb 10 10:30:27 2008
@@ -15,6 +15,7 @@
 #include <ddrawint.h>
 #include <ddrawgdi.h>
 #include <ntgdi.h>
+#include <d3dhal.h>

/* DATA **********************************************************************/

Modified: trunk/reactos/dll/win32/gdi32/misc/historic.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/histor...
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/historic.c (original)
+++ trunk/reactos/dll/win32/gdi32/misc/historic.c Sun Feb 10 10:30:27 2008
@@ -14,6 +14,7 @@
 #include <ddrawint.h>
 #include <ddrawgdi.h>
 #include <ntgdi.h>
+#include <d3dhal.h>

/*
  * @implemented

Modified: trunk/reactos/include/ddk/d3dhal.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/d3dhal.h?rev=32...
==============================================================================
--- trunk/reactos/include/ddk/d3dhal.h (original)
+++ trunk/reactos/include/ddk/d3dhal.h Sun Feb 10 10:30:27 2008
@@ -59,7 +59,12 @@
   DWORD			dwNumClipVertices;
   DWORD			dwNumTextureFormats;
   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 {
   DWORD			dwSize;
@@ -159,7 +164,12 @@
   DWORD				dwReserved7;
   DWORD				dwReserved8;
   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_CLEARDATA			*LPD3DHAL_CLEARDATA;

Modified: trunk/reactos/include/psdk/ddrawgdi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawgdi.h?rev...
==============================================================================
--- trunk/reactos/include/psdk/ddrawgdi.h (original)
+++ trunk/reactos/include/psdk/ddrawgdi.h Sun Feb 10 10:30:27 2008
@@ -19,7 +19,6 @@

#ifndef _DDRAWGDI_
 #define _DDRAWGDI_
-#include <d3dhal.h>

/* Define the real export names */
 #define DdCreateDirectDrawObject            GdiEntry1
@@ -39,6 +38,15 @@
 #define DdSetGammaRamp                      GdiEntry15
 #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
 STDCALL