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 2828d0820a1661e46f606f28db090d710cef11f4.

Browse Source
This commit is contained in:
Zebediah Figura
2021-03-18 00:32:41 -05:00
parent c747e46d75
commit 44af049de7
8 changed files with 76 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/ntdll-aarch-TEB/0002-ntdll-Always-restore-TEB-to-x18-on-aarch-64-on-retur.patch
View File

@@ -1,4 +1,4 @@
From 3a0372bf303cbbfbb94f23455758b6020f038241 Mon Sep 17 00:00:00 2001
From 53921ff97159fcd4a060568df463886192d41420 Mon Sep 17 00:00:00 2001
From: Martin Storsjo <martin@martin.st>
Date: Wed, 16 Aug 2017 23:48:40 +0300
Subject: [PATCH] ntdll: Always restore TEB to x18 on aarch 64 on return from
@@ -20,12 +20,12 @@ Signed-off-by: Martin Storsjo <martin@martin.st>
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index f54e25fcc5c..87ffc74062b 100644
index 092c47eac3b..05e36598cdb 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -2073,7 +2073,13 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name,
@@ -1890,7 +1890,13 @@ static NTSTATUS build_module( LPCWSTR load_path, const UNICODE_STRING *nt_name,
if (image_info->u.s.WineBuiltin)
if (is_builtin)
{
- if (TRACE_ON(relay)) RELAY_SetupDLL( *module );
+#ifdef __aarch64__
@@ -56,5 +56,5 @@ index be2dc833377..e29496a8c7a 100644
}
--
2.30.0
2.20.1