commit change to ddraw to use the new headers that will come in next commit

svn path=/trunk/; revision=18713

diff --git a/reactos/lib/ddraw/ddraw.xml b/reactos/lib/ddraw/ddraw.xml
index 0070e35..6663f16 100644 (file)
--- a/reactos/lib/ddraw/ddraw.xml
+++ b/reactos/lib/ddraw/ddraw.xml
@@ -1,11 +1,12 @@
 <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll">\r
        <importlibrary definition="ddraw.def" />\r
-       <include base="ddraw">.</include>\r
-       <include base="d3d8thk">.</include>\r
+       <include base="ddraw">.</include>       \r
        <define name="UNICODE" />\r
        <define name="__USE_W32API" />\r
        <define name="WINVER">0x0600</define>\r
        <define name="_WIN32_WINNT">0x0501</define>\r
+           \r
+\r
 \r
        <library>ntdll</library>\r
        <library>kernel32</library>\r

diff --git a/reactos/lib/ddraw/main/surface.c b/reactos/lib/ddraw/main/surface.c
index bc39285..2b9536b 100644 (file)
--- a/reactos/lib/ddraw/main/surface.c
+++ b/reactos/lib/ddraw/main/surface.c
@@ -28,7 +28,7 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIREC
    
        /* 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;

diff --git a/reactos/lib/ddraw/rosdraw.h b/reactos/lib/ddraw/rosdraw.h
index dfbe687..ec4224c 100644 (file)
--- a/reactos/lib/ddraw/rosdraw.h
+++ b/reactos/lib/ddraw/rosdraw.h
@@ -6,12 +6,13 @@
 #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 ********/