[PATCH v2] ntdll: Don't constraint TEB address to 2GB for native x64 process.
Paul Gofman
pgofman at codeweavers.com
Thu Nov 4 06:55:42 CDT 2021
Signed-off-by: Paul Gofman <pgofman at codeweavers.com>
---
v2:
- don't change virtual_alloc_first_teb().
dlls/ntdll/unix/virtual.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
index 756a7388a22..f62ca1f5f01 100644
--- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -3021,6 +3021,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb )
void *ptr = NULL;
NTSTATUS status = STATUS_SUCCESS;
SIZE_T block_size = signal_stack_mask + 1;
+ BOOL is_wow = !!NtCurrentTeb()->WowTebOffset;
server_enter_uninterrupted_section( &virtual_mutex, &sigset );
if (next_free_teb)
@@ -3035,7 +3036,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb )
{
SIZE_T total = 32 * block_size;
- if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 ? 0x7fffffff : 0,
+ if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 && is_wow ? 0x7fffffff : 0,
&total, MEM_RESERVE, PAGE_READWRITE )))
{
server_leave_uninterrupted_section( &virtual_mutex, &sigset );
@@ -3048,7 +3049,7 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb )
NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&ptr, 0, &block_size,
MEM_COMMIT, PAGE_READWRITE );
}
- *ret_teb = teb = init_teb( ptr, !!NtCurrentTeb()->WowTebOffset );
+ *ret_teb = teb = init_teb( ptr, is_wow );
server_leave_uninterrupted_section( &virtual_mutex, &sigset );
if ((status = signal_alloc_thread( teb )))
--
2.33.1
More information about the wine-devel
mailing list