Alexandre Julliard : kernel32: Move the wineboot event wait so that 16-bit processes wait too.
Alexandre Julliard
julliard at winehq.org
Tue May 13 14:10:36 CDT 2008
Module: wine
Branch: master
Commit: 12de7d7591aeb92e06ee8a8ba11876864f7d1c13
URL: http://source.winehq.org/git/wine.git/?a=commit;h=12de7d7591aeb92e06ee8a8ba11876864f7d1c13
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue May 13 20:26:37 2008 +0200
kernel32: Move the wineboot event wait so that 16-bit processes wait too.
---
dlls/kernel32/process.c | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 2118511..868cc04 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -1022,6 +1022,18 @@ void __wine_kernel_init(void)
RtlInitUnicodeString( &NtCurrentTeb()->Peb->ProcessParameters->DllPath,
MODULE_get_dll_load_path(main_exe_name) );
+ if (boot_event)
+ {
+ if (WaitForSingleObject( boot_event, 30000 )) WARN( "boot event wait timed out\n" );
+ CloseHandle( boot_event );
+ /* if we didn't find environment section, try again now that wineboot has run */
+ if (!got_environment)
+ {
+ set_registry_environment();
+ set_additional_environment();
+ }
+ }
+
if (!(peb->ImageBaseAddress = LoadLibraryExW( main_exe_name, 0, DONT_RESOLVE_DLL_REFERENCES )))
{
char msg[1024];
@@ -1041,18 +1053,6 @@ void __wine_kernel_init(void)
ExitProcess( error );
}
- if (boot_event)
- {
- if (WaitForSingleObject( boot_event, 30000 )) WARN( "boot event wait timed out\n" );
- CloseHandle( boot_event );
- /* if we didn't find environment section, try again now that wineboot has run */
- if (!got_environment)
- {
- set_registry_environment();
- set_additional_environment();
- }
- }
-
LdrInitializeThunk( 0, 0, 0, 0 );
/* switch to the new stack */
wine_switch_to_stack( start_process, NULL, NtCurrentTeb()->Tib.StackBase );
More information about the wine-cvs
mailing list