Skip to content

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

ntdll: Only create the main module on the 32-bit side for wow64.

parent 93a5dce0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 5 deletions
dlls/ntdll/loader.c
View file @ de81e2ea
...@@ -4219,16 +4219,13 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR ...@@ -4219,16 +4219,13 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
init_user_process_params(); init_user_process_params();
load_global_options(); load_global_options();
version_init(); version_init();
build_ntdll_module( meminfo.AllocationBase );
get_env_var( L"WINESYSTEMDLLPATH", 0, &system_dll_path ); if (NtCurrentTeb()->WowTebOffset) init_wow64( context );
wm = build_main_module(); wm = build_main_module();
wm->ldr.LoadCount = -1; wm->ldr.LoadCount = -1;
build_ntdll_module( meminfo.AllocationBase );
if (NtCurrentTeb()->WowTebOffset) init_wow64( context );
if ((status = load_dll( NULL, L"kernel32.dll", 0, &kernel32, FALSE )) != STATUS_SUCCESS) if ((status = load_dll( NULL, L"kernel32.dll", 0, &kernel32, FALSE )) != STATUS_SUCCESS)
{ {
MESSAGE( "wine: could not load kernel32.dll, status %lx\n", status ); MESSAGE( "wine: could not load kernel32.dll, status %lx\n", status );
...@@ -4245,6 +4242,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR ...@@ -4245,6 +4242,7 @@ void WINAPI LdrInitializeThunk( CONTEXT *context, ULONG_PTR unknown2, ULONG_PTR
actctx_init(); actctx_init();
locale_init(); locale_init();
get_env_var( L"WINESYSTEMDLLPATH", 0, &system_dll_path );
if (wm->ldr.Flags & LDR_COR_ILONLY) if (wm->ldr.Flags & LDR_COR_ILONLY)
status = fixup_imports_ilonly( wm, NULL, entry ); status = fixup_imports_ilonly( wm, NULL, entry );
else else
......
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