Rebase against 38938bdb6f752cb68d13d833be97d0c524fe827e.

This commit is contained in:
Alistair Leslie-Hughes
2025-10-28 10:29:18 +11:00
parent fa2f323344
commit 314769efdc
4 changed files with 6 additions and 66 deletions

View File

@@ -1,4 +1,4 @@
From f918a9c53c678d3234cc6b51083af524087966bb Mon Sep 17 00:00:00 2001
From 238af21a74a01c54ae3e24b6873b6b4fd66d7368 Mon Sep 17 00:00:00 2001
From: Paul Gofman <pgofman@codeweavers.com>
Date: Fri, 1 Dec 2023 14:55:20 -0600
Subject: [PATCH] ntdll: Exclude natively mapped areas from free areas list.
@@ -8,7 +8,7 @@ Subject: [PATCH] ntdll: Exclude natively mapped areas from free areas list.
1 file changed, 96 insertions(+), 9 deletions(-)
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index a5270649c0d..0fe761a3b85 100644
index b5115693758..a08c75dd2c1 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -144,6 +144,7 @@ struct file_view
@@ -31,7 +31,7 @@ index a5270649c0d..0fe761a3b85 100644
@@ -1380,7 +1383,9 @@ static void dump_view( struct file_view *view )
BYTE prot = get_page_vprot( addr );
TRACE( "View: %p - %p", addr, addr + view->size - 1 );
TRACE( "View: %p - %p %s", addr, addr + view->size - 1, get_prot_str(view->protect) );
- if (view->protect & VPROT_SYSTEM)
+ if (view->protect & VPROT_NATIVE)
+ TRACE(" (native)\n");
@@ -197,7 +197,7 @@ index a5270649c0d..0fe761a3b85 100644
}
done:
status = create_view( view_ret, ptr, size, vprot );
@@ -4746,7 +4828,12 @@ void virtual_set_force_exec( BOOL enable )
@@ -4882,7 +4964,12 @@ void virtual_set_force_exec( BOOL enable )
WINE_RB_FOR_EACH_ENTRY( view, &views_tree, struct file_view, entry )
{
/* file mappings are always accessible */
@@ -212,5 +212,5 @@ index a5270649c0d..0fe761a3b85 100644
mprotect_range( view->base, view->size, commit, 0 );
}
--
2.47.2
2.51.0