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

Fixes +relay for applications that use multiple threads when running in new Wow64.

ntdll: Only build the main module and ntdll once on Wow64.
c98d0eaa · Brendan Shanks · Alexandre Julliard · fe880597 · c98d0eaa
Commit c98d0eaa authored Jan 23, 2024 by Brendan Shanks Committed by Alexandre Julliard Jan 24, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

loader.c dlls/ntdll/loader.c +3 -3

No files found.
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -4131,9 +4131,6 @@ void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *contex

 static void init_wow64( CONTEXT *context )
 {
-    build_wow64_main_module();
-    build_ntdll_module();
-
    if (!imports_fixup_done)
    {
        HMODULE wow64;
@@ -4141,6 +4138,9 @@ static void init_wow64( CONTEXT *context )
        NTSTATUS status;
        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 )))
        {
            ERR( "could not load %s, status %lx\n", debugstr_w(wow64_path), status );