[PATCH 2/4] msvcrt: Use trampoline for _beginthreadex().

[Arkadiusz Hiler]

This way we can call _endthreadex() at the end as stated in the documentation.

This will also simplify FreeLibrary()-safe implementation for UCRT.

thread_data->handle is not set on purpose, so that accidental
_endthread() won't close it, see: existing tests.

Signed-off-by: Arkadiusz Hiler 
---
 dlls/msvcrt/thread.c | 55 ++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 50 insertions(+), 5 deletions(-)

diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c
index 650afdc08af..523e463d695 100644
--- a/dlls/msvcrt/thread.c
+++ b/dlls/msvcrt/thread.c
@@ -27,7 +27,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);

typedef struct {
   HANDLE thread;
-  _beginthread_start_routine_t start_address;
+  union {
+      _beginthread_start_routine_t start_address;
+      _beginthreadex_start_routine_t start_address_ex;
+  };
   void *arglist;
 } _beginthread_trampoline_t;

@@ -146,6 +149,21 @@ uintptr_t CDECL _beginthread(
   return (uintptr_t)thread;
 }

+/*********************************************************************
+ *		_beginthreadex_trampoline
+ */
+static DWORD CALLBACK _beginthreadex_trampoline(LPVOID arg)
+{
+    unsigned int retval;
+    _beginthread_trampoline_t local_trampoline;
+
+    memcpy(&local_trampoline,arg,sizeof(local_trampoline));
+    free(arg);
+
+    retval = local_trampoline.start_address_ex(local_trampoline.arglist);
+
+    _endthreadex(retval);
+}
 /*********************************************************************
  *		_beginthreadex (MSVCRT.@)
  */
@@ -157,12 +175,39 @@ uintptr_t CDECL _beginthreadex(
   unsigned int initflag,   /* [in] Initial state of new thread (0 for running or CREATE_SUSPEND for suspended) */
   unsigned int *thrdaddr)  /* [out] Points to a 32-bit variable that receives the thread identifier */
 {
+  _beginthread_trampoline_t* trampoline;
+  HANDLE thread;
+
   TRACE("(%p, %d, %p, %p, %d, %p)\n", security, stack_size, start_address, arglist, initflag, thrdaddr);

-  /* FIXME */
-  return (uintptr_t)CreateThread(security, stack_size,
-				     start_address, arglist,
-				     initflag, thrdaddr);
+  trampoline = malloc(sizeof(*trampoline));
+  if(!trampoline) {
+      *_errno() = EAGAIN;
+      return -1;
+  }
+
+  thread = CreateThread(security, stack_size, _beginthreadex_trampoline,
+          trampoline, initflag | CREATE_SUSPENDED, thrdaddr);
+  if(!thread) {
+      free(trampoline);
+      *_errno() = EAGAIN;
+      return -1;
+  }
+
+  trampoline->thread = thread;
+  trampoline->start_address_ex = start_address;
+  trampoline->arglist = arglist;
+
+  if(initflag & CREATE_SUSPENDED)
+      return (uintptr_t)thread;
+
+  if(ResumeThread(thread) == -1) {
+      free(trampoline);
+      *_errno() = EAGAIN;
+      return -1;
+  }
+
+  return (uintptr_t)thread;
 }

#if _MSVCR_VER>=80