mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-01 07:03:37 +00:00
include: Add a prototype for RtlUnwindEx on x86_64.
This commit is contained in:
parent
7c95b251e0
commit
2e81ba5f4f
|
@ -897,7 +897,7 @@
|
|||
@ stdcall RtlUnlockHeap(long)
|
||||
# @ stub RtlUnlockMemoryStreamRegion
|
||||
@ stdcall -register RtlUnwind(ptr ptr ptr ptr)
|
||||
@ stdcall -arch=x86_64 RtlUnwindEx(long long ptr long ptr)
|
||||
@ stdcall -arch=x86_64 RtlUnwindEx(ptr ptr ptr ptr ptr ptr)
|
||||
@ stdcall RtlUpcaseUnicodeChar(long)
|
||||
@ stdcall RtlUpcaseUnicodeString(ptr ptr long)
|
||||
@ stdcall RtlUpcaseUnicodeStringToAnsiString(ptr ptr long)
|
||||
|
|
|
@ -2772,8 +2772,8 @@ static void call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *
|
|||
/*******************************************************************
|
||||
* RtlUnwindEx (NTDLL.@)
|
||||
*/
|
||||
void WINAPI RtlUnwindEx( ULONG64 end_frame, ULONG64 target_ip, EXCEPTION_RECORD *rec,
|
||||
ULONG64 retval, CONTEXT *orig_context, UNWIND_HISTORY_TABLE *table )
|
||||
void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec,
|
||||
PVOID retval, CONTEXT *orig_context, UNWIND_HISTORY_TABLE *table )
|
||||
{
|
||||
EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList;
|
||||
EXCEPTION_RECORD record;
|
||||
|
@ -2796,7 +2796,7 @@ void WINAPI RtlUnwindEx( ULONG64 end_frame, ULONG64 target_ip, EXCEPTION_RECORD
|
|||
|
||||
rec->ExceptionFlags |= EH_UNWINDING | (end_frame ? 0 : EH_EXIT_UNWIND);
|
||||
|
||||
TRACE( "code=%x flags=%x end_frame=%lx target_ip=%lx rip=%016lx\n",
|
||||
TRACE( "code=%x flags=%x end_frame=%p target_ip=%p rip=%016lx\n",
|
||||
rec->ExceptionCode, rec->ExceptionFlags, end_frame, target_ip, orig_context->Rip );
|
||||
TRACE(" rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n",
|
||||
orig_context->Rax, orig_context->Rbx, orig_context->Rcx, orig_context->Rdx );
|
||||
|
@ -2809,11 +2809,11 @@ void WINAPI RtlUnwindEx( ULONG64 end_frame, ULONG64 target_ip, EXCEPTION_RECORD
|
|||
|
||||
context = *orig_context;
|
||||
dispatch.EstablisherFrame = context.Rsp;
|
||||
dispatch.TargetIp = target_ip;
|
||||
dispatch.TargetIp = (ULONG64)target_ip;
|
||||
dispatch.ContextRecord = &context;
|
||||
dispatch.HistoryTable = table;
|
||||
|
||||
while (dispatch.EstablisherFrame != end_frame)
|
||||
while (dispatch.EstablisherFrame != (ULONG64)end_frame)
|
||||
{
|
||||
new_context = context;
|
||||
|
||||
|
@ -2899,30 +2899,30 @@ void WINAPI RtlUnwindEx( ULONG64 end_frame, ULONG64 target_ip, EXCEPTION_RECORD
|
|||
|
||||
if (dispatch.LanguageHandler)
|
||||
{
|
||||
if (end_frame && (dispatch.EstablisherFrame > end_frame))
|
||||
if (end_frame && (dispatch.EstablisherFrame > (ULONG64)end_frame))
|
||||
{
|
||||
ERR( "invalid end frame %lx/%lx\n", dispatch.EstablisherFrame, end_frame );
|
||||
ERR( "invalid end frame %lx/%p\n", dispatch.EstablisherFrame, end_frame );
|
||||
raise_status( STATUS_INVALID_UNWIND_TARGET, rec );
|
||||
}
|
||||
call_unwind_handler( rec, &dispatch );
|
||||
}
|
||||
else /* hack: call builtin handlers registered in the tib list */
|
||||
{
|
||||
while ((ULONG64)teb_frame < new_context.Rsp && (ULONG64)teb_frame < end_frame)
|
||||
while ((ULONG64)teb_frame < new_context.Rsp && (ULONG64)teb_frame < (ULONG64)end_frame)
|
||||
{
|
||||
TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler );
|
||||
dispatch.EstablisherFrame = (ULONG64)teb_frame;
|
||||
call_teb_unwind_handler( rec, &dispatch, teb_frame );
|
||||
teb_frame = __wine_pop_frame( teb_frame );
|
||||
}
|
||||
if ((ULONG64)teb_frame == end_frame && end_frame < new_context.Rsp) break;
|
||||
if ((ULONG64)teb_frame == (ULONG64)end_frame && (ULONG64)end_frame < new_context.Rsp) break;
|
||||
dispatch.EstablisherFrame = new_context.Rsp;
|
||||
}
|
||||
|
||||
context = new_context;
|
||||
}
|
||||
context.Rax = retval;
|
||||
context.Rip = target_ip;
|
||||
context.Rax = (ULONG64)retval;
|
||||
context.Rip = (ULONG64)target_ip;
|
||||
TRACE( "returning to %lx stack %lx\n", context.Rip, context.Rsp );
|
||||
set_cpu_context( &context );
|
||||
}
|
||||
|
@ -2931,8 +2931,8 @@ void WINAPI RtlUnwindEx( ULONG64 end_frame, ULONG64 target_ip, EXCEPTION_RECORD
|
|||
/*******************************************************************
|
||||
* RtlUnwind (NTDLL.@)
|
||||
*/
|
||||
void WINAPI __regs_RtlUnwind( ULONG64 frame, ULONG64 target_ip, EXCEPTION_RECORD *rec,
|
||||
ULONG64 retval, CONTEXT *context )
|
||||
void WINAPI __regs_RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec,
|
||||
void *retval, CONTEXT *context )
|
||||
{
|
||||
RtlUnwindEx( frame, target_ip, rec, retval, context, NULL );
|
||||
}
|
||||
|
@ -2982,7 +2982,7 @@ EXCEPTION_DISPOSITION WINAPI __C_specific_handler( EXCEPTION_RECORD *rec,
|
|||
}
|
||||
}
|
||||
TRACE( "unwinding to target %lx\n", dispatch->ImageBase + table->ScopeRecord[i].JumpTarget );
|
||||
RtlUnwindEx( frame, dispatch->ImageBase + table->ScopeRecord[i].JumpTarget,
|
||||
RtlUnwindEx( (void *)frame, (char *)dispatch->ImageBase + table->ScopeRecord[i].JumpTarget,
|
||||
rec, 0, context, dispatch->HistoryTable );
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2497,7 +2497,9 @@ NTSYSAPI NTSTATUS WINAPI RtlUnicodeToOemN(LPSTR,DWORD,LPDWORD,LPCWSTR,DWORD);
|
|||
NTSYSAPI ULONG WINAPI RtlUniform(PULONG);
|
||||
NTSYSAPI BOOLEAN WINAPI RtlUnlockHeap(HANDLE);
|
||||
NTSYSAPI void WINAPI RtlUnwind(PVOID,PVOID,PEXCEPTION_RECORD,PVOID);
|
||||
#ifdef __ia64__
|
||||
#ifdef __x86_64__
|
||||
NTSYSAPI void WINAPI RtlUnwindEx(PVOID,PVOID,PEXCEPTION_RECORD,PVOID,PCONTEXT,PUNWIND_HISTORY_TABLE);
|
||||
#elif defined(__ia64__)
|
||||
NTSYSAPI void WINAPI RtlUnwind2(FRAME_POINTERS,PVOID,PEXCEPTION_RECORD,PVOID,PCONTEXT);
|
||||
NTSYSAPI void WINAPI RtlUnwindEx(FRAME_POINTERS,PVOID,PEXCEPTION_RECORD,PVOID,PCONTEXT,PUNWIND_HISTORY_TABLE);
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue