commit change to ddraw to use the new headers that will come in next
commit
Modified: trunk/reactos/lib/ddraw/ddraw.xml
Modified: trunk/reactos/lib/ddraw/main/surface.c
Modified: trunk/reactos/lib/ddraw/rosdraw.h
_____
Modified: trunk/reactos/lib/ddraw/ddraw.xml
--- trunk/reactos/lib/ddraw/ddraw.xml 2005-10-23 15:06:20 UTC (rev
18712)
+++ trunk/reactos/lib/ddraw/ddraw.xml 2005-10-23 15:24:56 UTC (rev
18713)
@@ -1,12 +1,13 @@
<module name="ddraw" type="win32dll"
installbase="system32"
installname="ddraw.dll">
<importlibrary definition="ddraw.def" />
- <include base="ddraw">.</include>
- <include base="d3d8thk">.</include>
+ <include base="ddraw">.</include>
<define name="UNICODE" />
<define name="__USE_W32API" />
<define name="WINVER">0x0600</define>
<define name="_WIN32_WINNT">0x0501</define>
+
+
<library>ntdll</library>
<library>kernel32</library>
<library>gdi32</library>
_____
Modified: trunk/reactos/lib/ddraw/main/surface.c
--- trunk/reactos/lib/ddraw/main/surface.c 2005-10-23 15:06:20 UTC
(rev 18712)
+++ trunk/reactos/lib/ddraw/main/surface.c 2005-10-23 15:24:56 UTC
(rev 18713)
@@ -28,7 +28,7 @@
/* can the driver create the surface */
DDHAL_CANCREATESURFACEDATA CanCreateData;
- memset(&CanCreateData, 0, sizeof(DD_CANCREATESURFACEDATA));
+ memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA));
CanCreateData.lpDD = &This->owner->DirectDrawGlobal;
CanCreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD;
CanCreateData.CanCreateSurface =
This->owner->HalInfo.lpDDCallbacks->CanCreateSurface;
_____
Modified: trunk/reactos/lib/ddraw/rosdraw.h
--- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 15:06:20 UTC (rev
18712)
+++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 15:24:56 UTC (rev
18713)
@@ -6,14 +6,15 @@
#include <windows.h>
#include <stdio.h>
#include <ddraw.h>
-
-#include <ddk/ddrawint.h>
-#include <ddk/d3dnthal.h>
+#include <ddk/ddrawi.h>
#include <ddk/d3dhal.h>
#include <ddrawgdi.h>
-#include <d3d8thk.h>
+
+
+
+
/******** Main Object ********/
typedef struct
Show replies by date