https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6ddfe7e5dd96473f5a8b35dd4eab64dcc3607893
commit 6ddfe7e5dd96473f5a8b35dd4eab64dcc3607893 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Wed Nov 22 15:23:37 2023 +0100 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Wed Nov 22 15:46:00 2023 +0100 [WIN32K] Re-order some of the includes in pch.h First the C headers, then the DDK followed by the Win32 PSDK ones, only then the NDK headers, and finally the rest. --- win32ss/pch.h | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/win32ss/pch.h b/win32ss/pch.h index d72708658f0..cf06876ac54 100644 --- a/win32ss/pch.h +++ b/win32ss/pch.h @@ -14,25 +14,23 @@ #define _NO_COM #define STRICT -/* DDK/NDK/SDK headers */ +/* C headers */ +#include <stdarg.h> +#define _USE_MATH_DEFINES +#include <math.h> +#include <intrin.h> + +/* DDK headers */ #undef NTDDI_VERSION #define NTDDI_VERSION NTDDI_WS03SP1 #include <ntifs.h> +#include <ntddkbd.h> #include <ntddmou.h> -#include <ndk/exfuncs.h> -#include <ndk/iofuncs.h> -#include <ndk/kdfuncs.h> -#include <ndk/kefuncs.h> -#include <ndk/mmfuncs.h> -#include <ndk/obfuncs.h> -#include <ndk/psfuncs.h> -#include <ndk/sefuncs.h> -#include <ndk/rtlfuncs.h> +#include <ntddvdeo.h> #include <ntstrsafe.h> #include <ntintsafe.h> -#include <ntddkbd.h> -/* Win32 headers */ +/* Win32 PSDK headers */ /* FIXME: Defines in winbase.h that we need... */ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; #define MAKEINTATOM(i) (LPWSTR)((ULONG_PTR)((WORD)(i))) @@ -40,11 +38,7 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; #define STARTF_USESHOWWINDOW 1 #define STARTF_USESIZE 2 #define STARTF_USEPOSITION 4 -#include <stdarg.h> #include <windef.h> -#define _USE_MATH_DEFINES -#include <math.h> -#include <intrin.h> // Needed because windef.h messes up CDECL for whatever #undef CDECL @@ -64,13 +58,24 @@ typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; #define NT_BUILD_ENVIRONMENT #define _ENGINE_EXPORT_ #include <winddi.h> +#define OEMRESOURCE #include <winuser.h> #include <prntfont.h> #define _NOCSECT_TYPE #include <ddrawi.h> #include <imm.h> #include <dbt.h> -#include <ntddvdeo.h> + +/* NDK headers */ +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kdfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/sefuncs.h> +#include <ndk/rtlfuncs.h> /* SEH support with PSEH */ #include <pseh/pseh2.h>
