June 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : winedump: Fix dumping of catchblocks for 32-bit modules.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 3f296440f5247c5f05937db247adf545a8081298 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f296440f5247c5f05937db247adf5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:11:41 2024 +0200 winedump: Fix dumping of catchblocks for 32-bit modules. The frame member isn't present on 32-bit. --- tools/winedump/pe.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 8f103e8e2a8..6acab7e4773 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -982,6 +982,14 @@ static void dump_cxx_exception_data( unsigned int rva, unsigned int func_rva ) UINT frame; } *catchblock; + const struct + { + UINT flags; + UINT type_info; + int offset; + UINT handler; + } *catchblock32; + const struct { UINT ip; @@ -1032,22 +1040,28 @@ static void dump_cxx_exception_data( unsigned int rva, unsigned int func_rva ) for (i = 0; i < func->tryblock_count; i++) { catchblock = RVA( tryblock[i].catchblock, sizeof(*catchblock) ); + catchblock32 = RVA( tryblock[i].catchblock, sizeof(*catchblock32) ); printf( " %d: start %d end %d catch %d count %u\n", i, tryblock[i].start, tryblock[i].end, tryblock[i].catch, tryblock[i].catchblock_count ); for (j = 0; j < tryblock[i].catchblock_count; j++) { const char *type = "<none>"; - if (catchblock[j].type_info) + + if (PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + if (catchblock[j].type_info) type = RVA( catchblock[j].type_info + 16, 1 ); + printf( " %d: flags %x offset %+d handler %08x frame %x type %s\n", j, + catchblock[j].flags, catchblock[j].offset, + catchblock[j].handler, catchblock[j].frame, type ); + } + else { - if (PE_nt_headers->OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) - type = RVA( catchblock[j].type_info + 16, 1 ); - else - type = RVA( catchblock[j].type_info + 8, 1 ); + if (catchblock32[j].type_info) type = RVA( catchblock32[j].type_info + 8, 1 ); + printf( " %d: flags %x offset %+d handler %08x type %s\n", j, + catchblock32[j].flags, catchblock32[j].offset, + catchblock32[j].handler, type ); } - printf( " %d: flags %x offset %+d handler %08x frame %x type %s\n", j, - catchblock[j].flags, catchblock[j].offset, - catchblock[j].handler, catchblock[j].frame, type ); } } }

1 0

Alexandre Julliard : msvcrt: The catchblock frame member isn't present on 32-bit.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 2bc870eccd7e1c1642e365516968412c17dcc73e URL: https://gitlab.winehq.org/wine/wine/-/commit/2bc870eccd7e1c1642e36551696841… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:12:17 2024 +0200 msvcrt: The catchblock frame member isn't present on 32-bit. --- dlls/msvcrt/cppexcept.h | 2 ++ dlls/msvcrt/except.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 10b3a200b66..e682222cb4c 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -90,7 +90,9 @@ typedef struct UINT type_info; int offset; UINT handler; +#ifdef _WIN64 UINT frame; +#endif } catchblock_info; typedef struct diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 074d6051a78..278ff68df78 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -74,7 +74,7 @@ void dump_function_descr( const cxx_function_descr *descr, uintptr_t base ) TRACE( " %d: flags %x offset %d handler %p", j, catchblock[j].flags, catchblock[j].offset, catchblock[j].handler ? rtti_rva(catchblock[j].handler, base) : NULL ); -#ifdef RTTI_USE_RVA +#ifdef _WIN64 TRACE( " frame %x", catchblock[j].frame ); #endif TRACE( " type %p %s\n", type_info, dbgstr_type_info(type_info) );

1 0

