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

Alexandre Julliard : msvcrt: Add platform-specific helpers to call C++ exception handlers.
by Alexandre Julliard June 5, 2024

June 5, 2024

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 June 5, 2024

June 5, 2024

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 June 5, 2024

June 5, 2024

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

Alexandre Julliard : msvcrt: The catchblock frame member isn't present on 32-bit.
by Alexandre Julliard June 5, 2024

June 5, 2024

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 June 5, 2024

June 5, 2024

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 June 5, 2024

June 5, 2024

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 : winedump: Fix dumping of catchblocks for 32-bit modules.
by Alexandre Julliard June 5, 2024

June 5, 2024

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

Rémi Bernon : win32u: Send display change messages when host display mode changes.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: 0a2ae3c41da343d8f837af295c058911d255f3d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a2ae3c41da343d8f837af295c0589… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 12:40:46 2024 +0200 win32u: Send display change messages when host display mode changes. Similarly to when it is changed from an application call, but avoid broadcasting WM_DISPLAYCHANGE to all windows when called from the drivers, as we may have done it already. --- dlls/win32u/sysparams.c | 70 +++++++++++++++++++++++++++++-------------- dlls/wineandroid.drv/init.c | 2 +- dlls/winemac.drv/display.c | 5 +--- dlls/winewayland.drv/window.c | 3 +- dlls/winex11.drv/xrandr.c | 5 +--- include/ntuser.h | 2 +- 6 files changed, 53 insertions(+), 34 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 1488e87e31b..db23795d57c 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -3203,6 +3203,50 @@ static BOOL all_detached_settings( const DEVMODEW *displays ) return TRUE; } +static BOOL get_primary_source_mode( DEVMODEW *mode ) +{ + struct source *primary; + BOOL ret; + + if (!(primary = find_source( NULL ))) return FALSE; + ret = source_get_current_settings( primary, mode ); + source_release( primary ); + + return ret; +} + +static void display_mode_changed( BOOL broadcast ) +{ + DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; + + if (!update_display_cache( TRUE )) + { + ERR( "Failed to update display cache after mode change.\n" ); + return; + } + if (!get_primary_source_mode( &current_mode )) + { + ERR( "Failed to get primary source current display settings.\n" ); + return; + } + + if (!broadcast) + send_message( get_desktop_window(), WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, + MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ) ); + else + { + /* broadcast to all the windows as well if an application changed the display settings */ + NtUserClipCursor( NULL ); + send_notify_message( get_desktop_window(), WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, + MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), FALSE ); + send_message_timeout( HWND_BROADCAST, WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, + MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), + SMTO_ABORTIFHUNG, 2000, FALSE ); + /* post clip_fullscreen_window request to the foreground window */ + NtUserPostMessage( NtUserGetForegroundWindow(), WM_WINE_CLIPCURSOR, SET_CURSOR_FSCLIP, 0 ); + } +} + static LONG apply_display_settings( struct source *target, const DEVMODEW *devmode, HWND hwnd, DWORD flags, void *lparam ) { @@ -3270,26 +3314,7 @@ static LONG apply_display_settings( struct source *target, const DEVMODEW *devmo } } - if (!update_display_cache( TRUE )) - WARN( "Failed to update display cache after mode change.\n" ); - - if ((source = find_source( NULL ))) - { - DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; - - if (!source_get_current_settings( source, &current_mode )) WARN( "Failed to get primary source current display settings.\n" ); - source_release( source ); - - NtUserClipCursor( NULL ); - send_notify_message( NtUserGetDesktopWindow(), WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, - MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), FALSE ); - send_message_timeout( HWND_BROADCAST, WM_DISPLAYCHANGE, current_mode.dmBitsPerPel, - MAKELPARAM( current_mode.dmPelsWidth, current_mode.dmPelsHeight ), - SMTO_ABORTIFHUNG, 2000, FALSE ); - /* post clip_fullscreen_window request to the foreground window */ - NtUserPostMessage( NtUserGetForegroundWindow(), WM_WINE_CLIPCURSOR, SET_CURSOR_FSCLIP, 0 ); - } - + display_mode_changed( TRUE ); return ret; } @@ -6306,8 +6331,9 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code ) case NtUserCallNoParam_ReleaseCapture: return release_capture(); - case NtUserCallNoParam_UpdateDisplayCache: - return update_display_cache( TRUE ); + case NtUserCallNoParam_DisplayModeChanged: + display_mode_changed( FALSE ); + return TRUE; /* temporary exports */ case NtUserExitingThread: diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 5b4ec59d2fa..cc01852d87f 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -84,7 +84,7 @@ void init_monitors( int width, int height ) wine_dbgstr_rect( &rect ), wine_dbgstr_rect( &monitor_rc_work )); /* if we're notified from Java thread, update registry */ - if (*p_java_vm) NtUserCallNoParam( NtUserCallNoParam_UpdateDisplayCache ); + if (*p_java_vm) NtUserCallNoParam( NtUserCallNoParam_DisplayModeChanged ); } diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 49ea924e5cb..4a9e9ab721e 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1112,10 +1112,7 @@ void macdrv_displays_changed(const macdrv_event *event) process it (by sending it to the desktop window). */ if (event->displays_changed.activating || NtUserGetWindowThread(hwnd, NULL) == GetCurrentThreadId()) - { - NtUserCallNoParam(NtUserCallNoParam_UpdateDisplayCache); - macdrv_resize_desktop(); - } + NtUserCallNoParam(NtUserCallNoParam_DisplayModeChanged); } UINT macdrv_UpdateDisplayDevices(const struct gdi_device_manager *device_manager, void *param) diff --git a/dlls/winewayland.drv/window.c b/dlls/winewayland.drv/window.c index 3706b6afb97..dd023fc96a7 100644 --- a/dlls/winewayland.drv/window.c +++ b/dlls/winewayland.drv/window.c @@ -633,8 +633,7 @@ LRESULT WAYLAND_WindowMessage(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) switch (msg) { case WM_WAYLAND_INIT_DISPLAY_DEVICES: - NtUserCallNoParam(NtUserCallNoParam_UpdateDisplayCache); - wayland_resize_desktop(); + NtUserCallNoParam(NtUserCallNoParam_DisplayModeChanged); return 0; case WM_WAYLAND_CONFIGURE: wayland_configure_window(hwnd); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 9a4284f493f..74b975e8671 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1180,10 +1180,7 @@ static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) xrandr14_invalidate_current_mode_cache(); if (hwnd == NtUserGetDesktopWindow() && NtUserGetWindowThread( hwnd, NULL ) == GetCurrentThreadId()) - { - NtUserCallNoParam( NtUserCallNoParam_UpdateDisplayCache ); - X11DRV_resize_desktop(); - } + NtUserCallNoParam( NtUserCallNoParam_DisplayModeChanged ); /* Update xinerama monitors for xinerama_get_fullscreen_monitors() */ rect = get_host_primary_monitor_rect(); xinerama_init( rect.right - rect.left, rect.bottom - rect.top ); diff --git a/include/ntuser.h b/include/ntuser.h index ff45ffa2bc8..e22de3023d3 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -833,7 +833,7 @@ enum NtUserCallNoParam_GetShellWindow, NtUserCallNoParam_GetTaskmanWindow, NtUserCallNoParam_ReleaseCapture, - NtUserCallNoParam_UpdateDisplayCache, + NtUserCallNoParam_DisplayModeChanged, /* temporary exports */ NtUserExitingThread, NtUserThreadDetach,

