Skip to content

W
wine-winehq
Commit 21a3690a authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

wow64: Preserve TEB exception frame in Wow64KiUserCallbackDispatcher.

parent de5f640a
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
dlls/wow64/syscall.c
View file @ 21a3690a
...@@ -850,6 +850,8 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON ...@@ -850,6 +850,8 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON
NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len,
void **ret_ptr, ULONG *ret_len ) void **ret_ptr, ULONG *ret_len )
{ {
TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset);
ULONG teb_frame = teb32->Tib.ExceptionList;
struct user_callback_frame frame; struct user_callback_frame frame;
frame.prev_frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA]; frame.prev_frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA];
...@@ -916,6 +918,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, ...@@ -916,6 +918,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len,
break; break;
} }
teb32->Tib.ExceptionList = teb_frame;
NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = frame.prev_frame; NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = frame.prev_frame;
NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = frame.temp_list; NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = frame.temp_list;
return frame.status; return frame.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