Alexandre Julliard : msvcrt: Use pointer-sized types instead of hardcoding 64-bit in __CxxFrameHandler.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 3bb1b3fecc2c7be2af540c20fc5024f08514eb88 URL: https://gitlab.winehq.org/wine/wine/-/commit/3bb1b3fecc2c7be2af540c20fc5024… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:15:35 2024 +0200 msvcrt: Use pointer-sized types instead of hardcoding 64-bit in __CxxFrameHandler. --- dlls/msvcrt/except_x86_64.c | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 80ddd19bf6c..5108ad7fc6e 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -49,8 +49,8 @@ typedef struct typedef struct { - ULONG64 dest_frame; - ULONG64 orig_frame; + ULONG_PTR dest_frame; + ULONG_PTR orig_frame; EXCEPTION_RECORD *seh_rec; DISPATCHER_CONTEXT *dispatch; const cxx_function_descr *descr; @@ -68,11 +68,11 @@ static inline int ip_to_state( const cxx_function_descr *descr, uintptr_t ip, ui return ret; } -static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, +static void cxx_local_unwind(ULONG_PTR frame, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, int last_level) { const unwind_info *unwind_table = rtti_rva(descr->unwind_table, dispatch->ImageBase); - void (__cdecl *handler)(ULONG64 unk, ULONG64 rbp); + void (__cdecl *handler)(ULONG_PTR unk, ULONG_PTR frame); int *unwind_help = (int *)(frame + descr->unwind_help); int trylevel; @@ -126,12 +126,12 @@ static void CALLBACK cxx_catch_cleanup(BOOL normal, void *c) static void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) { - ULONG64 frame = rec->ExceptionInformation[1]; + ULONG_PTR frame = rec->ExceptionInformation[1]; const cxx_function_descr *descr = (void*)rec->ExceptionInformation[2]; EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[4]; 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]; + void* (__cdecl *handler)(ULONG_PTR unk, ULONG_PTR frame) = (void*)rec->ExceptionInformation[5]; int *unwind_help = (int *)(frame + descr->unwind_help); EXCEPTION_POINTERS ep = { prev_rec, context }; cxx_catch_ctx ctx; @@ -183,11 +183,11 @@ static inline BOOL cxx_is_consolidate(const EXCEPTION_RECORD *rec) static inline void find_catch_block(EXCEPTION_RECORD *rec, CONTEXT *context, EXCEPTION_RECORD *untrans_rec, - ULONG64 frame, DISPATCHER_CONTEXT *dispatch, + ULONG_PTR frame, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, - cxx_exception_type *info, ULONG64 orig_frame) + cxx_exception_type *info, ULONG_PTR orig_frame) { - ULONG64 exc_base = (rec->NumberParameters == 4 ? rec->ExceptionInformation[3] : 0); + ULONG_PTR exc_base = (rec->NumberParameters == 4 ? rec->ExceptionInformation[3] : 0); void *handler, *object = (void *)rec->ExceptionInformation[1]; int trylevel = ip_to_state( descr, dispatch->ControlPc, dispatch->ImageBase ); thread_data_t *data = msvcrt_get_thread_data(); @@ -285,14 +285,14 @@ static void check_noexcept( PEXCEPTION_RECORD rec, } } -static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, +static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG_PTR frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr) { int trylevel = ip_to_state( descr, dispatch->ControlPc, dispatch->ImageBase ); cxx_exception_type *exc_type; - ULONG64 orig_frame = frame; - ULONG64 throw_base; + ULONG_PTR orig_frame = frame; + ULONG_PTR throw_base; DWORD throw_func_off; void *throw_func; UINT i, j; @@ -329,10 +329,9 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rtti_rva(catchblock->handler, dispatch->ImageBase) == throw_func) { - TRACE("nested exception detected\n"); unwindlevel = tryblock->end_level; - orig_frame = *(ULONG64*)(frame + catchblock->frame); - TRACE("setting orig_frame to %I64x\n", orig_frame); + orig_frame = *(ULONG_PTR *)(frame + catchblock->frame); + TRACE("nested exception detected, setting orig_frame to %Ix\n", orig_frame); } } } @@ -365,7 +364,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (TRACE_ON(seh)) { - TRACE("handling C++ exception rec %p frame %I64x descr %p\n", rec, frame, descr); + TRACE("handling C++ exception rec %p frame %Ix descr %p\n", rec, frame, descr); TRACE_EXCEPTION_TYPE(exc_type, rec->ExceptionInformation[3]); dump_function_descr(descr, dispatch->ImageBase); } @@ -375,7 +374,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, thread_data_t *data = msvcrt_get_thread_data(); exc_type = NULL; - TRACE("handling C exception code %lx rec %p frame %I64x descr %p\n", + TRACE("handling C exception code %lx rec %p frame %Ix descr %p\n", rec->ExceptionCode, rec, frame, descr); if (data->se_translator) { @@ -408,10 +407,10 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, /********************************************************************* * __CxxFrameHandler (MSVCRT.@) */ -EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 frame, +EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG_PTR frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) { - TRACE( "%p %I64x %p %p\n", rec, frame, context, dispatch ); + TRACE( "%p %Ix %p %p\n", rec, frame, context, dispatch ); return cxx_frame_handler( rec, frame, context, dispatch, rtti_rva(*(UINT *)dispatch->HandlerData, dispatch->ImageBase) ); }

