msvcrt: Save esp before calling catch block and restore afterwards.

It seems like the esp value (which is saved at [ebp-16]) is sometimes changed inside the catch handler so we end up with a bogus esp afterwards. To avoid that save it before calling the catch block.

msvcrt: Save esp before calling catch block and restore afterwards.
82818284 · Peter Beutner · Alexandre Julliard · be07b6db · 82818284
Commit 82818284 authored Feb 22, 2006 by Peter Beutner Committed by Alexandre Julliard Feb 22, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

cppexcept.c dlls/msvcrt/cppexcept.c +2 -0

No files found.
--- a/dlls/msvcrt/cppexcept.c
+++ b/dlls/msvcrt/cppexcept.c
@@ -285,6 +285,7 @@ inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame 
    struct catch_func_nested_frame nested_frame;
    int trylevel = frame->trylevel;
    thread_data_t *thread_data = msvcrt_get_thread_data();
+    DWORD save_esp = ((DWORD*)frame)[-1];

    for (i = 0; i < descr->tryblock_count; i++)
    {
@@ -339,6 +340,7 @@ inline static void call_catch_block( PEXCEPTION_RECORD rec, cxx_exception_frame 
            thread_data->exc_record = nested_frame.prev_rec;
            __wine_pop_frame( &nested_frame.frame );

+            ((DWORD*)frame)[-1] = save_esp;
            if (info && info->destructor) call_dtor( info->destructor, object );
            TRACE( "done, continuing at %p\n", addr );