Module: wine Branch: refs/heads/master Commit: 916c4b6b8c2e32645b652299b9461b565e9a1de3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=916c4b6b8c2e32645b652299...
Author: Peter Beutner p.beutner@gmx.net Date: Fri Feb 17 17:37:26 2006 +0100
msvcrt: Remove bogus code. We can't just pop a exception record from the exception handler list which we haven't put there.
---
dlls/msvcrt/cppexcept.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/msvcrt/cppexcept.c b/dlls/msvcrt/cppexcept.c index 29d7b58..073674a 100644 --- a/dlls/msvcrt/cppexcept.c +++ b/dlls/msvcrt/cppexcept.c @@ -259,7 +259,7 @@ inline static void call_catch_block( PEX { UINT i; int j; - void *addr, *prev_frame, *object = (void *)rec->ExceptionInformation[1]; + void *addr, *object = (void *)rec->ExceptionInformation[1]; struct catch_func_nested_frame nested_frame; int trylevel = frame->trylevel; thread_data_t *thread_data = msvcrt_get_thread_data(); @@ -318,8 +318,7 @@ inline static void call_catch_block( PEX
if (info && info->destructor) call_dtor( info->destructor, object ); TRACE( "done, continuing at %p\n", addr ); - prev_frame = NtCurrentTeb()->Tib.ExceptionList; - __wine_pop_frame( prev_frame ); + continue_after_catch( frame, addr ); } }