[PATCH 0/2] MR6841: wow64: Support running a BT module provided suspend routine.
Suspension in JITs cannot easily be handled on the unix side, so allow BT modules to provide their own suspend helper. This purely supports local thread suspension currently. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6841
From: Billy Laws <blaws05(a)gmail.com> --- dlls/ntdll/loader.c | 2 ++ dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/signal_arm64.c | 17 +++++++++++++++++ dlls/ntdll/signal_arm64ec.c | 7 +++++++ dlls/ntdll/signal_x86_64.c | 7 +++++++ include/winternl.h | 1 + 7 files changed, 36 insertions(+) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 2f2a7fe5427..4ed27e734d6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -4261,6 +4261,7 @@ static void build_wow64_main_module(void) static void (WINAPI *pWow64LdrpInitialize)( CONTEXT *ctx ); void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *context ) = NULL; +NTSTATUS (WINAPI *pWow64SuspendLocalThread)( HANDLE thread, ULONG *count ) = NULL; static void init_wow64( CONTEXT *context ) { @@ -4285,6 +4286,7 @@ static void init_wow64( CONTEXT *context ) GET_PTR( Wow64LdrpInitialize ); GET_PTR( Wow64PrepareForException ); + GET_PTR( Wow64SuspendLocalThread ); #undef GET_PTR imports_fixup_done = TRUE; } diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ddf1a120517..70f2315a778 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1126,6 +1126,7 @@ @ stdcall -arch=win64 RtlWow64PushCrossProcessWorkOntoWorkList(ptr ptr ptr) @ stdcall -arch=win64 RtlWow64RequestCrossProcessHeavyFlush(ptr) @ stdcall -arch=win64 RtlWow64SetThreadContext(long ptr) +@ stdcall -arch=win64 RtlWow64SuspendThread(long ptr) @ stub RtlWriteMemoryStream @ stdcall RtlWriteRegistryValue(long ptr wstr long ptr long) @ stub RtlZeroHeap diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index e58a07ba02a..5196db9bb28 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -78,6 +78,7 @@ extern void WINAPI KiUserApcDispatcher(CONTEXT*,ULONG_PTR,ULONG_PTR,ULONG_PTR,PN extern void WINAPI KiUserCallbackDispatcher(ULONG,void*,ULONG); extern void WINAPI KiUserCallbackDispatcherReturn(void); extern void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT *context ); +extern NTSTATUS (WINAPI *pWow64SuspendLocalThread)( HANDLE thread, ULONG *count ); /* debug helpers */ extern LPCSTR debugstr_us( const UNICODE_STRING *str ); diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c8eafc36211..0b6a414aabe 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -643,6 +643,23 @@ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) user_shared_data->ProcessorFeatures[feature]); } +/*********************************************************************** + * RtlWow64SuspendThread (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64SuspendThread( HANDLE thread, ULONG *count ) +{ + THREAD_BASIC_INFORMATION tbi; + + NTSTATUS ret = NtQueryInformationThread( thread, ThreadBasicInformation, &tbi, sizeof(tbi), NULL); + if (ret) return ret; + + if (tbi.ClientId.UniqueProcess != NtCurrentTeb()->ClientId.UniqueProcess) { + FIXME( "Non-local process thread suspend\n" ); + return STATUS_SUCCESS; + } + + return pWow64SuspendLocalThread( thread, count ); +} /************************************************************************* * RtlWalkFrameChain (NTDLL.@) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 438dfe8d439..1652be4a896 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1656,6 +1656,13 @@ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) return emulated_processor_features[feature]; } +/*********************************************************************** + * RtlWow64SuspendThread (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64SuspendThread( HANDLE thread, ULONG *count ) +{ + return NtSuspendThread( thread, count ); +} /************************************************************************* * RtlWalkFrameChain (NTDLL.@) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 7320aeabd49..24e513de0ef 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -846,6 +846,13 @@ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature]; } +/*********************************************************************** + * RtlWow64SuspendThread (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64SuspendThread( HANDLE thread, ULONG *count ) +{ + return NtSuspendThread( thread, count ); +} /************************************************************************* * RtlWalkFrameChain (NTDLL.@) diff --git a/include/winternl.h b/include/winternl.h index bc3ef12bc0d..1f30811e0e7 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -5119,6 +5119,7 @@ NTSYSAPI USHORT WINAPI RtlWow64GetCurrentMachine(void); NTSYSAPI NTSTATUS WINAPI RtlWow64GetProcessMachines(HANDLE,USHORT*,USHORT*); NTSYSAPI NTSTATUS WINAPI RtlWow64GetSharedInfoProcess(HANDLE,BOOLEAN*,WOW64INFO*); NTSYSAPI NTSTATUS WINAPI RtlWow64IsWowGuestMachineSupported(USHORT,BOOLEAN*); +NTSYSAPI NTSTATUS WINAPI RtlWow64SuspendThread(HANDLE,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI RtlZombifyActivationContext(HANDLE); NTSYSAPI NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6841
From: Billy Laws <blaws05(a)gmail.com> Suspension in JITs cannot easily be handled on the unix side, so allow BT modules to provide their own suspend helper. --- dlls/wow64/process.c | 2 +- dlls/wow64/syscall.c | 10 ++++++++++ dlls/wow64/wow64.spec | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 0153dba3433..6cb2fb0125f 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -1054,7 +1054,7 @@ NTSTATUS WINAPI wow64_NtSuspendThread( UINT *args ) HANDLE handle = get_handle( &args ); ULONG *count = get_ptr( &args ); - return NtSuspendThread( handle, count ); + return RtlWow64SuspendThread( handle, count ); } diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 790656b311e..db58a15ce9c 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -102,6 +102,7 @@ static void (WINAPI *pBTCpuProcessInit)(void); static NTSTATUS (WINAPI *pBTCpuSetContext)(HANDLE,HANDLE,void *,void *); static void (WINAPI *pBTCpuThreadInit)(void); static void (WINAPI *pBTCpuSimulate)(void) __attribute__((used)); +static NTSTATUS (WINAPI *pBTCpuSuspendLocalThread)(HANDLE,ULONG *); static void * (WINAPI *p__wine_get_unix_opcode)(void); static void * (WINAPI *pKiRaiseUserExceptionDispatcher)(void); void (WINAPI *pBTCpuFlushInstructionCache2)( const void *, SIZE_T ) = NULL; @@ -824,6 +825,7 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex GET_PTR( BTCpuProcessInit ); GET_PTR( BTCpuThreadInit ); GET_PTR( BTCpuResetToConsistentState ); + GET_PTR( BTCpuSuspendLocalThread ); GET_PTR( BTCpuSetContext ); GET_PTR( BTCpuSimulate ); GET_PTR( BTCpuFlushInstructionCache2 ); @@ -1510,3 +1512,11 @@ NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) return STATUS_SUCCESS; } + +/********************************************************************** + * Wow64SuspendLocalThread (wow64.@) + */ +NTSTATUS WINAPI Wow64SuspendLocalThread( HANDLE thread, ULONG *count ) +{ + return pBTCpuSuspendLocalThread( thread, count ); +} diff --git a/dlls/wow64/wow64.spec b/dlls/wow64/wow64.spec index 5b4e565e593..8f95dfcdbe5 100644 --- a/dlls/wow64/wow64.spec +++ b/dlls/wow64/wow64.spec @@ -22,7 +22,7 @@ @ stub Wow64ShallowThunkAllocSecurityQualityOfService32TO64_FNC @ stub Wow64ShallowThunkSIZE_T32TO64 @ stub Wow64ShallowThunkSIZE_T64TO32 -@ stub Wow64SuspendLocalThread +@ stdcall Wow64SuspendLocalThread(long ptr) @ stdcall -norelay Wow64SystemServiceEx(long ptr) @ stub Wow64ValidateUserCallTarget @ stub Wow64ValidateUserCallTargetFilter -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6841
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=149741 Your paranoid android. === debian11b (64 bit WoW report) === user32: input.c:4305: Test succeeded inside todo block: button_down_hwnd_todo 1: got MSG_TEST_WIN hwnd 00000000004200EE, msg WM_LBUTTONDOWN, wparam 0x1, lparam 0x320032 win.c:4070: Test failed: Expected active window 00000000024D0136, got 0000000000000000. win.c:4071: Test failed: Expected focus window 00000000024D0136, got 0000000000000000.
Hi, any update on that? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6841#note_138744
participants (4)
-
André Zwing (＠AndreRH) -
Billy Laws -
Billy Laws (＠bylaws)
-
Marvin