Updated ntdll-ForceBottomUpAlloc patchset.

wine-staging · Jun 24, 2020 · 97fbe3f · 97fbe3f
1 parent f2686a1
commit 97fbe3f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.../ntdll-ForceBottomUpAlloc/0005-ntdll-Use-free-area-list-for-virtual-memory-allocati.patch b/.../ntdll-ForceBottomUpAlloc/0005-ntdll-Use-free-area-list-for-virtual-memory-allocati.patch
@@ -1,4 +1,4 @@
-From 2e8d11bd7433a4f5f1fe67cdb2290086e1628fee Mon Sep 17 00:00:00 2001
+From 93e4ba286e3eee3cb846d05014cea4e92bee6c1b Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Tue, 14 Jan 2020 21:42:21 +0300
 Subject: [PATCH] ntdll: Use free area list for virtual memory allocation.
@@ -8,7 +8,7 @@ Subject: [PATCH] ntdll: Use free area list for virtual memory allocation.
  1 file changed, 230 insertions(+), 112 deletions(-)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index f4dba39cb160..76be52d3d56f 100644
+index f4dba39cb160..4827a1d785a4 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
 @@ -195,7 +195,11 @@ static BYTE *pages_vprot;
@@ -391,7 +391,7 @@ index f4dba39cb160..76be52d3d56f 100644
 +        TRACE("range %p-%p.\n", base, end);
 +
 +        if (base < (char *)address_space_start) base = (char *)address_space_start;
-+        if (end > (char *)limit + granularity_mask + 1) end = (char *)limit + granularity_mask + 1;
++        if (end > (char *)ROUND_ADDR(limit, granularity_mask)) end = ROUND_ADDR(limit, granularity_mask);
 +
 +        if (reserve_end >= base)
 +        {

diff --git a/.../ntdll-ForceBottomUpAlloc/0006-ntdll-Permanently-exclude-natively-mapped-areas-from.patch b/.../ntdll-ForceBottomUpAlloc/0006-ntdll-Permanently-exclude-natively-mapped-areas-from.patch
@@ -1,4 +1,4 @@
-From db4188d9c8bcb98326a0c61023cc9d2d4ffd4566 Mon Sep 17 00:00:00 2001
+From 957fc1577fb1b1f3184cb9d7710f7e9a2afebdb1 Mon Sep 17 00:00:00 2001
 From: Paul Gofman <pgofman@codeweavers.com>
 Date: Tue, 2 Jun 2020 21:06:33 +0300
 Subject: [PATCH] ntdll: Permanently exclude natively mapped areas from free
@@ -9,7 +9,7 @@ Subject: [PATCH] ntdll: Permanently exclude natively mapped areas from free
  1 file changed, 25 insertions(+)
 
 diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
-index 76be52d3d56f..b73eb4257476 100644
+index 4827a1d785a4..ef5c5dafe8fb 100644
 --- a/dlls/ntdll/unix/virtual.c
 +++ b/dlls/ntdll/unix/virtual.c
 @@ -124,6 +124,9 @@ static const BYTE VIRTUAL_Win32Flags[16] =