Commit 5c922669 authored by Alexandre Julliard's avatar Alexandre Julliard

Fixed RtlUnwind signature (reported by Pierre d'Herbemont).

parent 963dd34e
...@@ -74,11 +74,6 @@ static CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, ...@@ -74,11 +74,6 @@ static CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0,
# error You must define GET_IP for this CPU # error You must define GET_IP for this CPU
#endif #endif
void WINAPI EXC_RtlRaiseException( PEXCEPTION_RECORD, PCONTEXT );
void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD, LPVOID,
PEXCEPTION_RECORD, DWORD, PCONTEXT );
void WINAPI EXC_NtRaiseException( PEXCEPTION_RECORD, PCONTEXT,
BOOL, PCONTEXT );
/******************************************************************* /*******************************************************************
* EXC_RaiseHandler * EXC_RaiseHandler
...@@ -309,15 +304,14 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) ...@@ -309,15 +304,14 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec )
/******************************************************************* /*******************************************************************
* RtlUnwind (NTDLL.@) * RtlUnwind (NTDLL.@)
*/ */
void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, LPVOID unusedEip, void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, PVOID unusedEip,
PEXCEPTION_RECORD pRecord, DWORD returnEax, PEXCEPTION_RECORD pRecord, PVOID returnEax, CONTEXT *context )
CONTEXT *context )
{ {
EXCEPTION_RECORD record, newrec; EXCEPTION_RECORD record, newrec;
PEXCEPTION_REGISTRATION_RECORD frame, dispatch; PEXCEPTION_REGISTRATION_RECORD frame, dispatch;
#ifdef __i386__ #ifdef __i386__
context->Eax = returnEax; context->Eax = (DWORD)returnEax;
#endif #endif
/* build an exception record, if we do not have one */ /* build an exception record, if we do not have one */
...@@ -383,8 +377,8 @@ void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, LPVOID unus ...@@ -383,8 +377,8 @@ void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, LPVOID unus
#ifdef DEFINE_REGS_ENTRYPOINT #ifdef DEFINE_REGS_ENTRYPOINT
DEFINE_REGS_ENTRYPOINT( RtlUnwind, EXC_RtlUnwind, 16, 16 ); DEFINE_REGS_ENTRYPOINT( RtlUnwind, EXC_RtlUnwind, 16, 16 );
#else #else
void WINAPI RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, LPVOID unusedEip, void WINAPI RtlUnwind( PVOID pEndFrame, PVOID unusedEip,
PEXCEPTION_RECORD pRecord, DWORD returnEax ) PEXCEPTION_RECORD pRecord, PVOID returnEax )
{ {
CONTEXT context; CONTEXT context;
memset( &context, 0, sizeof(context) ); memset( &context, 0, sizeof(context) );
......
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