Rebase against ab94abb14f74fe863ae40dafc7a8301db22792fc.

This commit is contained in:
Alistair Leslie-Hughes
2020-08-22 09:32:28 +10:00
parent 4242749b5b
commit 663c3ba497
5 changed files with 180 additions and 14 deletions

View File

@@ -1,4 +1,4 @@
From 3c08a3d54b19ceb7daff2e033be76115ea013cd9 Mon Sep 17 00:00:00 2001
From 9749f5941c2bc14e4b94dc0ca2cabf25c781d675 Mon Sep 17 00:00:00 2001
From: Andrew Wesie <awesie@gmail.com>
Date: Fri, 24 Apr 2020 14:55:15 -0500
Subject: [PATCH] ntdll: Support WRITECOPY on x64.
@@ -10,13 +10,13 @@ Signed-off-by: Andrew Wesie <awesie@gmail.com>
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
index 4342ab023775..4984d5bdad72 100644
index 870c0c7e258..e30f7c67ce5 100644
--- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -2040,6 +2040,30 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r
@@ -2204,6 +2204,30 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r
return TRUE;
}
+/**********************************************************************
+ * segv_handler_early
+ *
@@ -44,7 +44,7 @@ index 4342ab023775..4984d5bdad72 100644
/**********************************************************************
* segv_handler
*
@@ -2414,6 +2438,23 @@ void signal_init_process(void)
@@ -2578,6 +2602,23 @@ void signal_init_process(void)
*/
void signal_init_early(void)
{
@@ -69,7 +69,7 @@ index 4342ab023775..4984d5bdad72 100644
/***********************************************************************
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 98c5aad578c6..16cfa8bda2d7 100644
index 5ab87f1aa81..e708f3c44b0 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -818,7 +818,7 @@ static int get_unix_prot( BYTE vprot )
@@ -82,5 +82,5 @@ index 98c5aad578c6..16cfa8bda2d7 100644
{
if (experimental_WRITECOPY() && !(vprot & VPROT_WRITTEN))
--
2.20.1
2.28.0