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 e3c9d3ac76b223073253667e2447e1cbc407ac97.

Browse Source
This commit is contained in:
Elizabeth Figura
2025-09-11 17:44:08 -05:00
parent 3d1b6a4bc0
commit 317665ee20
5 changed files with 12 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 82663e728099ca8f0127dcdf8d62d551eda6902c Mon Sep 17 00:00:00 2001
From 03ed95b629a5d5a9b1a8203e08d7db4ce1ed80d9 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.
@@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Implement NtSetLdtEntries.
2 files changed, 80 insertions(+), 1 deletion(-)
diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c
index 3cf58d928ae..78f9bbeb493 100644
index c0303b471e8..9025d66fba6 100644
--- a/dlls/kernel32/tests/thread.c
+++ b/dlls/kernel32/tests/thread.c
@@ -102,6 +102,7 @@ static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *);
@@ -103,6 +103,7 @@ static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,const WCHAR *);
static HRESULT (WINAPI *pGetThreadDescription)(HANDLE,WCHAR **);
static PVOID (WINAPI *pRtlAddVectoredExceptionHandler)(ULONG,PVECTORED_EXCEPTION_HANDLER);
static ULONG (WINAPI *pRtlRemoveVectoredExceptionHandler)(PVOID);
@@ -20,7 +20,7 @@ index 3cf58d928ae..78f9bbeb493 100644
static HANDLE create_target_process(const char *arg)
{
@@ -1299,6 +1300,82 @@ static void test_GetThreadSelectorEntry(void)
@@ -1319,6 +1320,82 @@ static void test_GetThreadSelectorEntry(void)
ok(entry.HighWord.Bits.Granularity == 1, "expected 1, got %u\n", entry.HighWord.Bits.Granularity);
}
@@ -103,7 +103,7 @@ index 3cf58d928ae..78f9bbeb493 100644
#endif /* __i386__ */
static HANDLE finish_event;
@@ -2617,6 +2694,7 @@ static void init_funcs(void)
@@ -2644,6 +2721,7 @@ static void init_funcs(void)
X(NtSetInformationThread);
X(RtlAddVectoredExceptionHandler);
X(RtlRemoveVectoredExceptionHandler);
@@ -111,7 +111,7 @@ index 3cf58d928ae..78f9bbeb493 100644
}
#undef X
}
@@ -2673,6 +2751,7 @@ START_TEST(thread)
@@ -2700,6 +2778,7 @@ START_TEST(thread)
test_SetThreadContext();
test_GetThreadSelectorEntry();
test_GetThreadContext();
@@ -120,12 +120,12 @@ index 3cf58d928ae..78f9bbeb493 100644
test_QueueUserWorkItem();
test_RegisterWaitForSingleObject();
diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c
index f8d8dd9bf28..194e9c3f3e6 100644
index 670a3c25015..b4a2392630f 100644
--- a/dlls/ntdll/unix/signal_i386.c
+++ b/dlls/ntdll/unix/signal_i386.c
@@ -2207,7 +2207,7 @@ NTSTATUS get_thread_ldt_entry( HANDLE handle, void *data, ULONG len, ULONG *ret_
@@ -2271,7 +2271,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 );
info->Entry = ldt_make_entry( reply->base, reply->limit, reply->flags );
else
- status = STATUS_UNSUCCESSFUL;
+ status = STATUS_ACCESS_VIOLATION;
@@ -133,5 +133,5 @@ index f8d8dd9bf28..194e9c3f3e6 100644
}
SERVER_END_REQ;
--
2.34.1
2.50.1