update for HEAD-2003091401

[reactos.git] / subsys / win32k / eng / objects.h

diff --git a/subsys/win32k/eng/objects.h b/subsys/win32k/eng/objects.h
index bf4149e..19e9a4e 100644 (file)
--- a/subsys/win32k/eng/objects.h
+++ b/subsys/win32k/eng/objects.h
@@ -1,4 +1,23 @@
 /*
+ *  ReactOS kernel
+ *  Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/* $Id$
+ * 
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI Internal Objects
@@ -72,27 +91,14 @@ typedef struct _FONTGDI {
   TEXTMETRICW TextMetric;
 } FONTGDI, *PFONTGDI;
 
-typedef struct _PALGDI {
-  ENGOBJ               Header;
-  PALOBJ               PalObj;
-
-  ULONG Mode; // PAL_INDEXED, PAL_BITFIELDS, PAL_RGB, PAL_BGR
-  ULONG NumColors;
-  ULONG *IndexedColors;
-  ULONG RedMask;
-  ULONG GreenMask;
-  ULONG BlueMask;
-} PALGDI, *PPALGDI;
-
 typedef struct _PATHGDI {
   ENGOBJ               Header;
   PATHOBJ              PathObj;
 } PATHGDI;
 
-/*ei Fixme! Fix STROBJ */
 typedef struct _STRGDI {
   ENGOBJ               Header;
-  //STROBJ             StrObj;
+  STROBJ               StrObj;
 } STRGDI;
 
 typedef BOOL STDCALL (*PFN_BitBlt)(PSURFOBJ, PSURFOBJ, PSURFOBJ, PCLIPOBJ,
@@ -148,7 +154,8 @@ typedef VOID    (*PFN_DIB_VLine)   (PSURFOBJ, LONG, LONG, LONG, ULONG);
 typedef BOOLEAN (*PFN_DIB_BitBlt)  (PSURFOBJ DestSurf, PSURFOBJ SourceSurf,
                                     PSURFGDI DestGDI,  PSURFGDI SourceGDI,
                                     PRECTL   DestRect, PPOINTL  SourcePoint,
-                                    XLATEOBJ *ColorTranslation);
+                                   PBRUSHOBJ BrushObj, PPOINTL BrushOrigin,
+                                    XLATEOBJ *ColorTranslation, ULONG Rop4);
 
 typedef struct _SURFGDI {
   ENGOBJ               Header;