From c404283ff4e69c6755da9f85799656493cf8dae3 Mon Sep 17 00:00:00 2001
From: Jason Filby <jason.filby@gmail.com>
Date: Fri, 17 Mar 2000 21:49:32 +0000
Subject: [PATCH] Additional modifications

svn path=/trunk/; revision=1070
---
 reactos/subsys/win32k/makefile      |  6 ++++--
 reactos/subsys/win32k/stubs/stubs.c | 25 -------------------------
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/reactos/subsys/win32k/makefile b/reactos/subsys/win32k/makefile
index 1348c07ad2d..0ba29ba1cac 100644
--- a/reactos/subsys/win32k/makefile
+++ b/reactos/subsys/win32k/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.18 2000/03/11 00:51:36 ea Exp $
+# $Id: makefile,v 1.19 2000/03/17 21:49:32 jfilby Exp $
 #
 # WIN32K.SYS build spec
 #
@@ -7,7 +7,9 @@ TARGET=win32k
 
 BASE_CFLAGS = -I../../include
 
-ENG_OBJECTS= eng/debug.o eng/mem.o
+ENG_OBJECTS= eng/debug.o eng/mem.o eng/brush.o eng/bitblt.o eng/clip.o eng/copybits.o \
+		 eng/device.o eng/handle.o eng/lineto.o eng/paint.o eng/palette.o \
+		eng/surface.o eng/xlate.o
 MAIN_OBJECTS = main/dllmain.o
 MISC_OBJECTS = misc/driver.o
 LDR_OBJECTS = ldr/loader.o
diff --git a/reactos/subsys/win32k/stubs/stubs.c b/reactos/subsys/win32k/stubs/stubs.c
index 71165d85569..38b9239eb4d 100644
--- a/reactos/subsys/win32k/stubs/stubs.c
+++ b/reactos/subsys/win32k/stubs/stubs.c
@@ -7,43 +7,25 @@
 
 #define STUB(x) void x(void) { DbgPrint("WIN32K: Stub for %s\n", #x); }
 
-STUB(BRUSHOBJ_pvAllocRbrush)
-STUB(BRUSHOBJ_pvGetRbrush)
 STUB(BRUSHOBJ_ulGetBrushColor)
-STUB(CLIPOBJ_bEnum)
-STUB(CLIPOBJ_cEnumStart)
 STUB(CLIPOBJ_ppoGetPath)
 STUB(EngAcquireSemaphore)
 STUB(EngAllocMem)
 STUB(EngAllocUserMem)
-STUB(EngAssociateSurface)
-STUB(EngBitBlt)
 STUB(EngCheckAbort)
 STUB(EngComputeGlyphSet)
-STUB(EngCopyBits)
-STUB(EngCreateBitmap)
-STUB(EngCreateClip)
-STUB(EngCreateDeviceBitmap)
-STUB(EngCreateDeviceSurface)
 STUB(EngCreateDriverObj)
 STUB(EngCreateEvent)
-STUB(EngCreatePalette)
 STUB(EngCreatePath)
 STUB(EngCreateSemaphore)
 STUB(EngCreateWnd)
 STUB(EngDebugBreak)
-STUB(EngDebugPrint)
-STUB(EngDeleteClip)
 STUB(EngDeleteDriverObj)
 STUB(EngDeleteEvent)
-STUB(EngDeletePalette)
 STUB(EngDeletePath)
 STUB(EngDeleteSemaphore)
-STUB(EngDeleteSurface)
 STUB(EngDeleteWnd)
-STUB(EngDeviceIoControl)
 STUB(EngEnumForms)
-STUB(EngEraseSurface)
 STUB(EngFillPath)
 STUB(EngFindImageProcAddress)
 STUB(EngFindResource)
@@ -61,11 +43,9 @@ STUB(EngGetPrinterData)
 STUB(EngGetPrinterDataFileName)
 STUB(EngGetProcessHandle)
 STUB(EngGetType1FontList)
-STUB(EngLineTo)
 STUB(EngLoadModule)
 STUB(EngLoadModuleForWrite)
 STUB(EngLockDriverObj)
-STUB(EngLockSurface)
 STUB(EngMapEvent)
 STUB(EngMapFontFile)
 STUB(EngMapModule)
@@ -74,7 +54,6 @@ STUB(EngMovePointer)
 STUB(EngMulDiv)
 STUB(EngMultiByteToUnicodeN)
 STUB(EngMultiByteToWideChar)
-STUB(EngPaint)
 STUB(EngProbeForRead)
 STUB(EngProbeForReadAndWrite)
 STUB(EngQueryLocalTime)
@@ -140,7 +119,6 @@ STUB(FONTOBJ_pxoGetXform)
 STUB(FONTOBJ_vGetInfo)
 STUB(HT_ComputeRGBGammaTable)
 STUB(HT_Get8BPPFormatPalette)
-STUB(PALOBJ_cGetColors)
 STUB(PATHOBJ_bCloseFigure)
 STUB(PATHOBJ_bEnum)
 STUB(PATHOBJ_bEnumClipLines)
@@ -167,9 +145,6 @@ STUB(WNDOBJ_vSetConsumer)
 STUB(XFORMOBJ_bApplyXform)
 STUB(XFORMOBJ_iGetFloatObjXform)
 STUB(XFORMOBJ_iGetXform)
-STUB(XLATEOBJ_cGetPalette)
-STUB(XLATEOBJ_iXlate)
-STUB(XLATEOBJ_piVector)
 STUB(_abnormal_termination)
 STUB(_except_handler2)
 STUB(_global_unwind2)