stubs/stubs.c (EngGetLastError, EngSetLastError): Moved to ...

eng/error.c: ... here
stubs/stubs.c (BRUSHOBJ_ulGetBrushColor): Moved to ...
eng/brush.c: ... here and implemented.
objects/semaphor.c: Moved to ...
eng/semaphor.c: ... here

svn path=/trunk/; revision=7921

reactos/subsys/win32k/eng/brush.c

@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: brush.c,v 1.9 2003/10/29 08:38:55 gvg Exp $
+/* $Id: brush.c,v 1.10 2004/01/30 16:36:16 navaraf Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -48,4 +48,14 @@ BRUSHOBJ_pvGetRbrush(IN BRUSHOBJ  *BrushObj)
 {
   return(BrushObj->pvRbrush);
 }
+
+/*
+ * @implemented
+ */
+ULONG STDCALL
+BRUSHOBJ_ulGetBrushColor(IN BRUSHOBJ *BrushObj)
+{
+   return BrushObj->iSolidColor;
+}
+
 /* EOF */

reactos/subsys/win32k/eng/error.c

@@ -0,0 +1,24 @@
+#include <ddk/winddi.h>
+#include <include/error.h>
+
+/*
+ * @implemented
+ */
+ULONG
+STDCALL
+EngGetLastError ( VOID )
+{
+  // www.osr.com/ddk/graphics/gdifncs_3non.htm
+  return GetLastNtError();
+}
+
+/*
+ * @implemented
+ */
+VOID
+STDCALL
+EngSetLastError ( IN ULONG iError )
+{
+  // www.osr.com/ddk/graphics/gdifncs_95m0.htm
+  SetLastNtError ( iError );
+}

reactos/subsys/win32k/makefile

@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.90 2003/12/14 17:59:16 navaraf Exp $
+# $Id: makefile,v 1.91 2004/01/30 16:36:16 navaraf Exp $
 
 PATH_TO_TOP = ../..
 
@@ -38,10 +38,10 @@ TARGET_LFLAGS =\
  $(PATH_TO_TOP)/dk/w32/lib/rosrtl.a \
  --disable-stdcall-fixup
 
-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/perfcnt.o eng/surface.o eng/xlate.o eng/transblt.o \
-    eng/mouse.o eng/misc.o eng/nls.o eng/sort.o
+ENG_OBJECTS= eng/debug.o eng/error.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/perfcnt.o eng/semaphor.o eng/surface.o \
+    eng/xlate.o eng/transblt.o eng/mouse.o eng/misc.o eng/nls.o eng/sort.o
 
 MAIN_OBJECTS = main/dllmain.o main/svctabm.o
 
@@ -66,7 +66,7 @@ OBJECTS_OBJECTS = objects/bitmaps.o objects/brush.o objects/cliprgn.o  \
                   objects/region.o objects/text.o objects/wingl.o \
                   objects/bezier.o objects/objconv.o objects/dib.o \
                   objects/palette.o objects/rect.o objects/polyfill.o \
-                  objects/cursoricon.o objects/semaphor.o
+                  objects/cursoricon.o
 
 DIB_OBJECTS = dib/dib.o dib/dib1bpp.o dib/dib4bpp.o dib/dib8bpp.o dib/dib16bpp.o \
               dib/dib24bpp.o dib/dib32bpp.o

reactos/subsys/win32k/stubs/stubs.c

@@ -94,18 +94,6 @@ EngTextOut (
   return FALSE;
 }
 
-/*
- * @unimplemented
- */
-ULONG
-STDCALL
-BRUSHOBJ_ulGetBrushColor ( IN BRUSHOBJ  *pbo )
-{
-  // www.osr.com/ddk/graphics/gdifncs_0ch3.htm
-  UNIMPLEMENTED;
-  return 0;
-}
-
 /*
  * @unimplemented
  */
@@ -374,28 +362,6 @@ EngGetForm(
   return FALSE;
 }
 
-/*
- * @implemented
- */
-ULONG
-STDCALL
-EngGetLastError ( VOID )
-{
-  // www.osr.com/ddk/graphics/gdifncs_3non.htm
-  return GetLastNtError();
-}
-
-/*
- * @implemented
- */
-VOID
-STDCALL
-EngSetLastError ( IN ULONG iError )
-{
-  // www.osr.com/ddk/graphics/gdifncs_95m0.htm
-  SetLastNtError ( iError );
-}
-
 /*
  * @unimplemented
  */