1 0

Rémi Bernon : win32u: Fix a restorer_str typo.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: e54bb48eb86b9624a91e577e51f08239e09849df URL: https://gitlab.winehq.org/wine/wine/-/commit/e54bb48eb86b9624a91e577e51f082… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 13:34:40 2024 +0200 win32u: Fix a restorer_str typo. --- dlls/win32u/sysparams.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 49bf26214e7..1488e87e31b 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -3208,7 +3208,7 @@ static LONG apply_display_settings( struct source *target, const DEVMODEW *devmo { static const WCHAR restorerW[] = {'_','_','w','i','n','e','_','d','i','s','p','l','a','y','_', 's','e','t','t','i','n','g','s','_','r','e','s','t','o','r','e','r',0}; - UNICODE_STRING restoter_str = RTL_CONSTANT_STRING( restorerW ); + UNICODE_STRING restorer_str = RTL_CONSTANT_STRING( restorerW ); WCHAR primary_name[CCHDEVICENAME]; struct source *primary, *source; DEVMODEW *mode, *displays; @@ -3261,7 +3261,7 @@ static LONG apply_display_settings( struct source *target, const DEVMODEW *devmo free( displays ); if (ret) return ret; - if ((restorer_window = NtUserFindWindowEx( NULL, NULL, &restoter_str, NULL, 0 ))) + if ((restorer_window = NtUserFindWindowEx( NULL, NULL, &restorer_str, NULL, 0 ))) { if (NtUserGetWindowThread( restorer_window, NULL ) != GetCurrentThreadId()) {

1 0

Rémi Bernon : win32u: Move desktop resize on WM_DISPLAYCHANGE out of the drivers.
by Alexandre Julliard June 4, 2024

June 4, 2024

Module: wine Branch: master Commit: b89c9c60d50cf21650331d1528ff965c319a1217 URL: https://gitlab.winehq.org/wine/wine/-/commit/b89c9c60d50cf21650331d1528ff96… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 3 12:56:27 2024 +0200 win32u: Move desktop resize on WM_DISPLAYCHANGE out of the drivers. --- dlls/win32u/defwnd.c | 27 ++++++++++++++++++++++++++- dlls/wineandroid.drv/window.c | 5 ----- dlls/winemac.drv/macdrv.h | 2 -- dlls/winemac.drv/window.c | 24 +----------------------- dlls/winewayland.drv/window.c | 17 ----------------- dlls/winex11.drv/desktop.c | 22 ---------------------- dlls/winex11.drv/window.c | 5 +---- dlls/winex11.drv/x11drv.h | 2 -- include/ntuser.h | 1 + 9 files changed, 29 insertions(+), 76 deletions(-)

1 0