[PATCH 2/2] Revert "ntdll: Always send a Wow context to the server for Wow64 processes."

Jinoh Kang wine at gitlab.winehq.org
Tue May 24 10:36:13 CDT 2022


From: Jinoh Kang <jinoh.kang.kr at gmail.com>

This reverts commit ee99bd4bc1b7ef4c18d5254a76d72d3bd38f41e8.

If a Wow64 process is in emulation mode (e.g. CS points to 32-bit compat
segment on x86-64), the Wow64 register context is synonymous to the
native register context.  The client should indicate this condition by
omitting the Wow64 context when issuing a select request.  Then, the
wineserver automatically redirects Wow64 context writes to the native
context.

Signed-off-by: Jinoh Kang <jinoh.kang.kr at gmail.com>
---
 dlls/ntdll/unix/thread.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c
index 6d937675bcb..8de8e68a8e7 100644
--- a/dlls/ntdll/unix/thread.c
+++ b/dlls/ntdll/unix/thread.c
@@ -1011,9 +1011,6 @@ static void contexts_to_server( context_t server_contexts[2], CONTEXT *context )
         context_to_server( &server_contexts[count++], native_machine, native_context, native_machine );
         if (wow_context) context_to_server( &server_contexts[count++], main_image_info.Machine,
                                             wow_context, main_image_info.Machine );
-        else if (native_machine != main_image_info.Machine)
-            context_to_server( &server_contexts[count++], main_image_info.Machine,
-                               native_context, native_machine );
     }
     else
         context_to_server( &server_contexts[count++], native_machine,
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/123



More information about the wine-devel mailing list