[ros-diffs] [mbosma] 17091: Add more DDRAWISURFs and remove useless #ifndefs.

Add more DDRAWISURFs and remove useless #ifndefs.
Modified: trunk/reactos/w32api/include/ddk/ddrawi.h
  _____  

Modified: trunk/reactos/w32api/include/ddk/ddrawi.h
--- trunk/reactos/w32api/include/ddk/ddrawi.h	2005-08-05 22:24:53 UTC
(rev 17090)
+++ trunk/reactos/w32api/include/ddk/ddrawi.h	2005-08-05 23:29:52 UTC
(rev 17091)
@@ -51,6 +51,7 @@

 
 #define MAX_DRIVER_NAME		CCHDEVICENAME
 
+
 
/***********************************************************************
******
  * Initialization stuff
  */
@@ -965,32 +966,40 @@
     LONG			lOverlayY;
 } DDRAWI_DDRAWSURFACE_LCL;
 
-#define DDRAWISURF_ATTACHED		0x00000001
-#define DDRAWISURF_IMPLICITCREATE	0x00000002
-#define DDRAWISURF_ISFREE		0x00000004
-#define DDRAWISURF_ATTACHED_FROM	0x00000008
-#define DDRAWISURF_IMPLICITROOT		0x00000010
-#define DDRAWISURF_PARTOFPRIMARYCHAIN	0x00000020
-#define DDRAWISURF_DATAISALIASED	0x00000040
-#define DDRAWISURF_HASDC		0x00000080
-#define DDRAWISURF_HASCKEYDESTOVERLAY	0x00000100
-#define DDRAWISURF_HASCKEYDESTBLT	0x00000200
-#define DDRAWISURF_HASCKEYSRCOVERLAY	0x00000400
-#ifndef DDRAWISURF_HASCKEYSRCBLT
-#define DDRAWISURF_HASCKEYSRCBLT	0x00000800
-#endif
-#define DDRAWISURF_LOCKEXCLUDEDCURSOR	0x00001000
-#ifndef DDRAWISURF_HASPIXELFORMAT
-#define DDRAWISURF_HASPIXELFORMAT	0x00002000
-#endif
-#ifndef DDRAWISURF_HASOVERLAYDATA
-#define DDRAWISURF_HASOVERLAYDATA	0x00004000
-#endif
-#define DDRAWISURF_SETGAMMA		0x00008000
-/* more... */
-#ifndef DDRAWISURF_INVALID
-#define DDRAWISURF_INVALID		0x10000000
-#endif
+#define DDRAWISURF_ATTACHED		0x00000001L 
+#define DDRAWISURF_IMPLICITCREATE	0x00000002L
+#define DDRAWISURF_ISFREE	0x00000004L 
+#define DDRAWISURF_ATTACHED_FROM	0x00000008L 
+#define DDRAWISURF_IMPLICITROOT		0x00000010L 
+#define DDRAWISURF_PARTOFPRIMARYCHAIN	0x00000020L 
+#define DDRAWISURF_DATAISALIASED	0x00000040L
+#define DDRAWISURF_HASDC	0x00000080L 
+#define DDRAWISURF_HASCKEYDESTOVERLAY	0x00000100L 
+#define DDRAWISURF_HASCKEYDESTBLT	0x00000200L
+#define DDRAWISURF_HASCKEYSRCOVERLAY	0x00000400L 
+#define DDRAWISURF_HASCKEYSRCBLT	0x00000800L
+#define DDRAWISURF_LOCKEXCLUDEDCURSOR	0x00001000L 
+#define DDRAWISURF_HASPIXELFORMAT	0x00002000L 
+#define DDRAWISURF_HASOVERLAYDATA	0x00004000L 
+#define DDRAWISURF_SETGAMMA		0x00008000L 
+#define DDRAWISURF_SW_CKEYDESTOVERLAY	0x00010000L
+#define DDRAWISURF_SW_CKEYDESTBLT	0x00020000L 
+#define DDRAWISURF_SW_CKEYSRCOVERLAY	0x00040000L 
+#define DDRAWISURF_SW_CKEYSRCBLT	0x00080000L
+#define DDRAWISURF_HW_CKEYDESTOVERLAY	0x00100000L
+#define DDRAWISURF_HW_CKEYDESTBLT	0x00200000L
+#define DDRAWISURF_HW_CKEYSRCOVERLAY	0x00400000L 
+#define DDRAWISURF_HW_CKEYSRCBLT	0x00800000L
+#define DDRAWISURF_INMASTERSPRITELIST	0x01000000l
+#define DDRAWISURF_HELCB	0x02000000L 
+#define DDRAWISURF_FRONTBUFFER	0x04000000L 
+#define DDRAWISURF_BACKBUFFER	0x08000000L 
+#define DDRAWISURF_INVALID	0x10000000L 
+#define DDRAWISURF_DCIBUSY	0x20000000L  
+#define DDRAWISURF_GETDCNULL	0x40000000L   
+#define DDRAWISURF_STEREOSURFACELEFT	0x20000000L   
+#define DDRAWISURF_DRIVERMANAGED	0x40000000L
+#define DDRAWISURF_DCILOCK	0x80000000L 
 
 /* palettes */
 typedef struct _DDRAWI_DDRAWPALETTE_INT {