* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61991
This commit is contained in:
Amine Khaldi 2014-02-05 16:30:19 +00:00
parent be1c410130
commit 9fa1b9ab65
7 changed files with 24 additions and 24 deletions

View file

@ -10,6 +10,9 @@
/* INCLUDES *******************************************************************/
#include <win32k.h>
#include <ntddvdeo.h>
#define NDEBUG
#include <debug.h>

View file

@ -11,6 +11,14 @@
#include <win32k.h>
#include FT_GLYPH_H
#include FT_TYPE1_TABLES_H
#include <freetype/tttables.h>
#include <freetype/fttrigon.h>
#include <freetype/ftbitmap.h>
#include <freetype/ftoutln.h>
#include <freetype/ftwinfnt.h>
#define NDEBUG
#include <debug.h>

View file

@ -16,22 +16,17 @@
/* DDK/NDK/SDK headers */
#undef NTDDI_VERSION
#define NTDDI_VERSION NTDDI_WS03SP1
#include <ntddk.h>
#include <ntddmou.h>
#include <ntddvdeo.h>
#include <ntifs.h>
#include <tvout.h>
#include <ntddmou.h>
#include <ndk/exfuncs.h>
#include <ndk/kdfuncs.h>
#include <ndk/kefuncs.h>
#include <ndk/lpcfuncs.h>
#include <ndk/mmfuncs.h>
#include <ndk/obfuncs.h>
#include <ndk/psfuncs.h>
#include <ndk/rtlfuncs.h>
#include <ntstrsafe.h>
#include <ntddkbd.h>
#include <bugcodes.h>
/* Win32 headers */
/* FIXME: Defines in winbase.h that we need... */
@ -61,21 +56,13 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
#define _ENGINE_EXPORT_
#include <winddi.h>
#include <winuser.h>
#include <windowsx.h>
#include <prntfont.h>
#include <dde.h>
#include <wincon.h>
#include <winnls.h>
#define _NOCSECT_TYPE
#include <ddrawi.h>
/* SEH support with PSEH */
#include <pseh/pseh2.h>
/* CSRSS Header */
#include <csr/csr.h>
#include <win/winmsg.h>
/* Public Win32K headers */
#include <include/callback.h>
#include <include/ntusrtyp.h>
@ -87,20 +74,10 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
/* Undocumented user definitions */
#include <undocuser.h>
#include <winlogon.h>
/* Freetype headers */
#include <ft2build.h>
#include FT_FREETYPE_H
#include FT_GLYPH_H
#include FT_TYPE1_TABLES_H
#include <freetype/tttables.h>
#include <freetype/fttrigon.h>
#include <freetype/ftglyph.h>
#include <freetype/ftbitmap.h>
#include <freetype/ftoutln.h>
#include <freetype/ftwinfnt.h>
#include <freetype/freetype.h>
/* Internal Win32K header */
#include "win32kp.h"

View file

@ -7,6 +7,9 @@
*/
#include <win32k.h>
#include <windowsx.h>
DBG_DEFAULT_CHANNEL(UserDefwnd);
// Client Shutdown messages

View file

@ -9,6 +9,9 @@
*/
#include <win32k.h>
#include <winnls.h>
DBG_DEFAULT_CHANNEL(UserKbdLayout);
PKL gspklBaseLayout = NULL;

View file

@ -7,6 +7,9 @@
*/
#include <win32k.h>
#include <dde.h>
DBG_DEFAULT_CHANNEL(UserMsg);
#define PM_BADMSGFLAGS ~((QS_RAWINPUT << 16)|PM_QS_SENDMESSAGE|PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_QS_INPUT|PM_NOYIELD|PM_REMOVE)

View file

@ -7,6 +7,9 @@
*/
#include <win32k.h>
#include <winlogon.h>
DBG_DEFAULT_CHANNEL(UserMisc);
/* registered Logon process */