1 0

Alexandre Julliard : msvcrt: Share __CxxFrameHandler implementation with ARM platforms.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 1404fcd3ea52b2b3466f3086ddf7c4834877a567 URL: https://gitlab.winehq.org/wine/wine/-/commit/1404fcd3ea52b2b3466f3086ddf7c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:15:51 2024 +0200 msvcrt: Share __CxxFrameHandler implementation with ARM platforms. --- dlls/msvcrt/except.c | 384 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/except_arm.c | 11 -- dlls/msvcrt/except_arm64.c | 11 -- dlls/msvcrt/except_arm64ec.c | 10 -- dlls/msvcrt/except_x86_64.c | 375 ------------------------------------------ 5 files changed, 384 insertions(+), 407 deletions(-)

1 0

Alexandre Julliard : msvcrt: Add platform-specific helpers to call C++ exception handlers.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 07d8612b75d69a31ceee5b3f6b39042299e1b943 URL: https://gitlab.winehq.org/wine/wine/-/commit/07d8612b75d69a31ceee5b3f6b3904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:17:23 2024 +0200 msvcrt: Add platform-specific helpers to call C++ exception handlers. --- dlls/msvcrt/cppexcept.h | 4 +++ dlls/msvcrt/except.c | 19 +++++------ dlls/msvcrt/except_arm.c | 34 +++++++++++++++++++ dlls/msvcrt/except_arm64.c | 58 +++++++++++++++++++++++++++++++++ dlls/msvcrt/except_arm64ec.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/except_x86_64.c | 37 +++++++++++++++++++++ 6 files changed, 218 insertions(+), 11 deletions(-)

1 0

