From 3dd6e3103fd7d587cb42adb14f868776cb795de7 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 25 Dec 2024 12:52:55 +0100
Subject: [PATCH] [INCLUDE][WKSSVC][MSV1_0] Rename msv1_0p.h to ntmsv1_0.h and
 move it to the ddk directory

---
 base/services/wkssvc/precomp.h |  1 +
 dll/win32/msv1_0/precomp.h     |  2 +-
 sdk/include/ddk/ntmsv1_0.h     | 47 ++++++++++++++++++++++++++++++++++
 sdk/include/reactos/msv1_0p.h  | 17 ------------
 4 files changed, 49 insertions(+), 18 deletions(-)
 create mode 100644 sdk/include/ddk/ntmsv1_0.h
 delete mode 100644 sdk/include/reactos/msv1_0p.h

diff --git a/base/services/wkssvc/precomp.h b/base/services/wkssvc/precomp.h
index b6d575316ab..f2fbde4e433 100644
--- a/base/services/wkssvc/precomp.h
+++ b/base/services/wkssvc/precomp.h
@@ -15,6 +15,7 @@
 #include <lmjoin.h>
 #include <lmserver.h>
 #include <ntsecapi.h>
+#include <ntmsv1_0.h>
 //#include <ntstatus.h>
 #include <ndk/rtlfuncs.h>
 
diff --git a/dll/win32/msv1_0/precomp.h b/dll/win32/msv1_0/precomp.h
index a034c3e6100..a56611e4ff2 100644
--- a/dll/win32/msv1_0/precomp.h
+++ b/dll/win32/msv1_0/precomp.h
@@ -27,10 +27,10 @@
 #include <ntsecpkg.h>
 #include <ntsam.h>
 #include <ntlsa.h>
+#include <ntmsv1_0.h>
 
 #include <samsrv/samsrv.h>
 //#include <lsass/lsasrv.h>
-#include <msv1_0p.h>
 
 #include "ntlm/global.h"
 #include "ntlm/protocol.h"
diff --git a/sdk/include/ddk/ntmsv1_0.h b/sdk/include/ddk/ntmsv1_0.h
new file mode 100644
index 00000000000..7db82d1feb1
--- /dev/null
+++ b/sdk/include/ddk/ntmsv1_0.h
@@ -0,0 +1,47 @@
+#ifndef _NTMSV1_0_
+#define _NTMSV1_0_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef struct _MSV1_0_ENUMUSERS_REQUEST
+{
+    MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
+} MSV1_0_ENUMUSERS_REQUEST, *PMSV1_0_ENUMUSERS_REQUEST;
+
+typedef struct _MSV1_0_ENUMUSERS_RESPONSE
+{
+    MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
+    ULONG NumberOfLoggedOnUsers;
+    PLUID LogonIds;
+    PULONG EnumHandles;
+} MSV1_0_ENUMUSERS_RESPONSE, *PMSV1_0_ENUMUSERS_RESPONSE;
+
+typedef struct _MSV1_0_GETUSERINFO_REQUEST
+{
+    MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
+    LUID LogonId;
+} MSV1_0_GETUSERINFO_REQUEST, *PMSV1_0_GETUSERINFO_REQUEST;
+
+typedef struct _MSV1_0_GETUSERINFO_RESPONSE
+{
+    MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
+    PSID UserSid;
+    UNICODE_STRING UserName;
+    UNICODE_STRING LogonDomainName;
+    UNICODE_STRING LogonServer;
+    SECURITY_LOGON_TYPE LogonType;
+} MSV1_0_GETUSERINFO_RESPONSE, *PMSV1_0_GETUSERINFO_RESPONSE;
+
+typedef struct _MSV1_0_RELOGON_REQUEST
+{
+    MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
+    UNICODE_STRING LogonServer;
+} MSV1_0_RELOGON_REQUEST, *PMSV1_0_RELOGON_REQUEST;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _NTMSV1_0_ */
diff --git a/sdk/include/reactos/msv1_0p.h b/sdk/include/reactos/msv1_0p.h
deleted file mode 100644
index 674d5f1f5a2..00000000000
--- a/sdk/include/reactos/msv1_0p.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _MSV1_0P_
-#define _MSV1_0P_
-
-typedef struct _MSV1_0_ENUMUSERS_REQUEST
-{
-    MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
-} MSV1_0_ENUMUSERS_REQUEST, *PMSV1_0_ENUMUSERS_REQUEST;
-
-typedef struct _MSV1_0_ENUMUSERS_RESPONSE
-{
-    MSV1_0_PROTOCOL_MESSAGE_TYPE MessageType;
-    ULONG NumberOfLoggedOnUsers;
-    PLUID LogonIds;
-    PULONG EnumHandles;
-} MSV1_0_ENUMUSERS_RESPONSE, *PMSV1_0_ENUMUSERS_RESPONSE;
-
-#endif /* _MSV1_0P_ */