ntdll: Fix the field names of KUSER_SHARED_DATA and update it.

This commit is contained in:
Francois Gouget 2011-08-03 11:51:39 +02:00 committed by Alexandre Julliard
parent 19edb43627
commit 21d6086c60
2 changed files with 20 additions and 9 deletions

View File

@ -531,9 +531,8 @@ done:
user_shared_data->NtProductType = current_version->wProductType; user_shared_data->NtProductType = current_version->wProductType;
user_shared_data->ProductTypeIsValid = TRUE; user_shared_data->ProductTypeIsValid = TRUE;
user_shared_data->MajorNtVersion = current_version->dwMajorVersion; user_shared_data->NtMajorVersion = current_version->dwMajorVersion;
user_shared_data->MinorNtVersion = current_version->dwMinorVersion; user_shared_data->NtMinorVersion = current_version->dwMinorVersion;
user_shared_data->MinorNtVersion = current_version->dwMinorVersion;
user_shared_data->SuiteMask = current_version->wSuiteMask; user_shared_data->SuiteMask = current_version->wSuiteMask;
TRACE( "got %d.%d platform %d build %x name %s service pack %d.%d product %d\n", TRACE( "got %d.%d platform %d build %x name %s service pack %d.%d product %d\n",

View File

@ -994,6 +994,13 @@ typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE
EndAlternatives EndAlternatives
} ALTERNATIVE_ARCHITECTURE_TYPE; } ALTERNATIVE_ARCHITECTURE_TYPE;
#define NX_SUPPORT_POLICY_ALWAYSOFF 0
#define NX_SUPPORT_POLICY_ALWAYSON 1
#define NX_SUPPORT_POLICY_OPTIN 2
#define NX_SUPPORT_POLICY_OPTOUT 3
#define MAX_WOW64_SHARED_ENTRIES 16
typedef struct _KUSER_SHARED_DATA { typedef struct _KUSER_SHARED_DATA {
ULONG TickCountLowDeprecated; ULONG TickCountLowDeprecated;
ULONG TickCountMultiplier; ULONG TickCountMultiplier;
@ -1003,15 +1010,15 @@ typedef struct _KUSER_SHARED_DATA {
USHORT ImageNumberLow; USHORT ImageNumberLow;
USHORT ImageNumberHigh; USHORT ImageNumberHigh;
WCHAR NtSystemRoot[260]; WCHAR NtSystemRoot[260];
ULONG MaxStckTraceDepth; ULONG MaxStackTraceDepth;
ULONG CryptoExponent; ULONG CryptoExponent;
ULONG TimeZoneId; ULONG TimeZoneId;
ULONG LargePageMinimum; ULONG LargePageMinimum;
ULONG Reserverd2[7]; ULONG Reserved2[7];
NT_PRODUCT_TYPE NtProductType; NT_PRODUCT_TYPE NtProductType;
BOOLEAN ProductTypeIsValid; BOOLEAN ProductTypeIsValid;
ULONG MajorNtVersion; ULONG NtMajorVersion;
ULONG MinorNtVersion; ULONG NtMinorVersion;
BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX];
ULONG Reserved1; ULONG Reserved1;
ULONG Reserved3; ULONG Reserved3;
@ -1020,6 +1027,7 @@ typedef struct _KUSER_SHARED_DATA {
LARGE_INTEGER SystemExpirationDate; LARGE_INTEGER SystemExpirationDate;
ULONG SuiteMask; ULONG SuiteMask;
BOOLEAN KdDebuggerEnabled; BOOLEAN KdDebuggerEnabled;
UCHAR NXSupportPolicy;
volatile ULONG ActiveConsoleId; volatile ULONG ActiveConsoleId;
volatile ULONG DismountCount; volatile ULONG DismountCount;
ULONG ComPlusPackage; ULONG ComPlusPackage;
@ -1027,12 +1035,16 @@ typedef struct _KUSER_SHARED_DATA {
ULONG NumberOfPhysicalPages; ULONG NumberOfPhysicalPages;
BOOLEAN SafeBootMode; BOOLEAN SafeBootMode;
ULONG TraceLogging; ULONG TraceLogging;
ULONGLONG Fill0; ULONGLONG TestRetInstruction;
ULONGLONG SystemCall[4]; ULONG SystemCall;
ULONG SystemCallReturn;
ULONGLONG SystemCallPad[3];
union { union {
volatile KSYSTEM_TIME TickCount; volatile KSYSTEM_TIME TickCount;
volatile ULONG64 TickCountQuad; volatile ULONG64 TickCountQuad;
} DUMMYUNIONNAME; } DUMMYUNIONNAME;
ULONG Cookie;
ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES];
} KSHARED_USER_DATA, *PKSHARED_USER_DATA; } KSHARED_USER_DATA, *PKSHARED_USER_DATA;
typedef enum _MEMORY_CACHING_TYPE { typedef enum _MEMORY_CACHING_TYPE {