Daniel Lehman : msvcrt: Stop at trylevel for ControlPc on target frame for non-consolidate unwinds.
Alexandre Julliard
julliard at winehq.org
Mon Apr 24 16:11:23 CDT 2017
Module: wine
Branch: master
Commit: 64c4c39746049fcaaa3af42ee982df2fad18dd62
URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c4c39746049fcaaa3af42ee982df2fad18dd62
Author: Daniel Lehman <dlehman at esri.com>
Date: Fri Apr 21 12:41:31 2017 -0700
msvcrt: Stop at trylevel for ControlPc on target frame for non-consolidate unwinds.
Signed-off-by: Daniel Lehman <dlehman at esri.com>
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcrt/except_x86_64.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c
index 8210f7b..e891567 100644
--- a/dlls/msvcrt/except_x86_64.c
+++ b/dlls/msvcrt/except_x86_64.c
@@ -515,7 +515,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
}
if (frame == orig_frame)
- cxx_local_unwind(frame, dispatch, descr, -1);
+ cxx_local_unwind(frame, dispatch, descr, rec->ExceptionFlags & EH_TARGET_UNWIND ? trylevel : -1);
return ExceptionContinueSearch;
}
if (!descr->tryblock_count) return ExceptionContinueSearch;
More information about the wine-cvs
mailing list