From 73f6718134a5a705b9fa92e8bd7de082c4998247 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 5 Jun 2005 18:22:02 +0000 Subject: [PATCH] Allocate the system view for builtin modules earlier in load_builtin_callback so that we also create one for the main executable. --- dlls/ntdll/loader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 15106ce22e0..937a0a965d5 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1200,6 +1200,9 @@ static void load_builtin_callback( void *module, const char *filename ) builtin_load_info->status = STATUS_INVALID_IMAGE_FORMAT; return; } + addr = module; + NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &nt->OptionalHeader.SizeOfImage, + MEM_SYSTEM | MEM_IMAGE, PAGE_EXECUTE_WRITECOPY ); if (!(nt->FileHeader.Characteristics & IMAGE_FILE_DLL)) { /* if we already have an executable, ignore this one */ @@ -1233,9 +1236,6 @@ static void load_builtin_callback( void *module, const char *filename ) return; } wm->ldr.Flags |= LDR_WINE_INTERNAL; - addr = module; - NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &nt->OptionalHeader.SizeOfImage, - MEM_SYSTEM | MEM_IMAGE, PAGE_EXECUTE_WRITECOPY ); /* fixup imports */