X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=platform%2Fwin32%2Fcrt0.c;h=7da2a8151e2ad3b279e0c9005d45b8b56b22c919;hb=026148e2e90368c0b23192f506e15aa6197105aa;hp=dd00c53009fa360f342ea45082a174089d4bed47;hpb=48b352165d2cb89126ddde1323a138820687970a;p=pdclib diff --git a/platform/win32/crt0.c b/platform/win32/crt0.c index dd00c53..7da2a81 100644 --- a/platform/win32/crt0.c +++ b/platform/win32/crt0.c @@ -2,6 +2,7 @@ #include #include #include +#include #include // Watcom bug: winnt.h assumes string.h defines wchar_t #include @@ -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; @@ -97,7 +99,10 @@ 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); @@ -108,9 +113,17 @@ _PDCLIB_noreturn void mainCRTStartup( void ) 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); exit(exitStatus); -} +} \ No newline at end of file