Changeset 21981 for trunk/src

Timestamp:

Mar 18, 2012, 12:41:27 AM (13 years ago)

Author:

dmik

Message:

kernel32: Fix stack size interpretation in CreateThread().

It now uses the stack size parameter as a number of bytes to
pre-commit, not as a total stack size, unless
STACK_SIZE_PARAM_IS_A_RESERVATION is set.

Closes #77.

Location:

trunk/src/kernel32

Files:

• hmthread.cpp (modified) (3 diffs)
• thread.cpp (modified) (3 diffs)
• thread.h (modified) (2 diffs)

trunk/src/kernel32/hmthread.cpp

@@ -79 +79 @@
     pHMHandleData->dwUserData = (DWORD)threadobj;
 
+    // round up to page size
+    cbStack = (cbStack + 0xFFF) & ~0xFFF;
+
+    // per default 1MB stack per thread
+    DWORD cbTotalStack = (WinExe) ? WinExe->getDefaultStackSize() : 0x100000;
+    DWORD cbCommitStack = 0;
+    if (fdwCreate & STACK_SIZE_PARAM_IS_A_RESERVATION) {
+        if (cbStack)
+            cbTotalStack = cbStack;
+    } else {
+        if (cbStack >= cbTotalStack) {
+            // round up the new reserved size to 1MB
+            cbTotalStack = (cbStack + 0xFFFFF) & ~0xFFFFF;
+            cbCommitStack = cbStack;
+        } else if (cbStack) {
+            cbCommitStack = cbStack;
+        }
+    }
+
+    dprintf(("Thread stack size 0x%X (0x%X to commit)", cbTotalStack, cbCommitStack));
+
     //SvL: This doesn't really create a thread, but only sets up the
     //     handle of the current thread.
@@ -85 +106 @@
         return pHMHandleData->hHMHandle;
     }
-    winthread = new Win32Thread(lpStartAddr, lpvThreadParm, fdwCreate, hThread);
+    winthread = new Win32Thread(lpStartAddr, lpvThreadParm, fdwCreate, hThread, cbCommitStack);
 
     if(winthread == 0) {
@@ -100 +121 @@
     }
 
-    // @@@PH Note: with debug code enabled, ODIN might request more stack space!
-    //SvL: Also need more stack in release build (RealPlayer 7 sometimes runs
-    //     out of stack
-    if (cbStack > 0) {
-        cbStack <<= 1;     // double stack
-    }
-    else {
-        cbStack = (WinExe) ? WinExe->getDefaultStackSize() : 0x100000; // per default 1MB stack per thread
-    }
-    dprintf(("Thread stack size 0x%x", cbStack));
-
     //************************************************************************************
     //NOTE: If we ever decide to allocate our own stack, then we MUST use VirtualAlloc!!!!
     //      (alignment reasons)
     //************************************************************************************
-    pHMHandleData->hHMHandle = O32_CreateThread(lpsa, cbStack, winthread->GetOS2Callback(),
+    pHMHandleData->hHMHandle = O32_CreateThread(lpsa, cbTotalStack, winthread->GetOS2Callback(),
                                                 (LPVOID)winthread, fdwCreate, lpIDThread);
 

trunk/src/kernel32/thread.cpp

@@ -674 +674 @@
 //******************************************************************************
 //******************************************************************************
-Win32Thread::Win32Thread(LPTHREAD_START_ROUTINE pUserCallback, LPVOID lpData, DWORD dwFlags, HANDLE hThread)
+Win32Thread::Win32Thread(LPTHREAD_START_ROUTINE pUserCallback, LPVOID lpData, DWORD dwFlags, HANDLE hThread, DWORD cbCommitStack)
 {
     lpUserData = lpData;
@@ -680 +680 @@
     this->dwFlags = dwFlags;
     this->hThread = hThread;
+    this->cbCommitStack = cbCommitStack;
 
     teb = CreateTEB(hThread, 0xFFFFFFFF);
@@ -721 +722 @@
 
     dprintf(("Stack top 0x%x, stack end 0x%x", winteb->stack_top, winteb->stack_low));
+
+    if (me->cbCommitStack) {
+        // pre-commit part of the stack
+        PBYTE stack = ((PBYTE) (winteb->stack_top)) - 1;
+        for (int i = 0; i < (me->cbCommitStack + 0xFFF) / 0x1000; i++) {
+            BYTE unused = *stack;
+            unused = unused;
+            stack -= 0x1000;
+        }
+    }
 
     if( IsDBCSEnv())

trunk/src/kernel32/thread.h

@@ -18 +18 @@
 {
 public:
-    Win32Thread(LPTHREAD_START_ROUTINE pUserCallback, LPVOID lpData, DWORD dwFlags, HANDLE hThread);
+    Win32Thread(LPTHREAD_START_ROUTINE pUserCallback, LPVOID lpData, DWORD dwFlags, HANDLE hThread, DWORD cbCommitStack);
 
     PTHREAD_START_ROUTINE_O32 GetOS2Callback()  { return Win32ThreadProc; };
@@ -31 +31 @@
     HANDLE      hThread;
     LPVOID      teb;
+    DWORD       cbCommitStack;
 
     static DWORD OPEN32API Win32ThreadProc(LPVOID lpData);