Commit c98d0eaa authored by Brendan Shanks's avatar Brendan Shanks Committed by Alexandre Julliard

ntdll: Only build the main module and ntdll once on Wow64.

Fixes +relay for applications that use multiple threads when running in new Wow64.
parent fe880597
...@@ -4131,9 +4131,6 @@ void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *contex ...@@ -4131,9 +4131,6 @@ void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *contex
static void init_wow64( CONTEXT *context ) static void init_wow64( CONTEXT *context )
{ {
build_wow64_main_module();
build_ntdll_module();
if (!imports_fixup_done) if (!imports_fixup_done)
{ {
HMODULE wow64; HMODULE wow64;
...@@ -4141,6 +4138,9 @@ static void init_wow64( CONTEXT *context ) ...@@ -4141,6 +4138,9 @@ static void init_wow64( CONTEXT *context )
NTSTATUS status; NTSTATUS status;
static const WCHAR wow64_path[] = L"C:\\windows\\system32\\wow64.dll"; static const WCHAR wow64_path[] = L"C:\\windows\\system32\\wow64.dll";
build_wow64_main_module();
build_ntdll_module();
if ((status = load_dll( NULL, wow64_path, 0, &wm, FALSE ))) if ((status = load_dll( NULL, wow64_path, 0, &wm, FALSE )))
{ {
ERR( "could not load %s, status %lx\n", debugstr_w(wow64_path), status ); ERR( "could not load %s, status %lx\n", debugstr_w(wow64_path), status );
......
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