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

Giovanni Mascellani : vkd3d-shader/ir: Move breaks out of selections again after having optimized loops.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: vkd3d Branch: master Commit: eb15f97083e03975bc27eb72f1f5c159058df577 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eb15f97083e03975bc27eb72f1f5c… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 14 16:26:52 2024 +0100 vkd3d-shader/ir: Move breaks out of selections again after having optimized loops. --- libs/vkd3d-shader/ir.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index a9588279..6d428e22 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4200,6 +4200,25 @@ static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections(struct vsir_cfg return VKD3D_OK; } +static enum vkd3d_result vsir_cfg_move_breaks_out_of_selections_recursively(struct vsir_cfg *cfg, + struct vsir_cfg_structure_list *list) +{ + struct vsir_cfg_structure *trailing; + + if (list->count == 0) + return VKD3D_OK; + + trailing = &list->structures[list->count - 1]; + + if (trailing->type != STRUCTURE_TYPE_SELECTION) + return VKD3D_OK; + + vsir_cfg_move_breaks_out_of_selections_recursively(cfg, &trailing->u.selection.if_body); + vsir_cfg_move_breaks_out_of_selections_recursively(cfg, &trailing->u.selection.else_body); + + return vsir_cfg_move_breaks_out_of_selections(cfg, list); +} + static enum vkd3d_result vsir_cfg_synthesize_selections(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list) { @@ -4364,7 +4383,7 @@ static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct } } - ret = VKD3D_OK; + ret = vsir_cfg_move_breaks_out_of_selections_recursively(cfg, list); out: vsir_cfg_structure_list_cleanup(&old_list);

1 0

