commit 8a8a94aecbfcd908e5909113ea2139ce17c41b56
author Alexandre Julliard <julliard@winehq.org> Mon Dec 12 17:20:29 2005 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Dec 12 17:20:29 2005 +0100
tree f2ec71d83562742ea70d1543d017ec1da8480633
parent 770c4a1551a3198f7cf2282dbe749d95e4902804

kernel: Moved main stack initialization to process.c.

dlls/kernel/process.c

diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c
index d95d08c..af9e23f 100644
--- a/dlls/kernel/process.c
+++ b/dlls/kernel/process.c
@@ -967,6 +967,38 @@
 
 
 /***********************************************************************
+ *           init_stack
+ *
+ * Allocate the stack of new process.
+ */
+static void *init_stack(void)
+{
+    void *base;
+    SIZE_T stack_size, page_size = getpagesize();
+    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);
+    if (stack_size < 1024 * 1024) stack_size = 1024 * 1024;  /* Xlib needs a large stack */
+
+    if (!(base = VirtualAlloc( NULL, stack_size, MEM_COMMIT, PAGE_READWRITE )))
+    {
+        ERR( "failed to allocate main process stack\n" );
+        ExitProcess( 1 );
+    }
+
+    /* 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;
+
+    /* setup guard page */
+    VirtualProtect( base, 1, PAGE_READWRITE | PAGE_GUARD, NULL );
+    return NtCurrentTeb()->Tib.StackBase;
+}
+
+
+/***********************************************************************
  *           start_process
  *
  * Startup routine of a new process. Runs on the new process stack.
@@ -1010,7 +1042,6 @@
 {
     WCHAR *main_exe_name, *p;
     char error[1024];
-    DWORD stack_size = 0;
     int file_exists;
     PEB *peb = NtCurrentTeb()->Peb;
 
@@ -1130,13 +1161,8 @@
     set_library_wargv( __wine_main_argv );
     if (!build_command_line( __wine_main_wargv )) goto error;
 
-    stack_size = RtlImageNtHeader(peb->ImageBaseAddress)->OptionalHeader.SizeOfStackReserve;
-
-    /* allocate main thread stack */
-    if (!THREAD_InitStack( NtCurrentTeb(), stack_size )) goto error;
-
     /* switch to the new stack */
-    wine_switch_to_stack( start_process, NULL, NtCurrentTeb()->Tib.StackBase );
+    wine_switch_to_stack( start_process, NULL, init_stack() );
 
  error:
     ExitProcess( GetLastError() );