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

Alexandre Julliard : widl: Pass 16-byte structures by value on ARM64.
by Alexandre Julliard 15 Apr '24

15 Apr '24

Module: wine Branch: master Commit: 9cda4233df1e970251d0f5595f77b1bc95d6763f URL: https://gitlab.winehq.org/wine/wine/-/commit/9cda4233df1e970251d0f5595f77b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 15 12:04:56 2024 +0200 widl: Pass 16-byte structures by value on ARM64. --- tools/widl/typegen.c | 13 ++++++++++++- tools/widl/widl.c | 2 +- tools/widl/widl.h | 1 + 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 917f4b40a21..52874b717fe 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -431,7 +431,18 @@ static unsigned int get_stack_size( const var_t *var, int *by_value ) case TGT_UNION: case TGT_USER_TYPE: stack_size = type_memsize( var->declspec.type ); - by_val = (pointer_size < 8 || stack_size <= pointer_size); /* FIXME: should be platform-specific */ + switch (target.cpu) + { + case CPU_x86_64: + by_val = (stack_size <= pointer_size); + break; + case CPU_ARM64: + by_val = (stack_size <= 2 * pointer_size); + break; + default: + by_val = 1; + break; + } break; default: by_val = 0; diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 6d7dd46c33e..30907eca69b 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -89,7 +89,7 @@ static const char usage[] = static const char version_string[] = "Wine IDL Compiler version " PACKAGE_VERSION "\n" "Copyright 2002 Ove Kaaven\n"; -static struct target target; +struct target target = { 0 }; int debuglevel = DEBUGLEVEL_NONE; int parser_debug, yy_flex_debug; diff --git a/tools/widl/widl.h b/tools/widl/widl.h index c5ccc140b36..31bb2c83694 100644 --- a/tools/widl/widl.h +++ b/tools/widl/widl.h @@ -71,6 +71,7 @@ extern const char *prefix_client; extern const char *prefix_server; extern unsigned int packing; extern unsigned int pointer_size; +extern struct target target; extern time_t now; extern int open_typelib( const char *name );

1 0

Alexandre Julliard : widl: Only pass power of 2 structures by value on x86-64.
by Alexandre Julliard 15 Apr '24

15 Apr '24

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

Alexandre Julliard : widl: Correctly align stack parameters on ARM.
by Alexandre Julliard 15 Apr '24

15 Apr '24

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: Don't use a structure for NdrClientCall2 parameters on ARM.
by Alexandre Julliard 15 Apr '24

15 Apr '24

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: Close device manager source key in write_source_to_registry.
by Alexandre Julliard 15 Apr '24

15 Apr '24

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

Rémi Bernon : win32u: Remove fake source creation when adding display mode.
by Alexandre Julliard 15 Apr '24

15 Apr '24

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: Keep the primary current mode in the device manager context.
by Alexandre Julliard 15 Apr '24

15 Apr '24

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: Add all display device source modes at once.
by Alexandre Julliard 15 Apr '24

15 Apr '24

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

Jinoh Kang : kernel32/tests: Test module refcounting with forwarded exports.
by Alexandre Julliard 15 Apr '24

15 Apr '24

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 15 Apr '24

15 Apr '24

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