Rebase against eb5c1872540a71ebef4703387c11c414516233f4.

This commit is contained in:
Sebastian Lackner
2017-09-07 17:45:21 +02:00
parent 578128d012
commit 34f5330124
7 changed files with 90 additions and 86 deletions

View File

@@ -1,4 +1,4 @@
From a903fc237899e6fd92f1604c33c12d12bfbad9ca Mon Sep 17 00:00:00 2001
From 001d09614779630b5fe3885975b8badc79b0a58b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 20 Aug 2014 19:21:18 +0200
Subject: ntdll: Move NtProtectVirtualMemory and NtCreateSection to separate
@@ -9,10 +9,10 @@ Subject: ntdll: Move NtProtectVirtualMemory and NtCreateSection to separate
1 file changed, 8 insertions(+)
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 4d4bc3b..4179dba 100644
index caf26ade02d..fb91b03ccb6 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -149,6 +149,14 @@ static void *preload_reserve_end;
@@ -152,6 +152,14 @@ static void *preload_reserve_end;
static BOOL use_locks;
static BOOL force_exec_prot; /* whether to force PROT_EXEC on all PROT_READ mmaps */
@@ -26,7 +26,7 @@ index 4d4bc3b..4179dba 100644
+
/***********************************************************************
* VIRTUAL_GetProtStr
* get_page_vprot
--
2.6.1
2.14.1