kernel: Added support for exec'ing a new Win32 process.

Use it to restart execution if the main binary can't be loaded because of address space conflicts, and also for Win16/DOS support.

kernel: Added support for exec'ing a new Win32 process.
2cb0f432 · Alexandre Julliard · c316f0e4 · 2cb0f432 · 2cb0f432
Commit 2cb0f432 authored Jul 19, 2006 by Alexandre Julliard
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 80 additions and 49 deletions

process.c dlls/kernel/process.c +77 -43

virtual.c dlls/ntdll/virtual.c +3 -6

No files found.
--- a/dlls/kernel/process.c
+++ b/dlls/kernel/process.c
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -1053,12 +1053,9 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz
        relocs = &nt->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BASERELOC];
        if (nt->FileHeader.Characteristics & IMAGE_FILE_RELOCS_STRIPPED)
        {
-            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 );
+            WARN( "Need to relocate module from addr %lx, but there are no relocation records\n",
+                  nt->OptionalHeader.ImageBase );
+            status = STATUS_CONFLICTING_ADDRESSES;
            goto error;
        }