Improve message given on image map failure

Mike Hearn mike at navi.cx
Sat Mar 13 17:20:18 CST 2004


Mike Hearn <mike at navi.cx>
Improve message given on image map failure

Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.28
diff -u -r1.28 virtual.c
--- dlls/ntdll/virtual.c        17 Feb 2004 20:22:43 -0000      1.28
+++ dlls/ntdll/virtual.c        13 Mar 2004 23:12:56 -0000
@@ -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;





More information about the wine-patches mailing list