17 Mar
2009
17 Mar
'09
1:41 a.m.
Author: tkreuzer
Date: Tue Mar 17 04:41:33 2009
New Revision: 40071
URL: http://svn.reactos.org/svn/reactos?rev=40071&view=rev
Log:
- Move contents of eng/misc.h into include/misc.h, get rid of eng/misc.h
- Move eng/objects.h -> include/engobjects.h
Added:
trunk/reactos/subsystems/win32/win32k/include/engobjects.h (props changed)
- copied unchanged from r40068, trunk/reactos/subsystems/win32/win32k/eng/objects.h
Removed:
trunk/reactos/subsystems/win32/win32k/eng/misc.h
trunk/reactos/subsystems/win32/win32k/eng/objects.h
Modified:
trunk/reactos/subsystems/win32/win32k/include/misc.h
trunk/reactos/subsystems/win32/win32k/include/mouse.h
trunk/reactos/subsystems/win32/win32k/include/text.h
trunk/reactos/subsystems/win32/win32k/include/win32k.h
Removed: trunk/reactos/subsystems/win32/win32k/eng/misc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/misc.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/misc.h (removed)
@@ -1,46 +1,0 @@
-/*
- * 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$ */
-#ifndef __ENG_MISC_H
-#define __ENG_MISC_H
-
-#ifndef __ENG_OBJECTS_H
-#include "objects.h"
-#endif
-
-typedef struct INTENG_ENTER_LEAVE_TAG
- {
- /* Contents is private to EngEnter/EngLeave */
- SURFOBJ *DestObj;
- SURFOBJ *OutputObj;
- HBITMAP OutputBitmap;
- CLIPOBJ *TrivialClipObj;
- RECTL DestRect;
- BOOL ReadOnly;
- } INTENG_ENTER_LEAVE, *PINTENG_ENTER_LEAVE;
-
-extern BOOL APIENTRY IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
- SURFOBJ *DestObj,
- RECTL *DestRect,
- BOOL ReadOnly,
- POINTL *Translate,
- SURFOBJ **OutputObj);
-extern BOOL APIENTRY IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave);
-
-#endif
Removed: trunk/reactos/subsystems/win32/win32k/eng/objects.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/objects.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/objects.h (removed)
@@ -1,178 +1,0 @@
-/*
- * 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
- * FILE: subsystem/win32/win32k/eng/objects.h
- * PROGRAMER: Jason Filby
- * REVISION HISTORY:
- * 21/8/1999: Created
- */
-#ifndef __ENG_OBJECTS_H
-#define __ENG_OBJECTS_H
-
-#include <ft2build.h>
-#include <freetype/freetype.h>
-
-/* Structure of internal gdi objects that win32k manages for ddi engine:
- |---------------------------------|
- | Public part |
- | accessed from engine |
- |---------------------------------|
- | Private part |
- | managed by gdi |
- |_________________________________|
-
----------------------------------------------------------------------------*/
-
-typedef struct _CLIPGDI {
- CLIPOBJ ClipObj;
- ULONG EnumPos;
- ULONG EnumOrder;
- ULONG EnumMax;
- ENUMRECTS EnumRects;
-} CLIPGDI, *PCLIPGDI;
-
-/*ei What is this for? */
-typedef struct _DRVFUNCTIONSGDI {
- HDEV hdev;
- DRVFN Functions[INDEX_LAST];
-} DRVFUNCTIONSGDI;
-
-typedef struct _FLOATGDI {
- ULONG Dummy;
-} FLOATGDI;
-
-
-#define FDM_TYPE_TEXT_METRIC 0x80000000
-
-typedef struct _FONTGDI {
- FONTOBJ FontObj;
- ULONG iUnique;
- FLONG flType;
- union{
- DHPDEV dhpdev;
- FT_Face face;
- };
- FLONG flRealizedType;
-
- LONG lMaxNegA;
- LONG lMaxNegC;
- LONG lMinWidthD;
-
- TEXTMETRICW TextMetric;
- LPWSTR Filename;
- BYTE Underline;
- BYTE StrikeOut;
-} FONTGDI, *PFONTGDI;
-
-typedef struct _PATHGDI {
- PATHOBJ PathObj;
-} PATHGDI;
-
-typedef BOOL (APIENTRY *PFN_BitBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *,
- XLATEOBJ *, RECTL *, POINTL *, POINTL *,
- BRUSHOBJ *, POINTL *, ROP4);
-
-typedef BOOL (APIENTRY *PFN_TransparentBlt)(SURFOBJ *, SURFOBJ *, CLIPOBJ *, XLATEOBJ *,
RECTL *, RECTL *, ULONG, ULONG);
-
-typedef BOOL (APIENTRY *PFN_StretchBlt)(SURFOBJ *, SURFOBJ *, SURFOBJ *, CLIPOBJ *,
- XLATEOBJ *, COLORADJUSTMENT *, POINTL *,
- RECTL *, RECTL *, PPOINT, ULONG);
-
-typedef BOOL (APIENTRY *PFN_TextOut)(SURFOBJ *, STROBJ *, FONTOBJ *, CLIPOBJ *,
- RECTL *, RECTL *, BRUSHOBJ *, BRUSHOBJ *,
- POINTL *, MIX);
-
-typedef BOOL (APIENTRY *PFN_Paint)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *, POINTL *, MIX);
-
-typedef BOOL (APIENTRY *PFN_StrokePath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, XFORMOBJ *,
- BRUSHOBJ *, POINTL *, LINEATTRS *, MIX);
-
-typedef BOOL (APIENTRY *PFN_FillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *, BRUSHOBJ *,
- POINTL *, MIX, ULONG);
-
-typedef BOOL (APIENTRY *PFN_StrokeAndFillPath)(SURFOBJ *, PATHOBJ *, CLIPOBJ *,
- XFORMOBJ *, BRUSHOBJ *, LINEATTRS *, BRUSHOBJ *,
- POINTL *, MIX, ULONG);
-
-typedef BOOL (APIENTRY *PFN_LineTo)(SURFOBJ *, CLIPOBJ *, BRUSHOBJ *,
- LONG, LONG, LONG, LONG, RECTL *, MIX);
-
-typedef BOOL (APIENTRY *PFN_CopyBits)(SURFOBJ *, SURFOBJ *, CLIPOBJ *,
- XLATEOBJ *, RECTL *, POINTL *);
-
-typedef VOID (APIENTRY *PFN_Synchronize)(DHPDEV, RECTL *);
-
-typedef VOID (APIENTRY *PFN_MovePointer)(SURFOBJ *, LONG, LONG, RECTL *);
-
-typedef ULONG (APIENTRY *PFN_SetPointerShape)(SURFOBJ *, SURFOBJ *, SURFOBJ *, XLATEOBJ
*,
- LONG, LONG, LONG, LONG, RECTL *, FLONG);
-
-typedef HBITMAP (APIENTRY *PFN_CreateDeviceBitmap)(DHPDEV, SIZEL, ULONG);
-
-typedef BOOL (APIENTRY *PFN_SetPalette)(DHPDEV, PALOBJ*, ULONG, ULONG, ULONG);
-
-typedef BOOL (APIENTRY *PFN_GradientFill)(SURFOBJ*, CLIPOBJ*, XLATEOBJ*, TRIVERTEX*,
ULONG, PVOID, ULONG, RECTL*, POINTL*, ULONG);
-
-typedef struct _WNDGDI {
- WNDOBJ WndObj;
- LIST_ENTRY ListEntry;
- HWND Hwnd;
- CLIPOBJ *ClientClipObj;
- WNDOBJCHANGEPROC ChangeProc;
- FLONG Flags;
- int PixelFormat;
-} WNDGDI, *PWNDGDI;
-
-typedef struct _XFORMGDI {
- ULONG Dummy;
- /* XFORMOBJ has no public members */
-} XFORMGDI;
-
-typedef struct _XLATEGDI {
- XLATEOBJ XlateObj;
- HPALETTE DestPal;
- HPALETTE SourcePal;
- BOOL UseShiftAndMask;
-
-// union {
-// struct { /* For Shift Translations */
- ULONG RedMask;
- ULONG GreenMask;
- ULONG BlueMask;
- INT RedShift;
- INT GreenShift;
- INT BlueShift;
-// };
-// struct { /* For Color -> Mono Translations */
- ULONG BackgroundColor;
-// };
-// };
-} XLATEGDI;
-
-/* as the *OBJ structures are located at the beginning of the *GDI structures
- we can simply typecast the pointer */
-#define ObjToGDI(ClipObj, Type) (Type##GDI *)(ClipObj)
-#define GDIToObj(ClipGDI, Type) (Type##OBJ *)(ClipGDI)
-
-
-#endif //__ENG_OBJECTS_H
Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h
------------------------------------------------------------------------------
svn:keywords = author date id revision
Propchange: trunk/reactos/subsystems/win32/win32k/include/engobjects.h
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: trunk/reactos/subsystems/win32/win32k/include/misc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/misc.h [iso-8859-1] Tue Mar 17 04:41:33
2009
@@ -30,6 +30,26 @@
#define W32PF_MANUALGUICHECK (0x02000000)
#define W32PF_CREATEDWINORDC (0x04000000)
+typedef struct INTENG_ENTER_LEAVE_TAG
+ {
+ /* Contents is private to EngEnter/EngLeave */
+ SURFOBJ *DestObj;
+ SURFOBJ *OutputObj;
+ HBITMAP OutputBitmap;
+ CLIPOBJ *TrivialClipObj;
+ RECTL DestRect;
+ BOOL ReadOnly;
+ } INTENG_ENTER_LEAVE, *PINTENG_ENTER_LEAVE;
+
+extern BOOL APIENTRY IntEngEnter(PINTENG_ENTER_LEAVE EnterLeave,
+ SURFOBJ *DestObj,
+ RECTL *DestRect,
+ BOOL ReadOnly,
+ POINTL *Translate,
+ SURFOBJ **OutputObj);
+
+extern BOOL APIENTRY IntEngLeave(PINTENG_ENTER_LEAVE EnterLeave);
+
extern HGDIOBJ StockObjects[];
extern SHORT gusLanguageID;
Modified: trunk/reactos/subsystems/win32/win32k/include/mouse.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/mouse.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/mouse.h [iso-8859-1] Tue Mar 17 04:41:33
2009
@@ -1,7 +1,6 @@
#ifndef _WIN32K_MOUSE_H
#define _WIN32K_MOUSE_H
-#include "../eng/misc.h"
#include <include/winsta.h>
INT INTERNAL_CALL MouseSafetyOnDrawStart(SURFOBJ *SurfObj, LONG HazardX1, LONG HazardY1,
LONG HazardX2, LONG HazardY2);
Modified: trunk/reactos/subsystems/win32/win32k/include/text.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/text.h [iso-8859-1] Tue Mar 17 04:41:33
2009
@@ -1,5 +1,7 @@
#ifndef _WIN32K_TEXT_H
#define _WIN32K_TEXT_H
+
+#include <include/engobjects.h>
#define TAG_FINF TAG('F', 'I', 'N', 'F')
//
Modified: trunk/reactos/subsystems/win32/win32k/include/win32k.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/include/win32k.h [iso-8859-1] Tue Mar 17
04:41:33 2009
@@ -73,8 +73,7 @@
#include <include/mmcopy.h>
#include <include/misc.h>
#include <include/gdifloat.h>
-#include <eng/objects.h>
-#include <eng/misc.h>
+#include <include/engobjects.h>
#include <dib/dib.h>
#endif /* __WIN32K_H */