commit cf4ca4e24e3480879b813d65ad2ed5f0c8a08cdf
author Alexandre Julliard <julliard@winehq.org> Sun Oct 12 02:26:20 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Oct 12 02:26:20 2003 +0000
tree 4be97734c3da1eca69bbe8ccdf9e3017e4fdc925
parent 88136f26cfbc2017452091ba378271440bc4b7ea

Moved the errno functions patching to wine_pthread_init_thread so that
it's done early enough now that kernel is only loaded later on.

scheduler/pthread.c

diff --git a/scheduler/pthread.c b/scheduler/pthread.c
index 134fe55..1191b35 100644
--- a/scheduler/pthread.c
+++ b/scheduler/pthread.c
@@ -157,12 +157,6 @@
 {
     memcpy( &funcs, functions, sizeof(funcs) );
     funcs.ptr_set_thread_data( &initial_descr );
-    initial_descr.cancel_state = PTHREAD_CANCEL_ENABLE;
-    initial_descr.cancel_type  = PTHREAD_CANCEL_ASYNCHRONOUS;
-    writejump( "__errno_location", __errno_location );
-    writejump( "__h_errno_location", __h_errno_location );
-    writejump( "__res_state", __res_state );
-    if (libc_uselocale) libc_uselocale( -1 /*LC_GLOBAL_LOCALE*/ );
 }
 
 
@@ -173,17 +167,24 @@
  */
 void wine_pthread_init_thread(void)
 {
+    struct pthread_descr_struct *descr;
+
     if (funcs.ptr_set_thread_data)
     {
-        struct pthread_descr_struct *descr = calloc( 1, sizeof(*descr) );
-
+        descr = calloc( 1, sizeof(*descr) );
         funcs.ptr_set_thread_data( descr );
-        descr->cancel_state = PTHREAD_CANCEL_ENABLE;
-        descr->cancel_type  = PTHREAD_CANCEL_ASYNCHRONOUS;
         if (libc_multiple_threads) *libc_multiple_threads = 1;
-        if (libc_uselocale) libc_uselocale( -1 /*LC_GLOBAL_LOCALE*/ );
     }
-    /* else it's the first thread, init will be done in wine_pthread_init_process */
+    else  /* first thread */
+    {
+        descr = &initial_descr;
+        writejump( "__errno_location", __errno_location );
+        writejump( "__h_errno_location", __h_errno_location );
+        writejump( "__res_state", __res_state );
+    }
+    descr->cancel_state = PTHREAD_CANCEL_ENABLE;
+    descr->cancel_type  = PTHREAD_CANCEL_ASYNCHRONOUS;
+    if (libc_uselocale) libc_uselocale( -1 /*LC_GLOBAL_LOCALE*/ );
 }