wine-commits June 2024

wine-commits@winehq.org

1 participants
613 discussions

Alexandre Julliard : msvcrt: Share the dump_function_descr() helper between platforms.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: df09103ab6cfc55659c068c51bee8ad24ab9134d URL: https://gitlab.winehq.org/wine/wine/-/commit/df09103ab6cfc55659c068c51bee8a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 15:33:08 2024 +0200 msvcrt: Share the dump_function_descr() helper between platforms. --- dlls/msvcrt/cppexcept.h | 1 + dlls/msvcrt/except.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/except_i386.c | 35 +--------------------------------- dlls/msvcrt/except_x86_64.c | 44 ------------------------------------------- 4 files changed, 48 insertions(+), 78 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 36bc72ab1bc..690c1f5817f 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -278,6 +278,7 @@ static inline void copy_exception( void *object, uintptr_t frame, int offset, UI } \ } while(0) +extern void dump_function_descr( const cxx_function_descr *descr, uintptr_t base ); extern void *find_catch_handler( void *object, uintptr_t frame, uintptr_t exc_base, const tryblock_info *tryblock, cxx_exception_type *exc_type, uintptr_t image_base ); diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 08e2a51011d..b6f2bb8784d 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -46,6 +46,52 @@ static MSVCRT_security_error_handler security_error_handler; static __sighandler_t sighandlers[NSIG] = { SIG_DFL }; +void dump_function_descr( const cxx_function_descr *descr, uintptr_t base ) +{ + unwind_info *unwind_table = rtti_rva( descr->unwind_table, base ); + tryblock_info *tryblock = rtti_rva( descr->tryblock, base ); + ipmap_info *ipmap = rtti_rva( descr->ipmap, base ); + UINT i, j; + + TRACE( "magic %x\n", descr->magic ); + TRACE( "unwind table: %p %d\n", unwind_table, descr->unwind_count ); + for (i = 0; i < descr->unwind_count; i++) + { + TRACE(" %d: prev %d func %p\n", i, unwind_table[i].prev, + unwind_table[i].handler ? rtti_rva( unwind_table[i].handler, base ) : NULL ); + } + TRACE( "try table: %p %d\n", tryblock, descr->tryblock_count ); + for (i = 0; i < descr->tryblock_count; i++) + { + catchblock_info *catchblock = rtti_rva( tryblock[i].catchblock, base ); + + TRACE( " %d: start %d end %d catchlevel %d catch %p %d\n", i, + tryblock[i].start_level, tryblock[i].end_level, + tryblock[i].catch_level, catchblock, tryblock[i].catchblock_count); + for (j = 0; j < tryblock[i].catchblock_count; j++) + { + type_info *type_info = catchblock[j].type_info ? rtti_rva( catchblock[j].type_info, base ) : NULL; + 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 + TRACE( " frame %x", catchblock[j].frame ); +#endif + TRACE( " type %p %s\n", type_info, dbgstr_type_info(type_info) ); + } + } + TRACE( "ipmap: %p %d\n", ipmap, descr->ipmap_count ); + for (i = 0; i < descr->ipmap_count; i++) + TRACE( " %d: ip %x state %d\n", i, ipmap[i].ip, ipmap[i].state ); +#ifdef RTTI_USE_RVA + TRACE( "unwind_help %+d\n", descr->unwind_help ); +#endif + if (descr->magic <= CXX_FRAME_MAGIC_VC6) return; + TRACE( "expect list: %p\n", rtti_rva( descr->expect_list, base ) ); + if (descr->magic <= CXX_FRAME_MAGIC_VC7) return; + TRACE( "flags: %08x\n", descr->flags ); +} + void *find_catch_handler( void *object, uintptr_t frame, uintptr_t exc_base, const tryblock_info *tryblock, cxx_exception_type *exc_type, uintptr_t image_base ) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 91fe11a4dfc..f76762d3cb0 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -152,39 +152,6 @@ __ASM_GLOBAL_FUNC( call_handler, "popl %ebp\n\t" "ret" ); -static void dump_function_descr( const cxx_function_descr *descr ) -{ - UINT i; - int j; - - TRACE( "magic %x\n", descr->magic ); - TRACE( "unwind table: %p %d\n", descr->unwind_table, descr->unwind_count ); - for (i = 0; i < descr->unwind_count; i++) - { - TRACE( " %d: prev %d func %p\n", i, - descr->unwind_table[i].prev, descr->unwind_table[i].handler ); - } - TRACE( "try table: %p %d\n", descr->tryblock, descr->tryblock_count ); - for (i = 0; i < descr->tryblock_count; i++) - { - TRACE( " %d: start %d end %d catchlevel %d catch %p %d\n", i, - descr->tryblock[i].start_level, descr->tryblock[i].end_level, - descr->tryblock[i].catch_level, descr->tryblock[i].catchblock, - descr->tryblock[i].catchblock_count ); - for (j = 0; j < descr->tryblock[i].catchblock_count; j++) - { - const catchblock_info *ptr = &descr->tryblock[i].catchblock[j]; - TRACE( " %d: flags %x offset %d handler %p type %p %s\n", - j, ptr->flags, ptr->offset, ptr->handler, - ptr->type_info, dbgstr_type_info( ptr->type_info ) ); - } - } - if (descr->magic <= CXX_FRAME_MAGIC_VC6) return; - TRACE( "expect list: %p\n", descr->expect_list ); - if (descr->magic <= CXX_FRAME_MAGIC_VC7) return; - TRACE( "flags: %08x\n", descr->flags ); -} - /* unwind the local function up to a given trylevel */ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_descr *descr, int last_level) { @@ -468,7 +435,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame TRACE("handling C++ exception rec %p frame %p trylevel %d descr %p nested_frame %p\n", rec, frame, frame->trylevel, descr, nested_frame ); TRACE_EXCEPTION_TYPE( exc_type, 0 ); - dump_function_descr( descr ); + dump_function_descr( descr, 0 ); } } else diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 39202ff7d9a..81a2515997b 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -61,50 +61,6 @@ static inline void* rva_to_ptr(UINT rva, ULONG64 base) return rva ? (void*)(base+rva) : NULL; } -static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_base) -{ - unwind_info *unwind_table = rva_to_ptr(descr->unwind_table, image_base); - tryblock_info *tryblock = rva_to_ptr(descr->tryblock, image_base); - ipmap_info *ipmap = rva_to_ptr(descr->ipmap, image_base); - UINT i, j; - - TRACE("magic %x\n", descr->magic); - TRACE("unwind table: %x(%p) %d\n", descr->unwind_table, unwind_table, descr->unwind_count); - for (i=0; i<descr->unwind_count; i++) - { - TRACE(" %d: prev %d func %x(%p)\n", i, unwind_table[i].prev, - unwind_table[i].handler, rva_to_ptr(unwind_table[i].handler, image_base)); - } - TRACE("try table: %x(%p) %d\n", descr->tryblock, tryblock, descr->tryblock_count); - for (i=0; i<descr->tryblock_count; i++) - { - catchblock_info *catchblock = rva_to_ptr(tryblock[i].catchblock, image_base); - - TRACE(" %d: start %d end %d catchlevel %d catch %x(%p) %d\n", i, - tryblock[i].start_level, tryblock[i].end_level, - tryblock[i].catch_level, tryblock[i].catchblock, - catchblock, tryblock[i].catchblock_count); - for (j=0; j<tryblock[i].catchblock_count; j++) - { - TRACE(" %d: flags %x offset %d handler %x(%p) frame %x type %x %s\n", - j, catchblock[j].flags, catchblock[j].offset, catchblock[j].handler, - rva_to_ptr(catchblock[j].handler, image_base), catchblock[j].frame, - catchblock[j].type_info, - dbgstr_type_info(rva_to_ptr(catchblock[j].type_info, image_base))); - } - } - TRACE("ipmap: %x(%p) %d\n", descr->ipmap, ipmap, descr->ipmap_count); - for (i=0; i<descr->ipmap_count; i++) - { - 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); -} - static inline int ip_to_state(ipmap_info *ipmap, UINT count, int ip) { UINT low = 0, high = count-1, med;

