ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msvcrt: Handle frames with CXX_FRAME_MAGIC_VC6 and CXX_FRAME_MAGIC_VC7 magic value. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2016-03-28 20:12:18 +02:00 committed by Alexandre Julliard
parent 63aea551ca
commit 953d6c88d1
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msvcrt/except_x86_64.c
View File

@ -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("unwind_help %d\n", descr->unwind_help);
if (descr->magic <= CXX_FRAME_MAGIC_VC6) return;
TRACE("expect list: %x\n", descr->expect_list);
if (descr->magic <= CXX_FRAME_MAGIC_VC7) return;
TRACE("flags: %08x\n", descr->flags);
}
@ -444,7 +446,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
{
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);
return ExceptionContinueSearch;