You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Rebase against 6144addcf0fc26f187aa05e6bac6c4a0c3542199.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 001d09614779630b5fe3885975b8badc79b0a58b Mon Sep 17 00:00:00 2001
|
||||
From 89a4ee827b74d8e4d63ca3e1354d89d75cc0fc19 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 caf26ade02d..fb91b03ccb6 100644
|
||||
index ce2469829b0..eb2dbe8a2cd 100644
|
||||
--- a/dlls/ntdll/virtual.c
|
||||
+++ b/dlls/ntdll/virtual.c
|
||||
@@ -152,6 +152,14 @@ static void *preload_reserve_end;
|
||||
@@ -168,6 +168,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 */
|
||||
|
||||
@@ -24,9 +24,9 @@ index caf26ade02d..fb91b03ccb6 100644
|
||||
+ ULONG sec_flags, HANDLE file ) DECLSPEC_ALIGN(4096);
|
||||
+#endif
|
||||
+
|
||||
|
||||
/***********************************************************************
|
||||
* get_page_vprot
|
||||
static inline int is_view_valloc( const struct file_view *view )
|
||||
{
|
||||
return !(view->protect & (SEC_FILE | SEC_RESERVE | SEC_COMMIT));
|
||||
--
|
||||
2.14.1
|
||||
|
||||
|
Reference in New Issue
Block a user