commit 12f29b5076ac3ae090a48959b89251f62094da3e
author Alexandre Julliard <julliard@winehq.org> Fri Mar 17 15:16:57 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Mar 17 15:16:57 2000 +0000
tree 1c61c4d4caa39230af1e1d93b84fa97b91f63755
parent aabef0291205f5b44af6f60a65f2313f8f1fe30b

Have threads and processes exit more cleanly whenever possible.

scheduler/thread.c

diff --git a/scheduler/thread.c b/scheduler/thread.c
index 9082cb8..a0c7391 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -336,8 +336,23 @@
  */
 void WINAPI ExitThread( DWORD code ) /* [in] Exit code for this thread */
 {
-    MODULE_DllThreadDetach( NULL );
-    TerminateThread( GetCurrentThread(), code );
+    struct terminate_thread_request *req = get_req_buffer();
+
+     /* send the exit code to the server */
+    req->handle    = GetCurrentThread();
+    req->exit_code = code;
+    server_call( REQ_TERMINATE_THREAD );
+    if (req->last)
+    {
+        MODULE_DllProcessDetach( TRUE, (LPVOID)1 );
+        TASK_KillTask( 0 );
+        exit( code );
+    }
+    else
+    {
+        MODULE_DllThreadDetach( NULL );
+        SYSDEPS_ExitThread( code );
+    }
 }
 
 
@@ -590,10 +605,16 @@
     HANDLE handle, /* [in] Handle to thread */
     DWORD exitcode)  /* [in] Exit code for thread */
 {
+    BOOL ret;
     struct terminate_thread_request *req = get_req_buffer();
     req->handle    = handle;
     req->exit_code = exitcode;
-    return !server_call( REQ_TERMINATE_THREAD );
+    if ((ret = !server_call( REQ_TERMINATE_THREAD )) && req->self)
+    {
+        if (req->last) exit( exitcode );
+        else SYSDEPS_ExitThread( exitcode );
+    }
+    return ret;
 }