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

vcruntime140_1: Add support for pointer to object in unwind info. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49307
Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2020-06-08 20:29:39 +02:00 committed by Alexandre Julliard
parent 3078f10d43
commit bf454cc394
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/vcruntime140_1/except_x86_64.c
View File

@ -79,6 +79,7 @@ typedef struct
#define UNWIND_TYPE_NO_HANDLER 0 #define UNWIND_TYPE_NO_HANDLER 0
#define UNWIND_TYPE_DTOR_OBJ 1 #define UNWIND_TYPE_DTOR_OBJ 1
#define UNWIND_TYPE_DTOR_PTR 2
#define UNWIND_TYPE_FRAME 3 #define UNWIND_TYPE_FRAME 3
typedef struct typedef struct
@ -162,7 +163,7 @@ static inline void* rva_to_ptr(UINT rva, ULONG64 base)
return rva ? (void*)(base+rva) : NULL; return rva ? (void*)(base+rva) : NULL;
} }
static BOOL read_unwind_info(BYTE **b, unwind_info *ui) static void read_unwind_info(BYTE **b, unwind_info *ui)
{ {
BYTE *p = *b; BYTE *p = *b;
@ -174,17 +175,18 @@ static BOOL read_unwind_info(BYTE **b, unwind_info *ui)
switch (ui->type) switch (ui->type)
{ {
case UNWIND_TYPE_NO_HANDLER: case UNWIND_TYPE_NO_HANDLER:
return TRUE; break;
case UNWIND_TYPE_DTOR_OBJ: case UNWIND_TYPE_DTOR_OBJ:
ui->handler = read_rva(b); ui->handler = read_rva(b);
ui->object = decode_uint(b); /* frame offset */ ui->object = decode_uint(b); /* frame offset to object */
return TRUE; break;
case UNWIND_TYPE_DTOR_PTR:
ui->handler = read_rva(b);
ui->object = decode_uint(b); /* frame offset to pointer to object */
break;
case UNWIND_TYPE_FRAME: case UNWIND_TYPE_FRAME:
ui->handler = read_rva(b); ui->handler = read_rva(b);
return TRUE; break;
default:
FIXME("unknown type: %d\n", ui->type);
return FALSE;
} }
} }
@ -277,7 +279,7 @@ static BOOL validate_cxx_function_descr4(const cxx_function_descr *descr, DISPAT
BYTE *entry = unwind_map; BYTE *entry = unwind_map;
unwind_info ui; unwind_info ui;
if (!read_unwind_info(&unwind_map, &ui)) return FALSE; read_unwind_info(&unwind_map, &ui);
if (ui.prev < (BYTE*)rva_to_ptr(descr->unwind_map, image_base)) ui.prev = NULL; if (ui.prev < (BYTE*)rva_to_ptr(descr->unwind_map, image_base)) ui.prev = NULL;
TRACE(" %d (%p): type 0x%x prev %p func 0x%x(%p) object 0x%x\n", TRACE(" %d (%p): type 0x%x prev %p func 0x%x(%p) object 0x%x\n",
i, entry, ui.type, ui.prev, ui.handler, i, entry, ui.type, ui.prev, ui.handler,
@ -452,6 +454,8 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch,
{ {
handler_dtor = rva_to_ptr(ui.handler, dispatch->ImageBase); handler_dtor = rva_to_ptr(ui.handler, dispatch->ImageBase);
obj = rva_to_ptr(ui.object, frame); obj = rva_to_ptr(ui.object, frame);
if(ui.type == UNWIND_TYPE_DTOR_PTR)
obj = *(void**)obj;
TRACE("handler: %p object: %p\n", handler_dtor, obj); TRACE("handler: %p object: %p\n", handler_dtor, obj);
handler_dtor(obj, frame); handler_dtor(obj, frame);
} }