[ros-diffs] [reactos] 01/01: [SVCHOST][SECLOGON][MSWSOCK] Minimal headers cleanup.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f1ad6845a811161a57b9d…

commit f1ad6845a811161a57b9d2cf80e6d7b5c2e5b74d
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Mon Jan 17 00:59:25 2022 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Mon Jan 17 01:08:09 2022 +0100

    [SVCHOST][SECLOGON][MSWSOCK] Minimal headers cleanup.
    
    - SVCHOST, SECLOGON: Add missing NTOS_MODE_USER.
    - MSWSOCK: Remove some useless windef.h includes.
---
 base/services/seclogon/precomp.h | 8 +++++---
 base/services/svchost/svchost.h  | 3 ++-
 dll/win32/mswsock/nsplookup.c    | 1 -
 dll/win32/mswsock/stubs.c        | 1 -
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/base/services/seclogon/precomp.h b/base/services/seclogon/precomp.h
index b1475ec2ead..ca2dd3fc80c 100644
--- a/base/services/seclogon/precomp.h
+++ b/base/services/seclogon/precomp.h
@@ -8,18 +8,20 @@
 #ifndef _SECLOGON_PCH_
 #define _SECLOGON_PCH_
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
 #include <winsvc.h>
 #include <svc.h>
 
+#define NTOS_MODE_USER
 #include <ndk/rtlfuncs.h>
 
 #include <wine/debug.h>
diff --git a/base/services/svchost/svchost.h b/base/services/svchost/svchost.h
index 192ad994ad8..8cd80fdf4f0 100644
--- a/base/services/svchost/svchost.h
+++ b/base/services/svchost/svchost.h
@@ -12,11 +12,12 @@
 #define WIN32_NO_STATUS
 #define WIN32_LEAN_AND_MEAN
 
-#include <rpc.h>
+#define NTOS_MODE_USER
 #include <ndk/rtlfuncs.h>
 #include <ndk/kdtypes.h>
 #include <dpfilter.h>
 
+#include <rpc.h>
 #include <svc.h>
 
 //
diff --git a/dll/win32/mswsock/nsplookup.c b/dll/win32/mswsock/nsplookup.c
index 301355b4498..10396cbdbf6 100644
--- a/dll/win32/mswsock/nsplookup.c
+++ b/dll/win32/mswsock/nsplookup.c
@@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <ws2spi.h>
 #include <nspapi.h>
-#include <windef.h>
 #include <winuser.h>
 #include <windns.h>
 #include <guiddef.h>
diff --git a/dll/win32/mswsock/stubs.c b/dll/win32/mswsock/stubs.c
index 2c336f4d60a..40def8f5cf3 100644
--- a/dll/win32/mswsock/stubs.c
+++ b/dll/win32/mswsock/stubs.c
@@ -9,7 +9,6 @@
 
 #include "precomp.h"
 
-#include <windef.h>
 #include <ws2spi.h>
 #include <nspapi.h>
 #include <svc.h>