Revert, thx Thomas, wasnt sure.

[reactos.git] / reactos / subsys / win32k / w32k.h

diff --git a/reactos/subsys/win32k/w32k.h b/reactos/subsys/win32k/w32k.h
index d28d485..650d89b 100644 (file)
--- a/reactos/subsys/win32k/w32k.h
+++ b/reactos/subsys/win32k/w32k.h
@@ -1,83 +1,55 @@
 /*
- * Precompiled headers for win32k.sys
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS Graphics Subsystem
+ * FILE:            subsys/win32k/w32k.h
+ * PURPOSE:         Main Win32K Header
+ * PROGRAMMER:      Alex Ionescu (alex@relsoft.net)
  */
 
-#define __WIN32K__
-#define NTOS_MODE_KERNEL
-
-#include <roscfg.h>
-#include <roskrnl.h>
-
-#include <ddk/winddi.h>
-#include <ddk/ntddk.h>
-#include <ddk/ntddmou.h>
-
-#include <win32k/win32k.h>
+/* INCLUDES ******************************************************************/
+
+#define _NO_COM
+
+/* DDK/NDK/SDK Headers */
+#include <ntifs.h>
+#include <ntddk.h>
+#include <ntddmou.h>
+#include <ntndk.h>
+
+/* Win32 Headers */
+/* FIXME: Defines in winbase.h that we need... */
+typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
+#define WINBASEAPI
+#define STARTF_USESIZE 2
+#define STARTF_USEPOSITION 4
+#include <stdarg.h>
+#include <windef.h>
+#include <wingdi.h>
+#include <winddi.h>
+#include <winuser.h>
+#include <prntfont.h>
+#include <dde.h>
+#include <wincon.h>
+
+/* SEH Support with PSEH */
+#include <pseh/pseh.h>
+
+/* CSRSS Header */
 #include <csrss/csrss.h>
 
-#include <internal/ob.h>
-#include <internal/safe.h>
-#include <internal/ps.h>
-
-#include <napi/win32.h>
-#include <ntos.h>
-#include <math.h>
-#include <float.h>
-#include <windows.h>
-
-#include <rosrtl/string.h>
-#include <user32/callback.h>
-
-#include <include/ssec.h>
-#include <include/accelerator.h>
-#include <include/callback.h>
-#include <include/caret.h>
-#include <include/class.h>
-#include <include/cleanup.h>
-#include <include/clipboard.h>
-#include <include/color.h>
-#include <include/csr.h>
-#include <include/cursoricon.h>
-#include <include/dce.h>
-#include <include/desktop.h>
-#include <include/dib.h>
-#include <include/eng.h>
-#include <include/error.h>
-#include <include/focus.h>
-#include <include/guicheck.h>
-#include <include/hook.h>
-#include <include/hotkey.h>
-#include <include/input.h>
-#include <include/inteng.h>
-#include <include/intgdi.h>
-#include <include/menu.h>
-#include <include/monitor.h>
-#include <include/mouse.h>
-#include <include/msgqueue.h>
-#include <include/object.h>
-#include <include/paint.h>
-#include <include/painting.h>
-#include <include/palette.h>
-#include <include/path.h>
-#include <include/prop.h>
-#include <include/rect.h>
-#include <include/scroll.h>
-#include <include/surface.h>
-#include <include/tags.h>
-#include <include/text.h>
-#include <include/timer.h>
-#include <include/timer.h>
-#include <include/useratom.h>
-#include <include/vis.h>
-#include <include/window.h>
-#include <include/winpos.h>
-#include <include/winsta.h>
-
-#include <eng/objects.h>
-#include <eng/misc.h>
+/* Helper Header */
+#include <reactos/helper.h>
 
-#include <dib/dib.h>
+/* Probe and capture */
+#include <reactos/probe.h>
 
-#define NDEBUG
-#include <win32k/debug1.h>
+/* Public Win32K Headers */
+#include <win32k/callback.h>
+#include <win32k/ntusrtyp.h>
+#include <win32k/ntuser.h>
+#include <win32k/ntgdityp.h>
+#include <win32k/ntgdibad.h>
+#include <ntgdi.h>
 
+/* Internal Win32K Header */
+#include "include/win32k.h"