From 5c92266987cfcaefaef771319f52e7c096b4175a Mon Sep 17 00:00:00 2001 From: Alexandre Julliard <julliard@winehq.org> Date: Tue, 30 Dec 2003 19:26:19 +0000 Subject: [PATCH] Fixed RtlUnwind signature (reported by Pierre d'Herbemont). --- dlls/ntdll/exception.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index bc408eedd66..e5aced92792 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -74,11 +74,6 @@ static CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, # error You must define GET_IP for this CPU #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 @@ -309,15 +304,14 @@ void WINAPI RtlRaiseException( EXCEPTION_RECORD *rec ) /******************************************************************* * RtlUnwind (NTDLL.@) */ -void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, LPVOID unusedEip, - PEXCEPTION_RECORD pRecord, DWORD returnEax, - CONTEXT *context ) +void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, PVOID unusedEip, + PEXCEPTION_RECORD pRecord, PVOID returnEax, CONTEXT *context ) { EXCEPTION_RECORD record, newrec; PEXCEPTION_REGISTRATION_RECORD frame, dispatch; #ifdef __i386__ - context->Eax = returnEax; + context->Eax = (DWORD)returnEax; #endif /* build an exception record, if we do not have one */ @@ -383,8 +377,8 @@ void WINAPI EXC_RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, LPVOID unus #ifdef DEFINE_REGS_ENTRYPOINT DEFINE_REGS_ENTRYPOINT( RtlUnwind, EXC_RtlUnwind, 16, 16 ); #else -void WINAPI RtlUnwind( PEXCEPTION_REGISTRATION_RECORD pEndFrame, LPVOID unusedEip, - PEXCEPTION_RECORD pRecord, DWORD returnEax ) +void WINAPI RtlUnwind( PVOID pEndFrame, PVOID unusedEip, + PEXCEPTION_RECORD pRecord, PVOID returnEax ) { CONTEXT context; memset( &context, 0, sizeof(context) ); -- GitLab