Skip to content

W
wine-winehq
Commit 73f67181 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Allocate the system view for builtin modules earlier in

load_builtin_callback so that we also create one for the main executable.
parent a8b541e2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
dlls/ntdll/loader.c
View file @ 73f67181
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment