X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=platform%2Fwin32%2Fcrt0.c;h=bead33206c1541a8f782a52cca59abb2c6c68ce5;hb=39358ba4521f18f66c118f3d9bcbeee6f6a2c87f;hp=dd00c53009fa360f342ea45082a174089d4bed47;hpb=c952424afa451bb4c2ca04510b2c3994909fbdcb;p=pdclib.old

diff --git a/platform/win32/crt0.c b/platform/win32/crt0.c
index dd00c53..bead332 100644
--- a/platform/win32/crt0.c
+++ b/platform/win32/crt0.c
@@ -2,8 +2,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
+#include <threads.h>
 #include <wchar.h> // Watcom bug: winnt.h assumes string.h defines wchar_t
 #include <windows.h>
+#include <_PDCLIB_io.h>
+#include <_PDCLIB_locale.h>
 
 static char ** argvToAnsi( wchar_t ** wargv, int argc )
 {
@@ -23,6 +26,7 @@ static char ** argvToAnsi( wchar_t ** wargv, int argc )
         if(rv != sz) {
             fputs("Error in C runtime initialization: "
                   "size mismatch during character set conversion", stderr);
+            abort();
         }
     }
     return argv;
@@ -97,20 +101,39 @@ static LONG CALLBACK sehExceptionFilter( EXCEPTION_POINTERS * exInfo )
 }
 
 extern int main( int argc, char ** argv, char ** envp );
-_PDCLIB_noreturn void mainCRTStartup( void ) 
+
+void __cdecl mainCRTStartup( void );
+
+void __cdecl mainCRTStartup( void ) 
 {
-    stdin->handle  = GetStdHandle(STD_INPUT_HANDLE);
-    stdout->handle = GetStdHandle(STD_OUTPUT_HANDLE);
-    stderr->handle = GetStdHandle(STD_ERROR_HANDLE);
+    stdin->handle.pointer  = GetStdHandle(STD_INPUT_HANDLE);
+    stdout->handle.pointer = GetStdHandle(STD_OUTPUT_HANDLE);
+    stderr->handle.pointer = GetStdHandle(STD_ERROR_HANDLE);
 
     oldFilter = SetUnhandledExceptionFilter( sehExceptionFilter );
 
     cl    = GetCommandLineW();
     wargv = CommandLineToArgvW(cl, &argc);
     argv  = argvToAnsi(wargv, argc);
+
+    if(tss_create(&_PDCLIB_locale_tss, (tss_dtor_t) freelocale) 
+            != thrd_success) {
+        fputs( "Error during C runtime initialization: "
+               "Unable to allocate locale TLS", stderr );
+        exit( EXIT_FAILURE );
+    }
+
+    if(        mtx_init(&stdin->lock, mtx_recursive) != thrd_success 
+            || mtx_init(&stdout->lock, mtx_recursive) != thrd_success
+            || mtx_init(&stderr->lock, mtx_recursive) != thrd_success ) {
+        fputs( "Error during C runtime initialization: "
+            "Unable to allocate stdio mutex", stderr );
+        exit( EXIT_FAILURE );
+    }
+
     atexit(freeArgs);
 
     int exitStatus = main(argc, argv, NULL);
 
     exit(exitStatus);
-}
+}
\ No newline at end of file