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

Eric Pouech : winedump: Support a couple of 'section' options (minidump).
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: b89102173e4fab8fe6f92adbabdb783ec2f9a393 URL: https://gitlab.winehq.org/wine/wine/-/commit/b89102173e4fab8fe6f92adbabdb78… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Mar 21 09:19:11 2024 +0100 winedump: Support a couple of 'section' options (minidump). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- tools/winedump/main.c | 4 +- tools/winedump/minidump.c | 707 +++++++++++++++++++++++----------------------- 2 files changed, 363 insertions(+), 348 deletions(-)

1 0

Rémi Bernon : win32u: Keep the primary current mode in the device manager context.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: ee0aad5cf63e9827226637ea99064e895782a221 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee0aad5cf63e9827226637ea99064e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 11 15:06:47 2024 +0200 win32u: Keep the primary current mode in the device manager context. --- dlls/win32u/sysparams.c | 35 +++++++++++++---------------------- 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 58ef0f2e9ac..01c3c4f13c6 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -924,9 +924,7 @@ struct device_manager_ctx HKEY source_key; /* for the virtual desktop settings */ BOOL is_primary; - UINT primary_bpp; - UINT primary_width; - UINT primary_height; + DEVMODEW primary; }; static void link_device( const char *instance, const char *class ) @@ -1828,13 +1826,7 @@ static void desktop_add_monitor( const struct gdi_monitor *monitor, void *param static void desktop_add_mode( const DEVMODEW *mode, BOOL current, void *param ) { struct device_manager_ctx *ctx = param; - - if (ctx->is_primary && current) - { - ctx->primary_bpp = mode->dmBitsPerPel; - ctx->primary_width = mode->dmPelsWidth; - ctx->primary_height = mode->dmPelsHeight; - } + if (ctx->is_primary && current) ctx->primary = *mode; } static const struct gdi_device_manager desktop_device_manager = @@ -1891,20 +1883,16 @@ static BOOL desktop_update_display_devices( BOOL force, struct device_manager_ct struct device_manager_ctx desktop_ctx = {0}; UINT screen_width, screen_height, max_width, max_height; unsigned int depths[] = {8, 16, 0}; - DEVMODEW current, mode = - { - .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, - .dmDisplayFrequency = 60, - }; + DEVMODEW current; UINT i, j; if (!force) return TRUE; /* in virtual desktop mode, read the device list from the user driver but expose virtual devices */ if (!update_display_devices( &desktop_device_manager, TRUE, &desktop_ctx )) return FALSE; - max_width = desktop_ctx.primary_width; - max_height = desktop_ctx.primary_height; - depths[ARRAY_SIZE(depths) - 1] = desktop_ctx.primary_bpp; + max_width = desktop_ctx.primary.dmPelsWidth; + max_height = desktop_ctx.primary.dmPelsHeight; + depths[ARRAY_SIZE(depths) - 1] = desktop_ctx.primary.dmBitsPerPel; if (!get_default_desktop_size( &screen_width, &screen_height )) { @@ -1916,9 +1904,7 @@ static BOOL desktop_update_display_devices( BOOL force, struct device_manager_ct add_source( "Default", source_flags, ctx ); if (!read_source_mode( ctx->source_key, ENUM_CURRENT_SETTINGS, &current )) { - current = mode; - current.dmFields |= DM_POSITION; - current.dmBitsPerPel = desktop_ctx.primary_bpp; + current = desktop_ctx.primary; current.dmPelsWidth = screen_width; current.dmPelsHeight = screen_height; } @@ -1931,7 +1917,12 @@ static BOOL desktop_update_display_devices( BOOL force, struct device_manager_ct for (i = 0; i < ARRAY_SIZE(depths); ++i) { - mode.dmBitsPerPel = depths[i]; + DEVMODEW mode = + { + .dmFields = DM_DISPLAYORIENTATION | DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY, + .dmDisplayFrequency = 60, + .dmBitsPerPel = depths[i], + }; for (j = 0; j < ARRAY_SIZE(screen_sizes); ++j) {

1 0

Rémi Bernon : win32u: Close device manager source key in write_source_to_registry.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: df1c70ee35de94b95bfe509bf8b89a9425238bef URL: https://gitlab.winehq.org/wine/wine/-/commit/df1c70ee35de94b95bfe509bf8b89a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 11 14:04:58 2024 +0200 win32u: Close device manager source key in write_source_to_registry. --- dlls/win32u/sysparams.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index b0b9a5cc907..916b84abbba 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1280,6 +1280,7 @@ static BOOL write_source_to_registry( const struct source *source, HKEY *source_ NtClose( hkey ); /* Following information is Wine specific, it doesn't really exist on Windows. */ + if (*source_key) NtClose( *source_key ); *source_key = reg_create_ascii_key( NULL, source->path, REG_OPTION_VOLATILE, NULL ); set_reg_ascii_value( *source_key, "GPUID", gpu->path ); set_reg_value( *source_key, state_flagsW, REG_DWORD, &source->state_flags, @@ -1302,12 +1303,6 @@ static void add_source( const char *name, UINT state_flags, void *param ) TRACE( "name %s, state_flags %#x\n", name, state_flags ); - if (ctx->source_key) - { - NtClose( ctx->source_key ); - ctx->source_key = NULL; - } - memset( &ctx->source, 0, sizeof(ctx->source) ); ctx->source.gpu = &ctx->gpu; ctx->source.id = ctx->source_count;

1 0

Alexandre Julliard : widl: Don't use a structure for NdrClientCall2 parameters on ARM.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 2f532567ffa5d400809450543828481b885fcab3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f532567ffa5d40080945054382848… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 15 12:57:20 2024 +0200 widl: Don't use a structure for NdrClientCall2 parameters on ARM. --- tools/widl/typegen.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7284e0531bc..063080bd9de 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -5063,7 +5063,7 @@ void write_client_call_routine( FILE *file, const type_t *iface, const var_t *fu int len, needs_params = 0; /* we need a param structure if we have more than one arg */ - if (pointer_size == 4 && args) needs_params = is_object( iface ) || list_count( args ) > 1; + if (target.cpu == CPU_i386 && args) needs_params = is_object( iface ) || list_count( args ) > 1; print_file( file, 0, "{\n"); if (needs_params) @@ -5086,7 +5086,7 @@ void write_client_call_routine( FILE *file, const type_t *iface, const var_t *fu { fprintf( file, ",\n%*s&__params", len, "" ); } - else if (pointer_size == 8) + else if (target.cpu != CPU_i386) { if (is_object( iface )) fprintf( file, ",\n%*sThis", len, "" ); if (args) @@ -5107,7 +5107,7 @@ void write_client_call_routine( FILE *file, const type_t *iface, const var_t *fu { print_file( file, 1, "return (" ); write_type_decl_left(file, rettype); - fprintf( file, ")%s;\n", pointer_size == 8 ? "_RetVal.Simple" : "*(LONG_PTR *)&_RetVal" ); + fprintf( file, ")%s;\n", target.cpu != CPU_i386 ? "_RetVal.Simple" : "*(LONG_PTR *)&_RetVal" ); } print_file( file, 0, "}\n\n"); }

1 0

Rémi Bernon : win32u: Remove fake source creation when adding display mode.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 72e429629355fea6118857ab27e15623f6a2708c URL: https://gitlab.winehq.org/wine/wine/-/commit/72e429629355fea6118857ab27e156… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 11 14:33:09 2024 +0200 win32u: Remove fake source creation when adding display mode. --- dlls/win32u/sysparams.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 916b84abbba..58ef0f2e9ac 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1439,13 +1439,6 @@ static void add_mode( const DEVMODEW *mode, BOOL current, void *param ) struct device_manager_ctx *ctx = param; DEVMODEW nopos_mode; - if (!ctx->gpu.source_count) - { - static const DWORD source_flags = DISPLAY_DEVICE_ATTACHED_TO_DESKTOP | DISPLAY_DEVICE_PRIMARY_DEVICE | DISPLAY_DEVICE_VGA_COMPATIBLE; - TRACE( "adding default fake source\n" ); - add_source( "Default", source_flags, ctx ); - } - nopos_mode = *mode; nopos_mode.dmPosition.x = 0; nopos_mode.dmPosition.y = 0;

1 0

Rémi Bernon : win32u: Add all display device source modes at once.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 320442a48b3de75470bb545831ebc9e80adaaab3 URL: https://gitlab.winehq.org/wine/wine/-/commit/320442a48b3de75470bb545831ebc9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 11 14:29:59 2024 +0200 win32u: Add all display device source modes at once. --- dlls/win32u/sysparams.c | 84 +++++++++++++++++------------------ dlls/wineandroid.drv/init.c | 8 +++- dlls/winemac.drv/display.c | 39 +--------------- dlls/winewayland.drv/display.c | 22 +++++---- dlls/winewayland.drv/wayland_output.c | 4 ++ dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winex11.drv/display.c | 41 ++--------------- include/wine/gdi_driver.h | 2 +- 8 files changed, 71 insertions(+), 130 deletions(-)

1 0

Alexandre Julliard : widl: Correctly align stack parameters on ARM.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 84509acb166387e5877066a39a56d4be54cdd9e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/84509acb166387e5877066a39a56d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 15 16:15:08 2024 +0200 widl: Correctly align stack parameters on ARM. --- tools/widl/typegen.c | 61 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 86d4354573e..7284e0531bc 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -417,20 +417,35 @@ static int get_padding(const var_list_t *fields) return ROUNDING(offset, salign); } -static unsigned int get_stack_size( const var_t *var, int *by_value ) +static unsigned int get_stack_size( const var_t *var, unsigned int *stack_align, int *by_value ) { - unsigned int stack_size; + unsigned int stack_size, align = 0; int by_val; switch (typegen_detect_type( var->declspec.type, var->attrs, TDT_ALL_TYPES )) { case TGT_BASIC: + if (target.cpu == CPU_ARM) + { + switch (type_basic_get_type( var->declspec.type )) + { + case TYPE_BASIC_FLOAT: + case TYPE_BASIC_DOUBLE: + case TYPE_BASIC_INT64: + case TYPE_BASIC_HYPER: + align = 8; + break; + default: + break; + } + } + /* fall through */ case TGT_ENUM: case TGT_RANGE: case TGT_STRUCT: case TGT_UNION: case TGT_USER_TYPE: - stack_size = type_memsize( var->declspec.type ); + stack_size = type_memsize_and_alignment( var->declspec.type, &align ); switch (target.cpu) { case CPU_x86_64: @@ -439,7 +454,11 @@ static unsigned int get_stack_size( const var_t *var, int *by_value ) case CPU_ARM64: by_val = (stack_size <= 2 * pointer_size); break; + case CPU_ARM: + by_val = 1; + break; default: + align = pointer_size; by_val = 1; break; } @@ -448,9 +467,12 @@ static unsigned int get_stack_size( const var_t *var, int *by_value ) by_val = 0; break; } - if (!by_val) stack_size = pointer_size; + if (align < pointer_size) align = pointer_size; + if (!by_val) stack_size = align = pointer_size; + if (by_value) *by_value = by_val; - return ROUND_SIZE( stack_size, pointer_size ); + if (stack_align) *stack_align = align; + return ROUND_SIZE( stack_size, align ); } static unsigned char get_contexthandle_flags( const type_t *iface, const attr_list_t *attrs, @@ -1035,7 +1057,8 @@ int decl_indirect(const type_t *t) } static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned short *flags, - unsigned int *stack_size, unsigned int *typestring_offset ) + unsigned int *stack_size, unsigned int *stack_align, + unsigned int *typestring_offset ) { unsigned int alignment, server_size = 0, buffer_size = 0; unsigned char fc = 0; @@ -1047,7 +1070,7 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned else if (!is_in && !is_out) is_in = TRUE; *flags = 0; - *stack_size = get_stack_size( var, &is_byval ); + *stack_size = get_stack_size( var, stack_align, &is_byval ); *typestring_offset = var->typestring_offset; if (is_in) *flags |= IsIn; @@ -1203,11 +1226,11 @@ static unsigned char get_func_oi2_flags( const var_t *func ) var_t *retval = type_function_get_retval( func->declspec.type ); unsigned char oi2_flags = 0x40; /* HasExtensions */ unsigned short flags; - unsigned int stack_size, typestring_offset; + unsigned int stack_size, stack_align, typestring_offset; if (args) LIST_FOR_EACH_ENTRY( var, args, const var_t, entry ) { - get_parameter_fc( var, 0, &flags, &stack_size, &typestring_offset ); + get_parameter_fc( var, 0, &flags, &stack_size, &stack_align, &typestring_offset ); if (flags & MustSize) { if (flags & IsIn) oi2_flags |= 0x02; /* ClientMustSize */ @@ -1218,7 +1241,7 @@ static unsigned char get_func_oi2_flags( const var_t *func ) if (!is_void( retval->declspec.type )) { oi2_flags |= 0x04; /* HasRet */ - get_parameter_fc( retval, 1, &flags, &stack_size, &typestring_offset ); + get_parameter_fc( retval, 1, &flags, &stack_size, &stack_align, &typestring_offset ); if (flags & MustSize) oi2_flags |= 0x01; /* ServerMustSize */ } return oi2_flags; @@ -1228,10 +1251,11 @@ static unsigned int write_new_procformatstring_type(FILE *file, int indent, cons int is_return, unsigned int *stack_offset) { char buffer[128]; - unsigned int stack_size, typestring_offset; + unsigned int stack_size, stack_align, typestring_offset; unsigned short flags; - unsigned char fc = get_parameter_fc( var, is_return, &flags, &stack_size, &typestring_offset ); + unsigned char fc = get_parameter_fc( var, is_return, &flags, &stack_size, &stack_align, &typestring_offset ); + *stack_offset = ROUND_SIZE( *stack_offset, stack_align ); strcpy( buffer, "/* flags:" ); if (flags & MustSize) strcat( buffer, " must size," ); if (flags & MustFree) strcat( buffer, " must free," ); @@ -1255,7 +1279,7 @@ static unsigned int write_new_procformatstring_type(FILE *file, int indent, cons else print_file( file, indent, "NdrFcShort(0x%x), /* type offset = %u */\n", typestring_offset, typestring_offset ); - *stack_offset += max( stack_size, pointer_size ); + *stack_offset += stack_size; return 6; } @@ -1313,7 +1337,7 @@ static unsigned int write_old_procformatstring_type(FILE *file, int indent, cons else print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); - size = get_stack_size( var, NULL ); + size = get_stack_size( var, NULL, NULL ); print_file(file, indent, "0x%02x,\n", size / pointer_size ); print_file(file, indent, "NdrFcShort(0x%x), /* type offset = %u */\n", offset, offset); size = 4; /* includes param type prefix */ @@ -1365,6 +1389,7 @@ static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, unsigned int nb_args = 0; unsigned int stack_size = 0; unsigned int stack_offset = 0; + unsigned int stack_align; unsigned short param_num = 0; unsigned short handle_stack_offset = 0; unsigned short handle_param_num = 0; @@ -1385,7 +1410,9 @@ static void write_proc_func_interp( FILE *file, int indent, const type_t *iface, handle_stack_offset = stack_size; handle_param_num = param_num; } - stack_size += get_stack_size( var, NULL ); + size = get_stack_size( var, &stack_align, NULL ); + stack_size = ROUND_SIZE( stack_size, stack_align ); + stack_size += size; param_num++; nb_args++; } @@ -1773,13 +1800,15 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *cont_type, if (is_object( iface )) offset += pointer_size; if (args) LIST_FOR_EACH_ENTRY( var, args, const var_t, entry ) { + unsigned int align, size = get_stack_size( var, &align, NULL ); + offset = ROUND_SIZE( offset, align ); if (var->name && !strcmp(var->name, subexpr->u.sval)) { expr_loc.v = var; correlation_variable = var->declspec.type; break; } - offset += get_stack_size( var, NULL ); + offset += size; if (var == current_arg) robust_flags &= ~RobustEarly; } }

1 0

Alexandre Julliard : widl: Only pass power of 2 structures by value on x86-64.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 377f9f8de923cc79144bcd2d02ad3959ce0c7ee4 URL: https://gitlab.winehq.org/wine/wine/-/commit/377f9f8de923cc79144bcd2d02ad39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 15 16:15:33 2024 +0200 widl: Only pass power of 2 structures by value on x86-64. --- tools/widl/typegen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 52874b717fe..86d4354573e 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -434,7 +434,7 @@ static unsigned int get_stack_size( const var_t *var, int *by_value ) switch (target.cpu) { case CPU_x86_64: - by_val = (stack_size <= pointer_size); + by_val = (stack_size == 1 || stack_size == 2 || stack_size == 4 || stack_size == 8); break; case CPU_ARM64: by_val = (stack_size <= 2 * pointer_size);

1 0

Eric Pouech : dbghelp: Store thread names in minidump.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: f0d0562881d8e31e4cde32c849b8a5c00475119f URL: https://gitlab.winehq.org/wine/wine/-/commit/f0d0562881d8e31e4cde32c849b8a5… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Apr 12 12:31:30 2024 +0200 dbghelp: Store thread names in minidump. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/minidump.c | 62 ++++++++++++++++++++++++++++++++++++++++++- dlls/dbghelp/tests/minidump.c | 4 +-- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/minidump.c b/dlls/dbghelp/minidump.c index 5a2b27f7632..054aaee22a9 100644 --- a/dlls/dbghelp/minidump.c +++ b/dlls/dbghelp/minidump.c @@ -771,6 +771,60 @@ static unsigned dump_threads(struct dump_context* dc) return sz; } +/****************************************************************** + * dump_threads_names + * + * Dumps into File the information about threads's name + */ +static unsigned dump_threads_names(struct dump_context* dc) +{ + MINIDUMP_THREAD_NAME md_thread_name; + MINIDUMP_THREAD_NAME_LIST md_thread_name_list; + unsigned i, sz; + RVA rva_base; + + /* FIXME this could be optimized + * (we use dc->num_threads disk space, could be optimized to the number of threads with name) + */ + + rva_base = dc->rva; + dc->rva += sz = offsetof(MINIDUMP_THREAD_NAME_LIST, ThreadNames[dc->num_threads]); + + md_thread_name_list.NumberOfThreadNames = 0; + + for (i = 0; i < dc->num_threads; i++) + { + HANDLE thread; + WCHAR *thread_name; + + if ((thread = OpenThread(THREAD_ALL_ACCESS, FALSE, dc->threads[i].tid)) != NULL) + { + if (GetThreadDescription(thread, &thread_name)) + { + MINIDUMP_STRING md_string; + + md_thread_name.ThreadId = dc->threads[i].tid; + md_thread_name.RvaOfThreadName = dc->rva; + + md_string.Length = wcslen(thread_name) * sizeof(WCHAR); + append(dc, &md_string.Length, sizeof(md_string.Length)); + append(dc, thread_name, md_string.Length); + + writeat(dc, + rva_base + offsetof(MINIDUMP_THREAD_NAME_LIST, ThreadNames[md_thread_name_list.NumberOfThreadNames]), + &md_thread_name, sizeof(md_thread_name)); + md_thread_name_list.NumberOfThreadNames++; + LocalFree(thread_name); + } + CloseHandle(thread); + } + } + if (!md_thread_name_list.NumberOfThreadNames) return 0; + + writeat(dc, rva_base, &md_thread_name_list.NumberOfThreadNames, sizeof(md_thread_name_list.NumberOfThreadNames)); + return sz; +} + /****************************************************************** * dump_memory_info * @@ -896,7 +950,7 @@ static DWORD CALLBACK write_minidump(void *_args) fetch_modules_info(dc); /* 1) init */ - nStreams = 6 + (dc->except_param ? 1 : 0) + + nStreams = 7 + (dc->except_param ? 1 : 0) + (dc->user_stream ? dc->user_stream->UserStreamCount : 0); /* pad the directory size to a multiple of 4 for alignment purposes */ @@ -931,6 +985,12 @@ static DWORD CALLBACK write_minidump(void *_args) writeat(dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), &mdDir, sizeof(mdDir)); + mdDir.StreamType = ThreadNamesStream; + mdDir.Location.Rva = dc->rva; + if ((mdDir.Location.DataSize = dump_threads_names(dc))) + writeat(dc, mdHead.StreamDirectoryRva + idx_stream++ * sizeof(mdDir), + &mdDir, sizeof(mdDir)); + mdDir.StreamType = ModuleListStream; mdDir.Location.Rva = dc->rva; mdDir.Location.DataSize = dump_modules(dc, FALSE); diff --git a/dlls/dbghelp/tests/minidump.c b/dlls/dbghelp/tests/minidump.c index 64fd3e4fb6c..088e44e6d8b 100644 --- a/dlls/dbghelp/tests/minidump.c +++ b/dlls/dbghelp/tests/minidump.c @@ -105,7 +105,7 @@ typedef DWORD64 stream_mask_t; STREAM2MASK(ProcessVmCountersStream)) /* streams added in Win8 & Win10... */ #define BASIC_STREAM_BROKEN_MASK (STREAM2MASK(SystemMemoryInfoStream) | STREAM2MASK(ProcessVmCountersStream)) -#define BASIC_STREAM_TODO_MASK (STREAM2MASK(SystemMemoryInfoStream) | STREAM2MASK(ProcessVmCountersStream) | STREAM2MASK(ThreadNamesStream)) +#define BASIC_STREAM_TODO_MASK (STREAM2MASK(SystemMemoryInfoStream) | STREAM2MASK(ProcessVmCountersStream)) static void test_minidump_contents(void) { static const struct minidump_streams @@ -234,9 +234,7 @@ static void minidump_check_threads_name(void *data, DWORD tid, const WCHAR* name if (!pSetThreadDescription) return; ret = MiniDumpReadDumpStream(data, ThreadNamesStream, NULL, (void**)&thread_name_list, &stream_size); - todo_wine ok(ret && thread_name_list, "Couldn't find thread-name-list stream\n"); - if (!ret) return; /* temp */ ok(stream_size == sizeof(thread_name_list->NumberOfThreadNames) + thread_name_list->NumberOfThreadNames * sizeof(thread_name_list->ThreadNames[0]), "Unexpected size\n"); for (i = 0; i < thread_name_list->NumberOfThreadNames; i++)

1 0

Eric Pouech : dbghelp: Test thread names in minidump.
by Alexandre Julliard April 15, 2024

April 15, 2024

Module: wine Branch: master Commit: 167902f318f202d878f7ade88e049e6b77aa0c94 URL: https://gitlab.winehq.org/wine/wine/-/commit/167902f318f202d878f7ade88e049e… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Mar 22 17:01:08 2024 +0100 dbghelp: Test thread names in minidump. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/minidump.c | 44 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/tests/minidump.c b/dlls/dbghelp/tests/minidump.c index c6f73ca2662..64fd3e4fb6c 100644 --- a/dlls/dbghelp/tests/minidump.c +++ b/dlls/dbghelp/tests/minidump.c @@ -26,6 +26,9 @@ #include "winnt.h" #include "wine/test.h" +static HRESULT (WINAPI *pSetThreadDescription)(HANDLE,PCWSTR); +static const WCHAR *main_thread_name = L"I'm the running thread!"; + static unsigned popcount32(ULONG val) { val -= val >> 1 & 0x55555555; @@ -102,7 +105,7 @@ typedef DWORD64 stream_mask_t; STREAM2MASK(ProcessVmCountersStream)) /* streams added in Win8 & Win10... */ #define BASIC_STREAM_BROKEN_MASK (STREAM2MASK(SystemMemoryInfoStream) | STREAM2MASK(ProcessVmCountersStream)) -#define BASIC_STREAM_TODO_MASK (STREAM2MASK(SystemMemoryInfoStream) | STREAM2MASK(ProcessVmCountersStream)) +#define BASIC_STREAM_TODO_MASK (STREAM2MASK(SystemMemoryInfoStream) | STREAM2MASK(ProcessVmCountersStream) | STREAM2MASK(ThreadNamesStream)) static void test_minidump_contents(void) { static const struct minidump_streams @@ -123,6 +126,7 @@ static void test_minidump_contents(void) {MiniDumpWithAvxXStateContext, BASIC_STREAM_MASK, BASIC_STREAM_TODO_MASK}, /* requires win10 at least */ {MiniDumpWithIptTrace, BASIC_STREAM_MASK, BASIC_STREAM_TODO_MASK}, }; + stream_mask_t expected_mask; MINIDUMP_HEADER *hdr; void *where; ULONG size; @@ -145,8 +149,10 @@ static void test_minidump_contents(void) for (j = 3; j < 25 /* last documented stream */; j++) { ret = MiniDumpReadDumpStream(hdr, j, NULL, &where, &size); + expected_mask = streams_table[i].streams_mask; + if (pSetThreadDescription) expected_mask |= STREAM2MASK(ThreadNamesStream); todo_wine_if(streams_table[i].todo_wine_mask & STREAM2MASK(j)) - if (streams_table[i].streams_mask & STREAM2MASK(j)) + if (expected_mask & STREAM2MASK(j)) ok((ret && where) || broken(BASIC_STREAM_BROKEN_MASK & STREAM2MASK(j)), "Expecting stream %d to be present\n", j); else ok(!ret, "Not expecting stream %d to be present\n", j); @@ -218,6 +224,36 @@ static void minidump_check_threads(void *data) } } +static void minidump_check_threads_name(void *data, DWORD tid, const WCHAR* name) +{ + MINIDUMP_THREAD_NAME_LIST *thread_name_list; + ULONG stream_size; + int i; + BOOL ret; + + if (!pSetThreadDescription) return; + + ret = MiniDumpReadDumpStream(data, ThreadNamesStream, NULL, (void**)&thread_name_list, &stream_size); + todo_wine + ok(ret && thread_name_list, "Couldn't find thread-name-list stream\n"); + if (!ret) return; /* temp */ + ok(stream_size == sizeof(thread_name_list->NumberOfThreadNames) + thread_name_list->NumberOfThreadNames * sizeof(thread_name_list->ThreadNames[0]), + "Unexpected size\n"); + for (i = 0; i < thread_name_list->NumberOfThreadNames; i++) + { + const MINIDUMP_THREAD_NAME *thread_name = &thread_name_list->ThreadNames[i]; + const MINIDUMP_STRING *md_string; + + md_string = RVA_TO_ADDR(data, (ULONG_PTR)thread_name->RvaOfThreadName); + if (thread_name->RvaOfThreadName == (ULONG_PTR)thread_name->RvaOfThreadName && + thread_name->ThreadId == tid && + wcslen(name) == md_string->Length / sizeof(WCHAR) && + !memcmp(name, md_string->Buffer, md_string->Length)) + break; + } + ok(i < thread_name_list->NumberOfThreadNames, "Couldn't find thread %lx %ls\n", tid, name); +} + static void minidump_check_module(void *data, const WCHAR *name, DWORD64 base) { MINIDUMP_MODULE_LIST *module_list; @@ -499,6 +535,7 @@ static void test_current_process(void) ok(walker.num_unwind_info == 0, "unexpected unwind info %u\n", walker.num_unwind_info); minidump_check_nostream(data, ExceptionStream); + minidump_check_threads_name(data, GetCurrentThreadId(), main_thread_name); minidump_close_for_read(data); ret = DeleteFileA("foo.mdmp"); @@ -857,6 +894,9 @@ START_TEST(minidump) return; } + if ((pSetThreadDescription = (void *)GetProcAddress(GetModuleHandleW(L"kernel32"), "SetThreadDescription"))) + pSetThreadDescription(GetCurrentThread(), main_thread_name); + test_minidump_contents(); test_current_process(); test_callback();

1 0