system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-03 08:19:41 +00:00
Code Issues Projects Releases Wiki Activity

msvcrt: Don't use rva_to_ptr() for non-RVA values.

Browse Source
This commit is contained in:
Alexandre Julliard 2024-05-31 16:33:13 +02:00
parent 1f7333f1ae
commit d85ba60371
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/msvcrt/except_x86_64.c
View File

@ -78,7 +78,7 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch,
{
const unwind_info *unwind_table = rva_to_ptr(descr->unwind_table, dispatch->ImageBase);
void (__cdecl *handler)(ULONG64 unk, ULONG64 rbp);
int *unwind_help = rva_to_ptr(descr->unwind_help, frame);
int *unwind_help = (int *)(frame + descr->unwind_help);
int trylevel;
if (unwind_help[0] == -2)
@ -137,7 +137,7 @@ static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec)
EXCEPTION_RECORD *untrans_rec = (void*)rec->ExceptionInformation[6];
CONTEXT *context = (void*)rec->ExceptionInformation[7];
void* (__cdecl *handler)(ULONG64 unk, ULONG64 rbp) = (void*)rec->ExceptionInformation[5];
int *unwind_help = rva_to_ptr(descr->unwind_help, frame);
int *unwind_help = (int *)(frame + descr->unwind_help);
EXCEPTION_POINTERS ep = { prev_rec, context };
cxx_catch_ctx ctx;
void *ret_addr = NULL;
@ -214,7 +214,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, CONTEXT *context,
if (!i)
in_catch = NULL;
unwind_help = rva_to_ptr(descr->unwind_help, orig_frame);
unwind_help = (int *)(orig_frame + descr->unwind_help);
if (trylevel > unwind_help[1])
unwind_help[0] = unwind_help[1] = trylevel;
else
@ -336,7 +336,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame,
{
TRACE("nested exception detected\n");
unwindlevel = tryblock->end_level;
orig_frame = *(ULONG64*)rva_to_ptr(catchblock->frame, frame);
orig_frame = *(ULONG64*)(frame + catchblock->frame);
TRACE("setting orig_frame to %I64x\n", orig_frame);
}
}

4
dlls/msvcrt/handler4.c
View File

@ -375,7 +375,7 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch,
if (ui.handler)
{
handler_dtor = rva_to_ptr(ui.handler, dispatch->ImageBase);
obj = rva_to_ptr(ui.object, frame);
obj = (void *)(frame + ui.object);
if(ui.type == UNWIND_TYPE_DTOR_PTR)
obj = *(void**)obj;
TRACE("handler: %p object: %p\n", handler_dtor, obj);
@ -619,7 +619,7 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame,
if (descr->header & FUNC_DESCR_IS_CATCH)
{
TRACE("nested exception detected\n");
orig_frame = *(ULONG64*)rva_to_ptr(descr->frame, frame);
orig_frame = *(ULONG64 *)(frame + descr->frame);
TRACE("setting orig_frame to %Ix\n", orig_frame);
}