ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Delay ntdll.dll loading until more initialization is done. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-09-28 19:38:17 +02:00
parent 48e88074cd
commit 20e0fd6e99
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/ntdll/unix/loader.c
View File

@ -1577,6 +1577,8 @@ static void start_main_thread(void)
init_cpu_info(); init_cpu_info();
init_files(); init_files();
NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 );
load_ntdll();
load_libwine();
status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs );
if (status) exec_process( status ); if (status) exec_process( status );
server_init_process_done(); server_init_process_done();
@ -1785,10 +1787,7 @@ void __wine_main( int argc, char *argv[], char *envp[] )
#endif #endif
virtual_init(); virtual_init();
load_ntdll();
init_environment( argc, argv, envp ); init_environment( argc, argv, envp );
load_libwine();
#ifdef __APPLE__ #ifdef __APPLE__
apple_main_thread(); apple_main_thread();