commit f3dad37ba2671a7d86c5770e498252e3363e809c
author Alexandre Julliard <julliard@winehq.org> Mon Dec 12 17:28:32 2005 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Dec 12 17:28:32 2005 +0100
tree b769127d918cf52526401b173c5ab3bb319484e9
parent 8a8a94aecbfcd908e5909113ea2139ce17c41b56

TEB.StackLimit should not include the guard page.

dlls/kernel/process.c

diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c
index af9e23f..42c4033 100644
--- a/dlls/kernel/process.c
+++ b/dlls/kernel/process.c
@@ -978,7 +978,8 @@
     IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress );
 
     stack_size = max( nt->OptionalHeader.SizeOfStackReserve, nt->OptionalHeader.SizeOfStackCommit );
-    stack_size = (stack_size + (page_size - 1)) & ~(page_size - 1);
+    stack_size += page_size;  /* for the guard page */
+    stack_size = (stack_size + 0xffff) & ~0xffff;  /* round to 64K boundary */
     if (stack_size < 1024 * 1024) stack_size = 1024 * 1024;  /* Xlib needs a large stack */
 
     if (!(base = VirtualAlloc( NULL, stack_size, MEM_COMMIT, PAGE_READWRITE )))
@@ -990,7 +991,7 @@
     /* note: limit is lower than base since the stack grows down */
     NtCurrentTeb()->DeallocationStack = base;
     NtCurrentTeb()->Tib.StackBase     = (char *)base + stack_size;
-    NtCurrentTeb()->Tib.StackLimit    = base;
+    NtCurrentTeb()->Tib.StackLimit    = (char *)base + page_size;
 
     /* setup guard page */
     VirtualProtect( base, 1, PAGE_READWRITE | PAGE_GUARD, NULL );