From d9cb1699205cf68fd0af09f3f6f4f8d920bfe346 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 12 Aug 2023 19:31:50 +0300
Subject: [PATCH] [XDK] Fix / improve some definitions

---
 sdk/include/xdk/rtltypes.h       | 36 +++++++++++++++++++-------------
 sdk/include/xdk/winnt.template.h |  1 +
 sdk/include/xdk/winnt_old.h      | 19 -----------------
 3 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/sdk/include/xdk/rtltypes.h b/sdk/include/xdk/rtltypes.h
index 527d3ed67ce..f248232485c 100644
--- a/sdk/include/xdk/rtltypes.h
+++ b/sdk/include/xdk/rtltypes.h
@@ -296,7 +296,7 @@ typedef LPOSVERSIONINFOA LPOSVERSIONINFO;
 #endif /* UNICODE */
 
 $endif (_WDMDDK_)
-$if (_NTDDK_)
+$if (_NTDDK_ || _WINNT_)
 
 #ifndef _RTL_RUN_ONCE_DEF
 #define _RTL_RUN_ONCE_DEF
@@ -309,6 +309,26 @@ $if (_NTDDK_)
 
 #define RTL_RUN_ONCE_CTX_RESERVED_BITS 2
 
+typedef union _RTL_RUN_ONCE {
+  PVOID Ptr;
+} RTL_RUN_ONCE, *PRTL_RUN_ONCE;
+
+typedef
+_Function_class_(RTL_RUN_ONCE_INIT_FN)
+_IRQL_requires_same_
+ULONG
+NTAPI
+RTL_RUN_ONCE_INIT_FN(
+    _Inout_ PRTL_RUN_ONCE RunOnce,
+    _Inout_opt_ PVOID Parameter,
+    _Inout_opt_ PVOID* Context);
+typedef RTL_RUN_ONCE_INIT_FN* PRTL_RUN_ONCE_INIT_FN;
+
+#endif /* _RTL_RUN_ONCE_DEF */
+
+$endif(_NTDDK_ || _WINNT_)
+$if(_NTDDK_)
+
 #define RTL_HASH_ALLOCATED_HEADER            0x00000001
 
 #define RTL_HASH_RESERVED_SIGNATURE 0
@@ -345,20 +365,6 @@ $if (_NTDDK_)
 #define VER_PLATFORM_WIN32_WINDOWS      1
 #define VER_PLATFORM_WIN32_NT           2
 
-typedef union _RTL_RUN_ONCE {
-  PVOID Ptr;
-} RTL_RUN_ONCE, *PRTL_RUN_ONCE;
-
-_Function_class_(RTL_RUN_ONCE_INIT_FN)
-_IRQL_requires_same_
-typedef ULONG /* LOGICAL */
-(NTAPI *PRTL_RUN_ONCE_INIT_FN) (
-  _Inout_ PRTL_RUN_ONCE RunOnce,
-  _Inout_opt_ PVOID Parameter,
-  _Inout_opt_ PVOID *Context);
-
-#endif /* _RTL_RUN_ONCE_DEF */
-
 typedef enum _TABLE_SEARCH_RESULT {
   TableEmptyTree,
   TableFoundNode,
diff --git a/sdk/include/xdk/winnt.template.h b/sdk/include/xdk/winnt.template.h
index 75a85102e08..216290cc980 100644
--- a/sdk/include/xdk/winnt.template.h
+++ b/sdk/include/xdk/winnt.template.h
@@ -74,6 +74,7 @@ $include(ntbasedef.h)
 $include(interlocked.h)
 $include(ketypes.h)
 $include(extypes.h)
+$include(rtltypes.h)
 $include(winnt_old.h)
 
 #ifdef __cplusplus
diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h
index 8edf6f58a59..08443624d29 100644
--- a/sdk/include/xdk/winnt_old.h
+++ b/sdk/include/xdk/winnt_old.h
@@ -2749,25 +2749,6 @@ NTAPI
 RtlQueryDepthSList(
   _In_ PSLIST_HEADER ListHead);
 
-#ifndef _RTL_RUN_ONCE_DEF
-#define _RTL_RUN_ONCE_DEF
-
-#define RTL_RUN_ONCE_CHECK_ONLY 0x00000001UL
-#define RTL_RUN_ONCE_ASYNC 0x00000002UL
-#define RTL_RUN_ONCE_INIT_FAILED 0x00000004UL
-
-#define RTL_RUN_ONCE_CTX_RESERVED_BITS 2
-
-#define RTL_RUN_ONCE_INIT {0}
-
-typedef union _RTL_RUN_ONCE {
-  PVOID Ptr;
-} RTL_RUN_ONCE, *PRTL_RUN_ONCE;
-
-typedef DWORD WINAPI RTL_RUN_ONCE_INIT_FN(PRTL_RUN_ONCE, PVOID, PVOID*);
-typedef RTL_RUN_ONCE_INIT_FN *PRTL_RUN_ONCE_INIT_FN;
-
-#endif
 
 #define RTL_CONDITION_VARIABLE_INIT {0}
 #define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 0x1