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

Rémi Bernon : widl: Use mangled namespace names in typedef pointer types.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: ee908ad076e8bfb7f0b178d9f6c7f0130bf64f91 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee908ad076e8bfb7f0b178d9f6c7f0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 30 10:38:46 2024 +0200 widl: Use mangled namespace names in typedef pointer types. --- tools/widl/header.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index ab931f0193e..bb30156b8a3 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -819,8 +819,8 @@ static void write_generic_handle_routines(FILE *header) static void write_typedef(FILE *header, type_t *type, bool define) { - type_t *t = type_alias_get_aliasee_type(type); - if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) + type_t *t = type_alias_get_aliasee_type(type), *root = type_pointer_get_root_type(t); + if (winrt_mode && root->namespace && !is_global_namespace(root->namespace)) { fprintf(header, "#ifndef __cplusplus\n"); fprintf(header, "typedef "); @@ -829,12 +829,12 @@ static void write_typedef(FILE *header, type_t *type, bool define) if (type_get_type_detect_alias(t) != TYPE_ENUM) { fprintf(header, "#else /* __cplusplus */\n"); - write_namespace_start(header, t->namespace); + if (t->namespace && !is_global_namespace(t->namespace)) write_namespace_start(header, t->namespace); indent(header, 0); fprintf(header, "typedef "); write_type_v(header, type_alias_get_aliasee(type), FALSE, false, type->name, NAME_DEFAULT); fprintf(header, ";\n"); - write_namespace_end(header, t->namespace); + if (t->namespace && !is_global_namespace(t->namespace)) write_namespace_end(header, t->namespace); } fprintf(header, "#endif /* __cplusplus */\n\n"); }

1 0

