Commit 953d6c88 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

msvcrt: Handle frames with CXX_FRAME_MAGIC_VC6 and CXX_FRAME_MAGIC_VC7 magic value.

parent 63aea551
...@@ -177,7 +177,9 @@ static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_b ...@@ -177,7 +177,9 @@ static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_b
TRACE(" %d: ip %x state %d\n", i, ipmap[i].ip, ipmap[i].state); TRACE(" %d: ip %x state %d\n", i, ipmap[i].ip, ipmap[i].state);
} }
TRACE("unwind_help %d\n", descr->unwind_help); TRACE("unwind_help %d\n", descr->unwind_help);
if (descr->magic <= CXX_FRAME_MAGIC_VC6) return;
TRACE("expect list: %x\n", descr->expect_list); TRACE("expect list: %x\n", descr->expect_list);
if (descr->magic <= CXX_FRAME_MAGIC_VC7) return;
TRACE("flags: %08x\n", descr->flags); TRACE("flags: %08x\n", descr->flags);
} }
...@@ -444,7 +446,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, ...@@ -444,7 +446,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
{ {
cxx_exception_type *exc_type; cxx_exception_type *exc_type;
if (descr->magic != CXX_FRAME_MAGIC_VC8) if (descr->magic<CXX_FRAME_MAGIC_VC6 || descr->magic>CXX_FRAME_MAGIC_VC8)
{ {
FIXME("unhandled frame magic %x\n", descr->magic); FIXME("unhandled frame magic %x\n", descr->magic);
return ExceptionContinueSearch; return ExceptionContinueSearch;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment