wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against ddec23013e39b563a3a50c0fe42c2ae8b518d538

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-11-26 11:52:26 +11:00
parent 3fe9b83fa4
commit f62913bfc3
7 changed files with 50 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
patches/ntdll-NtSetLdtEntries/0001-ntdll-Implement-NtSetLdtEntries.patch
View File

@@ -1,26 +1,26 @@
From b82b9f71f8204b1c55e397ca3de1bbd28a5ba86e Mon Sep 17 00:00:00 2001
From d1dca9874d914f25f3257c850275a14c3835a7e9 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Thu, 28 Apr 2016 18:14:36 +0800
Subject: ntdll: Implement NtSetLdtEntries.
Subject: [PATCH] ntdll: Implement NtSetLdtEntries.
---
dlls/kernel32/tests/thread.c | 79 ++++++++++++++++++++++++++++++++++++++++++++
dlls/ntdll/nt.c | 28 +++++++++++++++-
dlls/kernel32/tests/thread.c | 79 ++++++++++++++++++++++++++++++++++++
dlls/ntdll/nt.c | 28 ++++++++++++-
2 files changed, 106 insertions(+), 1 deletion(-)
diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c
index b5ad1da..8c5cb3c 100644
index 180eed82419..5e9d51c24cd 100644
--- a/dlls/kernel32/tests/thread.c
+++ b/dlls/kernel32/tests/thread.c
@@ -102,6 +102,7 @@ static NTSTATUS (WINAPI *pNtQueryInformationThread)(HANDLE,THREADINFOCLASS,PVOID
static BOOL (WINAPI *pGetThreadGroupAffinity)(HANDLE,GROUP_AFFINITY*);
static BOOL (WINAPI *pSetThreadGroupAffinity)(HANDLE,const GROUP_AFFINITY*,GROUP_AFFINITY*);
@@ -107,6 +107,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)
{
@@ -1140,6 +1141,82 @@ static void test_GetThreadSelectorEntry(void)
@@ -1223,6 +1224,82 @@ static void test_GetThreadSelectorEntry(void)
ok(entry.HighWord.Bits.Granularity == 0, "expected 0, got %u\n", entry.HighWord.Bits.Granularity);
}
@@ -103,7 +103,7 @@ index b5ad1da..8c5cb3c 100644
#endif /* __i386__ */
static HANDLE finish_event;
@@ -1953,6 +2030,7 @@ static void init_funcs(void)
@@ -2291,6 +2368,7 @@ static void init_funcs(void)
X(NtQueryInformationThread);
X(RtlGetThreadErrorMode);
X(NtSetInformationThread);
@@ -111,7 +111,7 @@ index b5ad1da..8c5cb3c 100644
}
#undef X
}
@@ -2006,6 +2084,7 @@ START_TEST(thread)
@@ -2346,6 +2424,7 @@ START_TEST(thread)
#ifdef __i386__
test_SetThreadContext();
test_GetThreadSelectorEntry();
@@ -120,10 +120,10 @@ index b5ad1da..8c5cb3c 100644
test_QueueUserWorkItem();
test_RegisterWaitForSingleObject();
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 3f5ae2c..fbea627 100644
index 85cefa638ab..fd3a7cb7eae 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -56,6 +56,7 @@
@@ -75,6 +75,7 @@
#include "winternl.h"
#include "ntdll_misc.h"
#include "wine/server.h"
@@ -131,7 +131,7 @@ index 3f5ae2c..fbea627 100644
#include "ddk/wdm.h"
#ifdef __APPLE__
@@ -2790,7 +2791,32 @@ NTSTATUS WINAPI NtSystemDebugControl(SYSDBG_COMMAND command, PVOID inbuffer, ULO
@@ -3781,7 +3782,32 @@ NTSTATUS WINAPI NtSystemDebugControl(SYSDBG_COMMAND command, PVOID inbuffer, ULO
NTSTATUS WINAPI NtSetLdtEntries(ULONG selector1, ULONG entry1_low, ULONG entry1_high,
ULONG selector2, ULONG entry2_low, ULONG entry2_high)
{
@@ -166,5 +166,5 @@ index 3f5ae2c..fbea627 100644
+#endif
}
--
2.8.0
2.17.1