Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=18713
This commit is contained in:
Magnus Olsen 2005-10-23 15:24:56 +00:00
parent 8d7e78ac81
commit 7133de6563
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/lib/ddraw/ddraw.xml
View file

@ -1,11 +1,12 @@
<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll"> <module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll">
<importlibrary definition="ddraw.def" /> <importlibrary definition="ddraw.def" />
<include base="ddraw">.</include> <include base="ddraw">.</include>
<include base="d3d8thk">.</include>
<define name="UNICODE" /> <define name="UNICODE" />
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="WINVER">0x0600</define> <define name="WINVER">0x0600</define>
<define name="_WIN32_WINNT">0x0501</define> <define name="_WIN32_WINNT">0x0501</define>
<library>ntdll</library> <library>ntdll</library>
<library>kernel32</library> <library>kernel32</library>

2
reactos/lib/ddraw/main/surface.c
View file

@ -28,7 +28,7 @@ HRESULT WINAPI Main_DDrawSurface_Initialize (LPDIRECTDRAWSURFACE7 iface, LPDIREC
/* can the driver create the surface */ /* can the driver create the surface */
DDHAL_CANCREATESURFACEDATA CanCreateData; DDHAL_CANCREATESURFACEDATA CanCreateData;
memset(&CanCreateData, 0, sizeof(DD_CANCREATESURFACEDATA)); memset(&CanCreateData, 0, sizeof(DDHAL_CANCREATESURFACEDATA));
CanCreateData.lpDD = &This->owner->DirectDrawGlobal; CanCreateData.lpDD = &This->owner->DirectDrawGlobal;
CanCreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD; CanCreateData.lpDDSurfaceDesc = (DDSURFACEDESC*)pDDSD;
CanCreateData.CanCreateSurface = This->owner->HalInfo.lpDDCallbacks->CanCreateSurface; CanCreateData.CanCreateSurface = This->owner->HalInfo.lpDDCallbacks->CanCreateSurface;

9
reactos/lib/ddraw/rosdraw.h
View file

@ -6,12 +6,13 @@
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <ddraw.h> #include <ddraw.h>
#include <ddk/ddrawi.h>
#include <ddk/ddrawint.h>
#include <ddk/d3dnthal.h>
#include <ddk/d3dhal.h> #include <ddk/d3dhal.h>
#include <ddrawgdi.h> #include <ddrawgdi.h>
#include <d3d8thk.h>
/******** Main Object ********/ /******** Main Object ********/