[ros-diffs] [greatlrd] 26204: remove VidMemFree and HeapVidMemAllocAligned they are protoypes belong to dmemmgr.h ddrawi.h need be rewiten it is from wine so I add some hacks for now getting it works simluare to ms ddk version. This fix gdi32.dll break in the build

Author: greatlrd
Date: Fri Mar 30 13:53:34 2007
New Revision: 26204

URL: http://svn.reactos.org/svn/reactos?rev=26204&view=rev
Log:
remove VidMemFree and HeapVidMemAllocAligned
they are protoypes belong to dmemmgr.h

ddrawi.h need be rewiten it is from wine so I add some hacks for now getting it works
simluare to ms ddk version. 
This fix gdi32.dll break in the build

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

Modified: trunk/reactos/include/ddk/ddrawi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ddrawi.h?rev=2…
==============================================================================
--- trunk/reactos/include/ddk/ddrawi.h (original)
+++ trunk/reactos/include/ddk/ddrawi.h Fri Mar 30 13:53:34 2007
@@ -207,14 +207,14 @@
 
 
 
-
+#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
 
 typedef struct _VIDMEMINFO {
     FLATPTR		fpPrimary;
@@ -328,9 +328,11 @@
 /*****************************************************************************
  * ddraw->driver callbacks
  */
+#ifndef __DD_INCLUDED__
 #define DDHAL_DRIVER_NOTHANDLED	0
 #define DDHAL_DRIVER_HANDLED	1
 #define DDHAL_DRIVER_NOCKEYHW	2
+#endif
 
 typedef struct _DDHAL_DESTROYDRIVERDATA		*LPDDHAL_DESTROYDRIVERDATA;
 typedef struct _DDHAL_CREATESURFACEDATA		*LPDDHAL_CREATESURFACEDATA;
@@ -694,10 +696,12 @@
 #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
@@ -725,11 +729,13 @@
 #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_VPORT32_CANCREATEVIDEOPORT    0x00000001
 #define DDHAL_VPORT32_CREATEVIDEOPORT       0x00000002
 #define DDHAL_VPORT32_FLIP                  0x00000004
@@ -746,8 +752,10 @@
 #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_MOCOMP32_GETGUIDS             0x00000001
 #define DDHAL_MOCOMP32_GETFORMATS           0x00000002
 #define DDHAL_MOCOMP32_CREATE               0x00000004
@@ -1680,9 +1688,11 @@
 #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 DDRAWIVPORT_ON                0x00000001
 #define DDRAWIVPORT_SOFTWARE_AUTOFLIP 0x00000002
 #define DDRAWIVPORT_COLORKEYANDINTERP 0x00000004

Modified: trunk/reactos/include/ddk/winddi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=2…
==============================================================================
--- trunk/reactos/include/ddk/winddi.h (original)
+++ trunk/reactos/include/ddk/winddi.h Fri Mar 30 13:53:34 2007
@@ -2512,15 +2512,7 @@
   IN ULONG  cjSize,
   OUT FONTINFO  *pfi);
 
-WIN32KAPI
-FLATPTR
-APIENTRY
-HeapVidMemAllocAligned(
-  IN LPVIDMEM  lpVidMem,
-  IN DWORD  dwWidth,
-  IN DWORD  dwHeight,
-  IN LPSURFACEALIGNMENT  lpAlignment,
-  OUT LPLONG  lpNewPitch);
+
 
 WIN32KAPI
 LONG
@@ -2683,13 +2675,6 @@
 APIENTRY
 STROBJ_vEnumStart(
   IN STROBJ  *pstro);
-
-WIN32KAPI
-VOID
-APIENTRY
-VidMemFree(
-  IN LPVMEMHEAP  pvmh,
-  IN FLATPTR  ptr);
 
 WIN32KAPI
 BOOL