1 0

Alexandre Julliard : msvcrt: Share a helper macro to print an exception type.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: e7546542abbdd58299b8f7333a1f62ba969a9ea6 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7546542abbdd58299b8f7333a1f62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 15:31:22 2024 +0200 msvcrt: Share a helper macro to print an exception type. --- dlls/msvcrt/cppexcept.h | 17 +++++++++++++++++ dlls/msvcrt/except_i386.c | 23 +---------------------- dlls/msvcrt/except_x86_64.c | 28 +--------------------------- dlls/msvcrt/handler4.c | 28 +--------------------------- 4 files changed, 20 insertions(+), 76 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index a5a8abb9345..36bc72ab1bc 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -261,6 +261,23 @@ static inline void copy_exception( void *object, uintptr_t frame, int offset, UI } } +#define TRACE_EXCEPTION_TYPE(type,base) do { \ + const cxx_type_info_table *table = rtti_rva( type->type_info_table, base ); \ + unsigned int i; \ + TRACE( "flags %x destr %p handler %p type info %p\n", \ + type->flags, rtti_rva( type->destructor, base ), \ + type->custom_handler ? rtti_rva( type->custom_handler, base ) : NULL, table ); \ + for (i = 0; i < table->count; i++) \ + { \ + const cxx_type_info *type = rtti_rva( table->info[i], base ); \ + const type_info *info = rtti_rva( type->type_info, base ); \ + TRACE( " %d: flags %x type %p %s offsets %d,%d,%d size %d copy ctor %p\n", \ + i, type->flags, info, dbgstr_type_info( info ), \ + type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, \ + type->size, rtti_rva( type->copy_ctor, base )); \ + } \ +} while(0) + extern void *find_catch_handler( void *object, uintptr_t frame, uintptr_t exc_base, const tryblock_info *tryblock, cxx_exception_type *exc_type, uintptr_t image_base ); diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 5a8a84089d9..91fe11a4dfc 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -152,27 +152,6 @@ __ASM_GLOBAL_FUNC( call_handler, "popl %ebp\n\t" "ret" ); -static inline void dump_type( const cxx_type_info *type ) -{ - TRACE( "flags %x type %p %s offsets %d,%d,%d size %d copy ctor %p\n", - type->flags, type->type_info, dbgstr_type_info(type->type_info), - type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, - type->size, type->copy_ctor ); -} - -static void dump_exception_type( const cxx_exception_type *type ) -{ - UINT i; - - TRACE( "flags %x destr %p handler %p type info %p\n", - type->flags, type->destructor, type->custom_handler, type->type_info_table ); - for (i = 0; i < type->type_info_table->count; i++) - { - TRACE( " %d: ", i ); - dump_type( type->type_info_table->info[i] ); - } -} - static void dump_function_descr( const cxx_function_descr *descr ) { UINT i; @@ -488,7 +467,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame { TRACE("handling C++ exception rec %p frame %p trylevel %d descr %p nested_frame %p\n", rec, frame, frame->trylevel, descr, nested_frame ); - dump_exception_type( exc_type ); + TRACE_EXCEPTION_TYPE( exc_type, 0 ); dump_function_descr( descr ); } } diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 7dc12db0f25..39202ff7d9a 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -61,32 +61,6 @@ static inline void* rva_to_ptr(UINT rva, ULONG64 base) return rva ? (void*)(base+rva) : NULL; } -static inline void dump_type(UINT type_rva, ULONG64 base) -{ - const cxx_type_info *type = rva_to_ptr(type_rva, base); - - TRACE("flags %x type %x %s offsets %d,%d,%d size %d copy ctor %x(%p)\n", - type->flags, type->type_info, dbgstr_type_info(rva_to_ptr(type->type_info, base)), - type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, - type->size, type->copy_ctor, rva_to_ptr(type->copy_ctor, base)); -} - -static void dump_exception_type(const cxx_exception_type *type, ULONG64 base) -{ - const cxx_type_info_table *type_info_table = rva_to_ptr(type->type_info_table, base); - UINT i; - - TRACE("flags %x destr %x(%p) handler %x(%p) type info %x(%p)\n", - type->flags, type->destructor, rva_to_ptr(type->destructor, base), - type->custom_handler, rva_to_ptr(type->custom_handler, base), - type->type_info_table, type_info_table); - for (i = 0; i < type_info_table->count; i++) - { - TRACE(" %d: ", i); - dump_type(type_info_table->info[i], base); - } -} - static void dump_function_descr(const cxx_function_descr *descr, ULONG64 image_base) { unwind_info *unwind_table = rva_to_ptr(descr->unwind_table, image_base); @@ -452,7 +426,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); - dump_exception_type(exc_type, rec->ExceptionInformation[3]); + TRACE_EXCEPTION_TYPE(exc_type, rec->ExceptionInformation[3]); dump_function_descr(descr, dispatch->ImageBase); } } diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c index e805543d6ca..878a5497aaa 100644 --- a/dlls/msvcrt/handler4.c +++ b/dlls/msvcrt/handler4.c @@ -249,32 +249,6 @@ static void read_ipmap_info(BYTE **b, ipmap_info *ii) ii->state = (INT)decode_uint(b) - 1; } -static inline void dump_type(UINT type_rva, ULONG64 base) -{ - const cxx_type_info *type = rva_to_ptr(type_rva, base); - - TRACE("flags %x type %x %s offsets %d,%d,%d size %d copy ctor %x(%p)\n", - type->flags, type->type_info, dbgstr_type_info(rva_to_ptr(type->type_info, base)), - type->offsets.this_offset, type->offsets.vbase_descr, type->offsets.vbase_offset, - type->size, type->copy_ctor, rva_to_ptr(type->copy_ctor, base)); -} - -static void dump_exception_type(const cxx_exception_type *type, ULONG64 base) -{ - const cxx_type_info_table *type_info_table = rva_to_ptr(type->type_info_table, base); - UINT i; - - TRACE("flags %x destr %x(%p) handler %x(%p) type info %x(%p)\n", - type->flags, type->destructor, rva_to_ptr(type->destructor, base), - type->custom_handler, rva_to_ptr(type->custom_handler, base), - type->type_info_table, type_info_table); - for (i = 0; i < type_info_table->count; i++) - { - TRACE(" %d: ", i); - dump_type(type_info_table->info[i], base); - } -} - static BOOL validate_cxx_function_descr4(const cxx_function_descr_v4 *descr, DISPATCHER_CONTEXT *dispatch) { ULONG64 image_base = dispatch->ImageBase; @@ -680,7 +654,7 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, if (TRACE_ON(seh)) { TRACE("handling C++ exception rec %p frame %Ix descr %p\n", rec, frame, descr); - dump_exception_type(exc_type, rec->ExceptionInformation[3]); + TRACE_EXCEPTION_TYPE(exc_type, rec->ExceptionInformation[3]); } } else

1 0

Alexandre Julliard : faudio: Import upstream release 24.06.
by Alexandre Julliard 03 Jun '24

03 Jun '24

Module: wine Branch: master Commit: 41c65022c1946c8f1bc877e038dcaf2b058ffcc5 URL: https://gitlab.winehq.org/wine/wine/-/commit/41c65022c1946c8f1bc877e038dcaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 2 22:03:55 2024 +0200 faudio: Import upstream release 24.06. --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FACT_internal.c | 14 +- libs/faudio/src/FAudioFX_reverb.c | 2 +- libs/faudio/src/FAudio_internal.c | 68 +++++++++- libs/faudio/src/FAudio_internal.h | 2 + libs/faudio/src/FAudio_platform_win32.c | 218 +++++++++++++++++++++++++++----- libs/faudio/src/stb_vorbis.h | 2 +- 7 files changed, 265 insertions(+), 43 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2024