Alexandre Julliard : msvcrt: Add platform-specific helpers to retrieve the exception PC.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 33e783c5ba8c7b98fd3b078c3b0bf2bf57cbea18 URL: https://gitlab.winehq.org/wine/wine/-/commit/33e783c5ba8c7b98fd3b078c3b0bf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 08:24:15 2024 +0200 msvcrt: Add platform-specific helpers to retrieve the exception PC. --- dlls/msvcrt/cppexcept.h | 1 + dlls/msvcrt/except.c | 15 ++++----------- dlls/msvcrt/except_arm.c | 11 +++++++++++ dlls/msvcrt/except_arm64.c | 11 +++++++++++ dlls/msvcrt/except_arm64ec.c | 11 +++++++++++ dlls/msvcrt/except_x86_64.c | 9 +++++++++ 6 files changed, 47 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index f6a02c44362..b6f962a62e0 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -284,6 +284,7 @@ extern int handle_fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS #ifndef __i386__ extern void *call_catch_handler( EXCEPTION_RECORD *rec ); extern void *call_unwind_handler( void *func, uintptr_t frame, DISPATCHER_CONTEXT *dispatch ); +extern ULONG_PTR get_exception_pc( DISPATCHER_CONTEXT *dispatch ); #endif #if _MSVCR_VER >= 80 diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 77d10cc7176..374357ed096 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -165,16 +165,9 @@ static void cxx_local_unwind(ULONG_PTR frame, DISPATCHER_CONTEXT *dispatch, { const unwind_info *unwind_table = rtti_rva(descr->unwind_table, dispatch->ImageBase); int *unwind_help = (int *)(frame + descr->unwind_help); - int trylevel; + int trylevel = unwind_help[0]; - if (unwind_help[0] == -2) - { - trylevel = ip_to_state( descr, dispatch->ControlPc, dispatch->ImageBase ); - } - else - { - trylevel = unwind_help[0]; - } + if (trylevel == -2) trylevel = ip_to_state( descr, get_exception_pc(dispatch), dispatch->ImageBase ); TRACE("current level: %d, last level: %d\n", trylevel, last_level); while (trylevel > last_level) @@ -277,7 +270,7 @@ static inline void find_catch_block(EXCEPTION_RECORD *rec, CONTEXT *context, { ULONG_PTR exc_base = (rec->NumberParameters == 4 ? rec->ExceptionInformation[3] : 0); void *handler, *object = (void *)rec->ExceptionInformation[1]; - int trylevel = ip_to_state( descr, dispatch->ControlPc, dispatch->ImageBase ); + int trylevel = ip_to_state( descr, get_exception_pc(dispatch), dispatch->ImageBase ); thread_data_t *data = msvcrt_get_thread_data(); const tryblock_info *in_catch; EXCEPTION_RECORD catch_record; @@ -378,7 +371,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG_PTR frame, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr) { - int trylevel = ip_to_state( descr, dispatch->ControlPc, dispatch->ImageBase ); + int trylevel = ip_to_state( descr, get_exception_pc(dispatch), dispatch->ImageBase ); cxx_exception_type *exc_type; ULONG_PTR orig_frame = frame; ULONG_PTR throw_base; diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index b25bbd32175..b2bf94d5338 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -73,6 +73,17 @@ void *call_unwind_handler( void *handler, ULONG_PTR frame, DISPATCHER_CONTEXT *d } +/******************************************************************* + * get_exception_pc + */ +ULONG_PTR get_exception_pc( DISPATCHER_CONTEXT *dispatch ) +{ + ULONG_PTR pc = dispatch->ControlPc; + if (dispatch->ControlPcIsUnwound) pc -= 2; + return pc; +} + + /********************************************************************* * handle_fpieee_flt */ diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index d577211503b..6d515f8b150 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -98,6 +98,17 @@ void *call_unwind_handler( void *handler, ULONG_PTR frame, DISPATCHER_CONTEXT *d } +/******************************************************************* + * get_exception_pc + */ +ULONG_PTR get_exception_pc( DISPATCHER_CONTEXT *dispatch ) +{ + ULONG_PTR pc = dispatch->ControlPc; + if (dispatch->ControlPcIsUnwound) pc -= 4; + return pc; +} + + /******************************************************************* * _setjmp (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c index b3af0d7e419..12790cee7d8 100644 --- a/dlls/msvcrt/except_arm64ec.c +++ b/dlls/msvcrt/except_arm64ec.c @@ -117,6 +117,17 @@ void *call_unwind_handler( void *handler, ULONG_PTR frame, DISPATCHER_CONTEXT *d } +/******************************************************************* + * get_exception_pc + */ +ULONG_PTR get_exception_pc( DISPATCHER_CONTEXT *dispatch ) +{ + ULONG_PTR pc = dispatch->ControlPc; + if (RtlIsEcCode( pc ) && ((DISPATCHER_CONTEXT_ARM64EC *)dispatch)->ControlPcIsUnwound) pc -= 4; + return pc; +} + + /********************************************************************* * handle_fpieee_flt */ diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 26eeb542f0f..1c3cc62bc7f 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -78,6 +78,15 @@ void *call_unwind_handler( void *handler, ULONG_PTR frame, DISPATCHER_CONTEXT *d } +/******************************************************************* + * get_exception_pc + */ +ULONG_PTR get_exception_pc( DISPATCHER_CONTEXT *dispatch ) +{ + return dispatch->ControlPc; +} + + /******************************************************************* * longjmp (MSVCRT.@) */

