Francois Gouget : ntdll: Fix the field names of KUSER_SHARED_DATA and update it.
Alexandre Julliard
julliard at winehq.org
Wed Aug 3 12:48:11 CDT 2011
Module: wine
Branch: master
Commit: 21d6086c60bccdb1614e992837e2b3b7c031f6e8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d6086c60bccdb1614e992837e2b3b7c031f6e8
Author: Francois Gouget <fgouget at free.fr>
Date: Wed Aug 3 11:51:39 2011 +0200
ntdll: Fix the field names of KUSER_SHARED_DATA and update it.
---
dlls/ntdll/version.c | 5 ++---
include/ddk/wdm.h | 24 ++++++++++++++++++------
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c
index bcb92a9..74010dd 100644
--- a/dlls/ntdll/version.c
+++ b/dlls/ntdll/version.c
@@ -531,9 +531,8 @@ done:
user_shared_data->NtProductType = current_version->wProductType;
user_shared_data->ProductTypeIsValid = TRUE;
- user_shared_data->MajorNtVersion = current_version->dwMajorVersion;
- user_shared_data->MinorNtVersion = current_version->dwMinorVersion;
- user_shared_data->MinorNtVersion = current_version->dwMinorVersion;
+ user_shared_data->NtMajorVersion = current_version->dwMajorVersion;
+ user_shared_data->NtMinorVersion = current_version->dwMinorVersion;
user_shared_data->SuiteMask = current_version->wSuiteMask;
TRACE( "got %d.%d platform %d build %x name %s service pack %d.%d product %d\n",
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 2f3fccb..8f5aa04 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -994,6 +994,13 @@ typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE
EndAlternatives
} 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 {
ULONG TickCountLowDeprecated;
ULONG TickCountMultiplier;
@@ -1003,15 +1010,15 @@ typedef struct _KUSER_SHARED_DATA {
USHORT ImageNumberLow;
USHORT ImageNumberHigh;
WCHAR NtSystemRoot[260];
- ULONG MaxStckTraceDepth;
+ ULONG MaxStackTraceDepth;
ULONG CryptoExponent;
ULONG TimeZoneId;
ULONG LargePageMinimum;
- ULONG Reserverd2[7];
+ ULONG Reserved2[7];
NT_PRODUCT_TYPE NtProductType;
BOOLEAN ProductTypeIsValid;
- ULONG MajorNtVersion;
- ULONG MinorNtVersion;
+ ULONG NtMajorVersion;
+ ULONG NtMinorVersion;
BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX];
ULONG Reserved1;
ULONG Reserved3;
@@ -1020,6 +1027,7 @@ typedef struct _KUSER_SHARED_DATA {
LARGE_INTEGER SystemExpirationDate;
ULONG SuiteMask;
BOOLEAN KdDebuggerEnabled;
+ UCHAR NXSupportPolicy;
volatile ULONG ActiveConsoleId;
volatile ULONG DismountCount;
ULONG ComPlusPackage;
@@ -1027,12 +1035,16 @@ typedef struct _KUSER_SHARED_DATA {
ULONG NumberOfPhysicalPages;
BOOLEAN SafeBootMode;
ULONG TraceLogging;
- ULONGLONG Fill0;
- ULONGLONG SystemCall[4];
+ ULONGLONG TestRetInstruction;
+ ULONG SystemCall;
+ ULONG SystemCallReturn;
+ ULONGLONG SystemCallPad[3];
union {
volatile KSYSTEM_TIME TickCount;
volatile ULONG64 TickCountQuad;
} DUMMYUNIONNAME;
+ ULONG Cookie;
+ ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES];
} KSHARED_USER_DATA, *PKSHARED_USER_DATA;
typedef enum _MEMORY_CACHING_TYPE {
More information about the wine-cvs
mailing list