Modified: trunk/reactos/lib/ddraw/ddraw.xml
Modified: trunk/reactos/lib/ddraw/main/ddraw.c
Modified: trunk/reactos/lib/ddraw/main/surface.c
Modified: trunk/reactos/lib/ddraw/main.c
Modified: trunk/reactos/lib/ddraw/rosdraw.h
--- trunk/reactos/lib/ddraw/ddraw.xml 2005-10-23 21:19:34 UTC (rev 18726)
+++ trunk/reactos/lib/ddraw/ddraw.xml 2005-10-23 21:29:30 UTC (rev 18727)
@@ -1,4 +1,4 @@
-<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll">
+<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings="true">
<importlibrary definition="ddraw.def" />
<include base="ddraw">.</include>
<define name="UNICODE" />
@@ -6,8 +6,6 @@
<define name="WINVER">0x0600</define>
<define name="_WIN32_WINNT">0x0501</define>
-
-
<library>ntdll</library>
<library>kernel32</library>
<library>gdi32</library>
@@ -27,6 +25,10 @@
<directory name="main">
<file>ddraw.c</file>
<file>surface.c</file>
+ <file>clipper.c</file>
+ <file>color.c</file>
+ <file>gamma.c</file>
+ <file>palette.c</file>
</directory>
<directory name="soft">
--- trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-23 21:19:34 UTC (rev 18726)
+++ trunk/reactos/lib/ddraw/main/ddraw.c 2005-10-23 21:29:30 UTC (rev 18727)
@@ -140,7 +140,7 @@
if (That == NULL)
return E_OUTOFMEMORY;
- That->lpVtbl = &DDrawSurface_VTable;
+ That->lpVtbl = &DirectDrawSurface_Vtable;
That->ref = 1;
*ppSurf = (LPDIRECTDRAWSURFACE7)That;
@@ -380,7 +380,7 @@
DX_STUB;
}
-IDirectDraw7Vtbl DirectDraw_VTable =
+IDirectDraw7Vtbl DirectDraw_Vtable =
{
Main_DirectDraw_QueryInterface,
Main_DirectDraw_AddRef,
--- trunk/reactos/lib/ddraw/main/surface.c 2005-10-23 21:19:34 UTC (rev 18726)
+++ trunk/reactos/lib/ddraw/main/surface.c 2005-10-23 21:29:30 UTC (rev 18727)
@@ -421,7 +421,7 @@
DX_STUB;
}
-IDirectDrawSurface7Vtbl DDrawSurface_VTable =
+IDirectDrawSurface7Vtbl DirectDrawSurface_Vtable =
{
Main_DDrawSurface_QueryInterface,
Main_DDrawSurface_AddRef,
--- trunk/reactos/lib/ddraw/main.c 2005-10-23 21:19:34 UTC (rev 18726)
+++ trunk/reactos/lib/ddraw/main.c 2005-10-23 21:29:30 UTC (rev 18727)
@@ -23,7 +23,7 @@
ZeroMemory(This,sizeof(IDirectDrawImpl));
- This->lpVtbl = &DirectDraw_VTable;
+ This->lpVtbl = &DirectDraw_Vtable;
This->DirectDrawGlobal.dwRefCnt = 1;
*pIface = (LPDIRECTDRAW)This;
--- trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 21:19:34 UTC (rev 18726)
+++ trunk/reactos/lib/ddraw/rosdraw.h 2005-10-23 21:29:30 UTC (rev 18727)
@@ -11,10 +11,6 @@
#include <ddk/d3dhal.h>
#include <ddrawgdi.h>
-
-
-
-
/******** Main Object ********/
typedef struct
@@ -67,8 +63,12 @@
/*********** VTables ************/
-extern IDirectDraw7Vtbl DirectDraw_VTable;
-extern IDirectDrawSurface7Vtbl DDrawSurface_VTable;
+extern IDirectDraw7Vtbl DirectDraw_Vtable;
+extern IDirectDrawSurface7Vtbl DirectDrawSurface_Vtable;
+extern IDirectDrawPaletteVtbl DirectDrawPalette_Vtable;
+extern IDirectDrawClipperVtbl DirectDrawClipper_Vtable;
+extern IDirectDrawColorControlVtbl DirectDrawColorControl_Vtable;
+extern IDirectDrawGammaControlVtbl DirectDrawGammaControl_Vtable;
/********* Prototypes **********/