1 0

Alexandre Julliard : msvcrt: Use platform-specific handlers also for __CxxFrameHandler4.
by Alexandre Julliard 05 Jun '24

05 Jun '24

Module: wine Branch: master Commit: 26dfb963f3d3b6f51954d70abacf91015e03d016 URL: https://gitlab.winehq.org/wine/wine/-/commit/26dfb963f3d3b6f51954d70abacf91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 5 10:15:17 2024 +0200 msvcrt: Use platform-specific handlers also for __CxxFrameHandler4. --- dlls/msvcrt/handler4.c | 28 ++++++++-------------------- dlls/vcruntime140_1/Makefile.in | 2 ++ 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c index 32694faca1c..8ffdbdbf063 100644 --- a/dlls/msvcrt/handler4.c +++ b/dlls/msvcrt/handler4.c @@ -306,15 +306,16 @@ static BOOL validate_cxx_function_descr4(const cxx_function_descr_v4 *descr, DIS return TRUE; } -static inline int ip_to_state4(BYTE *ip_map, UINT count, DISPATCHER_CONTEXT *dispatch, ULONG64 ip) +static inline int ip_to_state4(const cxx_function_descr_v4 *descr, DISPATCHER_CONTEXT *dispatch, ULONG64 ip) { + BYTE *ip_map = rtti_rva( descr->ip_map, dispatch->ImageBase ); ULONG64 state_ip; ipmap_info ii; int ret = -1; UINT i; state_ip = dispatch->ImageBase + dispatch->FunctionEntry->BeginAddress; - for (i = 0; i < count; i++) + for (i = 0; i < descr->ip_count; i++) { read_ipmap_info(&ip_map, &ii); state_ip += ii.ip; @@ -322,7 +323,7 @@ static inline int ip_to_state4(BYTE *ip_map, UINT count, DISPATCHER_CONTEXT *dis ret = ii.state; } - TRACE("state %d\n", ret); + TRACE("%I64x -> state %d\n", ip, ret); return ret; } @@ -335,11 +336,7 @@ static void cxx_local_unwind4(ULONG64 frame, DISPATCHER_CONTEXT *dispatch, void *obj; int i; - if (trylevel == -2) - { - trylevel = ip_to_state4(rtti_rva(descr->ip_map, dispatch->ImageBase), - descr->ip_count, dispatch, dispatch->ControlPc); - } + if (trylevel == -2) trylevel = ip_to_state4( descr, dispatch, get_exception_pc(dispatch) ); TRACE("current level: %d, last level: %d\n", trylevel, last_level); @@ -403,17 +400,13 @@ static void CALLBACK cxx_catch_cleanup(BOOL normal, void *c) static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) { - ULONG64 frame = rec->ExceptionInformation[1]; EXCEPTION_RECORD *prev_rec = (void*)rec->ExceptionInformation[4]; 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]; EXCEPTION_POINTERS ep = { prev_rec, context }; cxx_catch_ctx ctx; void *ret_addr = NULL; - TRACE("calling handler %p\n", handler); - ctx.rethrow = FALSE; __CxxRegisterExceptionObject(&ep, &ctx.frame_info); ctx.search_state = rec->ExceptionInformation[2]; @@ -424,7 +417,7 @@ static void* WINAPI call_catch_block4(EXCEPTION_RECORD *rec) { __TRY { - ret_addr = handler(0, frame); + ret_addr = call_catch_handler( rec ); } __EXCEPT_CTX(cxx_rethrow_filter, &ctx) { @@ -485,11 +478,7 @@ static inline void find_catch_block4(EXCEPTION_RECORD *rec, CONTEXT *context, (*processing_throw)++; - if (trylevel == -2) - { - trylevel = ip_to_state4(rtti_rva(descr->ip_map, dispatch->ImageBase), - descr->ip_count, dispatch, dispatch->ControlPc); - } + if (trylevel == -2) trylevel = ip_to_state4( descr, dispatch, get_exception_pc(dispatch) ); TRACE("current trylevel: %d\n", trylevel); tryblock_map = rtti_rva(descr->tryblock_map, dispatch->ImageBase); @@ -624,8 +613,7 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, if ((rec->ExceptionFlags & EXCEPTION_TARGET_UNWIND) && cxx_is_consolidate(rec)) last_level = rec->ExceptionInformation[3]; else if ((rec->ExceptionFlags & EXCEPTION_TARGET_UNWIND) && rec->ExceptionCode == STATUS_LONGJUMP) - last_level = ip_to_state4(rtti_rva(descr->ip_map, dispatch->ImageBase), - descr->ip_count, dispatch, dispatch->TargetIp); + last_level = ip_to_state4( descr, dispatch, dispatch->TargetIp ); cxx_local_unwind4(orig_frame, dispatch, descr, trylevel, last_level); return ExceptionContinueSearch; diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in index 9fad2edaa48..d7ed54cc588 100644 --- a/dlls/vcruntime140_1/Makefile.in +++ b/dlls/vcruntime140_1/Makefile.in @@ -3,5 +3,7 @@ IMPORTS = vcruntime140 PARENTSRC = ../msvcrt SOURCES = \ + except_arm64ec.c \ + except_x86_64.c \ handler4.c \ main.c