Giovanni Mascellani : vkd3d-shader/ir: Split program structurization.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: vkd3d Branch: master Commit: d891ac5017807f404f449061f54ca3441f8c6f2c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d891ac5017807f404f449061f54ca… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 10 15:21:52 2024 +0200 vkd3d-shader/ir: Split program structurization. --- libs/vkd3d-shader/ir.c | 76 +++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index 6d428e22..e7e66662 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4677,6 +4677,40 @@ fail: return ret; } +static enum vkd3d_result vsir_program_structurize(struct vsir_program *program, + struct vkd3d_shader_message_context *message_context) +{ + enum vkd3d_result ret; + struct vsir_cfg cfg; + + if ((ret = vsir_cfg_init(&cfg, program, message_context)) < 0) + return ret; + + vsir_cfg_compute_dominators(&cfg); + + if ((ret = vsir_cfg_compute_loops(&cfg)) < 0) + goto out; + + if ((ret = vsir_cfg_sort_nodes(&cfg)) < 0) + goto out; + + if ((ret = vsir_cfg_generate_synthetic_loop_intervals(&cfg)) < 0) + goto out; + + if ((ret = vsir_cfg_build_structured_program(&cfg)) < 0) + goto out; + + if ((ret = vsir_cfg_optimize(&cfg)) < 0) + goto out; + + ret = vsir_cfg_emit_structured_program(&cfg); + +out: + vsir_cfg_cleanup(&cfg); + + return ret; +} + static void register_map_undominated_use(struct vkd3d_shader_register *reg, struct ssas_to_temps_alloc *alloc, struct vsir_block *block, struct vsir_block **origin_blocks) { @@ -5654,48 +5688,8 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t if ((result = lower_switch_to_if_ladder(program)) < 0) return result; - if ((result = vsir_cfg_init(&cfg, program, message_context)) < 0) - return result; - - vsir_cfg_compute_dominators(&cfg); - - if ((result = vsir_cfg_compute_loops(&cfg)) < 0) - { - vsir_cfg_cleanup(&cfg); + if ((result = vsir_program_structurize(program, message_context)) < 0) return result; - } - - if ((result = vsir_cfg_sort_nodes(&cfg)) < 0) - { - vsir_cfg_cleanup(&cfg); - return result; - } - - if ((result = vsir_cfg_generate_synthetic_loop_intervals(&cfg)) < 0) - { - vsir_cfg_cleanup(&cfg); - return result; - } - - if ((result = vsir_cfg_build_structured_program(&cfg)) < 0) - { - vsir_cfg_cleanup(&cfg); - return result; - } - - if ((result = vsir_cfg_optimize(&cfg)) < 0) - { - vsir_cfg_cleanup(&cfg); - return result; - } - - if ((result = vsir_cfg_emit_structured_program(&cfg)) < 0) - { - vsir_cfg_cleanup(&cfg); - return result; - } - - vsir_cfg_cleanup(&cfg); if ((result = vsir_program_flatten_control_flow_constructs(program, message_context)) < 0) return result;

1 0

Giovanni Mascellani : vkd3d-shader/ir: Split undominated SSA materialization.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: vkd3d Branch: master Commit: 27801e56129f3288382b3227b623f664a6f91a1e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/27801e56129f3288382b3227b623f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Apr 10 15:26:50 2024 +0200 vkd3d-shader/ir: Split undominated SSA materialization. --- libs/vkd3d-shader/ir.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index e7e66662..b022d75c 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4803,6 +4803,24 @@ done: return VKD3D_OK; } +static enum vkd3d_result vsir_program_materialize_undominated_ssas_to_temps(struct vsir_program *program, + struct vkd3d_shader_message_context *message_context) +{ + enum vkd3d_result ret; + struct vsir_cfg cfg; + + if ((ret = vsir_cfg_init(&cfg, program, message_context)) < 0) + return ret; + + vsir_cfg_compute_dominators(&cfg); + + ret = vsir_cfg_materialize_undominated_ssas_to_temps(&cfg); + + vsir_cfg_cleanup(&cfg); + + return ret; +} + struct validation_context { struct vkd3d_shader_message_context *message_context; @@ -5680,8 +5698,6 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t if (program->shader_version.major >= 6) { - struct vsir_cfg cfg; - if ((result = vsir_program_materialise_phi_ssas_to_temps(program)) < 0) return result; @@ -5694,15 +5710,7 @@ enum vkd3d_result vsir_program_normalise(struct vsir_program *program, uint64_t if ((result = vsir_program_flatten_control_flow_constructs(program, message_context)) < 0) return result; - if ((result = vsir_cfg_init(&cfg, program, message_context)) < 0) - return result; - vsir_cfg_compute_dominators(&cfg); - - result = vsir_cfg_materialize_undominated_ssas_to_temps(&cfg); - - vsir_cfg_cleanup(&cfg); - - if (result < 0) + if ((result = vsir_program_materialize_undominated_ssas_to_temps(program, message_context)) < 0) return result; } else

1 0

Giovanni Mascellani : vkd3d-shader/ir: Prepare for changing the destination list in vsir_cfg_optimize_recurse().
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: vkd3d Branch: master Commit: a2c6b5450b3f6e21c60c9280df5e23694c91f6a5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a2c6b5450b3f6e21c60c9280df5e2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 14 15:04:29 2024 +0100 vkd3d-shader/ir: Prepare for changing the destination list in vsir_cfg_optimize_recurse(). --- libs/vkd3d-shader/ir.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index e0928ff7..da23e228 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4307,19 +4307,21 @@ static enum vkd3d_result vsir_cfg_append_loop(struct vsir_cfg *cfg, static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct vsir_cfg_structure_list *list) { - struct vsir_cfg_structure_list new_list = {0}; + struct vsir_cfg_structure_list old_list = *list, *new_list = list; enum vkd3d_result ret; size_t i; - for (i = 0; i < list->count; ++i) + memset(new_list, 0, sizeof(*new_list)); + + for (i = 0; i < old_list.count; ++i) { - struct vsir_cfg_structure *loop = &list->structures[i]; + struct vsir_cfg_structure *loop = &old_list.structures[i]; struct vsir_cfg_structure_list *loop_body; if (loop->type != STRUCTURE_TYPE_LOOP) { - if ((ret = vsir_cfg_structure_list_append_from_region(&new_list, loop, 1)) < 0) - goto fail; + if ((ret = vsir_cfg_structure_list_append_from_region(new_list, loop, 1)) < 0) + goto out; memset(loop, 0, sizeof(*loop)); continue; } @@ -4328,8 +4330,8 @@ static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct if (loop_body->count == 0) { - if ((ret = vsir_cfg_structure_list_append_from_region(&new_list, loop, 1)) < 0) - goto fail; + if ((ret = vsir_cfg_structure_list_append_from_region(new_list, loop, 1)) < 0) + goto out; memset(loop, 0, sizeof(*loop)); continue; } @@ -4337,22 +4339,19 @@ static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct vsir_cfg_remove_trailing_continue(cfg, loop_body, loop->u.loop.idx); if ((ret = vsir_cfg_optimize_recurse(cfg, loop_body)) < 0) - goto fail; + goto out; if ((ret = vsir_cfg_synthesize_selections(cfg, loop_body)) < 0) - goto fail; + goto out; - if ((ret = vsir_cfg_append_loop(cfg, &new_list, loop)) < 0) - goto fail; + if ((ret = vsir_cfg_append_loop(cfg, new_list, loop)) < 0) + goto out; } - vsir_cfg_structure_list_cleanup(list); - *list = new_list; + ret = VKD3D_OK; - return VKD3D_OK; - -fail: - vsir_cfg_structure_list_cleanup(list); +out: + vsir_cfg_structure_list_cleanup(&old_list); return ret; }

1 0

Giovanni Mascellani : vkd3d-shader/ir: Append code to the non-breaking branch if there is breaking one.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: vkd3d Branch: master Commit: be7eec75dcc769ebd809418e804e6bda4f4a9f71 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/be7eec75dcc769ebd809418e804e6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Mar 14 15:33:19 2024 +0100 vkd3d-shader/ir: Append code to the non-breaking branch if there is breaking one. --- libs/vkd3d-shader/ir.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/ir.c b/libs/vkd3d-shader/ir.c index da23e228..a9588279 100644 --- a/libs/vkd3d-shader/ir.c +++ b/libs/vkd3d-shader/ir.c @@ -4315,7 +4315,7 @@ static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct for (i = 0; i < old_list.count; ++i) { - struct vsir_cfg_structure *loop = &old_list.structures[i]; + struct vsir_cfg_structure *loop = &old_list.structures[i], *selection; struct vsir_cfg_structure_list *loop_body; if (loop->type != STRUCTURE_TYPE_LOOP) @@ -4346,6 +4346,22 @@ static enum vkd3d_result vsir_cfg_optimize_recurse(struct vsir_cfg *cfg, struct if ((ret = vsir_cfg_append_loop(cfg, new_list, loop)) < 0) goto out; + + /* If the last pushed instruction is a selection and one of the branches terminates with a + * `break', start pushing to the other branch, in the hope of eventually push a `break' + * there too and be able to remove a loop. */ + if (new_list->count == 0) + continue; + + selection = &new_list->structures[new_list->count - 1]; + + if (selection->type == STRUCTURE_TYPE_SELECTION) + { + if (vsir_cfg_get_trailing_break(&selection->u.selection.if_body)) + new_list = &selection->u.selection.else_body; + else if (vsir_cfg_get_trailing_break(&selection->u.selection.else_body)) + new_list = &selection->u.selection.if_body; + } } ret = VKD3D_OK;

1 0

Jinoh Kang : kernel32/tests: Test module refcounting with forwarded exports.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 4baada41a03ad577db3932334f48eda881a96f56 URL: https://gitlab.winehq.org/wine/wine/-/commit/4baada41a03ad577db3932334f48ed… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Mon Apr 15 23:50:22 2024 +0900 kernel32/tests: Test module refcounting with forwarded exports. --- dlls/kernel32/tests/loader.c | 433 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 433 insertions(+)

1 0

Eric Pouech : winedump: Add helpers to print DWORD64 integers.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: facae70c5e6c9d333378ab4af8db1efda1df1809 URL: https://gitlab.winehq.org/wine/wine/-/commit/facae70c5e6c9d333378ab4af8db1e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Mar 21 08:56:55 2024 +0100 winedump: Add helpers to print DWORD64 integers. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/dump.c | 23 ++++++++++++++++++ tools/winedump/minidump.c | 61 ++++++++++++++--------------------------------- tools/winedump/winedump.h | 2 ++ 3 files changed, 43 insertions(+), 43 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index 90602d43367..fb8e248729f 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -133,6 +133,29 @@ void dump_unicode_str( const WCHAR *str, int len ) printf( "\"" ); } +const char *get_hexint64_str( DWORD64 l ) +{ + char *buf = dump_want_n(2 + 16 + 1); + if (sizeof(l) > sizeof(unsigned long) && l >> 32) + sprintf(buf, "%#lx%08lx", (unsigned long)(l >> 32), (unsigned long)l); + else + sprintf(buf, "%#lx", (unsigned long)l); + assert(strlen(buf) <= 18); + return buf; +} + +const char *get_uint64_str( DWORD64 l ) +{ + char *buf = dump_want_n( 32 ); + char *ptr = buf + 31; + *ptr = '\0'; + for ( ; l; l /= 10) + *--ptr = '0' + (l % 10); + if (ptr == buf + 31) *--ptr = '0'; + assert(ptr >= buf); + return ptr; +} + const char* get_symbol_str(const char* symname) { const char* ret = NULL; diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 2506ae37d25..232b4b9f9dc 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -53,30 +53,6 @@ enum FileSig get_kind_mdmp(void) return SIG_UNKNOWN; } -static inline void print_longlong(const char *title, ULONG64 value) -{ - printf("%s: 0x", title); - if (sizeof(value) > sizeof(unsigned long) && value >> 32) - printf("%lx%08lx\n", (unsigned long)(value >> 32), (unsigned long)value); - else - printf("%lx\n", (unsigned long)value); -} - -static inline void print_longlong_range(const char *title, ULONG64 start, ULONG64 length) -{ - ULONG64 value = start; - printf("%s: 0x", title); - if (sizeof(value) > sizeof(unsigned long) && value >> 32) - printf("%lx%08lx-", (unsigned long)(value >> 32), (unsigned long)value); - else - printf("%lx-", (unsigned long)value); - value = start + length; - if (sizeof(value) > sizeof(unsigned long) && value >> 32) - printf("0x%lx%08lx\n", (unsigned long)(value >> 32), (unsigned long)value); - else - printf("0x%lx\n", (unsigned long)value); -} - void mdmp_dump(void) { const MINIDUMP_HEADER* hdr = PRD(0, sizeof(MINIDUMP_HEADER)); @@ -97,7 +73,7 @@ void mdmp_dump(void) printf("StreamDirectoryRva: %u\n", (UINT)hdr->StreamDirectoryRva); printf("CheckSum: %#x (%u)\n", hdr->CheckSum, hdr->CheckSum); printf("TimeDateStamp: %s\n", get_time_str(hdr->TimeDateStamp)); - print_longlong("Flags", hdr->Flags); + printf("Flags: %s\n", get_hexint64_str(hdr->Flags)); for (idx = 0; idx < hdr->NumberOfStreams; ++idx) { @@ -122,8 +98,8 @@ void mdmp_dump(void) printf(" SuspendCount: %u\n", mt->SuspendCount); printf(" PriorityClass: %u\n", mt->PriorityClass); printf(" Priority: %u\n", mt->Priority); - print_longlong(" Teb", mt->Teb); - print_longlong_range(" Stack", mt->Stack.StartOfMemoryRange, mt->Stack.Memory.DataSize); + printf(" Teb: %s\n", get_hexint64_str(mt->Teb)); + printf(" Stack: %s +%#x\n", get_hexint64_str(mt->Stack.StartOfMemoryRange), mt->Stack.Memory.DataSize); dump_mdmp_data(&mt->Stack.Memory, " "); printf(" ThreadContext:\n"); dump_mdmp_data(&mt->ThreadContext, " "); @@ -144,7 +120,7 @@ void mdmp_dump(void) for (i = 0; i < mml->NumberOfModules; i++, mm++) { printf(" Module #%d:\n", i); - print_longlong(" BaseOfImage", mm->BaseOfImage); + printf(" BaseOfImage: %s\n", get_hexint64_str(mm->BaseOfImage)); printf(" SizeOfImage: %#x (%u)\n", mm->SizeOfImage, mm->SizeOfImage); printf(" CheckSum: %#x (%u)\n", mm->CheckSum, mm->CheckSum); printf(" TimeDateStamp: %s\n", get_time_str(mm->TimeDateStamp)); @@ -214,8 +190,8 @@ void mdmp_dump(void) dump_mdmp_data(&mm->CvRecord, " "); printf(" MiscRecord: <%u>\n", (UINT)mm->MiscRecord.DataSize); dump_mdmp_data(&mm->MiscRecord, " "); - print_longlong(" Reserved0", mm->Reserved0); - print_longlong(" Reserved1", mm->Reserved1); + printf(" Reserved0: %s\n", get_hexint64_str(mm->Reserved0)); + printf(" Reserved1: %s\n", get_hexint64_str(mm->Reserved1)); } } break; @@ -228,7 +204,7 @@ void mdmp_dump(void) for (i = 0; i < mml->NumberOfMemoryRanges; i++, mmd++) { printf(" Memory Range #%d:\n", i); - print_longlong_range(" Range", mmd->StartOfMemoryRange, mmd->Memory.DataSize); + printf(" Range: %s +%#x\n", get_hexint64_str(mmd->StartOfMemoryRange), mmd->Memory.DataSize); dump_mdmp_data(&mmd->Memory, " "); } } @@ -423,13 +399,12 @@ void mdmp_dump(void) printf(" ExceptionRecord:\n"); printf(" ExceptionCode: %#x\n", mes->ExceptionRecord.ExceptionCode); printf(" ExceptionFlags: %#x\n", mes->ExceptionRecord.ExceptionFlags); - print_longlong(" ExceptionRecord", mes->ExceptionRecord.ExceptionRecord); - print_longlong(" ExceptionAddress", mes->ExceptionRecord.ExceptionAddress); + printf(" ExceptionRecord: %s\n", get_hexint64_str( mes->ExceptionRecord.ExceptionRecord)); + printf(" ExceptionAddress: %s\n", get_hexint64_str( mes->ExceptionRecord.ExceptionAddress)); printf(" ExceptionNumberParameters: %u\n", mes->ExceptionRecord.NumberParameters); for (i = 0; i < mes->ExceptionRecord.NumberParameters; i++) { - printf(" [%d]", i); - print_longlong(" ", mes->ExceptionRecord.ExceptionInformation[i]); + printf(" [%d] %s\n", i, get_hexint64_str(mes->ExceptionRecord.ExceptionInformation[i])); } printf(" ThreadContext:\n"); dump_mdmp_data(&mes->ThreadContext, " "); @@ -450,7 +425,7 @@ void mdmp_dump(void) const MINIDUMP_HANDLE_DESCRIPTOR_2 *hd = (void *)ptr; printf(" Handle [%u]:\n", i); - print_longlong(" Handle", hd->Handle); + printf(" Handle: %s\n", get_hexint64_str(hd->Handle)); printf(" TypeName: "); dump_mdmp_string(hd->TypeNameRva); printf("\n"); @@ -493,12 +468,12 @@ void mdmp_dump(void) printf(" DumpFlags: %#x\n", ti->DumpFlags); printf(" DumpError: %u\n", ti->DumpError); printf(" ExitStatus: %u\n", ti->ExitStatus); - print_longlong(" CreateTime", ti->CreateTime); - print_longlong(" ExitTime", ti->ExitTime); - print_longlong(" KernelTime", ti->KernelTime); - print_longlong(" UserTime", ti->UserTime); - print_longlong(" StartAddress", ti->StartAddress); - print_longlong(" Affinity", ti->Affinity); + printf(" CreateTime: %s\n", get_uint64_str(ti->CreateTime)); + printf(" ExitTime: %s\n", get_hexint64_str(ti->ExitTime)); + printf(" KernelTime: %s\n", get_uint64_str(ti->KernelTime)); + printf(" UserTime: %s\n", get_uint64_str(ti->UserTime)); + printf(" StartAddress: %s\n", get_hexint64_str(ti->StartAddress)); + printf(" Affinity: %s\n", get_uint64_str(ti->Affinity)); ptr += til->SizeOfEntry; } @@ -520,7 +495,7 @@ void mdmp_dump(void) const MINIDUMP_UNLOADED_MODULE *mod = (void *)ptr; printf(" Module [%u]:\n", i); - print_longlong(" BaseOfImage", mod->BaseOfImage); + printf(" BaseOfImage: %s\n", get_hexint64_str(mod->BaseOfImage)); printf(" SizeOfImage: %u\n", mod->SizeOfImage); printf(" CheckSum: %#x\n", mod->CheckSum); printf(" TimeDateStamp: %s\n", get_time_str(mod->TimeDateStamp)); diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 3df2410a6c3..673312b120c 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -229,6 +229,8 @@ void dump_data( const unsigned char *ptr, unsigned int size, const ch const char* get_time_str( unsigned long ); unsigned int strlenW( const unsigned short *str ); void dump_unicode_str( const unsigned short *str, int len ); +const char* get_hexint64_str( DWORD64 l ); +const char* get_uint64_str( DWORD64 l ); const char* get_guid_str(const GUID* guid); const char* get_unicode_str( const WCHAR *str, int len ); const char* get_symbol_str(const char* symname);

1 0

Eric Pouech : winedump: Simplify unicode string printing (minidump).
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 2253504aa5e1a05b05eac85e3c7939de21f795e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/2253504aa5e1a05b05eac85e3c7939… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Mar 21 09:08:29 2024 +0100 winedump: Simplify unicode string printing (minidump). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/minidump.c | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index 232b4b9f9dc..e93241ec1d0 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -31,15 +31,14 @@ static void dump_mdmp_data(const MINIDUMP_LOCATION_DESCRIPTOR* md, const char* p dump_data(PRD(md->Rva, md->DataSize), md->DataSize, pfx); } -static void dump_mdmp_string(DWORD rva) +static const char *get_mdmp_str(DWORD rva) { - const MINIDUMP_STRING* ms = PRD(rva, sizeof(MINIDUMP_STRING)); + const MINIDUMP_STRING* ms; if (!rva) - printf("<<rva=0>>"); - else if (ms) - dump_unicode_str( ms->Buffer, ms->Length / sizeof(WCHAR) ); - else - printf("<<?>>"); + return "<<rva=0>>"; + if ((ms = PRD(rva, sizeof(MINIDUMP_STRING)))) + return get_unicode_str( ms->Buffer, ms->Length / sizeof(WCHAR) ); + return "<<?>>"; } enum FileSig get_kind_mdmp(void) @@ -124,9 +123,7 @@ void mdmp_dump(void) printf(" SizeOfImage: %#x (%u)\n", mm->SizeOfImage, mm->SizeOfImage); printf(" CheckSum: %#x (%u)\n", mm->CheckSum, mm->CheckSum); printf(" TimeDateStamp: %s\n", get_time_str(mm->TimeDateStamp)); - printf(" ModuleName: "); - dump_mdmp_string(mm->ModuleNameRva); - printf("\n"); + printf(" ModuleName: %s\n", get_mdmp_str(mm->ModuleNameRva)); printf(" VersionInfo:\n"); printf(" dwSignature: %x\n", (UINT)mm->VersionInfo.dwSignature); printf(" dwStrucVersion: %x\n", (UINT)mm->VersionInfo.dwStrucVersion); @@ -344,9 +341,7 @@ void mdmp_dump(void) } printf(" Version: Windows %s (%u)\n", str, msi->BuildNumber); printf(" PlatformId: %u\n", msi->PlatformId); - printf(" CSD: "); - dump_mdmp_string(msi->CSDVersionRva); - printf("\n"); + printf(" CSD: %s\n", get_mdmp_str(msi->CSDVersionRva)); printf(" Reserved1: %u\n", msi->Reserved1); if (msi->ProcessorArchitecture == PROCESSOR_ARCHITECTURE_INTEL) { @@ -426,12 +421,8 @@ void mdmp_dump(void) printf(" Handle [%u]:\n", i); printf(" Handle: %s\n", get_hexint64_str(hd->Handle)); - printf(" TypeName: "); - dump_mdmp_string(hd->TypeNameRva); - printf("\n"); - printf(" ObjectName: "); - dump_mdmp_string(hd->ObjectNameRva); - printf("\n"); + printf(" TypeName: %s\n", get_mdmp_str(hd->TypeNameRva)); + printf(" ObjectName: %s\n", get_mdmp_str(hd->ObjectNameRva)); printf(" Attributes: %#x\n", hd->Attributes); printf(" GrantedAccess: %#x\n", hd->GrantedAccess); printf(" HandleCount: %u\n", hd->HandleCount); @@ -439,9 +430,7 @@ void mdmp_dump(void) if (mhd->SizeOfDescriptor >= sizeof(MINIDUMP_HANDLE_DESCRIPTOR_2)) { - printf(" ObjectInfo: "); - dump_mdmp_string(hd->ObjectInfoRva); - printf("\n"); + printf(" ObjectInfo: %s\n", get_mdmp_str(hd->ObjectInfoRva)); printf(" Reserved0: %#x\n", hd->Reserved0); } @@ -499,9 +488,7 @@ void mdmp_dump(void) printf(" SizeOfImage: %u\n", mod->SizeOfImage); printf(" CheckSum: %#x\n", mod->CheckSum); printf(" TimeDateStamp: %s\n", get_time_str(mod->TimeDateStamp)); - printf(" ModuleName: "); - dump_mdmp_string(mod->ModuleNameRva); - printf("\n"); + printf(" ModuleName: %s\n", get_mdmp_str(mod->ModuleNameRva)); ptr += uml->SizeOfEntry; }

1 0

Eric Pouech : winedump: Extend dumping of some minidump parts.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 30a70548796e46c07bb508ac9aee38b30db60e39 URL: https://gitlab.winehq.org/wine/wine/-/commit/30a70548796e46c07bb508ac9aee38… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Mar 2 12:19:08 2024 +0100 winedump: Extend dumping of some minidump parts. - extend dump information in misc stream - dump token, thread name, memory info list streams Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/main.c | 4 +- tools/winedump/minidump.c | 305 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 303 insertions(+), 6 deletions(-)

1 0

Eric Pouech : winedump: Tidy up dumping minidump.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 73b653f5144c0930a268be8b8fa3f99cc2b5c1d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/73b653f5144c0930a268be8b8fa3f9… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Apr 12 15:56:04 2024 +0200 winedump: Tidy up dumping minidump. - homogenize dir entry - print all thread id:s and RVA in hex - improve some indentation Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/minidump.c | 66 ++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index e6faa7da5c1..45938098396 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -2,6 +2,7 @@ * MiniDump dumping utility * * Copyright 2005 Eric Pouech + * 2024 Eric Pouech for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -66,12 +67,13 @@ void mdmp_dump(void) return; } - printf("Signature: %#x (%.4s)\n", hdr->Signature, (const char*)&hdr->Signature); - printf("Version: %#x\n", hdr->Version); - printf("NumberOfStreams: %u\n", hdr->NumberOfStreams); - printf("StreamDirectoryRva: %u\n", (UINT)hdr->StreamDirectoryRva); - printf("CheckSum: %#x (%u)\n", hdr->CheckSum, hdr->CheckSum); - printf("TimeDateStamp: %s\n", get_time_str(hdr->TimeDateStamp)); + printf("Header\n"); + printf(" Signature: %#x (%.4s)\n", hdr->Signature, (const char*)&hdr->Signature); + printf(" Version: %#x\n", hdr->Version); + printf(" NumberOfStreams: %u\n", hdr->NumberOfStreams); + printf(" StreamDirectoryRva: %#x\n", (UINT)hdr->StreamDirectoryRva); + printf(" CheckSum: %#x (%u)\n", hdr->CheckSum, hdr->CheckSum); + printf(" TimeDateStamp: %s\n", get_time_str(hdr->TimeDateStamp)); printf("Flags: %s\n", get_hexint64_str(hdr->Flags)); for (idx = 0; idx < hdr->NumberOfStreams; ++idx) @@ -81,29 +83,32 @@ void mdmp_dump(void) stream = PRD(dir->Location.Rva, dir->Location.DataSize); - printf("Stream [%u]: ", idx); switch (dir->StreamType) { + case UnusedStream: + printf("Stream [%u]: Unused:\n", idx); + break; case ThreadListStream: if (globals_dump_sect("thread")) { const MINIDUMP_THREAD_LIST *mtl = stream; const MINIDUMP_THREAD *mt = mtl->Threads; - printf("Threads: %u\n", (UINT)mtl->NumberOfThreads); + printf("Stream [%u]: Threads:\n", idx); + printf(" NumberOfThreads: %u\n", mtl->NumberOfThreads); for (i = 0; i < mtl->NumberOfThreads; i++, mt++) { - printf("Thread: #%d\n", i); - printf(" ThreadId: %u\n", mt->ThreadId); - printf(" SuspendCount: %u\n", mt->SuspendCount); - printf(" PriorityClass: %u\n", mt->PriorityClass); - printf(" Priority: %u\n", mt->Priority); + printf(" Thread: #%d\n", i); + printf(" ThreadId: %#x\n", mt->ThreadId); + printf(" SuspendCount: %u\n", mt->SuspendCount); + printf(" PriorityClass: %u\n", mt->PriorityClass); + printf(" Priority: %u\n", mt->Priority); printf(" Teb: %s\n", get_hexint64_str(mt->Teb)); printf(" Stack: %s +%#x\n", get_hexint64_str(mt->Stack.StartOfMemoryRange), mt->Stack.Memory.DataSize); if (globals_dump_sect("content")) - dump_mdmp_data(&mt->Stack.Memory, " "); + dump_mdmp_data(&mt->Stack.Memory, " "); printf(" ThreadContext:\n"); - dump_mdmp_data(&mt->ThreadContext, " "); + dump_mdmp_data(&mt->ThreadContext, " "); } } break; @@ -116,9 +121,9 @@ void mdmp_dump(void) const char* p1; const char* p2; - printf("Modules (%s): %u\n", - dir->StreamType == ModuleListStream ? "PE" : "ELF", - mml->NumberOfModules); + printf("Stream [%u]: Modules (%s):\n", idx, + dir->StreamType == ModuleListStream ? "PE" : "ELF"); + printf(" NumberOfModules: %u\n", mml->NumberOfModules); for (i = 0; i < mml->NumberOfModules; i++, mm++) { printf(" Module #%d:\n", i); @@ -188,10 +193,10 @@ void mdmp_dump(void) (UINT)mm->VersionInfo.dwFileDateMS, (UINT)mm->VersionInfo.dwFileDateLS); printf(" CvRecord: <%u>\n", (UINT)mm->CvRecord.DataSize); if (globals_dump_sect("content")) - dump_mdmp_data(&mm->CvRecord, " "); + dump_mdmp_data(&mm->CvRecord, " "); printf(" MiscRecord: <%u>\n", (UINT)mm->MiscRecord.DataSize); if (globals_dump_sect("content")) - dump_mdmp_data(&mm->MiscRecord, " "); + dump_mdmp_data(&mm->MiscRecord, " "); printf(" Reserved0: %s\n", get_hexint64_str(mm->Reserved0)); printf(" Reserved1: %s\n", get_hexint64_str(mm->Reserved1)); } @@ -203,14 +208,15 @@ void mdmp_dump(void) const MINIDUMP_MEMORY_LIST *mml = stream; const MINIDUMP_MEMORY_DESCRIPTOR* mmd = mml->MemoryRanges; - printf("Memory Ranges: %u\n", mml->NumberOfMemoryRanges); + printf("Stream [%u]: Memory Ranges:\n", idx); + printf(" NumberOfMemoryRanges: %u\n", mml->NumberOfMemoryRanges); for (i = 0; i < mml->NumberOfMemoryRanges; i++, mmd++) { printf(" Memory Range #%d:\n", i); dump_mdmp_data(&mmd->Memory, " "); printf(" Range: %s +%#x\n", get_hexint64_str(mmd->StartOfMemoryRange), mmd->Memory.DataSize); if (globals_dump_sect("content")) - dump_mdmp_data(&mmd->Memory, " "); + dump_mdmp_data(&mmd->Memory, " "); } } break; @@ -221,7 +227,7 @@ void mdmp_dump(void) const char* str; char tmp[128]; - printf("System Information:\n"); + printf("Stream [%u]: System Information:\n", idx); switch (msi->ProcessorArchitecture) { case PROCESSOR_ARCHITECTURE_UNKNOWN: @@ -400,7 +406,7 @@ void mdmp_dump(void) { const MINIDUMP_EXCEPTION_STREAM *mes = stream; - printf("Exception:\n"); + printf("Stream [%u]: Exception:\n", idx); printf(" ThreadId: %#x\n", mes->ThreadId); printf(" ExceptionRecord:\n"); printf(" ExceptionCode: %#x\n", mes->ExceptionRecord.ExceptionCode); @@ -421,7 +427,7 @@ void mdmp_dump(void) { const MINIDUMP_HANDLE_DATA_STREAM *mhd = stream; - printf("Handle data:\n"); + printf("Stream [%u]: Handle data:\n", idx); printf(" SizeOfHeader: %u\n", mhd->SizeOfHeader); printf(" SizeOfDescriptor: %u\n", mhd->SizeOfDescriptor); printf(" NumberOfDescriptors: %u\n", mhd->NumberOfDescriptors); @@ -455,7 +461,7 @@ void mdmp_dump(void) { const MINIDUMP_THREAD_INFO_LIST *til = stream; - printf("Thread Info List:\n"); + printf("Stream [%u]: Thread Info List:\n", idx); printf(" SizeOfHeader: %u\n", (UINT)til->SizeOfHeader); printf(" SizeOfEntry: %u\n", (UINT)til->SizeOfEntry); printf(" NumberOfEntries: %u\n", (UINT)til->NumberOfEntries); @@ -466,7 +472,7 @@ void mdmp_dump(void) const MINIDUMP_THREAD_INFO *ti = (void *)ptr; printf(" Thread [%u]:\n", i); - printf(" ThreadId: %u\n", ti->ThreadId); + printf(" ThreadId: %#x\n", ti->ThreadId); printf(" DumpFlags: %#x\n", ti->DumpFlags); printf(" DumpError: %u\n", ti->DumpError); printf(" ExitStatus: %u\n", ti->ExitStatus); @@ -486,7 +492,7 @@ void mdmp_dump(void) { const MINIDUMP_UNLOADED_MODULE_LIST *uml = stream; - printf("Unloaded module list:\n"); + printf("Stream [%u]: Unloaded module list:\n", idx); printf(" SizeOfHeader: %u\n", uml->SizeOfHeader); printf(" SizeOfEntry: %u\n", uml->SizeOfEntry); printf(" NumberOfEntries: %u\n", uml->NumberOfEntries); @@ -508,8 +514,8 @@ void mdmp_dump(void) } break; default: - printf("NIY %d\n", dir->StreamType); - printf(" RVA: %u\n", (UINT)dir->Location.Rva); + printf("Stream [%u]: NIY %d\n", idx, dir->StreamType); + printf(" RVA: %#x\n", (UINT)dir->Location.Rva); printf(" Size: %u\n", dir->Location.DataSize); if (globals_dump_sect("content")) dump_mdmp_data(&dir->Location, " ");

1 0