Elizabeth Figura : widl: Do not write type definitions for types defined in an imported header.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: 93d50fd9de906b7acfa4b5b8c40bff394a2df4e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/93d50fd9de906b7acfa4b5b8c40bff… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Mar 25 18:37:42 2024 -0500 widl: Do not write type definitions for types defined in an imported header. midl does not, and this would result in redefinition errors. An equivalent (and arguably a bit more declarative) way to do this would be to keep track in the parser whether a type or typedef statement is actually a definition or not, and record that information in the statement_t. However, this would require passing additional information alongside the type_t from each relevant bison rule, which would thrash a lot of code. --- tools/widl/parser.y | 6 +++--- tools/widl/typetree.c | 2 ++ tools/widl/widltypes.h | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d8363afa981..f5b82f29db3 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1359,7 +1359,7 @@ type: typedef: m_attributes tTYPEDEF m_attributes decl_spec declarator_list { $1 = append_attribs($1, $3); reg_typedefs( @$, $4, $5, check_typedef_attrs( $1 ) ); - $$ = make_statement_typedef($5, $4->type->defined); + $$ = make_statement_typedef($5, $4->type->defined && !$4->type->defined_in_import); } ; @@ -1719,7 +1719,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator v->declspec.type = decl->type; v->declspec.qualifier = decl->qualifier; v->attrs = attrs; - v->is_defined = type->defined; + v->is_defined = type->defined && !type->defined_in_import; if (is_attr(type->attrs, ATTR_CALLCONV) && !is_func(type)) error_loc("calling convention applied to non-function type\n"); @@ -2833,7 +2833,7 @@ static statement_t *make_statement_type_decl(type_t *type) { statement_t *stmt = make_statement(STMT_TYPE); stmt->u.type = type; - stmt->is_defined = type->defined; + stmt->is_defined = type->defined && !type->defined_in_import; return stmt; } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index ea17f16e0c8..af41906c42b 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -536,6 +536,7 @@ static void define_type(type_t *type, const struct location *where) error_loc("type %s already defined at %s:%d\n", type->name, type->where.input_name, type->where.first_line ); type->defined = TRUE; + type->defined_in_import = parse_only; type->where = *where; } @@ -935,6 +936,7 @@ type_t *type_delegate_define(type_t *delegate, attr_list_t *attrs, iface->details.iface->disp_inherit = NULL; iface->details.iface->async_iface = NULL; iface->details.iface->requires = NULL; + define_type(iface, where); iface->defined = TRUE; compute_method_indexes(iface); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 9d99c83a25e..7bc24fad0d3 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -523,6 +523,7 @@ struct _type_t { struct location where; unsigned int ignore : 1; unsigned int defined : 1; + unsigned int defined_in_import : 1; unsigned int written : 1; unsigned int user_types_registered : 1; unsigned int tfswrite : 1; /* if the type needs to be written to the TFS */

1 0

Mohamad Al-Jaf : coremessaging: Add stub DLL.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: c0878d7f9561742ce8e6fdf251580013c5a5caad URL: https://gitlab.winehq.org/wine/wine/-/commit/c0878d7f9561742ce8e6fdf2515800… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Tue May 28 22:50:40 2024 -0400 coremessaging: Add stub DLL. Needed by Photoshop 2024. --- configure | 2 ++ configure.ac | 1 + dlls/coremessaging/Makefile.in | 1 + dlls/coremessaging/coremessaging.spec | 31 +++++++++++++++++++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/configure b/configure index 4f4c37756c1..101981ad8df 100755 --- a/configure +++ b/configure @@ -1027,6 +1027,7 @@ enable_compstui enable_comsvcs enable_concrt140 enable_connect +enable_coremessaging enable_credui enable_crtdll enable_crypt32 @@ -21985,6 +21986,7 @@ wine_fn_config_makefile dlls/comsvcs/tests enable_tests wine_fn_config_makefile dlls/concrt140 enable_concrt140 wine_fn_config_makefile dlls/concrt140/tests enable_tests wine_fn_config_makefile dlls/connect enable_connect +wine_fn_config_makefile dlls/coremessaging enable_coremessaging wine_fn_config_makefile dlls/credui enable_credui wine_fn_config_makefile dlls/credui/tests enable_tests wine_fn_config_makefile dlls/crtdll enable_crtdll diff --git a/configure.ac b/configure.ac index 3f54230b46b..231ec7f17d6 100644 --- a/configure.ac +++ b/configure.ac @@ -2494,6 +2494,7 @@ WINE_CONFIG_MAKEFILE(dlls/comsvcs/tests) WINE_CONFIG_MAKEFILE(dlls/concrt140) WINE_CONFIG_MAKEFILE(dlls/concrt140/tests) WINE_CONFIG_MAKEFILE(dlls/connect) +WINE_CONFIG_MAKEFILE(dlls/coremessaging) WINE_CONFIG_MAKEFILE(dlls/credui) WINE_CONFIG_MAKEFILE(dlls/credui/tests) WINE_CONFIG_MAKEFILE(dlls/crtdll) diff --git a/dlls/coremessaging/Makefile.in b/dlls/coremessaging/Makefile.in new file mode 100644 index 00000000000..2d43a9077cd --- /dev/null +++ b/dlls/coremessaging/Makefile.in @@ -0,0 +1 @@ +MODULE = coremessaging.dll diff --git a/dlls/coremessaging/coremessaging.spec b/dlls/coremessaging/coremessaging.spec new file mode 100644 index 00000000000..f8c31e6fbdb --- /dev/null +++ b/dlls/coremessaging/coremessaging.spec @@ -0,0 +1,31 @@ +@ stub CoreUICallComputeMaximumMessageSize +@ stub CoreUICallCreateConversationHost +@ stub CoreUICallCreateEndpointHost +@ stub CoreUICallCreateEndpointHostWithSendPriority +@ stub CoreUICallGetAddressOfParameterInBuffer +@ stub CoreUICallReceive +@ stub CoreUICallSend +@ stub CoreUICallSendVaList +@ stub CoreUIConfigureTestHost +@ stub CoreUIConfigureUserIntegration +@ stub CoreUICreate +@ stub CoreUICreateAnonymousStream +@ stub CoreUICreateEx +@ stub CoreUIInitializeTestService +@ stub CoreUIOpenExisting +@ stub CoreUIRouteToTestRegistrar +@ stub CoreUIUninitializeTestService +@ stub CreateDispatcherQueueController +@ stub CreateDispatcherQueueForCurrentThread +@ stdcall -private DllCanUnloadNow() +@ stub DllGetActivationFactory +@ stub DllGetClassObject +@ stub GetDispatcherQueueForCurrentThread +@ stub MsgBlobCreateShared +@ stub MsgBlobCreateStack +@ stub MsgBufferShare +@ stub MsgRelease +@ stub MsgStringCreateShared +@ stub MsgStringCreateStack +@ stub ServiceMain +@ stub SvchostPushServiceGlobals

1 0

Elizabeth Figura : widl: Allow using UDTs with the keyword even when the identifier is also a typedef.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: 9839a0d68d86473008b349cf01418c0888a04401 URL: https://gitlab.winehq.org/wine/wine/-/commit/9839a0d68d86473008b349cf01418c… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Mar 25 15:21:44 2024 -0500 widl: Allow using UDTs with the keyword even when the identifier is also a typedef. E.g. in cases like typedef int apple; struct apple { ... }; allow subsequently using "struct apple" in future expressions. Note that this already worked for UDT definitions (so the above example by itself was legal in widl), but any attempt to use the defined type would result in a syntax error. --- tools/widl/parser.y | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e5e28fd7b24..097d927dbc2 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -500,11 +500,11 @@ warnings: typedecl: enumdef - | tENUM aIDENTIFIER { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } + | tENUM typename { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } | structdef - | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } + | tSTRUCT typename { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } | uniondef - | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } + | tUNION typename { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } | attributes enumdef { $$ = $2; $$->attrs = check_enum_attrs($1); } | attributes structdef { $$ = $2; $$->attrs = check_struct_attrs($1); } | attributes uniondef { $$ = $2; $$->attrs = check_union_attrs($1); } @@ -1338,17 +1338,17 @@ structdef: tSTRUCT m_typename '{' fields '}' { $$ = type_new_struct($2, current_ ; unqualified_type: - tVOID { $$ = type_new_void(); } - | base_type { $$ = $1; } - | enumdef { $$ = $1; } - | tENUM aIDENTIFIER { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } - | structdef { $$ = $1; } - | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } - | uniondef { $$ = $1; } - | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } - | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } - | aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } - ; + tVOID { $$ = type_new_void(); } + | base_type { $$ = $1; } + | enumdef { $$ = $1; } + | tENUM typename { $$ = type_new_enum($2, current_namespace, FALSE, NULL); } + | structdef { $$ = $1; } + | tSTRUCT typename { $$ = type_new_struct($2, current_namespace, FALSE, NULL); } + | uniondef { $$ = $1; } + | tUNION typename { $$ = type_new_nonencapsulated_union($2, current_namespace, FALSE, NULL); } + | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } + | aKNOWNTYPE { $$ = find_type_or_error(current_namespace, $1); } + ; type: unqualified_type

1 0

Elizabeth Figura : widl: Invert "declonly".
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: da8d81c63ddb066ca37dcfe2c7d58b8372a2fa20 URL: https://gitlab.winehq.org/wine/wine/-/commit/da8d81c63ddb066ca37dcfe2c7d58b… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Mar 25 17:18:21 2024 -0500 widl: Invert "declonly". This makes the logic around it a bit simpler, and I find it easier to understand as well. --- tools/widl/header.c | 58 +++++++++++++++++++++++++------------------------- tools/widl/header.h | 2 +- tools/widl/parser.y | 16 +++++++------- tools/widl/typegen.c | 8 +++---- tools/widl/widltypes.h | 8 +++++-- 5 files changed, 48 insertions(+), 44 deletions(-)

1 0

Elizabeth Figura : widl: Factor out a define_type() helper.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: 1522d7b727da45c7fa313755d6bbfb12dfb443c1 URL: https://gitlab.winehq.org/wine/wine/-/commit/1522d7b727da45c7fa313755d6bbfb… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Mar 25 18:25:55 2024 -0500 widl: Factor out a define_type() helper. --- tools/widl/typetree.c | 95 ++++++++++++++++----------------------------------- 1 file changed, 30 insertions(+), 65 deletions(-)

1 0

Elizabeth Figura : widl: Update the type location in define_type().
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: 1db2eaf0b39c7839fd6f41ecd583bc9852f1fde9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1db2eaf0b39c7839fd6f41ecd583bc… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Mar 25 18:26:42 2024 -0500 widl: Update the type location in define_type(). This improves error reporting for the following IDL: interface apple; [uuid(12345678-1234-1234-1234-123456654321)] interface apple {void func(void);} [uuid(12345678-1234-1234-1234-123456654321)] interface apple {void func(void);} Previously widl would report: test2.idl:19:34: error: type apple already defined at test2.idl:2 This changes it to refer to line 5, where the interface is actually defined. --- tools/widl/parser.y | 42 ++++++++++++++--------------- tools/widl/typetree.c | 74 ++++++++++++++++++++++++++++++--------------------- tools/widl/typetree.h | 41 ++++++++++++++++++---------- 3 files changed, 92 insertions(+), 65 deletions(-)

1 0

Elizabeth Figura : widl: Assign to the right location variable.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: 07243c4e128207a23a4cbf6d7804cbc05114c5d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/07243c4e128207a23a4cbf6d7804cb… Author: Elizabeth Figura <zfigura(a)codeweavers.com> Date: Mon Mar 25 13:56:33 2024 -0500 widl: Assign to the right location variable. yyloc is an internal variable; we want to assign to yylloc here. This fixes error reporting. Fixes: 3b12583db0cf68b356f20d7bbd091651af246eff --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9b6a4c36732..e5e28fd7b24 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -515,7 +515,7 @@ cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; } import_start: tIMPORT aSTRING ';' { $$ = $2; push_import( $2, &yylloc ); } ; -import: import_start imp_statements aEOF { yyloc = pop_import(); } +import: import_start imp_statements aEOF { yylloc = pop_import(); } ; importlib: tIMPORTLIB '(' aSTRING ')'

1 0

Alexandre Julliard : msvcrt: Don't use rva_to_ptr() for non-RVA values.
by Alexandre Julliard June 3, 2024

June 3, 2024

Module: wine Branch: master Commit: d85ba603713f54b10ea723c7300c9567f3195d89 URL: https://gitlab.winehq.org/wine/wine/-/commit/d85ba603713f54b10ea723c7300c95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 31 16:33:13 2024 +0200 msvcrt: Don't use rva_to_ptr() for non-RVA values. --- dlls/msvcrt/except_x86_64.c | 8 ++++---- dlls/msvcrt/handler4.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index b0cf2ff9425..13bb0fa6fbd 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -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); } } diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c index 878a5497aaa..0f54ddd9f1f 100644 --- a/dlls/msvcrt/handler4.c +++ b/dlls/msvcrt/handler4.c @@ -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); }

1 0

Alexandre Julliard : msvcrt: Share the dump_function_descr() helper between platforms.
by Alexandre Julliard June 3, 2024

June 3, 2024

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