Bump systeminformer to 658f64268

[github-actions]

diff --git a/phnt/README.md b/phnt/README.md
index d042a01db..ac35a0db4 100644
--- a/phnt/README.md
+++ b/phnt/README.md
@@ -14,12 +14,12 @@ These header files are designed to be used by user-mode programs. Instead of `#i
 at the top of your program. The first line provides access to the Win32 API as well as the `NTSTATUS` values. The second line provides access to the entire Native API. By default, only definitions present in Windows XP are included into your program. To change this, use one of the following:
 

-#define PHNT_VERSION PHNT_WINXP // Windows XP
-#define PHNT_VERSION PHNT_WS03 // Windows Server 2003
-#define PHNT_VERSION PHNT_VISTA // Windows Vista
-#define PHNT_VERSION PHNT_WIN7 // Windows 7
-#define PHNT_VERSION PHNT_WIN8 // Windows 8
-#define PHNT_VERSION PHNT_WINBLUE // Windows 8.1
-#define PHNT_VERSION PHNT_THRESHOLD // Windows 10
-#define PHNT_VERSION PHNT_WIN11 // Windows 11
+#define PHNT_VERSION PHNT_WINDOWS_XP // Windows XP
+#define PHNT_VERSION PHNT_WINDOWS_SERVER_2003 // Windows Server 2003
+#define PHNT_VERSION PHNT_WINDOWS_VISTA // Windows Vista
+#define PHNT_VERSION PHNT_WINDOWS_7 // Windows 7
+#define PHNT_VERSION PHNT_WINDOWS_8 // Windows 8
+#define PHNT_VERSION PHNT_WINDOWS_8_1 // Windows 8.1
+#define PHNT_VERSION PHNT_WINDOWS_10 // Windows 10
+#define PHNT_VERSION PHNT_WINDOWS_11 // Windows 11

diff --git a/phnt/include/ntbcd.h b/phnt/include/ntbcd.h
index 79607cc65..1327e22bb 100644
--- a/phnt/include/ntbcd.h
+++ b/phnt/include/ntbcd.h
@@ -231,7 +231,7 @@ BcdExportStore(
    _In_ PCUNICODE_STRING BcdFilePath
    );

-#if (PHNT_VERSION > PHNT_WIN11)
+#if (PHNT_VERSION > PHNT_WINDOWS_11)
/**
 * Exports the BCD store to a file with additional flags.
 *
diff --git a/phnt/include/ntexapi.h b/phnt/include/ntexapi.h
index 13fd1a6b9..0ffe98f3b 100644
--- a/phnt/include/ntexapi.h
+++ b/phnt/include/ntexapi.h
@@ -245,7 +245,7 @@ typedef struct _EFI_DRIVER_ENTRY_LIST
    EFI_DRIVER_ENTRY DriverEntry;
} EFI_DRIVER_ENTRY_LIST, *PEFI_DRIVER_ENTRY_LIST;

-#if (PHNT_VERSION >= PHNT_WINXP)
+#if (PHNT_VERSION >= PHNT_WINDOWS_XP)
/**
 * The NtAddBootEntry routine adds a new boot entry to the system boot configuration.
 *
@@ -380,9 +380,9 @@ NtTranslateFilePath(
    _Out_writes_bytes_opt_(*OutputFilePathLength) PFILE_PATH OutputFilePath,
    _Inout_opt_ PULONG OutputFilePathLength
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_XP)

-#if (PHNT_VERSION >= PHNT_WS03)
+#if (PHNT_VERSION >= PHNT_WINDOWS_SERVER_2003)
/**
 * The NtAddDriverEntry routine adds a new driver entry to the system boot configuration.
 *
@@ -468,7 +468,7 @@ NtSetDriverEntryOrder(
    _In_reads_(Count) PULONG Ids,
    _In_ ULONG Count
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_SERVER_2003)

typedef enum _FILTER_BOOT_OPTION_OPERATION
{
@@ -478,7 +478,7 @@ typedef enum _FILTER_BOOT_OPTION_OPERATION
    FilterBootOptionOperationMax
} FILTER_BOOT_OPTION_OPERATION;

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
/**
 * The NtFilterBootOption routine filters boot options based on the specified operation, object type, and element type.
 *
@@ -499,7 +499,7 @@ NtFilterBootOption(
    _In_reads_bytes_opt_(DataSize) PVOID Data,
    _In_ ULONG DataSize
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_8)

//
// Event
@@ -583,7 +583,7 @@ NtSetEvent(
    _Out_opt_ PLONG PreviousState
    );

-#if (PHNT_VERSION >= PHNT_WIN11)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11)
/**
 * The NtSetEventEx routine sets an event object to the signaled state and optionally acquires a lock.
 *
@@ -598,7 +598,7 @@ NtSetEventEx(
    _In_ HANDLE ThreadId,
    _In_opt_ PRTL_SRWLOCK Lock
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_11)

/**
 * The NtSetEventBoostPriority routine sets an event object to the signaled state and boosts the priority of threads waiting on the event.
@@ -1097,7 +1097,7 @@ NtSetTimer(
    _Out_opt_ PBOOLEAN PreviousState
    );

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1107,7 +1107,7 @@ NtSetTimerEx(
    _Inout_updates_bytes_opt_(TimerSetInformationLength) PVOID TimerSetInformation,
    _In_ ULONG TimerSetInformationLength
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_7)

NTSYSCALLAPI
NTSTATUS
@@ -1128,7 +1128,7 @@ NtQueryTimer(
    _Out_opt_ PULONG ReturnLength
    );

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)

NTSYSCALLAPI
NTSTATUS
@@ -1147,9 +1147,9 @@ NtSetIRTimer(
    _In_opt_ PLARGE_INTEGER DueTime
    );

-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_8)

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)

NTSYSCALLAPI
NTSTATUS
@@ -1162,7 +1162,7 @@ NtCreateTimer2(
    _In_ ACCESS_MASK DesiredAccess
    );

-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_10)

typedef struct _T2_SET_PARAMETERS_V0
{
@@ -1173,7 +1173,7 @@ typedef struct _T2_SET_PARAMETERS_V0

typedef PVOID PT2_CANCEL_PARAMETERS;

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)

NTSYSCALLAPI
NTSTATUS
@@ -1193,9 +1193,11 @@ NtCancelTimer2(
    _In_ PT2_CANCEL_PARAMETERS Parameters
    );

-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_10)

+//
// Profile
+//

#define PROFILE_CONTROL 0x0001
#define PROFILE_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | PROFILE_CONTROL)
@@ -1215,7 +1217,7 @@ NtCreateProfile(
    _In_ KAFFINITY Affinity
    );

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1231,7 +1233,7 @@ NtCreateProfileEx(
    _In_ USHORT GroupCount,
    _In_reads_(GroupCount) PGROUP_AFFINITY GroupAffinity
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_7)

NTSYSCALLAPI
NTSTATUS
@@ -1309,18 +1311,22 @@ NtWaitForKeyedEvent(
    _In_opt_ PLARGE_INTEGER Timeout
    );

+//
// UMS
+//

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
NTSYSCALLAPI
NTSTATUS
NTAPI
NtUmsThreadYield(
    _In_ PVOID SchedulerParam
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_7)

+//
// WNF
+//

// begin_private

@@ -1379,7 +1385,7 @@ typedef struct _WNF_DELIVERY_DESCRIPTOR

// end_private

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)

NTSYSCALLAPI
NTSTATUS
@@ -1462,9 +1468,9 @@ NtUnsubscribeWnfStateChange(
    _In_ PCWNF_STATE_NAME StateName
    );

-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_8)

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)

NTSYSCALLAPI
NTSTATUS
@@ -1485,9 +1491,11 @@ NtSetWnfProcessNotificationEvent(
    _In_ HANDLE NotificationEvent
    );

-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_10)

+//
// Worker factory
+//

// begin_rev

@@ -1563,7 +1571,7 @@ typedef struct _WORKER_FACTORY_BASIC_INFORMATION

// end_private

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)

NTSYSCALLAPI
NTSTATUS
@@ -1632,7 +1640,7 @@ typedef struct _WORKER_FACTORY_DEFERRED_WORK
    ULONG Flags;
} WORKER_FACTORY_DEFERRED_WORK, *PWORKER_FACTORY_DEFERRED_WORK;

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)

NTSYSCALLAPI
NTSTATUS
@@ -1655,9 +1663,9 @@ NtWaitForWorkViaWorkerFactory(
    _Out_ PFILE_IO_COMPLETION_INFORMATION MiniPacket
    );

-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_8)

-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_VISTA)

//
// Time
@@ -1729,7 +1737,7 @@ NtSetTimerResolution(
    );

//
-// Performance Counter
+// Performance Counters
//

NTSYSCALLAPI
@@ -1740,8 +1748,15 @@ NtQueryPerformanceCounter(
    _Out_opt_ PLARGE_INTEGER PerformanceFrequency
    );

-#if (PHNT_VERSION >= PHNT_REDSTONE2)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS2)
// rev
+/**
+ * The NtQueryAuxiliaryCounterFrequency routine queries the auxiliary counter frequency. (The auxiliary counter is generally the HPET hardware timer).
+ *
+ * @param AuxiliaryCounterFrequency A pointer to an output buffer that contains the specified auxiliary counter frequency. If the auxiliary counter is not supported, the value in the output buffer will be undefined.
+ * @return NTSTATUS Successful or errant status.
+ * @see https://learn.microsoft.com/en-us/windows/win32/api/realtimeapiset/nf-realtimeapiset-queryauxiliarycounterfrequency
+ */
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1750,6 +1765,17 @@ NtQueryAuxiliaryCounterFrequency(
    );

// rev
+/**
+ * The NtConvertBetweenAuxiliaryCounterAndPerformanceCounter routine converts the specified performance counter value to the corresponding auxiliary counter value;
+ * optionally provides the estimated conversion error in nanoseconds due to latencies and maximum possible drift.
+ *
+ * @param ConvertAuxiliaryToPerformanceCounter  If TRUE, the value will be converted from AUX to QPC. If FALSE, the value will be converted from QPC to AUX.
+ * @param PerformanceOrAuxiliaryCounterValue The performance counter value to convert.
+ * @param ConvertedValue On success, contains the converted auxiliary counter value. Will be undefined if the function fails.
+ * @param ConversionError On success, contains the estimated conversion error, in nanoseconds. Will be undefined if the function fails.
+ * @return NTSTATUS Successful or errant status.
+ * @see https://learn.microsoft.com/en-us/windows/win32/api/realtimeapiset/nf-realtimeapiset-convertperformancecountertoauxiliarycounter
+ */
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1759,9 +1785,11 @@ NtConvertBetweenAuxiliaryCounterAndPerformanceCounter(
    _Out_ PULONG64 ConvertedValue,
    _Out_opt_ PULONG64 ConversionError
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_10_RS2)

+//
// LUIDs
+//

NTSYSCALLAPI
NTSTATUS
@@ -1770,7 +1798,9 @@ NtAllocateLocallyUniqueId(
    _Out_ PLUID Luid
    );

+//
// UUIDs
+//

NTSYSCALLAPI
NTSTATUS
@@ -1789,10 +1819,12 @@ NtAllocateUuids(
    _Out_ PCHAR Seed
    );

-// System Information
-
#endif // (PHNT_MODE != PHNT_MODE_KERNEL)

+//
+// System Information
+//
+
// rev
// private
typedef enum _SYSTEM_INFORMATION_CLASS
@@ -3083,7 +3115,7 @@ typedef struct _SYSTEM_GDI_DRIVER_INFORMATION
    PIMAGE_EXPORT_DIRECTORY ExportSectionPointer;
    ULONG ImageLength;
} SYSTEM_GDI_DRIVER_INFORMATION, *PSYSTEM_GDI_DRIVER_INFORMATION;
-#endif
+#endif // (PHNT_MODE != PHNT_MODE_KERNEL)

// geoffchappell
#ifdef _WIN64
@@ -3278,7 +3310,7 @@ typedef struct _SYSTEM_FIRMWARE_TABLE_INFORMATION
    ULONG TableBufferLength;
    _Field_size_bytes_(TableBufferLength) UCHAR TableBuffer[1];
} SYSTEM_FIRMWARE_TABLE_INFORMATION, *PSYSTEM_FIRMWARE_TABLE_INFORMATION;
-#endif
+#endif // (PHNT_MODE != PHNT_MODE_KERNEL)

#if (PHNT_MODE != PHNT_MODE_KERNEL)
// private
@@ -3294,7 +3326,7 @@ typedef struct _SYSTEM_FIRMWARE_TABLE_HANDLER
    PFNFTH FirmwareTableHandler;
    PVOID DriverObject;
} SYSTEM_FIRMWARE_TABLE_HANDLER, *PSYSTEM_FIRMWARE_TABLE_HANDLER;
-#endif
+#endif // (PHNT_MODE != PHNT_MODE_KERNEL)

// private
typedef struct _SYSTEM_MEMORY_LIST_INFORMATION
@@ -5022,7 +5054,7 @@ typedef struct _SYSTEM_SUPPORTED_PROCESSOR_ARCHITECTURES_INFORMATION
    ULONG WoW64Container : 1;
    ULONG ReservedZero0 : 11;
} SYSTEM_SUPPORTED_PROCESSOR_ARCHITECTURES_INFORMATION, *PSYSTEM_SUPPORTED_PROCESSOR_ARCHITECTURES_INFORMATION;
-#endif
+#endif // NTDDI_WIN10_FE

// private
typedef struct _SYSTEM_MEMORY_USAGE_INFORMATION
@@ -5607,7 +5639,7 @@ NtQuerySystemInformation(
    _Out_opt_ PULONG ReturnLength
    );

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -5619,7 +5651,7 @@ NtQuerySystemInformationEx(
    _In_ ULONG SystemInformationLength,
    _Out_opt_ PULONG ReturnLength
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_7)

NTSYSCALLAPI
NTSTATUS
@@ -6722,7 +6754,9 @@ NtGetTickCount(
#endif
}

+//
// Locale
+//

NTSYSCALLAPI
NTSTATUS
@@ -6747,7 +6781,7 @@ NtQueryInstallUILanguage(
    _Out_ LANGID *InstallUILanguageId
    );

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
// private
NTSYSCALLAPI
NTSTATUS
@@ -6756,7 +6790,7 @@ NtFlushInstallUILanguage(
    _In_ LANGID InstallUILanguage,
    _In_ ULONG SetComittedFlag
    );
-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_VISTA

NTSYSCALLAPI
NTSTATUS
@@ -6772,7 +6806,7 @@ NtSetDefaultUILanguage(
    _In_ LANGID DefaultUILanguageId
    );

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
// private
NTSYSCALLAPI
NTSTATUS
@@ -6780,13 +6814,13 @@ NTAPI
NtIsUILanguageComitted(
    VOID
    );
-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_VISTA

// NLS

// begin_private

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)

NTSYSCALLAPI
NTSTATUS
@@ -6809,7 +6843,7 @@ NtGetNlsSectionPtr(
    _Out_ PULONG SectionSize
    );

-#if (PHNT_VERSION < PHNT_WIN7)
+#if (PHNT_VERSION < PHNT_WINDOWS_7)

NTSYSCALLAPI
NTSTATUS
@@ -6827,7 +6861,7 @@ NtReleaseCMFViewOwnership(
    VOID
    );

-#endif
+#endif // PHNT_VERSION < PHNT_WINDOWS_7

NTSYSCALLAPI
NTSTATUS
@@ -6850,11 +6884,13 @@ NtGetMUIRegistryInfo(
    _Out_ PVOID Data
    );

-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_VISTA

// end_private

+//
// Global atoms
+//

NTSYSCALLAPI
NTSTATUS
@@ -6865,7 +6901,7 @@ NtAddAtom(
    _Out_opt_ PRTL_ATOM Atom
    );

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)

#define ATOM_FLAG_GLOBAL 0x2

@@ -6880,7 +6916,7 @@ NtAddAtomEx(
    _In_ ULONG Flags
    );

-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_8

NTSYSCALLAPI
NTSTATUS
@@ -6929,7 +6965,9 @@ NtQueryInformationAtom(
    _Out_opt_ PULONG ReturnLength
    );

+//
// Global flags
+//

#define FLG_STOP_ON_EXCEPTION 0x00000001 // uk
#define FLG_SHOW_LDR_SNAPS 0x00000002 // uk
@@ -7010,7 +7048,7 @@ NtQueryInformationAtom(
    FLG_ENABLE_HANDLE_EXCEPTIONS)

// Licensing
-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -7058,7 +7096,7 @@ NtDisplayString(

// Boot graphics

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
// rev
NTSYSCALLAPI
NTSTATUS
@@ -7106,10 +7144,6 @@ typedef struct _MANAGE_HOT_PATCH_LOAD_PATCH
    HOT_PATCH_IMAGE_INFO BaseInfo;
} MANAGE_HOT_PATCH_LOAD_PATCH, *PMANAGE_HOT_PATCH_LOAD_PATCH;

-#ifdef WIN64
-static_assert(sizeof(MANAGE_HOT_PATCH_LOAD_PATCH) == 0x68, "Size of MANAGE_HOT_PATCH_LOAD_PATCH is incorrect");
-#endif
-
typedef struct _MANAGE_HOT_PATCH_UNLOAD_PATCH
{
    ULONG Version;
@@ -7121,10 +7155,6 @@ typedef struct _MANAGE_HOT_PATCH_UNLOAD_PATCH
    } UserSid;
} MANAGE_HOT_PATCH_UNLOAD_PATCH, *PMANAGE_HOT_PATCH_UNLOAD_PATCH;

-#ifdef WIN64
-static_assert(sizeof(MANAGE_HOT_PATCH_LOAD_PATCH) == 0x68, "Size of MANAGE_HOT_PATCH_LOAD_PATCH is incorrect");
-#endif
-
typedef struct _MANAGE_HOT_PATCH_QUERY_PATCHES
{
    ULONG Version;
@@ -7203,7 +7233,7 @@ static_assert(sizeof(MANAGE_HOT_PATCH_CHECK_ENABLED) == 0x8, "Size of MANAGE_HOT
static_assert(sizeof(MANAGE_HOT_PATCH_CREATE_PATCH_SECTION) == 0x28, "Size of MANAGE_HOT_PATCH_CREATE_PATCH_SECTION is incorrect");
#endif

-#if (PHNT_VERSION >= PHNT_WIN11)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11)
// rev
NTSYSCALLAPI
NTSTATUS
@@ -7214,7 +7244,7 @@ NtManageHotPatch(
    _In_ ULONG HotPatchInformationLength,
    _Out_opt_ PULONG ReturnLength
    );
-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_11

#endif // (PHNT_MODE != PHNT_MODE_KERNEL)

diff --git a/phnt/include/ntioapi.h b/phnt/include/ntioapi.h
index 439992751..cfcbe763a 100644
--- a/phnt/include/ntioapi.h
+++ b/phnt/include/ntioapi.h
@@ -462,7 +462,7 @@ typedef struct _FILE_END_OF_FILE_INFORMATION
    LARGE_INTEGER EndOfFile;
} FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION;

-//#if (PHNT_VERSION >= PHNT_REDSTONE5)
+//#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS5)
#define FLAGS_END_OF_FILE_INFO_EX_EXTEND_PAGING             0x00000001
#define FLAGS_END_OF_FILE_INFO_EX_NO_EXTRA_PAGING_EXTEND    0x00000002
#define FLAGS_END_OF_FILE_INFO_EX_TIME_CONSTRAINED          0x00000004
@@ -842,7 +842,7 @@ typedef struct _FILE_VOLUME_NAME_INFORMATION

#ifndef FILE_INVALID_FILE_ID
#define FILE_INVALID_FILE_ID ((LONGLONG)-1LL)
-#endif
+#endif // FILE_INVALID_FILE_ID

#define FILE_ID_IS_INVALID(FID) ((FID).QuadPart == FILE_INVALID_FILE_ID)

@@ -1104,7 +1104,7 @@ typedef struct _FILE_STAT_BASIC_INFORMATION
    LARGE_INTEGER VolumeSerialNumber;
    FILE_ID_128 FileId128;
} FILE_STAT_BASIC_INFORMATION, *PFILE_STAT_BASIC_INFORMATION;
-#endif
+#endif // NTDDI_WIN11_GE

typedef struct _FILE_MEMORY_PARTITION_INFORMATION
{
@@ -1148,7 +1148,7 @@ typedef struct _FILE_STAT_LX_INFORMATION
    ULONG LxDeviceIdMajor;
    ULONG LxDeviceIdMinor;
} FILE_STAT_LX_INFORMATION, *PFILE_STAT_LX_INFORMATION;
-#endif
+#endif // NTDDI_WIN11_GE

typedef struct _FILE_STORAGE_RESERVE_ID_INFORMATION
{
@@ -1162,7 +1162,7 @@ typedef struct _FILE_CASE_SENSITIVE_INFORMATION
{
    ULONG Flags;
} FILE_CASE_SENSITIVE_INFORMATION, *PFILE_CASE_SENSITIVE_INFORMATION;
-#endif
+#endif // NTDDI_WIN11_GE

typedef enum _FILE_KNOWN_FOLDER_TYPE
{
@@ -1736,7 +1736,7 @@ NtFlushBuffersFile(
#define FLUSH_FLAGS_FLUSH_AND_PURGE 0x00000008 // 24H2


-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1760,7 +1760,7 @@ NtQueryInformationFile(
    _In_ FILE_INFORMATION_CLASS FileInformationClass
    );

-#if (PHNT_VERSION >= PHNT_REDSTONE2)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS2)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1808,7 +1808,7 @@ NtQueryDirectoryFile(
#define FILE_QUERY_RETURN_ON_DISK_ENTRIES_ONLY 0x00000008
#define FILE_QUERY_NO_CURSOR_UPDATE 0x00000010 // RS5

-#if (PHNT_VERSION >= PHNT_REDSTONE3)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS3)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1906,7 +1906,7 @@ NtCancelIoFile(
    _Out_ PIO_STATUS_BLOCK IoStatusBlock
    );

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1917,7 +1917,7 @@ NtCancelIoFileEx(
    );
#endif

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -2144,7 +2144,7 @@ typedef struct _FILE_NOTIFY_EXTENDED_INFORMATION
    ULONG FileNameLength;
    WCHAR FileName[1];
} FILE_NOTIFY_EXTENDED_INFORMATION, *PFILE_NOTIFY_EXTENDED_INFORMATION;
-#endif
+#endif // NTDDI_WIN10_RS5

#define FILE_NAME_FLAG_HARDLINK      0    // not part of a name pair
#define FILE_NAME_FLAG_NTFS          0x01 // NTFS name in a name pair
@@ -2178,7 +2178,7 @@ typedef struct _FILE_NOTIFY_FULL_INFORMATION
} FILE_NOTIFY_FULL_INFORMATION, *PFILE_NOTIFY_FULL_INFORMATION;
#endif

-#if (PHNT_VERSION >= PHNT_REDSTONE3)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS3)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -2296,7 +2296,7 @@ NtSetIoCompletion(
    _In_ ULONG_PTR IoStatusInformation
    );

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -2321,7 +2321,7 @@ NtRemoveIoCompletion(
    _In_opt_ PLARGE_INTEGER Timeout
    );

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
// private
typedef struct _FILE_IO_COMPLETION_INFORMATION
{
@@ -2341,11 +2341,13 @@ NtRemoveIoCompletionEx(
    _In_opt_ PLARGE_INTEGER Timeout,
    _In_ BOOLEAN Alertable
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_VISTA)

+//
// Wait completion packet
+//

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)

NTSYSCALLAPI
NTSTATUS
@@ -2378,71 +2380,31 @@ NtCancelWaitCompletionPacket(
    _In_ BOOLEAN RemoveSignaledPacket
    );

-#endif
-
-// Sessions
-
-typedef enum _IO_SESSION_EVENT
-{
-    IoSessionEventIgnore,
-    IoSessionEventCreated,
-    IoSessionEventTerminated,
-    IoSessionEventConnected,
-    IoSessionEventDisconnected,
-    IoSessionEventLogon,
-    IoSessionEventLogoff,
-    IoSessionEventMax
-} IO_SESSION_EVENT;
-
-typedef enum _IO_SESSION_STATE
-{
-    IoSessionStateCreated = 1,
-    IoSessionStateInitialized = 2,
-    IoSessionStateConnected = 3,
-    IoSessionStateDisconnected = 4,
-    IoSessionStateDisconnectedLoggedOn = 5,
-    IoSessionStateLoggedOn = 6,
-    IoSessionStateLoggedOff = 7,
-    IoSessionStateTerminated = 8,
-    IoSessionStateMax
-} IO_SESSION_STATE;
-
-// Sessions
-
-#if (PHNT_MODE != PHNT_MODE_KERNEL)
-
-#if (PHNT_VERSION >= PHNT_VISTA)
-NTSYSCALLAPI
-NTSTATUS
-NTAPI
-NtOpenSession(
-    _Out_ PHANDLE SessionHandle,
-    _In_ ACCESS_MASK DesiredAccess,
-    _In_ POBJECT_ATTRIBUTES ObjectAttributes
-    );
-#endif
-
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_8)

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11)
NTSYSCALLAPI
NTSTATUS
NTAPI
-NtNotifyChangeSession(
-    _In_ HANDLE SessionHandle,
-    _In_ ULONG ChangeSequenceNumber,
-    _In_ PLARGE_INTEGER ChangeTimeStamp,
-    _In_ IO_SESSION_EVENT Event,
-    _In_ IO_SESSION_STATE NewState,
-    _In_ IO_SESSION_STATE PreviousState,
-    _In_reads_bytes_opt_(PayloadSize) PVOID Payload,
-    _In_ ULONG PayloadSize
+NtCopyFileChunk(
+    _In_ HANDLE SourceHandle,
+    _In_ HANDLE DestinationHandle,
+    _In_opt_ HANDLE EventHandle,
+    _Out_ PIO_STATUS_BLOCK IoStatusBlock,
+    _In_ ULONG Length,
+    _In_ PLARGE_INTEGER SourceOffset,
+    _In_ PLARGE_INTEGER DestOffset,
+    _In_opt_ PULONG SourceKey,
+    _In_opt_ PULONG DestKey,
+    _In_ ULONG Flags
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_11)

+//
// I/O Ring
+//

-#if (PHNT_VERSION >= PHNT_WIN11)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -2481,9 +2443,11 @@ NtSetInformationIoRing(
    _In_ ULONG IoRingInformationLength,
    _In_ PVOID IoRingInformation
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_11)

+//
// Other types
+//

typedef enum _INTERFACE_TYPE
{
@@ -2843,7 +2807,9 @@ typedef struct _FILE_MAILSLOT_PEEK_BUFFER
    ULONG MessageLength;
} FILE_MAILSLOT_PEEK_BUFFER, *PFILE_MAILSLOT_PEEK_BUFFER;

+//
// Mount manager FS control definitions
+//

#define MOUNTMGR_DEVICE_NAME L"\\Device\\MountPointManager"
#define MOUNTMGRCONTROLTYPE 0x0000006D // 'm'
@@ -3050,7 +3016,12 @@ typedef struct _MOUNTMGR_VOLUME_PATHS
     (s)->Length == 98 && \
     (s)->Buffer[1] == '?')

+//
// Filter manager
+//
+
+#define FLT_PORT_CONNECT 0x0001
+#define FLT_PORT_ALL_ACCESS (FLT_PORT_CONNECT | STANDARD_RIGHTS_ALL)

// rev
#define FLT_SYMLINK_NAME     L"\\Global??\\FltMgr"
diff --git a/phnt/include/ntkeapi.h b/phnt/include/ntkeapi.h
index 107e66fe0..9b06855d6 100644
--- a/phnt/include/ntkeapi.h
+++ b/phnt/include/ntkeapi.h
@@ -139,7 +139,13 @@ NtCallbackReturn(
    _In_ NTSTATUS Status
    );

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
+/**
+ * The NtFlushProcessWriteBuffers routine flushes the write queue of each processor that is running a thread of the current process.
+ *
+ * @return NTSTATUS Successful or errant status.
+ * @see https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-flushprocesswritebuffers
+ */
NTSYSCALLAPI
NTSTATUS
NTAPI
diff --git a/phnt/include/ntldr.h b/phnt/include/ntldr.h
index 9917010ad..fde277058 100644
--- a/phnt/include/ntldr.h
+++ b/phnt/include/ntldr.h
@@ -262,7 +262,7 @@ LdrGetDllHandleEx(
    _Out_ PVOID *DllHandle
    );

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
// rev
NTSYSAPI
NTSTATUS
@@ -273,7 +273,7 @@ LdrGetDllHandleByMapping(
    );
#endif

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
// rev
NTSYSAPI
NTSTATUS
@@ -285,7 +285,7 @@ LdrGetDllHandleByName(
    );
#endif

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
// rev
NTSYSAPI
NTSTATUS
@@ -346,7 +346,7 @@ LdrGetProcedureAddress(
// rev
#define LDR_GET_PROCEDURE_ADDRESS_DONT_RECORD_FORWARDER 0x00000001

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
// private
NTSYSAPI
NTSTATUS
@@ -369,7 +369,7 @@ LdrGetKnownDllSectionHandle(
    _Out_ PHANDLE Section
    );

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
// rev
NTSYSAPI
NTSTATUS
@@ -443,7 +443,7 @@ LdrProcessRelocationBlock(
    _In_ LONG_PTR Diff
    );

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
NTSYSAPI
PIMAGE_BASE_RELOCATION
NTAPI
@@ -509,7 +509,7 @@ typedef struct _LDR_VERIFY_IMAGE_INFO
    USHORT ImageCharacteristics;
} LDR_VERIFY_IMAGE_INFO, *PLDR_VERIFY_IMAGE_INFO;

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
// private
NTSYSAPI
NTSTATUS
@@ -520,7 +520,7 @@ LdrVerifyImageMatchesChecksumEx(
    );
#endif

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
// private
NTSYSAPI
NTSTATUS
@@ -569,7 +569,7 @@ VOID NTAPI LDR_DLL_NOTIFICATION_FUNCTION(
    );
typedef LDR_DLL_NOTIFICATION_FUNCTION* PLDR_DLL_NOTIFICATION_FUNCTION;

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
/**
 * Registers for notification when a DLL is first loaded. This notification occurs before dynamic linking takes place.
 *
@@ -622,7 +622,7 @@ typedef struct _LDR_FAILURE_DATA
    WCHAR AdditionalInfo[0x20];
} LDR_FAILURE_DATA, *PLDR_FAILURE_DATA;

-#if (PHNT_VERSION >= PHNT_WINBLUE)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8_1)
NTSYSAPI
PLDR_FAILURE_DATA
NTAPI
@@ -676,7 +676,7 @@ typedef struct _PS_SYSTEM_DLL_INIT_BLOCK
} PS_SYSTEM_DLL_INIT_BLOCK, *PPS_SYSTEM_DLL_INIT_BLOCK;

// rev
-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
NTSYSAPI PS_SYSTEM_DLL_INIT_BLOCK LdrSystemDllInitBlock;
#endif

@@ -715,7 +715,7 @@ typedef struct _RTL_SCPCFG_NTDLL_EXPORTS
} RTL_SCPCFG_NTDLL_EXPORTS, *PRTL_SCPCFG_NTDLL_EXPORTS;

// rev
-#if (PHNT_VERSION >= PHNT_WIN11_24H2)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11_24H2)
NTSYSAPI RTL_SCPCFG_NTDLL_EXPORTS RtlpScpCfgNtdllExports;
#endif

@@ -723,7 +723,7 @@ NTSYSAPI RTL_SCPCFG_NTDLL_EXPORTS RtlpScpCfgNtdllExports;
// Load as data table
//

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)

// private
NTSYSAPI
@@ -823,7 +823,7 @@ LdrFindResourceDirectory_U(
    _Out_ PIMAGE_RESOURCE_DIRECTORY *ResourceDirectory
    );

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
/**
 * The LdrResFindResource function finds a resource in a DLL.
 *
@@ -1201,7 +1201,7 @@ PVOID NTAPI DELAYLOAD_FAILURE_SYSTEM_ROUTINE(
    );
typedef DELAYLOAD_FAILURE_SYSTEM_ROUTINE* PDELAYLOAD_FAILURE_SYSTEM_ROUTINE;

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
// rev from QueryOptionalDelayLoadedAPI
/**
 * Determines whether the specified function in a delay-loaded DLL is available on the system.
@@ -1224,7 +1224,7 @@ LdrQueryOptionalDelayLoadedAPI(
    );
#endif

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
// rev from ResolveDelayLoadedAPI
/**
 * Locates the target function of the specified import and replaces the function pointer in the import thunk with the target of the function implementation.
@@ -1337,7 +1337,7 @@ LdrShutdownThread(
    VOID
    );

-#if (PHNT_VERSION >= PHNT_WINBLUE)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8_1)
// rev
NTSYSAPI
NTSTATUS
@@ -1347,7 +1347,7 @@ LdrSetImplicitPathOptions(
    );
#endif

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
#ifdef PHNT_INLINE_TYPEDEFS
/**
 * The LdrControlFlowGuardEnforced function checks if Control Flow Guard is enforced.
@@ -1379,7 +1379,7 @@ LdrControlFlowGuardEnforced(
#endif
#endif

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
/**
 * The LdrControlFlowGuardEnforcedWithExportSuppression function checks if Control Flow Guard is
 * enforced with export suppression.
@@ -1399,7 +1399,7 @@ LdrControlFlowGuardEnforcedWithExportSuppression(
}
#endif

-#if (PHNT_VERSION >= PHNT_19H1)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_19H1)
// rev
NTSYSAPI
BOOLEAN
@@ -1409,7 +1409,7 @@ LdrIsModuleSxsRedirected(
    );
#endif

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
// rev
NTSYSAPI
NTSTATUS
@@ -1441,7 +1441,7 @@ typedef struct _LDR_SOFTWARE_ENCLAVE
    PLDR_DATA_TABLE_ENTRY BCryptPrimitivesModule;
} LDR_SOFTWARE_ENCLAVE, *PLDR_SOFTWARE_ENCLAVE;

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)

// rev from CreateEnclave
/**
@@ -1597,7 +1597,7 @@ LdrSetDllManifestProber(
    _In_ PVOID Routine
    );

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
NTSYSAPI BOOLEAN LdrpChildNtdll; // DATA export
#endif

diff --git a/phnt/include/ntlpcapi.h b/phnt/include/ntlpcapi.h
index f945fded2..290eae50f 100644
--- a/phnt/include/ntlpcapi.h
+++ b/phnt/include/ntlpcapi.h
@@ -654,7 +654,7 @@ typedef struct _ALPC_MESSAGE_HANDLE_INFORMATION

// begin_private

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)

//
// System calls
@@ -823,7 +823,7 @@ NtAlpcConnectPort(
    _In_opt_ PLARGE_INTEGER Timeout
    );

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -897,7 +897,7 @@ NtAlpcImpersonateClientOfPort(
    _In_ PVOID Flags
    );

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -990,7 +990,7 @@ AlpcUnregisterCompletionList(
    _In_ HANDLE PortHandle
    );

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
// rev
NTSYSAPI
NTSTATUS
diff --git a/phnt/include/ntmisc.h b/phnt/include/ntmisc.h
index 7fe70df6e..d6d7c7b3e 100644
--- a/phnt/include/ntmisc.h
+++ b/phnt/include/ntmisc.h
@@ -7,12 +7,9 @@
#ifndef _NTMISC_H
#define _NTMISC_H

-// Filter manager
-
-#define FLT_PORT_CONNECT 0x0001
-#define FLT_PORT_ALL_ACCESS (FLT_PORT_CONNECT | STANDARD_RIGHTS_ALL)
-
+//
// VDM
+//

typedef enum _VDMSERVICECLASS
{
@@ -42,7 +39,69 @@ NtVdmControl(
    _Inout_ PVOID ServiceData
    );

+//
+// Sessions
+//
+
+typedef enum _IO_SESSION_EVENT
+{
+    IoSessionEventIgnore,
+    IoSessionEventCreated,
+    IoSessionEventTerminated,
+    IoSessionEventConnected,
+    IoSessionEventDisconnected,
+    IoSessionEventLogon,
+    IoSessionEventLogoff,
+    IoSessionEventMax
+} IO_SESSION_EVENT;
+
+typedef enum _IO_SESSION_STATE
+{
+    IoSessionStateCreated = 1,
+    IoSessionStateInitialized = 2,
+    IoSessionStateConnected = 3,
+    IoSessionStateDisconnected = 4,
+    IoSessionStateDisconnectedLoggedOn = 5,
+    IoSessionStateLoggedOn = 6,
+    IoSessionStateLoggedOff = 7,
+    IoSessionStateTerminated = 8,
+    IoSessionStateMax
+} IO_SESSION_STATE;
+
+#if (PHNT_MODE != PHNT_MODE_KERNEL)
+
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
+NTSYSCALLAPI
+NTSTATUS
+NTAPI
+NtOpenSession(
+    _Out_ PHANDLE SessionHandle,
+    _In_ ACCESS_MASK DesiredAccess,
+    _In_ POBJECT_ATTRIBUTES ObjectAttributes
+    );
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
+
+#endif // (PHNT_MODE != PHNT_MODE_KERNEL)
+
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
+NTSYSCALLAPI
+NTSTATUS
+NTAPI
+NtNotifyChangeSession(
+    _In_ HANDLE SessionHandle,
+    _In_ ULONG ChangeSequenceNumber,
+    _In_ PLARGE_INTEGER ChangeTimeStamp,
+    _In_ IO_SESSION_EVENT Event,
+    _In_ IO_SESSION_STATE NewState,
+    _In_ IO_SESSION_STATE PreviousState,
+    _In_reads_bytes_opt_(PayloadSize) PVOID Payload,
+    _In_ ULONG PayloadSize
+    );
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_7)
+
+//
// ApiSet
+//

NTSYSAPI
BOOL
@@ -70,7 +129,7 @@ typedef enum _SECURE_SETTING_VALUE_TYPE
    SecureSettingValueTypeUnknown = 4
} SECURE_SETTING_VALUE_TYPE, *PSECURE_SETTING_VALUE_TYPE;

-#if (PHNT_VERSION >= PHNT_REDSTONE)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS1)
// rev
NTSYSCALLAPI
NTSTATUS
@@ -85,7 +144,7 @@ NtQuerySecurityPolicy(
    );
#endif

-#if (PHNT_VERSION >= PHNT_20H1)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_20H1)
// rev
NTSYSCALLAPI
NTSTATUS
@@ -132,9 +191,9 @@ NtDirectGraphicsCall(
    _Out_writes_bytes_opt_(OutputBufferLength) PVOID OutputBuffer,
    _Out_ PULONG ReturnLength
    );
-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_10_20H1)

-#if (PHNT_VERSION >= PHNT_WIN11_22H2)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11_22H2)
// rev
NTSYSCALLAPI
NTSTATUS
@@ -170,9 +229,10 @@ NtSetInformationCpuPartition(
    );
#endif

-#if (PHNT_VERSION >= PHNT_REDSTONE2)
-
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS2)
+//
// Process KeepAlive (also WakeCounter)
+//

typedef enum _PROCESS_ACTIVITY_TYPE
{
@@ -190,6 +250,405 @@ NtAcquireProcessActivityReference(
    _Reserved_ PROCESS_ACTIVITY_TYPE Reserved
    );

-#endif
+#endif // (PHNT_VERSION >= PHNT_WINDOWS_10_RS2)
+
+//
+// Appx/Msix Packages
+//
+
+// private
+typedef struct _PACKAGE_CONTEXT_REFERENCE
+{
+    PVOID reserved;
+} *PACKAGE_CONTEXT_REFERENCE;
+
+// private
+typedef enum PackageProperty
+{
+    PackageProperty_Name = 1,                  // q: WCHAR[]
+    PackageProperty_Version = 2,               // q: WCHAR[]
+    PackageProperty_Architecture = 3,          // q: ULONG (PROCESSOR_ARCHITECTURE_*)
+    PackageProperty_ResourceId = 4,            // q: WCHAR[]
+    PackageProperty_Publisher = 5,             // q: WCHAR[]
+    PackageProperty_PublisherId = 6,           // q: WCHAR[]
+    PackageProperty_FamilyName = 7,            // q: WCHAR[]
+    PackageProperty_FullName = 8,              // q: WCHAR[]
+    PackageProperty_Flags = 9,                 // q: ULONG
+    PackageProperty_InstalledLocation = 10,    // q: WCHAR[]
+    PackageProperty_DisplayName = 11,          // q: WCHAR[]
+    PackageProperty_PublisherDisplayName = 12, // q: WCHAR[]
+    PackageProperty_Description = 13,          // q: WCHAR[]
+    PackageProperty_Logo = 14,                 // q: WCHAR[]
+    PackageProperty_PackageOrigin = 15         // q: PackageOrigin
+} PackageProperty;
+
+// private
+typedef struct _PACKAGE_APPLICATION_CONTEXT_REFERENCE
+{
+    PVOID reserved;
+} *PACKAGE_APPLICATION_CONTEXT_REFERENCE;
+
+// private
+typedef enum PackageApplicationProperty
+{
+    PackageApplicationProperty_Aumid = 1,                        // q: WCHAR[]
+    PackageApplicationProperty_Praid = 2,                        // q: WCHAR[]
+    PackageApplicationProperty_DisplayName = 3,                  // q: WCHAR[]
+    PackageApplicationProperty_Description = 4,                  // q: WCHAR[]
+    PackageApplicationProperty_Logo = 5,                         // q: WCHAR[]
+    PackageApplicationProperty_SmallLogo = 6,                    // q: WCHAR[]
+    PackageApplicationProperty_ForegroundText = 7,               // q: ULONG
+    PackageApplicationProperty_ForegroundTextString = 8,         // q: WCHAR[]
+    PackageApplicationProperty_BackgroundColor = 9,              // q: ULONG
+    PackageApplicationProperty_StartPage = 10,                   // q: WCHAR[]
+    PackageApplicationProperty_ContentURIRulesCount = 11,        // q: ULONG
+    PackageApplicationProperty_ContentURIRules = 12,             // q: WCHAR[] (multi-sz)
+    PackageApplicationProperty_StaticContentURIRulesCount = 13,  // q: ULONG
+    PackageApplicationProperty_StaticContentURIRules = 14,       // q: WCHAR[] (multi-sz)
+    PackageApplicationProperty_DynamicContentURIRulesCount = 15, // q: ULONG
+    PackageApplicationProperty_DynamicContentURIRules = 16       // q: WCHAR[] (multi-sz)
+} PackageApplicationProperty;
+
+// private
+typedef struct _PACKAGE_RESOURCES_CONTEXT_REFERENCE
+{
+    PVOID reserved;
+} *PACKAGE_RESOURCES_CONTEXT_REFERENCE;
+
+// private
+typedef enum PackageResourcesProperty
+{
+    PackageResourcesProperty_DisplayName = 1,
+    PackageResourcesProperty_PublisherDisplayName = 2,
+    PackageResourcesProperty_Description = 3,
+    PackageResourcesProperty_Logo = 4,
+    PackageResourcesProperty_SmallLogo = 5,
+    PackageResourcesProperty_StartPage = 6
+} PackageResourcesProperty;
+
+// private
+typedef struct _PACKAGE_SECURITY_CONTEXT_REFERENCE
+{
+    PVOID reserved;
+} *PACKAGE_SECURITY_CONTEXT_REFERENCE;
+
+// private
+typedef enum PackageSecurityProperty
+{
+    PackageSecurityProperty_SecurityFlags = 1,     // q: ULONG
+    PackageSecurityProperty_AppContainerSID = 2,   // q: Sid
+    PackageSecurityProperty_CapabilitiesCount = 3, // q: ULONG
+    PackageSecurityProperty_Capabilities = 4       // q: Sid[]
+} PackageSecurityProperty;
+
+// private
+typedef struct _TARGET_PLATFORM_CONTEXT_REFERENCE
+{
+    PVOID reserved;
+} *TARGET_PLATFORM_CONTEXT_REFERENCE;
+
+// private
+typedef enum TargetPlatformProperty
+{
+    TargetPlatformProperty_Platform = 1,   // q: ULONG
+    TargetPlatformProperty_MinVersion = 2, // q: PACKAGE_VERSION
+    TargetPlatformProperty_MaxVersion = 3  // q: PACKAGE_VERSION
+} TargetPlatformProperty;
+
+// private
+typedef struct _PACKAGE_GLOBALIZATION_CONTEXT_REFERENCE
+{
+    PVOID reserved;
+} *PACKAGE_GLOBALIZATION_CONTEXT_REFERENCE;
+
+// private
+typedef enum PackageGlobalizationProperty
+{
+    PackageGlobalizationProperty_ForceUtf8 = 1,                // q: ULONG
+    PackageGlobalizationProperty_UseWindowsDisplayLanguage = 2 // q: ULONG
+} PackageGlobalizationProperty;
+
+#if (PHNT_VERSION >= PHNT_WINDOWS_8_1)
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetCurrentPackageContext(
+    _In_ ULONG Index,
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_CONTEXT_REFERENCE *PackageContext
+    );
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetPackageContext(
+    _In_ PVOID PackageInfoReference, // PACKAGE_INFO_REFERENCE
+    _In_ ULONG Index,
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_CONTEXT_REFERENCE *PackageContext
+    );
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetPackageProperty(
+    _In_ PACKAGE_CONTEXT_REFERENCE PackageContext,
+    _In_ PackageProperty PropertyId,
+    _Inout_ PULONG BufferSize,
+    _Out_writes_bytes_(BufferSize) PVOID Buffer
+    );
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetPackagePropertyString(
+    _In_ PACKAGE_CONTEXT_REFERENCE PackageContext,
+    _In_ PackageProperty PropertyId,
+    _Inout_ PULONG BufferLength,
+    _Out_writes_(BufferLength) PWSTR Buffer
+    );
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetPackageOSMaxVersionTested(
+    _In_ PACKAGE_CONTEXT_REFERENCE PackageContext,
+    _Out_ ULONGLONG *OSMaxVersionTested // PACKAGE_VERSION
+    );
+
+//
+// Package Application Properties
+//
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetCurrentPackageApplicationContext(
+    _In_ ULONG Index,
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_APPLICATION_CONTEXT_REFERENCE *PackageApplicationContext
+    );
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetPackageApplicationContext(
+    _In_ PVOID PackageInfoReference, // PACKAGE_INFO_REFERENCE
+    _In_ ULONG Index,
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_APPLICATION_CONTEXT_REFERENCE *PackageApplicationContext
+    );
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetPackageApplicationProperty(
+    _In_ PACKAGE_APPLICATION_CONTEXT_REFERENCE PackageApplicationContext,
+    _In_ PackageApplicationProperty PropertyId,
+    _Inout_ PULONG BufferSize,
+    _Out_writes_bytes_(BufferSize) PVOID Buffer
+    );
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetPackageApplicationPropertyString(
+    _In_ PACKAGE_APPLICATION_CONTEXT_REFERENCE PackageApplicationContext,
+    _In_ PackageApplicationProperty PropertyId,
+    _Inout_ PULONG BufferLength,
+    _Out_writes_(BufferLength) PWSTR Buffer
+    );
+
+//
+// Package Resource Properties
+//
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetCurrentPackageResourcesContext(
+    _In_ ULONG Index,
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_RESOURCES_CONTEXT_REFERENCE *PackageResourcesContext
+    );
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetPackageResourcesContext(
+    _In_ PVOID PackageInfoReference, // PACKAGE_INFO_REFERENCE
+    _In_ ULONG Index,
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_RESOURCES_CONTEXT_REFERENCE *PackageResourcesContext
+    );
+
+// rev
+WINBASEAPI
+ULONG
+WINAPI
+GetCurrentPackageApplicationResourcesContext(
+    _In_ ULONG Index,
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_APPLICATION_CONTEXT_REFERENCE *PackageResourcesContext
+    );
+
+// rev
+WINBASEAPI
+LONG
+WINAPI
+GetPackageApplicationResourcesContext(
+    _In_ PVOID PackageInfoReference, // PACKAGE_INFO_REFERENCE
+    _In_ ULONG Index,
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_APPLICATION_CONTEXT_REFERENCE *PackageResourcesContext
+    );
+
+// rev
+WINBASEAPI
+LONG
+WINAPI
+GetPackageResourcesProperty(
+    _In_ PACKAGE_APPLICATION_CONTEXT_REFERENCE PackageResourcesContext,
+    _In_ PackageResourcesProperty PropertyId,
+    _Inout_ PULONG BufferSize,
+    _Out_writes_bytes_(BufferSize) PVOID Buffer
+    );
+
+//
+// Package Security Properties
+//
+
+// rev
+WINBASEAPI
+LONG
+WINAPI
+GetCurrentPackageSecurityContext(
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_SECURITY_CONTEXT_REFERENCE *PackageSecurityContext
+    );
+
+// rev
+WINBASEAPI
+LONG
+WINAPI
+GetPackageSecurityContext(
+    _In_ PVOID PackageInfoReference, // PACKAGE_INFO_REFERENCE
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_SECURITY_CONTEXT_REFERENCE *PackageSecurityContext
+    );
+
+// rev
+WINBASEAPI
+LONG
+WINAPI
+GetPackageSecurityProperty(
+    _In_ PACKAGE_SECURITY_CONTEXT_REFERENCE PackageSecurityContext,
+    _In_ PackageSecurityProperty PropertyId,
+    _Inout_ PULONG BufferSize,
+    _Out_writes_bytes_(BufferSize) PVOID Buffer
+    );
+
+#endif // PHNT_VERSION >= PHNT_WINDOWS_8_1
+
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
+
+//
+// Target Platform Properties
+//
+
+// rev
+WINBASEAPI
+LONG
+WINAPI
+GetCurrentTargetPlatformContext(
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ TARGET_PLATFORM_CONTEXT_REFERENCE *TargetPlatformContext
+    );
+
+WINBASEAPI
+LONG
+WINAPI
+GetTargetPlatformContext(
+    _In_ PVOID PackageInfoReference, // PACKAGE_INFO_REFERENCE
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ TARGET_PLATFORM_CONTEXT_REFERENCE *TargetPlatformContext
+    );
+
+// rev
+WINBASEAPI
+LONG
+WINAPI
+GetPackageTargetPlatformProperty(
+    _In_ TARGET_PLATFORM_CONTEXT_REFERENCE TargetPlatformContext,
+    _In_ TargetPlatformProperty PropertyId,
+    _Inout_ PULONG BufferSize,
+    _Out_writes_bytes_(BufferSize) PVOID Buffer
+    );
+
+#endif // PHNT_VERSION >= PHNT_WINDOWS_10
+
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_20H1)
+
+// rev
+WINBASEAPI
+HRESULT
+WINAPI
+GetCurrentPackageInfo3(
+    _In_ ULONG flags,
+    _In_ ULONG packagePathType, // PackagePathType
+    _Inout_ PULONG bufferLength,
+    _Out_writes_bytes_opt_(*bufferLength) PVOID buffer,
+    _Out_opt_ PULONG count
+    );
+
+//
+// Package Globalization Properties
+//
+
+// rev
+WINBASEAPI
+LONG
+WINAPI
+GetCurrentPackageGlobalizationContext(
+    _In_ ULONG Index,
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_GLOBALIZATION_CONTEXT_REFERENCE *PackageGlobalizationContext
+    );
+
+// rev
+WINBASEAPI
+LONG
+WINAPI
+GetPackageGlobalizationContext(
+    _In_ PVOID PackageInfoReference, // PACKAGE_INFO_REFERENCE
+    _In_ ULONG Index,
+    _Reserved_ ULONG_PTR Unused,
+    _Out_ PACKAGE_GLOBALIZATION_CONTEXT_REFERENCE *PackageGlobalizationContext
+    );
+
+// rev
+WINBASEAPI
+LONG
+WINAPI
+GetPackageGlobalizationProperty(
+    _In_ PACKAGE_GLOBALIZATION_CONTEXT_REFERENCE PackageGlobalizationContext,
+    _In_ PackageGlobalizationProperty PropertyId,
+    _Inout_ PULONG BufferSize,
+    _Out_writes_bytes_(BufferSize) PVOID Buffer
+    );
+
+#endif // PHNT_VERSION >= PHNT_WINDOWS_10_20H1

#endif
diff --git a/phnt/include/ntmmapi.h b/phnt/include/ntmmapi.h
index 47f11eb1f..25469be6c 100644
--- a/phnt/include/ntmmapi.h
+++ b/phnt/include/ntmmapi.h
@@ -716,7 +716,7 @@ NtAllocateVirtualMemory(
    _In_ ULONG PageProtection
    );

-#if (PHNT_VERSION >= PHNT_REDSTONE5)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS5)
_Must_inspect_result_
_When_(return == 0, __drv_allocatesMem(mem))
NTSYSCALLAPI
@@ -774,7 +774,7 @@ NtReadVirtualMemory(
    );

// rev
-NTSYSAPI
+NTSYSCALLAPI
NTSTATUS
NTAPI
NtWow64ReadVirtualMemory64(
@@ -785,7 +785,7 @@ NtWow64ReadVirtualMemory64(
    _Out_opt_ PULONGLONG NumberOfBytesRead
    );

-#if (PHNT_VERSION >= PHNT_WIN11)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11)
/**
 * Reads virtual memory from a process with extended options.
 *
@@ -842,7 +842,7 @@ NtWriteVirtualMemory(
 * @param NumberOfBytesWritten A pointer to a variable that receives the number of bytes transferred into the specified buffer.
 * @return NTSTATUS Successful or errant status.
 */
-NTSYSAPI
+NTSYSCALLAPI
NTSTATUS
NTAPI
NtWow64WriteVirtualMemory64(
@@ -909,7 +909,7 @@ NtQueryVirtualMemory(
 * @param ReturnLength A pointer to a variable that receives the number of bytes returned in the MemoryInformation buffer.
 * @return NTSTATUS Successful or errant status.
 */
-NTSYSAPI
+NTSYSCALLAPI
NTSTATUS
NTAPI
NtWow64QueryVirtualMemory64(
@@ -1018,7 +1018,7 @@ typedef struct _CFG_CALL_TARGET_LIST_INFORMATION

#if (PHNT_MODE != PHNT_MODE_KERNEL)

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)

NTSYSCALLAPI
NTSTATUS
@@ -1076,7 +1076,7 @@ NtCreateSection(
    _In_opt_ HANDLE FileHandle
    );

-#if (PHNT_VERSION >= PHNT_REDSTONE5)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS5)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1118,7 +1118,7 @@ NtMapViewOfSection(
    _In_ ULONG PageProtection
    );

-#if (PHNT_VERSION >= PHNT_REDSTONE5)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS5)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1143,7 +1143,7 @@ NtUnmapViewOfSection(
    _In_opt_ PVOID BaseAddress
    );

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1332,7 +1332,7 @@ typedef struct _MEMORY_PARTITION_MEMORY_EVENTS_INFORMATION

#if (PHNT_MODE != PHNT_MODE_KERNEL)

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)

NTSYSCALLAPI
NTSTATUS
@@ -1400,7 +1400,7 @@ NtAllocateUserPhysicalPages(
    _Out_writes_(*NumberOfPages) PULONG_PTR UserPfnArray
    );

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -1506,7 +1506,7 @@ NtFlushWriteBuffer(
// Enclave support
//

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)

NTSYSCALLAPI
NTSTATUS
diff --git a/phnt/include/ntobapi.h b/phnt/include/ntobapi.h
index be35538ce..18a8d5083 100644
--- a/phnt/include/ntobapi.h
+++ b/phnt/include/ntobapi.h
@@ -214,7 +214,7 @@ NtWaitForMultipleObjects(
    _In_opt_ PLARGE_INTEGER Timeout
    );

-#if (PHNT_VERSION >= PHNT_WS03)
+#if (PHNT_VERSION >= PHNT_WINDOWS_SERVER_2003)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -254,7 +254,7 @@ NtClose(
    _In_ _Post_ptr_invalid_ HANDLE Handle
    );

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -279,7 +279,7 @@ NtCreateDirectoryObject(
    _In_ POBJECT_ATTRIBUTES ObjectAttributes
    );

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -369,7 +369,7 @@ typedef struct _OBJECT_BOUNDARY_DESCRIPTOR
    //OBJECT_BOUNDARY_ENTRY Entries[1];
} OBJECT_BOUNDARY_DESCRIPTOR, *POBJECT_BOUNDARY_DESCRIPTOR;

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)

NTSYSCALLAPI
NTSTATUS
@@ -441,7 +441,7 @@ typedef enum _SYMBOLIC_LINK_INFO_CLASS
    MaxnSymbolicLinkInfoClass
} SYMBOLIC_LINK_INFO_CLASS;

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
NTSYSCALLAPI
NTSTATUS
NTAPI
diff --git a/phnt/include/ntpebteb.h b/phnt/include/ntpebteb.h
index 28edb0a96..1836c4f1c 100644
--- a/phnt/include/ntpebteb.h
+++ b/phnt/include/ntpebteb.h
@@ -792,17 +792,17 @@ typedef struct _PEB
} PEB, * PPEB;

#ifdef _WIN64
-static_assert(FIELD_OFFSET(PEB, SessionId) == 0x2C0);
-//static_assert(sizeof(PEB) == 0x7B0); // REDSTONE3
-//static_assert(sizeof(PEB) == 0x7B8); // REDSTONE4
-//static_assert(sizeof(PEB) == 0x7C8); // REDSTONE5 // 19H1
-static_assert(sizeof(PEB) == 0x7d0); // WIN11
+static_assert(FIELD_OFFSET(PEB, SessionId) == 0x2C0, "FIELD_OFFSET(PEB, SessionId) is incorrect");
+//static_assert(sizeof(PEB) == 0x7B0, "Size of PEB is incorrect"); // REDSTONE3
+//static_assert(sizeof(PEB) == 0x7B8, "Size of PEB is incorrect"); // REDSTONE4
+//static_assert(sizeof(PEB) == 0x7C8, "Size of PEB is incorrect"); // REDSTONE5 // 19H1
+static_assert(sizeof(PEB) == 0x7d0, "Size of PEB is incorrect"); // WIN11
#else
-static_assert(FIELD_OFFSET(PEB, SessionId) == 0x1D4);
-//static_assert(sizeof(PEB) == 0x468); // REDSTONE3
-//static_assert(sizeof(PEB) == 0x470); // REDSTONE4
-//static_assert(sizeof(PEB) == 0x480); // REDSTONE5 // 19H1
-static_assert(sizeof(PEB) == 0x488); // WIN11
+static_assert(FIELD_OFFSET(PEB, SessionId) == 0x1D4, "FIELD_OFFSET(PEB, SessionId) is incorrect");
+//static_assert(sizeof(PEB) == 0x468, "Size of PEB is incorrect"); // REDSTONE3
+//static_assert(sizeof(PEB) == 0x470, "Size of PEB is incorrect"); // REDSTONE4
+//static_assert(sizeof(PEB) == 0x480, "Size of PEB is incorrect"); // REDSTONE5 // 19H1
+static_assert(sizeof(PEB) == 0x488, "Size of PEB is incorrect"); // WIN11
#endif

#define GDI_BATCH_BUFFER_SIZE 310
@@ -1278,10 +1278,10 @@ typedef struct _TEB
} TEB, *PTEB;

#ifdef _WIN64
-//static_assert(sizeof(TEB) == 0x1850); // WIN11
+//static_assert(sizeof(TEB) == 0x1850, "Size of TEB is incorrect"); // WIN11
static_assert(sizeof(TEB) == 0x1878, "Size of TEB is incorrect"); // 24H2
#else
-//static_assert(sizeof(TEB) == 0x1018); // WIN11
+//static_assert(sizeof(TEB) == 0x1018, "Size of TEB is incorrect"); // WIN11
static_assert(sizeof(TEB) == 0x1038, "Size of TEB is incorrect"); // 24H2
#endif

diff --git a/phnt/include/ntpnpapi.h b/phnt/include/ntpnpapi.h
index 801b82bbf..6b49034ca 100644
--- a/phnt/include/ntpnpapi.h
+++ b/phnt/include/ntpnpapi.h
@@ -149,7 +149,7 @@ typedef enum _DEVICE_USAGE_NOTIFICATION_TYPE
    DeviceUsageTypeGuestAssigned
} DEVICE_USAGE_NOTIFICATION_TYPE, *PDEVICE_USAGE_NOTIFICATION_TYPE;

-#if (PHNT_VERSION < PHNT_WIN8)
+#if (PHNT_VERSION < PHNT_WINDOWS_8)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -170,7 +170,7 @@ NtPlugPlayControl(
    _In_ ULONG PnPControlDataLength
    );

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)

NTSYSCALLAPI
NTSTATUS
@@ -195,7 +195,7 @@ NtDisableLastKnownGood(

#endif

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
NTSYSCALLAPI
NTSTATUS
NTAPI
diff --git a/phnt/include/ntpoapi.h b/phnt/include/ntpoapi.h
index 47a1540b9..44ff100f3 100644
--- a/phnt/include/ntpoapi.h
+++ b/phnt/include/ntpoapi.h
@@ -545,7 +545,7 @@ typedef struct _POWER_REQUEST
            ULONG PowerRequestCount[POWER_REQUEST_SUPPORTED_TYPES_V1];
            DIAGNOSTIC_BUFFER DiagnosticBuffer;
        } V1;
-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
        struct
        {
            ULONG SupportedRequestMask;
@@ -553,7 +553,7 @@ typedef struct _POWER_REQUEST
            DIAGNOSTIC_BUFFER DiagnosticBuffer;
        } V2;
#endif
-#if (PHNT_VERSION >= PHNT_WINBLUE)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8_1)
        struct
        {
            ULONG SupportedRequestMask;
@@ -561,7 +561,7 @@ typedef struct _POWER_REQUEST
            DIAGNOSTIC_BUFFER DiagnosticBuffer;
        } V3;
#endif
-#if (PHNT_VERSION >= PHNT_REDSTONE)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS1)
        struct
        {
            ULONG SupportedRequestMask;
@@ -917,7 +917,7 @@ NtSetThreadExecutionState(
    _Out_ EXECUTION_STATE *PreviousFlags
    );

-#if (PHNT_VERSION < PHNT_WIN7)
+#if (PHNT_VERSION < PHNT_WINDOWS_7)
/**
 * Requests the system resume latency.
 *
diff --git a/phnt/include/ntpsapi.h b/phnt/include/ntpsapi.h
index 316fdede3..2e6e04a48 100644
--- a/phnt/include/ntpsapi.h
+++ b/phnt/include/ntpsapi.h
@@ -59,7 +59,7 @@
#define PROCESS_SET_LIMITED_INFORMATION 0x2000
#endif
#ifndef PROCESS_ALL_ACCESS
-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
#define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | SPECIFIC_RIGHTS_ALL)
#else
#define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xFFF)
@@ -110,7 +110,7 @@
#define THREAD_RESUME 0x1000
#endif
#ifndef THREAD_ALL_ACCESS
-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
#define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | SPECIFIC_RIGHTS_ALL)
#else
#define THREAD_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3FF)
@@ -137,7 +137,7 @@
#define JOB_OBJECT_SET_SECURITY_ATTRIBUTES 0x0010
#endif
#ifndef JOB_OBJECT_ALL_ACCESS
-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
#define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3F)
#else
#define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x1f) // pre-Vista full access
@@ -1256,9 +1256,11 @@ typedef struct _PROCESS_CHILD_PROCESS_INFORMATION
} PROCESS_CHILD_PROCESS_INFORMATION, *PPROCESS_CHILD_PROCESS_INFORMATION;

#define POWER_THROTTLING_PROCESS_CURRENT_VERSION 1
+
#define POWER_THROTTLING_PROCESS_EXECUTION_SPEED 0x1
#define POWER_THROTTLING_PROCESS_DELAYTIMERS 0x2
#define POWER_THROTTLING_PROCESS_IGNORE_TIMER_RESOLUTION 0x4 // since WIN11
+
#define POWER_THROTTLING_PROCESS_VALID_FLAGS \
    ((POWER_THROTTLING_PROCESS_EXECUTION_SPEED | POWER_THROTTLING_PROCESS_DELAYTIMERS | POWER_THROTTLING_PROCESS_IGNORE_TIMER_RESOLUTION))

@@ -1981,7 +1983,7 @@ NtQueryInformationProcess(
    );

// rev
-NTSYSAPI
+NTSYSCALLAPI
NTSTATUS
NTAPI
NtWow64QueryInformationProcess64(
@@ -2013,7 +2015,7 @@ NtSetInformationProcess(

#define PROCESS_GET_NEXT_FLAGS_PREVIOUS_PROCESS 0x00000001

-#if (PHNT_VERSION >= PHNT_WS03)
+#if (PHNT_VERSION >= PHNT_WINDOWS_SERVER_2003)
/**
 * Retrieves a handle to the next process in the system.
 *
@@ -2072,7 +2074,7 @@ typedef enum _PROCESS_STATE_CHANGE_TYPE
    ProcessStateChangeMax,
} PROCESS_STATE_CHANGE_TYPE, *PPROCESS_STATE_CHANGE_TYPE;

-#if (PHNT_VERSION >= PHNT_WIN11)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11)
/**
 * Creates a state change handle for changing the suspension state of a process.
 *
@@ -2125,7 +2127,7 @@ typedef enum _THREAD_STATE_CHANGE_TYPE
    ThreadStateChangeMax,
} THREAD_STATE_CHANGE_TYPE, *PTHREAD_STATE_CHANGE_TYPE;

-#if (PHNT_VERSION >= PHNT_WIN11)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11)
/**
 * Creates a state change handle for changing the suspension state of a thread.
 *
@@ -2267,7 +2269,7 @@ NtResumeThread(
    _Out_opt_ PULONG PreviousSuspendCount
    );

-#if (PHNT_VERSION >= PHNT_WS03)
+#if (PHNT_VERSION >= PHNT_WINDOWS_SERVER_2003)
/**
 * Retrieves the number of the current processor.
 *
@@ -2281,7 +2283,7 @@ NtGetCurrentProcessorNumber(
    );
#endif

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
/**
 * Retrieves the number of the current processor.
 *
@@ -2405,7 +2407,7 @@ NtTestAlert(
    VOID
    );

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
// rev
/**
 * Sends an alert to the specified thread.
@@ -2421,7 +2423,7 @@ NtAlertThreadByThreadId(
    );
#endif

-#if (PHNT_VERSION >= PHNT_WIN11)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11)
/**
 * Sends an alert to the specified thread by its thread ID, with an optional lock.
 *
@@ -2457,7 +2459,7 @@ NtAlertMultipleThreadByThreadId(
    );
#endif

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)
// rev
/**
 * Waits for an alert to be delivered to the specified thread.
@@ -2603,7 +2605,7 @@ NtQueueApcThread(
 */
#define QUEUE_USER_APC_SPECIAL_USER_APC ((HANDLE)0x1)

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
/**
 * Queues an APC (Asynchronous Procedure Call) to a thread.
 *
@@ -2645,7 +2647,7 @@ typedef struct _APC_CALLBACK_DATA_CONTEXT
#define QUEUE_USER_APC_FLAGS_SPECIAL_USER_APC 0x00000001
#define QUEUE_USER_APC_FLAGS_CALLBACK_DATA_CONTEXT 0x00010000 // APC_CALLBACK_DATA_CONTEXT

-#if (PHNT_VERSION >= PHNT_WIN11)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11)
/**
 * Queues an Asynchronous Procedure Call (APC) to a specified thread.
 *
@@ -3197,7 +3199,7 @@ typedef struct _PS_CREATE_INFO

// end_private

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
/**
 * Creates a new process and primary thread.
 *
@@ -3679,7 +3681,7 @@ NtCreateJobSet(
    _In_ ULONG Flags
    );

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
NTSYSCALLAPI
NTSTATUS
NTAPI
@@ -3704,7 +3706,7 @@ typedef enum _MEMORY_RESERVE_TYPE
    MemoryReserveTypeMax
} MEMORY_RESERVE_TYPE;

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
/**
 * Allocates a memory reserve object.
 *
@@ -3777,7 +3779,7 @@ typedef enum _PSSNT_QUERY_INFORMATION_CLASS

#define PSSNT_SIGNATURE_PSSD 'PSSD' // 0x50535344

-#if (PHNT_VERSION >= PHNT_WINBLUE)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8_1)
// rev
/**
 * Captures a snapshot of the specified process.
@@ -3888,7 +3890,7 @@ typedef struct _NTPSS_MEMORY_BULK_INFORMATION
    PVOID NextValidAddress;
} NTPSS_MEMORY_BULK_INFORMATION, *PNTPSS_MEMORY_BULK_INFORMATION;

-#if (PHNT_VERSION >= PHNT_20H1)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_20H1)
// rev
/**
 * Captures virtual address space bulk information for a process.
diff --git a/phnt/include/ntregapi.h b/phnt/include/ntregapi.h
index 74fcd7b69..261f84171 100644
--- a/phnt/include/ntregapi.h
+++ b/phnt/include/ntregapi.h
@@ -609,7 +609,7 @@ NtCreateKey(
    _Out_opt_ PULONG Disposition
    );

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
/**
 * Creates a new registry key or opens an existing one, and it associates the key with a transaction.
 *
@@ -656,7 +656,7 @@ NtOpenKey(
    _In_ POBJECT_ATTRIBUTES ObjectAttributes
    );

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
/**
 * Opens an existing registry key and associates the key with a transaction.
 *
@@ -677,7 +677,7 @@ NtOpenKeyTransacted(
    );
#endif

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
/**
 * Opens an existing registry key with extended options.
 *
@@ -990,7 +990,7 @@ NtLoadKey2(
    _In_ ULONG Flags
    );

-#if (PHNT_VERSION >= PHNT_WS03)
+#if (PHNT_VERSION >= PHNT_WINDOWS_SERVER_2003)
/**
 * Loads a registry key from a file with extended options.
 *
@@ -1019,7 +1019,7 @@ NtLoadKeyEx(
    );
#endif

-#if (PHNT_VERSION >= PHNT_20H1)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_20H1)
// rev by tyranid
/**
 * Loads a registry key from a file with extended parameters.
@@ -1145,7 +1145,7 @@ NtUnloadKey(
    _In_ POBJECT_ATTRIBUTES TargetKey
    );

-#if PHNT_VERSION >= PHNT_WS03
+#if PHNT_VERSION >= PHNT_WINDOWS_SERVER_2003
/**
 * Unloads a registry key with additional flags.
 *
@@ -1259,7 +1259,7 @@ NtQueryOpenSubKeys(
    _Out_ PULONG HandleCount
    );

-#if (PHNT_VERSION >= PHNT_WS03)
+#if (PHNT_VERSION >= PHNT_WINDOWS_SERVER_2003)
/**
 * Queries the open subkeys of a registry key with additional information.
 *
@@ -1322,7 +1322,7 @@ NtLockProductActivationKeys(
    _Out_opt_ ULONG *pSafeMode
    );

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
/**
 * Freezes the registry and prevents changes from being flushed to disk.
 *
@@ -1337,7 +1337,7 @@ NtFreezeRegistry(
    );
#endif

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
/**
 * Thaws the registry and enables flushing changes to disk.
 *
@@ -1351,7 +1351,7 @@ NtThawRegistry(
    );
#endif

-#if (PHNT_VERSION >= PHNT_REDSTONE)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS1)
/**
 * Creates a registry transaction.
 *
@@ -1369,7 +1369,7 @@ NTSTATUS NtCreateRegistryTransaction(
    );
#endif

-#if (PHNT_VERSION >= PHNT_REDSTONE)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS1)
/**
 * Opens a registry transaction.
 *
@@ -1385,7 +1385,7 @@ NTSTATUS NtOpenRegistryTransaction(
    );
#endif

-#if (PHNT_VERSION >= PHNT_REDSTONE)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS1)
/**
 * Commits a registry transaction.
 *
@@ -1399,7 +1399,7 @@ NTSTATUS NtCommitRegistryTransaction(
    );
#endif

-#if (PHNT_VERSION >= PHNT_REDSTONE)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10_RS1)
/**
 * Rolls back a registry transaction.
 *
diff --git a/phnt/include/ntrtl.h b/phnt/include/ntrtl.h
index 9d0af06fe..96eef3f7f 100644
--- a/phnt/include/ntrtl.h
+++ b/phnt/include/ntrtl.h
@@ -594,7 +594,7 @@ typedef struct _RTL_RB_TREE
    PRTL_BALANCED_NODE Min;
} RTL_RB_TREE, *PRTL_RB_TREE;

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)

// rev
NTSYSAPI
@@ -615,9 +615,9 @@ RtlRbRemoveNode(
    _In_ PRTL_RB_TREE Tree,
    _In_ PRTL_BALANCED_NODE Node
    );
-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_8

-#if (PHNT_VERSION >= PHNT_WIN11)
+#if (PHNT_VERSION >= PHNT_WINDOWS_11)
// rev
NTSYSAPI
NTSTATUS
@@ -646,9 +646,11 @@ RtlRemovePointerMapping(
    _In_ PRTL_RB_TREE Tree,
    _Inout_ PRTL_BALANCED_NODE Children
    );
-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_11

+//
// Hash tables
+//

// begin_ntddk

@@ -697,7 +699,7 @@ typedef struct _RTL_DYNAMIC_HASH_TABLE
    PVOID Directory;
} RTL_DYNAMIC_HASH_TABLE, *PRTL_DYNAMIC_HASH_TABLE;

-#if (PHNT_VERSION >= PHNT_WIN7)
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)

FORCEINLINE
VOID
@@ -906,9 +908,9 @@ RtlContractHashTable(
    _In_ PRTL_DYNAMIC_HASH_TABLE HashTable
    );

-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_7

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)

NTSYSAPI
BOOLEAN
@@ -935,7 +937,7 @@ RtlEndStrongEnumerationHashTable(
    _Inout_ PRTL_DYNAMIC_HASH_TABLE_ENUMERATOR Enumerator
    );

-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_10

// end_ntddk

@@ -1063,7 +1065,7 @@ RtlSetCriticalSectionSpinCount(
    _In_ ULONG SpinCount
    );

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)
// private
NTSYSAPI
HANDLE
@@ -1071,7 +1073,7 @@ NTAPI
RtlQueryCriticalSectionOwner(
    _In_ HANDLE EventHandle
    );
-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_VISTA

NTSYSAPI
VOID
@@ -1177,7 +1179,7 @@ RtlDumpResource(

// Slim reader-writer locks, condition variables, and barriers

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)

// winbase:InitializeSRWLock
NTSYSAPI
@@ -1241,7 +1243,9 @@ RtlTryAcquireSRWLockShared(
    _Inout_ PRTL_SRWLOCK SRWLock
    );

-#if (PHNT_VERSION >= PHNT_WIN7)
+#endif // PHNT_VERSION >= PHNT_WINDOWS_VISTA
+
+#if (PHNT_VERSION >= PHNT_WINDOWS_7)
// rev
NTSYSAPI
VOID
@@ -1249,9 +1253,9 @@ NTAPI
RtlAcquireReleaseSRWLockExclusive(
    _Inout_ PRTL_SRWLOCK SRWLock
    );
-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_7

-#if (PHNT_VERSION >= PHNT_WIN10)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
// rev
NTSYSAPI
BOOLEAN
@@ -1259,8 +1263,9 @@ NTAPI
RtlConvertSRWLockExclusiveToShared(
    _Inout_ PRTL_SRWLOCK SRWLock
    );
-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_10

+#if (PHNT_VERSION >= PHNT_WINDOWS_11)
//
// Read-Copy Update.
//
@@ -1307,9 +1312,9 @@ RtlRcuSynchronize(
    _Inout_ PRTL_SRWLOCK SRWLock
    );

-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_11

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)

#define RTL_CONDITION_VARIABLE_INIT {0}
#define RTL_CONDITION_VARIABLE_LOCKMODE_SHARED 0x1
@@ -1359,7 +1364,7 @@ RtlWakeAllConditionVariable(
    _Inout_ PRTL_CONDITION_VARIABLE ConditionVariable
    );

-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_VISTA

// begin_rev
#define RTL_BARRIER_FLAGS_SPIN_ONLY 0x00000001 // never block on event - always spin
@@ -1369,7 +1374,7 @@ RtlWakeAllConditionVariable(

// begin_private

-#if (PHNT_VERSION >= PHNT_VISTA)
+#if (PHNT_VERSION >= PHNT_WINDOWS_VISTA)

NTSYSAPI
NTSTATUS
@@ -1403,15 +1408,17 @@ RtlBarrierForDelete(
    _In_ ULONG Flags
    );

-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_VISTA

// end_private

+//
// Wait on address
+//

// begin_rev

-#if (PHNT_VERSION >= PHNT_WIN8)
+#if (PHNT_VERSION >= PHNT_WINDOWS_8)

NTSYSAPI
NTSTATUS
@@ -1451,7 +1458,7 @@ RtlWakeAddressSingleNoFence(
    _In_ PVOID Address
    );

-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_8

// end_rev

@@ -1492,9 +1499,9 @@ RtlInitString(
    _Out_ PSTRING DestinationString,
    _In_opt_z_ PCSTR SourceString
    );
-#endif
+#endif // PHNT_NO_INLINE_INIT_STRING

-#if (PHNT_VERSION >= PHNT_THRESHOLD)
+#if (PHNT_VERSION >= PHNT_WINDOWS_10)
NTSYSAPI
NTSTATUS
NTAPI
@@ -1502,7 +1509,7 @@ RtlInitStringEx(
    _Out_ PSTRING DestinationString,
    _In_opt_z_ PCSZ SourceString
    );
-#endif
+#endif // PHNT_VERSION >= PHNT_WINDOWS_10

#ifndef PHNT_NO_INLINE_INIT_STRING
FORCEINLINE VOID RtlInitAnsiString(
@@ -1525,9 +1532,9 @@ RtlInitAnsiString(
    _Out_ PANSI_STRING DestinationString,
    _In_opt_z_ PCSTR SourceString
    );
-#endif
+#endif // PHNT_NO_INLINE_INIT_STRING

-#if (PHNT_VERSION >= PHNT_WS03)
+#if (PHNT_VERSION >= PHNT_WINDOWS_SERVER_2003)
NTSYSAPI
NTSTATUS
NTAPI
@@ -1535,7 +1542,7 @@ RtlInitAnsiStringEx(
    _Out_ PANSI_STRING DestinationSt```