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 51dd1ba02e4a96a3e0c9381a434bfd1fd4347d83.

Browse Source
This commit is contained in:
Zebediah Figura
2020-07-03 18:18:38 -05:00
parent 215d78f8e1
commit 502c444d9c
11 changed files with 102 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/ntdll-Builtin_Prot/0001-ntdll-Fix-holes-in-ELF-mappings.patch
View File

@@ -1,4 +1,4 @@
From be204ab84d031b7efb223ac7c4962246549c8eb0 Mon Sep 17 00:00:00 2001
From aa9b48c7e76994f4b93fbc516eee5d39a597f63f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Thu, 1 Jun 2017 06:04:53 +0200
Subject: [PATCH] ntdll: Fix holes in ELF mappings. (v2)
@@ -10,10 +10,10 @@ Based on a patch by Andrew Wesie.
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index e824b9ced25..90143f5c07b 100644
index 66bcde8aff1..734dd130817 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -966,6 +966,16 @@ static inline BOOL is_write_watch_range( const void *addr, size_t size )
@@ -959,6 +959,16 @@ static inline BOOL is_write_watch_range( const void *addr, size_t size )
}
@@ -30,7 +30,7 @@ index e824b9ced25..90143f5c07b 100644
/***********************************************************************
* find_view_range
*
@@ -2812,6 +2822,19 @@ NTSTATUS CDECL virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_sta
@@ -2920,6 +2930,19 @@ NTSTATUS virtual_handle_fault( LPCVOID addr, DWORD err, BOOL on_signal_stack )
/* ignore fault if page is writable now */
if (get_unix_prot( get_page_vprot( page ) ) & PROT_WRITE) ret = STATUS_SUCCESS;
}
@@ -47,7 +47,7 @@ index e824b9ced25..90143f5c07b 100644
+ else
+ set_page_vprot_bits( page, page_size, 0, VPROT_READ | VPROT_EXEC );
+ }
server_leave_uninterrupted_section( &csVirtual, &sigset );
server_leave_uninterrupted_section( &virtual_mutex, &sigset );
return ret;
}
diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c
@@ -86,5 +86,5 @@ index eb52fc690cf..178f5605a23 100644
static BOOL check_with_margin(SIZE_T perf, SIZE_T sysperf, int margin)
--
2.26.2
2.27.0