msvcrt: Stop at trylevel for ControlPc on target frame for non-consolidate unwinds.

Signed-off-by: Daniel Lehman <dlehman@esri.com> Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Stop at trylevel for ControlPc on target frame for non-consolidate unwinds.
64c4c397 · Daniel Lehman · Alexandre Julliard · b0326bea · 64c4c397
Commit 64c4c397 authored Apr 21, 2017 by Daniel Lehman Committed by Alexandre Julliard Apr 24, 2017
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

except_x86_64.c dlls/msvcrt/except_x86_64.c +1 -1

No files found.
--- 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;