commit 82818284c3a227fdbd894e626b887f5bb6b3addc
author Peter Beutner <p.beutner@gmx.net> Wed Feb 22 12:21:00 2006 +0100
committer Alexandre Julliard <julliard@winehq.org> Wed Feb 22 12:21:00 2006 +0100
tree 2cbb40baa9efa22464d09ac3046611f6ecbee504
parent be07b6db594d279a3391b7fb5af8048dcd78473b

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.

dlls/msvcrt/cppexcept.c

diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c
index 3f28166..da7b0fb 100644
--- a/dlls/msvcrt/cppexcept.c
+++ b/dlls/msvcrt/cppexcept.c
@@ -285,6 +285,7 @@
     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 @@
             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 );