Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com>
---
v2:
- no changes.
.../api-ms-win-core-xstate-l1-1-0.spec | 2 +-
dlls/ntdll/exception.c | 71 +++++++++
dlls/ntdll/ntdll.spec | 2 +
dlls/ntdll/tests/exception.c | 147 +++++++++++++++++-
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +
include/ddk/wdm.h | 8 +-
6 files changed, 228 insertions(+), 4 deletions(-)
diff --git a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec
index 36a1c8812f0..15126e5ddfe 100644
--- a/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec
+++ b/dlls/api-ms-win-core-xstate-l1-1-0/api-ms-win-core-xstate-l1-1-0.spec
@@ -1,6 +1,6 @@
@ stub RtlCopyExtendedContext
@ stdcall RtlGetEnabledExtendedFeatures(int64) ntdll.RtlGetEnabledExtendedFeatures
-@ stub RtlGetExtendedContextLength
+@ stdcall RtlGetExtendedContextLength(long ptr) ntdll.RtlGetExtendedContextLength
@ stub RtlGetExtendedFeaturesMask
@ stub RtlInitializeExtendedContext
@ stub RtlLocateExtendedFeature
diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 3f7443bb45b..1b212cdee7f 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -665,3 +665,74 @@ ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64 feature_mask)
{
return user_shared_data->XState.EnabledFeatures & feature_mask;
}
+
+static const struct context_parameters
+{
+ ULONG arch_flag;
+ ULONG supported_flags;
+ ULONG context_size; /* sizeof(CONTEXT) */
+ ULONG context_ex_size; /* sizeof(CONTEXT_EX) */
+ ULONG alignment;
+}
+arch_context_paramaters[] =
+{
+ {0x00100000, 0xd810005f, 0x4d0, 0x20, 7},
+ {0x00010000, 0xd801007f, 0x2cc, 0x18, 3},
+};
+
+static const struct context_parameters *context_get_parameters( ULONG context_flags )
+{
+ unsigned int i;
+
+ for (i = 0; i < ARRAY_SIZE(arch_context_paramaters); ++i)
+ {
+ if (context_flags & arch_context_paramaters[i].arch_flag)
+ return context_flags & ~arch_context_paramaters[i].supported_flags ? NULL : &arch_context_paramaters[i];
+ }
+ return NULL;
+}
+
+
+/**********************************************************************
+ * RtlGetExtendedContextLength2 (NTDLL.@)
+ */
+ULONG64 WINAPI RtlGetExtendedContextLength2( ULONG context_flags, ULONG *length, ULONG64 compaction_mask )
+{
+ const struct context_parameters *p;
+ ULONG64 supported_mask;
+ ULONG64 size;
+
+ TRACE( "context_flags %#x, length %p, compaction_mask %s.\n", context_flags, length,
+ wine_dbgstr_longlong(compaction_mask) );
+
+ if (!(p = context_get_parameters( context_flags )))
+ return STATUS_INVALID_PARAMETER;
+
+ if (!(context_flags & 0x40))
+ {
+ *length = p->context_size + p->context_ex_size + p->alignment;
+ return STATUS_SUCCESS;
+ }
+
+ if (!(supported_mask = RtlGetEnabledExtendedFeatures( ~(ULONG64)0) ))
+ return STATUS_NOT_SUPPORTED;
+
+ compaction_mask &= supported_mask;
+
+ size = p->context_size + p->context_ex_size + offsetof(XSTATE, YmmContext) + 63;
+
+ if (compaction_mask & supported_mask & (1 << XSTATE_AVX))
+ size += sizeof(YMMCONTEXT);
+
+ *length = size;
+ return STATUS_SUCCESS;
+}
+
+
+/**********************************************************************
+ * RtlGetExtendedContextLength (NTDLL.@)
+ */
+ULONG64 WINAPI RtlGetExtendedContextLength( ULONG context_flags, ULONG *length )
+{
+ return RtlGetExtendedContextLength2( context_flags, length, ~(ULONG64)0 );
+}
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index c21e2bcf32a..08c6e1849a2 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -695,6 +695,8 @@
# @ stub RtlGetElementGenericTableAvl
@ stdcall RtlGetEnabledExtendedFeatures(int64)
@ stdcall RtlGetExePath(wstr ptr)
+@ stdcall -ret64 RtlGetExtendedContextLength(long ptr)
+@ stdcall -ret64 RtlGetExtendedContextLength2(long ptr int64)
# @ stub RtlGetFirstRange
@ stdcall RtlGetFrame()
@ stdcall RtlGetFullPathName_U(wstr long ptr ptr)
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
index 9f93212acf6..0e00e889d41 100644
--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -45,6 +45,8 @@ static PVOID (WINAPI *pRtlAddVectoredContinueHandler)(ULONG first, PVECTORED
static ULONG (WINAPI *pRtlRemoveVectoredContinueHandler)(PVOID handler);
static void (WINAPI *pRtlSetUnhandledExceptionFilter)(PRTL_EXCEPTION_FILTER filter);
static ULONG64 (WINAPI *pRtlGetEnabledExtendedFeatures)(ULONG64);
+static ULONG64 (WINAPI *pRtlGetExtendedContextLength)(ULONG context_flags, ULONG *length);
+static ULONG64 (WINAPI *pRtlGetExtendedContextLength2)(ULONG context_flags, ULONG *length, ULONG64 compaction_mask);
static NTSTATUS (WINAPI *pNtReadVirtualMemory)(HANDLE, const void*, void*, SIZE_T, SIZE_T*);
static NTSTATUS (WINAPI *pNtTerminateProcess)(HANDLE handle, LONG exit_code);
static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG);
@@ -5544,6 +5546,8 @@ done:
return ExceptionContinueExecution;
}
+#define CONTEXT_NATIVE (CONTEXT_XSTATE & CONTEXT_CONTROL)
+
static void test_extended_context(void)
{
static BYTE except_code_set_ymm0[] =
@@ -5580,19 +5584,156 @@ static void test_extended_context(void)
0xc5, 0xfc, 0x11, 0x00, /* vmovups %ymm0,(%ax) */
0xc3, /* ret */
};
- unsigned int i, address_offset;
+ static const struct
+ {
+ ULONG flag;
+ ULONG supported_flags;
+ ULONG broken_flags;
+ ULONG context_length;
+ ULONG context_ex_length;
+ ULONG align;
+ }
+ context_arch[] =
+ {
+ {
+ 0x00100000, /* CONTEXT_AMD64 */
+ 0xd800005f,
+ 0xd8000000,
+ 0x4d0, /* sizeof(CONTEXT) */
+ 0x20, /* sizeof(CONTEXT_EX) */
+ 7,
+ },
+ {
+ 0x00010000, /* CONTEXT_X86 */
+ 0xd800007f,
+ 0xd8000000,
+ 0x2cc, /* sizeof(CONTEXT) */
+ 0x18, /* sizeof(CONTEXT_EX) */
+ 3,
+ },
+ };
+ ULONG expected_length, expected_length_xstate;
+ unsigned int i, address_offset, test;
+ ULONG64 enabled_features;
+ ULONG ret, length;
unsigned data[8];
+ ULONG flags;
address_offset = sizeof(void *) == 8 ? 2 : 1;
*(void **)(except_code_set_ymm0 + address_offset) = data;
*(void **)(except_code_reset_ymm_state + address_offset) = data;
- if (!pRtlGetEnabledExtendedFeatures || !(pRtlGetEnabledExtendedFeatures(~(ULONG64)0) & (1 << XSTATE_AVX)))
+ if (!pRtlGetEnabledExtendedFeatures)
+ {
+ skip("RtlGetEnabledExtendedFeatures is not available.\n");
+ return;
+ }
+
+ enabled_features = pRtlGetEnabledExtendedFeatures(~(ULONG64)0);
+
+ /* Test context manipulation functions. */
+ length = 0xdeadbeef;
+ ret = pRtlGetExtendedContextLength(0, &length);
+ ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef, "Got unexpected result ret %#x, length %#x.\n",
+ ret, length);
+
+ for (test = 0; test < ARRAY_SIZE(context_arch); ++test)
+ {
+ expected_length = context_arch[test].context_length + context_arch[test].context_ex_length
+ + context_arch[test].align;
+ expected_length_xstate = context_arch[test].context_length + context_arch[test].context_ex_length
+ + sizeof(XSTATE) + 63;
+
+
+ length = 0xdeadbeef;
+ ret = pRtlGetExtendedContextLength(context_arch[test].flag, &length);
+ ok(!ret && length == expected_length, "Got unexpected result ret %#x, length %#x.\n",
+ ret, length);
+
+ for (i = 0; i < 32; ++i)
+ {
+ if (i == 6) /* CONTEXT_XSTATE */
+ continue;
+
+ flags = context_arch[test].flag | (1 << i);
+ length = 0xdeadbeef;
+ ret = pRtlGetExtendedContextLength(flags, &length);
+
+ if ((context_arch[test].supported_flags & flags) || flags == context_arch[test].flag)
+ {
+ ok((!ret && length == expected_length)
+ || broken((context_arch[test].broken_flags & (1 << i))
+ && ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef),
+ "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n",
+ ret, length, flags);
+ }
+ else
+ {
+ ok(ret == STATUS_INVALID_PARAMETER && length == 0xdeadbeef,
+ "Got unexpected result ret %#x, length %#x, flags 0x%08x.\n", ret, length, flags);
+ }
+ }
+
+ flags = context_arch[test].flag | 0x40;
+
+ length = 0xdeadbeef;
+ ret = pRtlGetExtendedContextLength(flags, &length);
+
+ if (!enabled_features)
+ {
+ ok(ret == STATUS_NOT_SUPPORTED && length == 0xdeadbeef,
+ "Got unexpected result ret %#x, length %#x.\n", ret, length);
+ continue;
+ }
+
+ ok(!ret && length >= expected_length_xstate,
+ "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+
+ if (!pRtlGetExtendedContextLength2)
+ {
+ win_skip("RtlGetExtendedContextLength2 is not available.\n");
+ continue;
+ }
+
+ length = 0xdeadbeef;
+ ret = pRtlGetExtendedContextLength2(flags, &length, 7);
+ ok(!ret && length == expected_length_xstate,
+ "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+
+ length = 0xdeadbeef;
+ ret = pRtlGetExtendedContextLength2(flags, &length, ~0);
+ ok(!ret && length >= expected_length_xstate,
+ "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+
+ length = 0xdeadbeef;
+ ret = pRtlGetExtendedContextLength2(flags, &length, 0);
+ ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT),
+ "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+
+ length = 0xdeadbeef;
+ ret = pRtlGetExtendedContextLength2(flags, &length, 3);
+ ok(!ret && length == expected_length_xstate - sizeof(YMMCONTEXT),
+ "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+
+ length = 0xdeadbeef;
+ ret = pRtlGetExtendedContextLength2(flags, &length, 4);
+ ok(!ret && length == expected_length_xstate,
+ "Got unexpected result ret %#x, length %#x, test %u.\n", ret, length, test);
+ }
+
+ if (0)
+ {
+ /* Crashes on Windows. */
+ pRtlGetExtendedContextLength(CONTEXT_FULL, NULL);
+ }
+
+ if (!(enabled_features & (1 << XSTATE_AVX)))
{
skip("AVX is not supported.\n");
return;
}
+ /* Test fault exception context. */
memset(data, 0xff, sizeof(data));
test_extended_context_modified_state = FALSE;
run_exception_test(test_extended_context_handler, NULL, except_code_reset_ymm_state,
@@ -5657,6 +5798,8 @@ START_TEST(exception)
X(RtlGetUnloadEventTrace);
X(RtlGetUnloadEventTraceEx);
X(RtlGetEnabledExtendedFeatures);
+ X(RtlGetExtendedContextLength);
+ X(RtlGetExtendedContextLength2);
#undef X
pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process");
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index 0e8082fad26..45024a3a8da 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -1096,6 +1096,8 @@
@ stub RtlGetDefaultCodePage
@ stub RtlGetElementGenericTable
@ stub RtlGetElementGenericTableAvl
+@ stdcall RtlGetExtendedContextLength(long ptr)
+@ stdcall RtlGetExtendedContextLength2(long ptr int64)
@ stub RtlGetFirstRange
@ stdcall RtlGetGroupSecurityDescriptor(ptr ptr ptr)
@ stub RtlGetNextRange
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index cc841326979..fa0f42aadef 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -1836,12 +1836,18 @@ HANDLE WINAPI PsGetProcessInheritedFromUniqueProcessId(PEPROCESS);
BOOLEAN WINAPI PsGetVersion(ULONG*,ULONG*,ULONG*,UNICODE_STRING*);
NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS);
+ULONG64 WINAPI RtlGetExtendedContextLength(ULONG,ULONG*);
+ULONG64 WINAPI RtlGetExtendedContextLength2(ULONG,ULONG*,ULONG64);
+
+#if defined(__x86_64__) || defined(__i386__)
+ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64);
+#endif
+
#ifdef __x86_64__
void WINAPI RtlCopyMemoryNonTemporal(void*,const void*,SIZE_T);
#else
#define RtlCopyMemoryNonTemporal RtlCopyMemory
#endif
-ULONG64 WINAPI RtlGetEnabledExtendedFeatures(ULONG64);
BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG);
NTSTATUS WINAPI ZwAddBootEntry(PUNICODE_STRING,PUNICODE_STRING);
--
2.26.2
