[sginsberg] 37673: - Fix some definitions, and remove __DD_INCLUDED__ hack

Author: sginsberg
Date: Wed Nov 26 14:00:14 2008
New Revision: 37673

URL: http://svn.reactos.org/svn/reactos?rev=37673&view=rev
Log:
- Fix some definitions, and remove __DD_INCLUDED__ hack

Modified:
    trunk/reactos/include/ddk/ddrawi.h

Modified: trunk/reactos/include/ddk/ddrawi.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawi.h?rev=37...
==============================================================================
--- trunk/reactos/include/ddk/ddrawi.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ddrawi.h [iso-8859-1] Wed Nov 26 14:00:14 2008
@@ -216,15 +216,12 @@
 } VIDMEM;

-
-#ifndef __DD_INCLUDED__
-#define VIDMEM_ISLINEAR		0x00000001
-#define VIDMEM_ISRECTANGULAR	0x00000002
-#define VIDMEM_ISHEAP		0x00000004
-#define VIDMEM_ISNONLOCAL	0x00000008
-#define VIDMEM_ISWC		0x00000010
-#define VIDMEM_ISDISABLED	0x00000020
-#endif
+#define VIDMEM_ISLINEAR                       0x00000001l
+#define VIDMEM_ISRECTANGULAR                  0x00000002l
+#define VIDMEM_ISHEAP                         0x00000004l
+#define VIDMEM_ISNONLOCAL                     0x00000008l
+#define VIDMEM_ISWC                           0x00000010l
+#define VIDMEM_HEAPDISABLED                   0x00000020l

typedef struct _VIDMEMINFO {
     FLATPTR		fpPrimary;
@@ -338,11 +335,9 @@
 /*****************************************************************************
  * ddraw->driver callbacks
  */
-#ifndef __DD_INCLUDED__
-#define DDHAL_DRIVER_NOTHANDLED	0
-#define DDHAL_DRIVER_HANDLED	1
-#define DDHAL_DRIVER_NOCKEYHW	2
-#endif
+#define DDHAL_DRIVER_NOTHANDLED               0x00000000l
+#define DDHAL_DRIVER_HANDLED                  0x00000001l
+#define DDHAL_DRIVER_NOCKEYHW                 0x00000002l

typedef struct _DDHAL_DESTROYDRIVERDATA		*LPDDHAL_DESTROYDRIVERDATA;
 typedef struct _DDHAL_CREATESURFACEDATA		*LPDDHAL_CREATESURFACEDATA;
@@ -706,12 +701,10 @@
 #define DDHAL_CB32_FLIPTOGDISURFACE     0x00000200l
 #define DDHAL_PALCB32_DESTROYPALETTE    0x00000001l
 #define DDHAL_PALCB32_SETENTRIES    0x00000002l
-#ifndef __DD_INCLUDED__
 #define DDHALINFO_ISPRIMARYDISPLAY	        0x00000001
 #define DDHALINFO_MODEXILLEGAL	  	        0x00000002
 #define DDHALINFO_GETDRIVERINFOSET	        0x00000004
 #define DDHALINFO_GETDRIVERINFO2            0x00000008
-#endif
 #define DDRAWI_VPORTSTART                   0x0001
 #define DDRAWI_VPORTSTOP                    0x0002
 #define DDRAWI_VPORTUPDATE                  0x0003
@@ -739,13 +732,11 @@
 #define DDHAL_MISC2CB32_CREATESURFACEEX     0x00000002
 #define DDHAL_MISC2CB32_GETDRIVERSTATE      0x00000004
 #define DDHAL_MISC2CB32_DESTROYDDLOCAL      0x00000008
-#ifndef __DD_INCLUDED__
-#define DDHAL_EXEBUFCB32_CANCREATEEXEBUF    0x00000001
-#define DDHAL_EXEBUFCB32_CREATEEXEBUF       0x00000002
-#define DDHAL_EXEBUFCB32_DESTROYEXEBUF      0x00000004
-#define DDHAL_EXEBUFCB32_LOCKEXEBUF         0x00000008
-#define DDHAL_EXEBUFCB32_UNLOCKEXEBUF       0x00000010
-#endif
+#define DDHAL_EXEBUFCB32_CANCREATEEXEBUF      0x00000001l
+#define DDHAL_EXEBUFCB32_CREATEEXEBUF         0x00000002l
+#define DDHAL_EXEBUFCB32_DESTROYEXEBUF        0x00000004l
+#define DDHAL_EXEBUFCB32_LOCKEXEBUF           0x00000008l
+#define DDHAL_EXEBUFCB32_UNLOCKEXEBUF         0x00000010l
 #define DDHAL_VPORT32_CANCREATEVIDEOPORT    0x00000001
 #define DDHAL_VPORT32_CREATEVIDEOPORT       0x00000002
 #define DDHAL_VPORT32_FLIP                  0x00000004
@@ -762,10 +753,8 @@
 #define DDHAL_VPORT32_GETSIGNALSTATUS       0x00004000
 #define DDHAL_VPORT32_COLORCONTROL          0x00008000
 #define DDHAL_COLOR_COLORCONTROL            0x00000001
-#ifndef __DD_INCLUDED__
-#define DDHAL_KERNEL_SYNCSURFACEDATA        0x00000001
-#define DDHAL_KERNEL_SYNCVIDEOPORTDATA      0x00000002
-#endif
+#define DDHAL_KERNEL_SYNCSURFACEDATA        0x00000001l
+#define DDHAL_KERNEL_SYNCVIDEOPORTDATA      0x00000002l
 #define DDHAL_MOCOMP32_GETGUIDS             0x00000001
 #define DDHAL_MOCOMP32_GETFORMATS           0x00000002
 #define DDHAL_MOCOMP32_CREATE               0x00000004
@@ -1698,11 +1687,9 @@
 #define DDRAWICLIP_INMASTERSPRITELIST 0x00000004
 #define PFINDEX_UNINITIALIZED         (0UL)
 #define PFINDEX_UNSUPPORTED           (~0UL)
-#ifndef __DD_INCLUDED__
-#define ROP_HAS_SOURCE                0x00000001
-#define ROP_HAS_PATTERN               0x00000002
-#define ROP_HAS_SOURCEPATTERN         ROP_HAS_PATTERN | ROP_HAS_SOURCE
-#endif
+#define ROP_HAS_SOURCE                0x00000001l
+#define ROP_HAS_PATTERN               0x00000002l
+#define ROP_HAS_SOURCEPATTERN         ROP_HAS_SOURCE | ROP_HAS_PATTERN
 #define DDRAWIVPORT_ON                0x00000001
 #define DDRAWIVPORT_SOFTWARE_AUTOFLIP 0x00000002
 #define DDRAWIVPORT_COLORKEYANDINTERP 0x00000004