X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=platform%2Fwin32%2Fcrt0.c;h=d32a6ac703976a8e2793a6c04d5be482b9aba575;hb=99677c35ae2bfd651274191143e140d730fc9925;hp=5fb49552f56915eaf878f0b30d61dc8596ab4b37;hpb=57b65100f3689d865cef937ed99be737e6909362;p=pdclib.old

diff --git a/platform/win32/crt0.c b/platform/win32/crt0.c
index 5fb4955..d32a6ac 100644
--- a/platform/win32/crt0.c
+++ b/platform/win32/crt0.c
@@ -2,6 +2,7 @@
 #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>
 
@@ -23,6 +24,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;
@@ -102,15 +104,23 @@ 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(        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 );
+    }
+
     atexit(freeArgs);
 
     int exitStatus = main(argc, argv, NULL);