Module: wine Branch: master Commit: 5031c6d938f119580e8dbc7817ef68724d17954e URL: https://gitlab.winehq.org/wine/wine/-/commit/5031c6d938f119580e8dbc7817ef687... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 24 14:40:46 2023 +0100 ntdll: Convert WoW context to native context when running in 32-bit code. It fixes single-stepping in the kernel32:debugger tests. --- dlls/ntdll/unix/thread.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index bf025a38188..4c8c04cf9fc 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1068,7 +1068,10 @@ static void contexts_from_server( CONTEXT *context, context_t server_contexts[2] if (native_context) { context_from_server( native_context, &server_contexts[0], native_machine ); - if (wow_context) context_from_server( wow_context, &server_contexts[1], main_image_info.Machine ); + if (wow_context) + context_from_server( wow_context, &server_contexts[1], main_image_info.Machine ); + else + context_from_server( native_context, &server_contexts[1], native_machine ); } else context_from_server( wow_context, &server_contexts[0], main_image_info.Machine ); }