Commit 107b289a authored by Alexandre Julliard's avatar Alexandre Julliard

Fixed a couple of bugs in _except_handler3.

parent cf67b00a
......@@ -38,13 +38,15 @@ typedef struct _MSVCRT_EXCEPTION_FRAME
PEXCEPTION_POINTERS xpointers;
} MSVCRT_EXCEPTION_FRAME;
#define TRYLEVEL_END 0xff /* End of trylevel list */
#define TRYLEVEL_END 0xffffffff /* End of trylevel list */
#if defined(__GNUC__) && defined(__i386__)
#define CALL_FINALLY_BLOCK(code_block, base_ptr) \
__asm__ __volatile__ ("movl %0,%%eax; movl %1,%%ebp; call *%%eax" \
: : "g" (code_block), "g" (base_ptr))
inline static void call_finally_block( void *code_block, void *base_ptr )
{
__asm__ __volatile__ ("movl %1,%%ebp; call *%%eax" \
: : "a" (code_block), "g" (base_ptr));
}
static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec,
struct __EXCEPTION_FRAME* frame,
......@@ -201,7 +203,7 @@ int _except_handler3(PEXCEPTION_RECORD rec,
*/
frame->trylevel = pScopeTable->previousTryLevel;
TRACE("__finally block %p\n",pScopeTable[trylevel].lpfnHandler);
CALL_FINALLY_BLOCK(pScopeTable[trylevel].lpfnHandler, frame->_ebp);
call_finally_block(pScopeTable[trylevel].lpfnHandler, &frame->_ebp);
ERR("Returned from __finally block - expect crash!\n");
}
}
......
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