1 0

Eric Pouech : cmd: Introduce a helper to set std handles.
by Alexandre Julliard 04 Jun '24

04 Jun '24

Module: wine Branch: master Commit: 18d8c6fe5220978105c71e66776c2c18f902c9ec URL: https://gitlab.winehq.org/wine/wine/-/commit/18d8c6fe5220978105c71e66776c2c… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Apr 17 16:15:24 2024 +0200 cmd: Introduce a helper to set std handles. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 185 ++++++++++++++++++++++++------------------------ 1 file changed, 91 insertions(+), 94 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 2c5cf4a3196..764811fffd7 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1295,6 +1295,83 @@ void WCMD_run_program (WCHAR *command, BOOL called) } +static BOOL set_std_redirections(WCHAR *new_redir, WCHAR *in_pipe) +{ + SECURITY_ATTRIBUTES sa = {.nLength = sizeof(sa), .lpSecurityDescriptor = NULL, .bInheritHandle = TRUE}; + WCHAR *pos, *redir; + HANDLE h; + + /* STDIN could come from a preceding pipe, so delete on close if it does */ + if (in_pipe) + { + TRACE("Input coming from %s\n", wine_dbgstr_w(in_pipe)); + h = CreateFileW(in_pipe, GENERIC_READ, + FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); + if (h == INVALID_HANDLE_VALUE) return FALSE; + SetStdHandle(STD_INPUT_HANDLE, h); + /* Otherwise STDIN could come from a '<' redirect */ + } + else if ((pos = wcschr(new_redir,'<')) != NULL) + { + h = CreateFileW(WCMD_parameter(++pos, 0, NULL, FALSE, FALSE), GENERIC_READ, FILE_SHARE_READ, + &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (h == INVALID_HANDLE_VALUE) return FALSE; + SetStdHandle(STD_INPUT_HANDLE, h); + } + + redir = new_redir; + /* Scan the whole command looking for > and 2> */ + while (redir != NULL && ((pos = wcschr(redir,'>')) != NULL)) + { + DWORD disposition; + int std_idx; + + if (pos > redir && (*(pos-1)=='2')) + std_idx = STD_ERROR_HANDLE; + else + /* FIXME what if a number different from 1 & 2 is present? */ + std_idx = STD_OUTPUT_HANDLE; + + pos++; + if ('>' == *pos) + { + disposition = OPEN_ALWAYS; + pos++; + } + else + disposition = CREATE_ALWAYS; + + /* Add support for 2>&1 */ + redir = pos; + if (*pos == '&') + { + int idx = *(pos+1) - '0'; + + /* FIXME what if a number different from 1 & 2 is present? */ + if (!DuplicateHandle(GetCurrentProcess(), + GetStdHandle(idx == 2 ? STD_ERROR_HANDLE : STD_OUTPUT_HANDLE), + GetCurrentProcess(), + &h, + 0, TRUE, DUPLICATE_SAME_ACCESS)) + { + FIXME("Duplicating handle failed with gle %ld\n", GetLastError()); + } + } + else + { + WCHAR *param = WCMD_parameter(pos, 0, NULL, FALSE, FALSE); + h = CreateFileW(param, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, + &sa, disposition, FILE_ATTRIBUTE_NORMAL, NULL); + if (h == INVALID_HANDLE_VALUE) return FALSE; + if (SetFilePointer(h, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) + WCMD_print_error(); + } + SetStdHandle(std_idx, h); + } + return TRUE; +} + /***************************************************************************** * Process one command. If the command is EXIT this routine does not return. * We will recurse through here executing batch files. @@ -1305,21 +1382,16 @@ void WCMD_run_program (WCHAR *command, BOOL called) void WCMD_execute (const WCHAR *command, const WCHAR *redirects, CMD_NODE **cmdList, BOOL retrycall) { - WCHAR *cmd, *parms_start, *redir; - WCHAR *pos; + WCHAR *cmd, *parms_start; int status, i, cmd_index; - DWORD count, creationDisposition; - HANDLE h; + DWORD count; WCHAR *whichcmd; - SECURITY_ATTRIBUTES sa; WCHAR *new_cmd = NULL; WCHAR *new_redir = NULL; HANDLE old_stdhandles[3] = {GetStdHandle (STD_INPUT_HANDLE), GetStdHandle (STD_OUTPUT_HANDLE), GetStdHandle (STD_ERROR_HANDLE)}; - DWORD idx_stdhandles[3] = {STD_INPUT_HANDLE, - STD_OUTPUT_HANDLE, - STD_ERROR_HANDLE}; + static DWORD idx_stdhandles[3] = {STD_INPUT_HANDLE, STD_OUTPUT_HANDLE, STD_ERROR_HANDLE}; BOOL prev_echo_mode, piped = FALSE; WINE_TRACE("command on entry:%s (%p)\n", @@ -1332,7 +1404,6 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, /* Move copy of the redirects onto the heap so it can be expanded */ new_redir = xalloc(MAXSTRING * sizeof(WCHAR)); - redir = new_redir; /* Strip leading whitespaces, and a '@' if supplied */ whichcmd = WCMD_skip_leading_spaces(cmd); @@ -1381,7 +1452,6 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, } else { lstrcpyW(new_redir, redirects); } - /* Expand variables in command line mode only (batch mode will be expanded as the line is read in, except for 'for' loops) */ handleExpansion(new_cmd, (context != NULL), delayedsubst); @@ -1417,97 +1487,24 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, return; } - sa.nLength = sizeof(sa); - sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = TRUE; - /* * Redirect stdin, stdout and/or stderr if required. * Note: Do not do this for a for or if statement as the pipe is for * the individual statements, not the for or if itself. */ if (!(cmd_index == WCMD_FOR || cmd_index == WCMD_IF)) { - /* STDIN could come from a preceding pipe, so delete on close if it does */ - if (cmdList && CMD_node_get_command(*cmdList)->pipeFile[0] != 0x00) { - WINE_TRACE("Input coming from %s\n", wine_dbgstr_w(CMD_node_get_command(*cmdList)->pipeFile)); - h = CreateFileW(CMD_node_get_command(*cmdList)->pipeFile, GENERIC_READ, - FILE_SHARE_READ | FILE_SHARE_WRITE, &sa, OPEN_EXISTING, - FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE, NULL); - if (h == INVALID_HANDLE_VALUE) { - WCMD_print_error (); - free(cmd); - free(new_redir); - return; - } - SetStdHandle (STD_INPUT_HANDLE, h); - - /* No need to remember the temporary name any longer once opened */ - CMD_node_get_command(*cmdList)->pipeFile[0] = 0x00; - - /* Otherwise STDIN could come from a '<' redirect */ - } else if ((pos = wcschr(new_redir,'<')) != NULL) { - h = CreateFileW(WCMD_parameter(++pos, 0, NULL, FALSE, FALSE), GENERIC_READ, FILE_SHARE_READ, - &sa, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (h == INVALID_HANDLE_VALUE) { - WCMD_print_error (); - free(cmd); - free(new_redir); - return; - } - SetStdHandle (STD_INPUT_HANDLE, h); - } - - /* Scan the whole command looking for > and 2> */ - while (redir != NULL && ((pos = wcschr(redir,'>')) != NULL)) { - int handle = 0; - - if (pos > redir && (*(pos-1)=='2')) - handle = 2; - else - handle = 1; - - pos++; - if ('>' == *pos) { - creationDisposition = OPEN_ALWAYS; - pos++; - } - else { - creationDisposition = CREATE_ALWAYS; - } - - /* Add support for 2>&1 */ - redir = pos; - if (*pos == '&') { - int idx = *(pos+1) - '0'; - - if (DuplicateHandle(GetCurrentProcess(), - GetStdHandle(idx_stdhandles[idx]), - GetCurrentProcess(), - &h, - 0, TRUE, DUPLICATE_SAME_ACCESS) == 0) { - WINE_FIXME("Duplicating handle failed with gle %ld\n", GetLastError()); - } - WINE_TRACE("Redirect %d (%p) to %d (%p)\n", handle, GetStdHandle(idx_stdhandles[idx]), idx, h); - - } else { - WCHAR *param = WCMD_parameter(pos, 0, NULL, FALSE, FALSE); - h = CreateFileW(param, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, - &sa, creationDisposition, FILE_ATTRIBUTE_NORMAL, NULL); - if (h == INVALID_HANDLE_VALUE) { - WCMD_print_error (); - free(cmd); - free(new_redir); - return; - } - if (SetFilePointer (h, 0, NULL, FILE_END) == - INVALID_SET_FILE_POINTER) { - WCMD_print_error (); - } - WINE_TRACE("Redirect %d to '%s' (%p)\n", handle, wine_dbgstr_w(param), h); - } - - SetStdHandle (idx_stdhandles[handle], h); + WCHAR *in_pipe = NULL; + if (cmdList && CMD_node_get_command(*cmdList)->pipeFile[0] != 0x00) + in_pipe = CMD_node_get_command(*cmdList)->pipeFile; + if (!set_std_redirections(new_redir, in_pipe)) { + WCMD_print_error (); + free(cmd); + free(new_redir); + return; } + if (in_pipe) + /* No need to remember the temporary name any longer once opened */ + in_pipe[0] = 0x00; } else { WINE_TRACE("Not touching redirects for a FOR or IF command\n"); }

