- Move contents of eng/misc.h into include/misc.h, get rid of eng/misc.h

- Move eng/objects.h -> include/engobjects.h

svn path=/trunk/; revision=40071

reactos/subsystems/win32/win32k/eng/misc.h

@@ -1,46 +0,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

reactos/subsystems/win32/win32k/include/misc.h

@@ -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;
 

reactos/subsystems/win32/win32k/include/mouse.h

@@ -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);

reactos/subsystems/win32/win32k/include/text.h

@@ -1,6 +1,8 @@
 #ifndef _WIN32K_TEXT_H
 #define _WIN32K_TEXT_H
 
+#include <include/engobjects.h>
+
 #define TAG_FINF        TAG('F', 'I', 'N', 'F')
 //
 // EXSTROBJ flags.

reactos/subsystems/win32/win32k/include/win32k.h

@@ -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 */