Module: wine Branch: master Commit: 2bc870eccd7e1c1642e365516968412c17dcc73e URL: https://gitlab.winehq.org/wine/wine/-/commit/2bc870eccd7e1c1642e365516968412...
Author: Alexandre Julliard julliard@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) );