1 0

Eric Pouech : cmd: Introduce structure CMD_REDIRECTION.
by Alexandre Julliard 04 Jun '24

04 Jun '24

Module: wine Branch: master Commit: a899caac7b0468c9a5f9953828cf6b5ecbe70e33 URL: https://gitlab.winehq.org/wine/wine/-/commit/a899caac7b0468c9a5f9953828cf6b… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Apr 25 18:00:05 2024 +0200 cmd: Introduce structure CMD_REDIRECTION. This structure will hold information for a redirection, and can be chained in a list when multiple redirections are listed. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 2 +- programs/cmd/wcmd.h | 21 +++- programs/cmd/wcmdmain.c | 322 +++++++++++++++++++++++++++--------------------- 3 files changed, 200 insertions(+), 145 deletions(-)

1 0

Eric Pouech : cmd: Create helper to execute a command.
by Alexandre Julliard 04 Jun '24

04 Jun '24

Module: wine Branch: master Commit: 855642d565639f133abe0afd96f697ba22bdee24 URL: https://gitlab.winehq.org/wine/wine/-/commit/855642d565639f133abe0afd96f697… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Apr 26 17:10:53 2024 +0200 cmd: Create helper to execute a command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 183 +++++++++++++++++++++++++++++------------------- 1 file changed, 111 insertions(+), 72 deletions(-)

1 0