commit 4d2cfee1fac75bae941a93162dbbe070836d12cb
author Mike Hearn <mike@navi.cx> Mon Mar 15 20:06:50 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Mar 15 20:06:50 2004 +0000
tree c74100ae59a5efe8661570b8cf8c41331d03e200
parent 9eb33c82f35851d3f55a5a5265fcd6213675c40b

Improve message given on image map failure.

dlls/ntdll/virtual.c

diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 66766bd..9a25082 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -724,9 +724,10 @@
         relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC];
         if (!relocs->VirtualAddress || !relocs->Size)
         {
-            if (nt->OptionalHeader.ImageBase == 0x400000)
-                ERR("Standard load address for a Win32 program (0x00400000) not available - security-patched kernel ?\n");
-            else
+            if (nt->OptionalHeader.ImageBase == 0x400000) {
+                ERR("Image was mapped at %p: standard load address for a Win32 program (0x00400000) not available\n", ptr);
+                ERR("Do you have exec-shield or prelink active?\n");
+            } else
                 ERR( "FATAL: Need to relocate module from addr %lx, but there are no relocation records\n",
                      nt->OptionalHeader.ImageBase );
             goto error;