From 94e7bbcc6bcd6b12b64a05a8d2741eeea063d57e Mon Sep 17 00:00:00 2001 From: "Carl J. Bialorucki" Date: Tue, 30 Dec 2025 17:12:09 +0200 Subject: [PATCH] [SDK] Update some headers Preparation for ntdll_winetest sync. --- sdk/include/ddk/ntimage.h | 4 +- sdk/include/wine/winternl.h | 4 ++ sdk/include/xdk/ketypes.h | 8 ++-- sdk/include/xdk/winnt_old.h | 84 ++++++++++++++++++++++++++++++++++++- 4 files changed, 92 insertions(+), 8 deletions(-) diff --git a/sdk/include/ddk/ntimage.h b/sdk/include/ddk/ntimage.h index 675e3b9d76a..1b593365135 100644 --- a/sdk/include/ddk/ntimage.h +++ b/sdk/include/ddk/ntimage.h @@ -118,7 +118,7 @@ typedef struct { ULONG ProcessHeapFlags; ULONG ProcessAffinityMask; USHORT CSDVersion; - USHORT Reserved1; + USHORT DependentLoadFlags; ULONG EditList; ULONG SecurityCookie; ULONG SEHandlerTable; @@ -141,7 +141,7 @@ typedef struct { ULONGLONG ProcessAffinityMask; ULONG ProcessHeapFlags; USHORT CSDVersion; - USHORT Reserved1; + USHORT DependentLoadFlags; ULONGLONG EditList; ULONGLONG SecurityCookie; ULONGLONG SEHandlerTable; diff --git a/sdk/include/wine/winternl.h b/sdk/include/wine/winternl.h index 6aa8ef7ca2e..c66e20d5e8e 100644 --- a/sdk/include/wine/winternl.h +++ b/sdk/include/wine/winternl.h @@ -4401,6 +4401,10 @@ typedef struct _WOW64_CPU_AREA_INFO WOW64_CPURESERVED *CpuReserved; ULONG ContextFlag; USHORT Machine; +#ifdef __REACTOS__ + USHORT Reserved; + ULONG64 Unknown; +#endif } WOW64_CPU_AREA_INFO, *PWOW64_CPU_AREA_INFO; typedef struct _WOW64INFO diff --git a/sdk/include/xdk/ketypes.h b/sdk/include/xdk/ketypes.h index cb2c706b515..ea38cd8315b 100644 --- a/sdk/include/xdk/ketypes.h +++ b/sdk/include/xdk/ketypes.h @@ -91,10 +91,10 @@ typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP { } LOGICAL_PROCESSOR_RELATIONSHIP; typedef struct _PROCESSOR_RELATIONSHIP { - UCHAR Flags; - UCHAR EfficiencyClass; - UCHAR Reserved[20]; - USHORT GroupCount; + $UCHAR Flags; + $UCHAR EfficiencyClass; + $UCHAR Reserved[20]; + $USHORT GroupCount; _Field_size_(GroupCount) GROUP_AFFINITY GroupMask[ANYSIZE_ARRAY]; } PROCESSOR_RELATIONSHIP, *PPROCESSOR_RELATIONSHIP; diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index d8cbcb88546..feb3fbc06fc 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -3760,7 +3760,7 @@ typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY32 { DWORD ProcessHeapFlags; DWORD ProcessAffinityMask; WORD CSDVersion; - WORD Reserved1; + WORD DependentLoadFlags; DWORD EditList; DWORD SecurityCookie; DWORD SEHandlerTable; @@ -3783,7 +3783,7 @@ typedef struct _IMAGE_LOAD_CONFIG_DIRECTORY64 { ULONGLONG ProcessAffinityMask; DWORD ProcessHeapFlags; WORD CSDVersion; - WORD Reserved1; + WORD DependentLoadFlags; ULONGLONG EditList; ULONGLONG SecurityCookie; ULONGLONG SEHandlerTable; @@ -3992,6 +3992,7 @@ typedef union _FILE_SEGMENT_ELEMENT { #define JOB_OBJECT_QUERY 4 #define JOB_OBJECT_TERMINATE 8 #define JOB_OBJECT_SET_SECURITY_ATTRIBUTES 16 +#define JOB_OBJECT_IMPERSONATE 32 #define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|31) typedef enum _JOBOBJECTINFOCLASS { @@ -4476,6 +4477,85 @@ typedef struct _ACTIVATION_CONTEXT_COMPATIBILITY_INFORMATION { #endif /* (_WIN32_WINNT >= 0x0501) */ +#if (NTDDI_VERSION >= NTDDI_WINTHRESHOLD) +#define UNIFIEDBUILDREVISION_KEY L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion" +#define UNIFIEDBUILDREVISION_VALUE L"UBR" +#define UNIFIEDBUILDREVISION_MIN 0x00000000 + +#define DEVICEFAMILYDEVICEFORM_KEY L"\\Registry\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\OEM" +#define DEVICEFAMILYDEVICEFORM_VALUE L"DeviceForm" + +#define DEVICEFAMILYINFOENUM_UAP 0x00000000 +#define DEVICEFAMILYINFOENUM_WINDOWS_8X 0x00000001 +#define DEVICEFAMILYINFOENUM_WINDOWS_PHONE_8X 0x00000002 +#define DEVICEFAMILYINFOENUM_DESKTOP 0x00000003 +#define DEVICEFAMILYINFOENUM_MOBILE 0x00000004 +#define DEVICEFAMILYINFOENUM_XBOX 0x00000005 +#define DEVICEFAMILYINFOENUM_TEAM 0x00000006 +#define DEVICEFAMILYINFOENUM_IOT 0x00000007 +#define DEVICEFAMILYINFOENUM_IOT_HEADLESS 0x00000008 +#define DEVICEFAMILYINFOENUM_SERVER 0x00000009 +#define DEVICEFAMILYINFOENUM_HOLOGRAPHIC 0x0000000A +#define DEVICEFAMILYINFOENUM_XBOXSRA 0x0000000B +#define DEVICEFAMILYINFOENUM_XBOXERA 0x0000000C +#define DEVICEFAMILYINFOENUM_SERVER_NANO 0x0000000D +#define DEVICEFAMILYINFOENUM_8828080 0x0000000E +#define DEVICEFAMILYINFOENUM_7067329 0x0000000F +#define DEVICEFAMILYINFOENUM_WINDOWS_CORE 0x00000010 +#define DEVICEFAMILYINFOENUM_WINDOWS_CORE_HEADLESS 0x00000011 +#define DEVICEFAMILYINFOENUM_MAX 0x00000011 + +#define DEVICEFAMILYDEVICEFORM_UNKNOWN 0x00000000 +#define DEVICEFAMILYDEVICEFORM_PHONE 0x00000001 +#define DEVICEFAMILYDEVICEFORM_TABLET 0x00000002 +#define DEVICEFAMILYDEVICEFORM_DESKTOP 0x00000003 +#define DEVICEFAMILYDEVICEFORM_NOTEBOOK 0x00000004 +#define DEVICEFAMILYDEVICEFORM_CONVERTIBLE 0x00000005 +#define DEVICEFAMILYDEVICEFORM_DETACHABLE 0x00000006 +#define DEVICEFAMILYDEVICEFORM_ALLINONE 0x00000007 +#define DEVICEFAMILYDEVICEFORM_STICKPC 0x00000008 +#define DEVICEFAMILYDEVICEFORM_PUCK 0x00000009 +#define DEVICEFAMILYDEVICEFORM_LARGESCREEN 0x0000000A +#define DEVICEFAMILYDEVICEFORM_HMD 0x0000000B +#define DEVICEFAMILYDEVICEFORM_INDUSTRY_HANDHELD 0x0000000C +#define DEVICEFAMILYDEVICEFORM_INDUSTRY_TABLET 0x0000000D +#define DEVICEFAMILYDEVICEFORM_BANKING 0x0000000E +#define DEVICEFAMILYDEVICEFORM_BUILDING_AUTOMATION 0x0000000F +#define DEVICEFAMILYDEVICEFORM_DIGITAL_SIGNAGE 0x00000010 +#define DEVICEFAMILYDEVICEFORM_GAMING 0x00000011 +#define DEVICEFAMILYDEVICEFORM_HOME_AUTOMATION 0x00000012 +#define DEVICEFAMILYDEVICEFORM_INDUSTRIAL_AUTOMATION 0x00000013 +#define DEVICEFAMILYDEVICEFORM_KIOSK 0x00000014 +#define DEVICEFAMILYDEVICEFORM_MAKER_BOARD 0x00000015 +#define DEVICEFAMILYDEVICEFORM_MEDICAL 0x00000016 +#define DEVICEFAMILYDEVICEFORM_NETWORKING 0x00000017 +#define DEVICEFAMILYDEVICEFORM_POINT_OF_SERVICE 0x00000018 +#define DEVICEFAMILYDEVICEFORM_PRINTING 0x00000019 +#define DEVICEFAMILYDEVICEFORM_THIN_CLIENT 0x0000001A +#define DEVICEFAMILYDEVICEFORM_TOY 0x0000001B +#define DEVICEFAMILYDEVICEFORM_VENDING 0x0000001C +#define DEVICEFAMILYDEVICEFORM_INDUSTRY_OTHER 0x0000001D +#define DEVICEFAMILYDEVICEFORM_XBOX_ONE 0x0000001E +#define DEVICEFAMILYDEVICEFORM_XBOX_ONE_S 0x0000001F +#define DEVICEFAMILYDEVICEFORM_XBOX_ONE_X 0x00000020 +#define DEVICEFAMILYDEVICEFORM_XBOX_ONE_X_DEVKIT 0x00000021 +#define DEVICEFAMILYDEVICEFORM_XBOX_SERIES_X 0x00000022 +#define DEVICEFAMILYDEVICEFORM_XBOX_SERIES_X_DEVKIT 0x00000023 +#define DEVICEFAMILYDEVICEFORM_XBOX_SERIES_S 0x00000024 +#define DEVICEFAMILYDEVICEFORM_XBOX_RESERVED_01 0x00000025 +#define DEVICEFAMILYDEVICEFORM_XBOX_RESERVED_02 0x00000026 +#define DEVICEFAMILYDEVICEFORM_XBOX_RESERVED_03 0x00000027 +#define DEVICEFAMILYDEVICEFORM_XBOX_RESERVED_04 0x00000028 +#define DEVICEFAMILYDEVICEFORM_XBOX_RESERVED_05 0x00000029 +#define DEVICEFAMILYDEVICEFORM_XBOX_RESERVED_06 0x0000002A +#define DEVICEFAMILYDEVICEFORM_XBOX_RESERVED_07 0x0000002B +#define DEVICEFAMILYDEVICEFORM_XBOX_RESERVED_08 0x0000002C +#define DEVICEFAMILYDEVICEFORM_XBOX_RESERVED_09 0x0000002D +#define DEVICEFAMILYDEVICEFORM_GAMING_HANDHELD 0x0000002E +#define DEVICEFAMILYDEVICEFORM_GAMING_CONSOLE 0x0000002F +#define DEVICEFAMILYDEVICEFORM_MAX 0x0000002F +#endif /* (NTDDI_VERSION >= NTDDI_WINTHRESHOLD) */ + typedef struct _PROCESSOR_POWER_POLICY_INFO { DWORD TimeCheck; DWORD DemoteLimit;