mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
1785a56934
Fixed a test failure.
138 lines
5.0 KiB
Diff
138 lines
5.0 KiB
Diff
From 8abf5d134499aaf9dc87daa657cfe87586ad8ded Mon Sep 17 00:00:00 2001
|
|
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
|
Date: Thu, 28 Apr 2016 18:14:36 +0800
|
|
Subject: [PATCH] ntdll: Implement NtSetLdtEntries.
|
|
|
|
---
|
|
dlls/kernel32/tests/thread.c | 79 ++++++++++++++++++++++++++++++++++++
|
|
dlls/ntdll/signal_i386.c | 2 +-
|
|
2 files changed, 80 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c
|
|
index 2dd274e0c10..ae67a9aa0a0 100644
|
|
--- a/dlls/kernel32/tests/thread.c
|
|
+++ b/dlls/kernel32/tests/thread.c
|
|
@@ -99,6 +99,7 @@ static BOOL (WINAPI *pSetThreadGroupAffinity)(HANDLE,const GROUP_AFFINITY*,GROUP
|
|
static NTSTATUS (WINAPI *pNtSetInformationThread)(HANDLE,THREADINFOCLASS,LPCVOID,ULONG);
|
|
static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *);
|
|
static HRESULT (WINAPI *pGetThreadDescription)(HANDLE,WCHAR **);
|
|
+static NTSTATUS (WINAPI *pNtSetLdtEntries)(ULONG,ULONG,ULONG,ULONG,ULONG,ULONG);
|
|
|
|
static HANDLE create_target_process(const char *arg)
|
|
{
|
|
@@ -1276,6 +1277,82 @@ static void test_GetThreadSelectorEntry(void)
|
|
ok(entry.HighWord.Bits.Granularity == 1, "expected 1, got %u\n", entry.HighWord.Bits.Granularity);
|
|
}
|
|
|
|
+static void test_NtSetLdtEntries(void)
|
|
+{
|
|
+ THREAD_DESCRIPTOR_INFORMATION tdi;
|
|
+ LDT_ENTRY ds_entry;
|
|
+ CONTEXT ctx;
|
|
+ DWORD ret;
|
|
+ union
|
|
+ {
|
|
+ LDT_ENTRY entry;
|
|
+ DWORD dw[2];
|
|
+ } sel;
|
|
+
|
|
+ if (!pNtSetLdtEntries)
|
|
+ {
|
|
+ win_skip("NtSetLdtEntries is not available on this platform\n");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (pNtSetLdtEntries(0, 0, 0, 0, 0, 0) == STATUS_NOT_IMPLEMENTED) /* WoW64 */
|
|
+ {
|
|
+ win_skip("NtSetLdtEntries is not implemented on this platform\n");
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ ret = pNtSetLdtEntries(0, 0, 0, 0, 0, 0);
|
|
+ ok(!ret, "NtSetLdtEntries failed: %08x\n", ret);
|
|
+
|
|
+ ctx.ContextFlags = CONTEXT_SEGMENTS;
|
|
+ ret = GetThreadContext(GetCurrentThread(), &ctx);
|
|
+ ok(ret, "GetThreadContext failed\n");
|
|
+
|
|
+ tdi.Selector = ctx.SegDs;
|
|
+ ret = pNtQueryInformationThread(GetCurrentThread(), ThreadDescriptorTableEntry, &tdi, sizeof(tdi), &ret);
|
|
+ ok(!ret, "NtQueryInformationThread failed: %08x\n", ret);
|
|
+ ds_entry = tdi.Entry;
|
|
+
|
|
+ tdi.Selector = 0x000f;
|
|
+ ret = pNtQueryInformationThread(GetCurrentThread(), ThreadDescriptorTableEntry, &tdi, sizeof(tdi), &ret);
|
|
+ ok(ret == STATUS_ACCESS_VIOLATION, "got %08x\n", ret);
|
|
+
|
|
+ tdi.Selector = 0x001f;
|
|
+ ret = pNtQueryInformationThread(GetCurrentThread(), ThreadDescriptorTableEntry, &tdi, sizeof(tdi), &ret);
|
|
+ ok(ret == STATUS_ACCESS_VIOLATION, "NtQueryInformationThread returned %08x\n", ret);
|
|
+
|
|
+ ret = GetThreadSelectorEntry(GetCurrentThread(), 0x000f, &sel.entry);
|
|
+ ok(!ret, "GetThreadSelectorEntry should fail\n");
|
|
+
|
|
+ ret = GetThreadSelectorEntry(GetCurrentThread(), 0x001f, &sel.entry);
|
|
+ ok(!ret, "GetThreadSelectorEntry should fail\n");
|
|
+
|
|
+ memset(&sel.entry, 0x9a, sizeof(sel.entry));
|
|
+ ret = GetThreadSelectorEntry(GetCurrentThread(), ctx.SegDs, &sel.entry);
|
|
+ ok(ret, "GetThreadSelectorEntry failed\n");
|
|
+ ok(!memcmp(&ds_entry, &sel.entry, sizeof(ds_entry)), "entries do not match\n");
|
|
+
|
|
+ ret = pNtSetLdtEntries(0x000f, sel.dw[0], sel.dw[1], 0x001f, sel.dw[0], sel.dw[1]);
|
|
+ ok(!ret || broken(ret == STATUS_INVALID_LDT_DESCRIPTOR) /*XP*/, "NtSetLdtEntries failed: %08x\n", ret);
|
|
+
|
|
+ if (!ret)
|
|
+ {
|
|
+ memset(&sel.entry, 0x9a, sizeof(sel.entry));
|
|
+ ret = GetThreadSelectorEntry(GetCurrentThread(), 0x000f, &sel.entry);
|
|
+ todo_wine
|
|
+ ok(ret, "GetThreadSelectorEntry failed\n");
|
|
+ todo_wine
|
|
+ ok(!memcmp(&ds_entry, &sel.entry, sizeof(ds_entry)), "entries do not match\n");
|
|
+
|
|
+ memset(&sel.entry, 0x9a, sizeof(sel.entry));
|
|
+ ret = GetThreadSelectorEntry(GetCurrentThread(), 0x001f, &sel.entry);
|
|
+ todo_wine
|
|
+ ok(ret, "GetThreadSelectorEntry failed\n");
|
|
+ todo_wine
|
|
+ ok(!memcmp(&ds_entry, &sel.entry, sizeof(ds_entry)), "entries do not match\n");
|
|
+ }
|
|
+}
|
|
+
|
|
#endif /* __i386__ */
|
|
|
|
static HANDLE finish_event;
|
|
@@ -2338,6 +2415,7 @@ static void init_funcs(void)
|
|
X(NtQueryInformationThread);
|
|
X(RtlGetThreadErrorMode);
|
|
X(NtSetInformationThread);
|
|
+ X(NtSetLdtEntries);
|
|
}
|
|
#undef X
|
|
}
|
|
@@ -2393,6 +2471,7 @@ START_TEST(thread)
|
|
test_SetThreadContext();
|
|
test_GetThreadSelectorEntry();
|
|
test_GetThreadContext();
|
|
+ test_NtSetLdtEntries();
|
|
#endif
|
|
test_QueueUserWorkItem();
|
|
test_RegisterWaitForSingleObject();
|
|
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
|
|
index 441ef579609..eb28d668279 100644
|
|
--- a/dlls/ntdll/signal_i386.c
|
|
+++ b/dlls/ntdll/signal_i386.c
|
|
@@ -2533,7 +2533,7 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_
|
|
if (reply->flags)
|
|
info->Entry = ldt_make_entry( (void *)reply->base, reply->limit, reply->flags );
|
|
else
|
|
- status = STATUS_UNSUCCESSFUL;
|
|
+ status = STATUS_ACCESS_VIOLATION;
|
|
}
|
|
}
|
|
SERVER_END_REQ;
|
|
--
|
|
2.26.2
|
|
|