Alexandre Julliard : kernel: Fail more gracefully when loading a builtin exe didn't work.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Jan 24 06:44:55 CST 2006


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Jan 24 11:05:11 2006 +0100

kernel: Fail more gracefully when loading a builtin exe didn't work.

---

 dlls/kernel/process.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel/process.c b/dlls/kernel/process.c
index 4bfbbc9..bf2b392 100644
--- a/dlls/kernel/process.c
+++ b/dlls/kernel/process.c
@@ -1088,9 +1088,10 @@ void __wine_kernel_init(void)
     if (!main_exe_file)  /* no file handle -> Winelib app */
     {
         TRACE( "starting Winelib app %s\n", debugstr_w(main_exe_name) );
-        if (open_builtin_exe_file( main_exe_name, error, sizeof(error), 0, &file_exists ))
+        if (open_builtin_exe_file( main_exe_name, error, sizeof(error), 0, &file_exists ) &&
+            NtCurrentTeb()->Peb->ImageBaseAddress)
             goto found;
-        MESSAGE( "wine: cannot open builtin library for %s: %s\n",
+        MESSAGE( "wine: cannot open builtin exe for %s: %s\n",
                  debugstr_w(main_exe_name), error );
         ExitProcess(1);
     }




More information about the wine-cvs mailing list