Alexandre Julliard : kernel32: Use a longer wineboot timeout for the initial prefix creation.

Alexandre Julliard julliard at winehq.org
Tue Aug 18 10:01:10 CDT 2009


Module: wine
Branch: master
Commit: e49918b5a2cdcbf5e775bda499e0c266532540fa
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e49918b5a2cdcbf5e775bda499e0c266532540fa

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Aug 18 12:17:04 2009 +0200

kernel32: Use a longer wineboot timeout for the initial prefix creation.

---

 dlls/kernel32/process.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
index 0be47e7..92eb01a 100644
--- a/dlls/kernel32/process.c
+++ b/dlls/kernel32/process.c
@@ -1079,9 +1079,11 @@ void CDECL __wine_kernel_init(void)
 
     if (boot_events[0])
     {
-        DWORD count = 1;
+        DWORD timeout = 30000, count = 1;
+
         if (boot_events[1]) count++;
-        if (WaitForMultipleObjects( count, boot_events, FALSE, 30000 ) == WAIT_TIMEOUT)
+        if (!got_environment) timeout = 300000;  /* initial prefix creation can take longer */
+        if (WaitForMultipleObjects( count, boot_events, FALSE, timeout ) == WAIT_TIMEOUT)
             ERR( "boot event wait timed out\n" );
         CloseHandle( boot_events[0] );
         if (boot_events[1]) CloseHandle( boot_events[1] );




More information about the wine-cvs mailing list