September 2022 - Wine-Commits

Zebediah Figura : vkd3d-shader/hlsl: Use hlsl_new_int_constant() in the "primary_expr" rule.
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: vkd3d Branch: master Commit: f8da1000524388bfbd19243c72e8d57956e0bd7b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f8da1000524388bfbd19243c72e8d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 18:54:09 2022 -0500 vkd3d-shader/hlsl: Use hlsl_new_int_constant() in the "primary_expr" rule. --- libs/vkd3d-shader/hlsl.y | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 50a3a094..fc3b31a4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3990,10 +3990,8 @@ primary_expr: { struct hlsl_ir_constant *c; - if (!(c = hlsl_alloc(ctx, sizeof(*c)))) + if (!(c = hlsl_new_int_constant(ctx, $1, &@1))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, hlsl_get_scalar_type(ctx, HLSL_TYPE_INT), @1); - c->value[0].i = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce a hlsl_new_bool_constant() helper.
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: vkd3d Branch: master Commit: 3fc2fdc37f2e6c3b9c3560213a8fdd36577b6e80 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3fc2fdc37f2e6c3b9c3560213a8fd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 18:54:03 2022 -0500 vkd3d-shader/hlsl: Introduce a hlsl_new_bool_constant() helper. --- libs/vkd3d-shader/hlsl.c | 10 ++++++++++ libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 13 +++++++------ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index cb1fd14a..c1cd065a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -915,6 +915,16 @@ struct hlsl_ir_constant *hlsl_new_constant(struct hlsl_ctx *ctx, struct hlsl_typ return c; } +struct hlsl_ir_constant *hlsl_new_bool_constant(struct hlsl_ctx *ctx, bool b, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_constant *c; + + if ((c = hlsl_new_constant(ctx, hlsl_get_scalar_type(ctx, HLSL_TYPE_BOOL), loc))) + c->value[0].u = b ? ~0u : 0; + + return c; +} + struct hlsl_ir_constant *hlsl_new_float_constant(struct hlsl_ctx *ctx, float f, const struct vkd3d_shader_location *loc) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index c5bd9b79..770a4032 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -751,6 +751,7 @@ struct hlsl_type *hlsl_get_element_type_from_path_index(struct hlsl_ctx *ctx, co struct hlsl_type *hlsl_new_array_type(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, unsigned int array_size); struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2); +struct hlsl_ir_constant *hlsl_new_bool_constant(struct hlsl_ctx *ctx, bool b, const struct vkd3d_shader_location *loc); struct hlsl_buffer *hlsl_new_buffer(struct hlsl_ctx *ctx, enum hlsl_buffer_type type, const char *name, const struct hlsl_reg_reservation *reservation, struct vkd3d_shader_location loc); struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ctx *ctx, struct hlsl_ir_node *node, struct hlsl_type *type, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 565a551d..50a3a094 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2800,7 +2800,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl struct hlsl_type *type; INT intval; FLOAT floatval; - BOOL boolval; + bool boolval; char *name; DWORD modifiers; struct hlsl_ir_node *instr; @@ -3857,11 +3857,11 @@ initializer_expr_list: boolean: KW_TRUE { - $$ = TRUE; + $$ = true; } | KW_FALSE { - $$ = FALSE; + $$ = false; } statement_list: @@ -4001,12 +4001,13 @@ primary_expr: { struct hlsl_ir_constant *c; - if (!(c = hlsl_alloc(ctx, sizeof(*c)))) + if (!(c = hlsl_new_bool_constant(ctx, $1, &@1))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, hlsl_get_scalar_type(ctx, HLSL_TYPE_BOOL), @1); - c->value[0].u = $1 ? ~0u : 0; if (!($$ = make_list(ctx, &c->node))) + { + hlsl_free_instr(&c->node); YYABORT; + } } | VAR_IDENTIFIER {

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce a hlsl_new_float_constant() helper.
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: vkd3d Branch: master Commit: 4c5fd9c7b96e45a769bd21f1b6adcf2469083431 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4c5fd9c7b96e45a769bd21f1b6adc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 18:50:04 2022 -0500 vkd3d-shader/hlsl: Introduce a hlsl_new_float_constant() helper. --- libs/vkd3d-shader/hlsl.c | 11 +++++++++++ libs/vkd3d-shader/hlsl.h | 2 ++ libs/vkd3d-shader/hlsl.y | 4 +--- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c4848632..cb1fd14a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -915,6 +915,17 @@ struct hlsl_ir_constant *hlsl_new_constant(struct hlsl_ctx *ctx, struct hlsl_typ return c; } +struct hlsl_ir_constant *hlsl_new_float_constant(struct hlsl_ctx *ctx, float f, + const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_constant *c; + + if ((c = hlsl_new_constant(ctx, hlsl_get_scalar_type(ctx, HLSL_TYPE_FLOAT), loc))) + c->value[0].f = f; + + return c; +} + struct hlsl_ir_constant *hlsl_new_int_constant(struct hlsl_ctx *ctx, int n, const struct vkd3d_shader_location *loc) { diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index b9dfc9cd..c5bd9b79 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -758,6 +758,8 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ctx *ctx, struct hlsl_ir_node *no struct hlsl_ir_constant *hlsl_new_constant(struct hlsl_ctx *ctx, struct hlsl_type *type, const struct vkd3d_shader_location *loc); struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ctx *ctx, struct hlsl_ir_node *node); +struct hlsl_ir_constant *hlsl_new_float_constant(struct hlsl_ctx *ctx, + float f, const struct vkd3d_shader_location *loc); struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, struct list *parameters, const struct hlsl_semantic *semantic, struct vkd3d_shader_location loc); struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct vkd3d_shader_location loc); diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 4c9b912c..565a551d 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -3981,10 +3981,8 @@ primary_expr: { struct hlsl_ir_constant *c; - if (!(c = hlsl_alloc(ctx, sizeof(*c)))) + if (!(c = hlsl_new_float_constant(ctx, $1, &@1))) YYABORT; - init_node(&c->node, HLSL_IR_CONSTANT, hlsl_get_scalar_type(ctx, HLSL_TYPE_FLOAT), @1); - c->value[0].f = $1; if (!($$ = make_list(ctx, &c->node))) YYABORT; }

1 0

Francois Gouget : winetest: Allow some extra failures for Windows 11.
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: tools Branch: master Commit: 89abc5a43c39e602f6c3b0240a3590628835c7d4 URL: https://gitlab.winehq.org/winehq/tools/-/commit/89abc5a43c39e602f6c3b0240a3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 27 17:40:28 2022 +0200 winetest: Allow some extra failures for Windows 11. The latest Windows 10 versions don't need the slack anymore but Windows 11 currently has about 10 too many failures. --- winetest/dissect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/winetest/dissect b/winetest/dissect index ee676980..5a1ada8b 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -414,7 +414,7 @@ foreach my $entry (@idmatch) } } # Give a little slack to the latest Windows 10. -$maxfailedtests += 20 if ($version =~ /^win200[49]$/); +$maxfailedtests += 20 if ($version =~ /^w11/); if ($prediluvian and not $acceptprediluvianwin) {

1 0

Francois Gouget : winetest: Add support for Windows 11 21H2 and 22H2.
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: tools Branch: master Commit: 46e44b57aa87df3affa0b0d1e481f4ddcbd3b7a0 URL: https://gitlab.winehq.org/winehq/tools/-/commit/46e44b57aa87df3affa0b0d1e48… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 27 17:36:36 2022 +0200 winetest: Add support for Windows 11 21H2 and 22H2. Use 'w11' as the prefix instead of 'win11' to keep the version name short and distinguish them from the similar Windows 10 names. --- winetest/build-patterns | 1 + winetest/dissect | 2 ++ winetest/winetest.conf | 1 + 3 files changed, 4 insertions(+) diff --git a/winetest/build-patterns b/winetest/build-patterns index 08121c1b..a975c35c 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -430,6 +430,7 @@ my %platform_order = ( win2009 => 10.2009, win21H1 => 10.2101, win21H2 => 10.2107, win10 => 10.2100, # for backward compatibility + w1121H2 => 11.2110, w1122H2 => 11.2210, wine => 90.0, linux => 90.1, mac => 90.2, bsd => 90.3, solaris => 90.4 ); diff --git a/winetest/dissect b/winetest/dissect index 300079a9..ee676980 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -392,6 +392,8 @@ my @idmatch = ( [ "win2009", 2, 10, 0, 19042, 1, 0 ], [ "win21H1", 2, 10, 0, 19043, 1, 0 ], [ "win21H2", 2, 10, 0, 19044, 1, 0 ], + [ "w1121H2", 2, 10, 0, 22000, 1, 0 ], + [ "w1122H2", 2, 10, 0, 22621, 1, 0 ], # [ "ce", 3, undef, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, undef, 0 ], [ "unknown", undef, undef, undef, undef, undef, 1 ], diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 54ab7928..d9e6c359 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -50,6 +50,7 @@ $fixed_threshold = 0.99; { name => "Win1909+", ids => [ "win1909", "win2004" ] }, { name => "Win10", ids => [ "win2009", "win21H2", "win10" ] }, # win10 for backward compatibility { name => "Win10L", ids => [ "win21H1" ] }, + { name => "Win11", ids => [ "w1121H2", "w1122H2" ] }, { name => "Other", ids => [ "unknown" ] }, { name => "Linux", ids => [ "linux" ] }, { name => "Mac", ids => [ "mac" ] },

1 0

Francois Gouget : winetest: Tweak the Windows version ordering to make it easier to extend.
by Alexandre Julliard Sept. 28, 2022

Sept. 28, 2022

Module: tools Branch: master Commit: 3be3641198ab254eaa8a8e6cfa43b4c65596bd85 URL: https://gitlab.winehq.org/winehq/tools/-/commit/3be3641198ab254eaa8a8e6cfa4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 27 17:33:30 2022 +0200 winetest: Tweak the Windows version ordering to make it easier to extend. Use decimal numbers loosely based on Windows' major.minor version numbers. Just make sure that the fractional part always provides a sensible order. --- winetest/build-patterns | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/winetest/build-patterns b/winetest/build-patterns index 2e909697..08121c1b 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -416,22 +416,22 @@ foreach my $build (@sortedbuilds) # my %platform_order = ( - 95 => 1, 98 => 2, me => 3, - nt3 => 4, nt4 => 5, 2000 => 6, - xp => 7, 2003 => 8, - vista => 9, 2008 => 10, - win7 => 11, - win8 => 21, win81 => 22, - win1507 => 1507, win1511 => 1511, - win1607 => 1607, win1703 => 1703, - win1709 => 1709, win1803 => 1803, - win1809 => 1809, win1903 => 1903, - win1909 => 1909, win2004 => 2004, - win2009 => 2009, win21H1 => 2101, - win21H2 => 2107, - win10 => 2100, # for backward compatibility - wine => 3000, linux => 3001, mac => 3001, - bsd => 3002, solaris => 3003 + 95 => 2.0, 98 => 2.1, me => 2.3, + nt3 => 3.0, nt4 => 4.0, 2000 => 5.0, + xp => 5.1, 2003 => 5.2, + vista => 6.0, 2008 => 6.1, + win7 => 7.0, + win8 => 8.0, win81 => 8.1, + win1507 => 10.1507, win1511 => 10.1511, + win1607 => 10.1607, win1703 => 10.1703, + win1709 => 10.1709, win1803 => 10.1803, + win1809 => 10.1809, win1903 => 10.1903, + win1909 => 10.1909, win2004 => 10.2004, + win2009 => 10.2009, win21H1 => 10.2101, + win21H2 => 10.2107, + win10 => 10.2100, # for backward compatibility + wine => 90.0, linux => 90.1, mac => 90.2, + bsd => 90.3, solaris => 90.4 ); sub cmpreports

1 0

Jacek Caban : winevulkan: Always use params to return Unix thunks result.
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: wine Branch: master Commit: 26dce2480ab68756a6558e17eb2bb1ec45743218 URL: https://gitlab.winehq.org/wine/wine/-/commit/26dce2480ab68756a6558e17eb2bb1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 23 21:14:41 2022 +0200 winevulkan: Always use params to return Unix thunks result. --- dlls/winevulkan/loader.c | 28 +- dlls/winevulkan/loader_thunks.c | 453 +++++++---- dlls/winevulkan/loader_thunks.h | 157 ++++ dlls/winevulkan/make_vulkan | 20 +- dlls/winevulkan/vulkan_thunks.c | 1570 ++++++++++++++++----------------------- 5 files changed, 1107 insertions(+), 1121 deletions(-)

1 0

Eric Pouech : winedump: Dump PDB public symbols' stream.
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: wine Branch: master Commit: a014f19bddba0b889c82529fa1084add851fde3f URL: https://gitlab.winehq.org/wine/wine/-/commit/a014f19bddba0b889c82529fa1084a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 27 11:22:12 2022 +0200 winedump: Dump PDB public symbols' stream. Add relevant structures to include/mscvpdb.h. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/mscvpdb.h | 15 +++++++++++++++ tools/winedump/pdb.c | 23 ++++++++++++++++------- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 96511b759b1..90adc3ee465 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2649,6 +2649,21 @@ typedef struct #define DBI_MAX_HASH 4096 #define DBI_BITMAP_HASH_SIZE ((DBI_MAX_HASH / (8 * sizeof(unsigned)) + 1) * sizeof(unsigned)) +/* Header for public stream (from DBI / SYMBOLS stream) + * Followed by a hash table (cf DBI_HASH_HEADER and the following bits) + */ +typedef struct +{ + unsigned hash_size; + unsigned address_map_size; + unsigned num_thunks; + unsigned size_thunk; + unsigned short section_thunk_table; + unsigned short _pad0; + unsigned offset_thunk_table; + unsigned num_sects; +} DBI_PUBLIC_HEADER; + #include "poppack.h" /* =================================================== diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index efedda2d6d4..ab844fd8555 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -306,17 +306,26 @@ static void dump_global_symbol(struct pdb_reader* reader, unsigned file) static void dump_public_symbol(struct pdb_reader* reader, unsigned file) { - void* public = NULL; - DWORD size; + unsigned size; + DBI_PUBLIC_HEADER* hdr; - public = reader->read_file(reader, file); - if (!public) return; + hdr = reader->read_file(reader, file); + if (!hdr) return; size = pdb_get_file_size(reader, file); - printf("Public symbols table:\n"); - dump_data(public, size, "\t"); - free(public); + printf("Public symbols table: (%u)\n", size); + + printf("\tHash size: %u\n", hdr->hash_size); + printf("\tAddress map size: %u\n", hdr->address_map_size); + printf("\tNumber of thunks: %u\n", hdr->num_thunks); + printf("\tSize of thunk: %u\n", hdr->size_thunk); + printf("\tSection of thunk table: %u\n", hdr->section_thunk_table); + printf("\tOffset of thunk table: %u\n", hdr->offset_thunk_table); + printf("\tNumber of sections: %u\n", hdr->num_sects); + + dump_dbi_hash_table((const BYTE*)(hdr + 1), hdr->hash_size, "Public", "\t"); + free(hdr); } static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx)

1 0

Eric Pouech : winedump: Dump global hash table out of PDB symbols' stream.
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: wine Branch: master Commit: 805ffc8adb2e0bdad9170980595d076f082b8740 URL: https://gitlab.winehq.org/wine/wine/-/commit/805ffc8adb2e0bdad9170980595d07… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Sep 27 11:22:11 2022 +0200 winedump: Dump global hash table out of PDB symbols' stream. Introduce relevant structures in include/wine/msvcpdb.h. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 2 +- include/wine/mscvpdb.h | 31 +++++++++++++- tools/winedump/pdb.c | 107 ++++++++++++++++++++++++++++++++++++++----------- 3 files changed, 113 insertions(+), 27 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index ca2fe1c9302..8714e756462 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3182,7 +3182,7 @@ static void pdb_convert_symbols_header(PDB_SYMBOLS* symbols, symbols->hash_size = old->hash_size; symbols->srcmodule_size = old->srcmodule_size; symbols->pdbimport_size = 0; - symbols->global_file = old->global_file; + symbols->global_hash_file= old->global_hash_file; symbols->public_file = old->public_file; symbols->gsym_file = old->gsym_file; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 5e30a6c2beb..96511b759b1 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2535,7 +2535,7 @@ typedef struct _PDB_SYMBOL_IMPORT typedef struct _PDB_SYMBOLS_OLD { - unsigned short global_file; + unsigned short global_hash_file; unsigned short public_file; unsigned short gsym_file; unsigned short pad; @@ -2550,7 +2550,7 @@ typedef struct _PDB_SYMBOLS unsigned int signature; unsigned int version; unsigned int age; - unsigned short global_file; + unsigned short global_hash_file; unsigned short flags; unsigned short public_file; unsigned short bldVer; @@ -2622,6 +2622,33 @@ PDB_STRING_TABLE; * - a serialized hash table */ +/* Header for hash tables inside DBI (aka symbols) stream. + * - The global hash stream contains only the hash table. + * - The public stream contains the same layout for its hash table + * (but other information as well). + */ +typedef struct +{ + unsigned signature; + unsigned version; + unsigned size_hash_records; + unsigned unknown; +} DBI_HASH_HEADER; +/* This header is followed by: + * - DBI_HASH_RECORDS (on hdr:size_hash_records bytes) + * - a bitmap of DBI_MAX_HASH + 1 entries (on DBI_BITMAP_HASH_SIZE bytes) + * - a table (one entry per present bit in bitmap) as index into hdr:num_records + */ + +typedef struct +{ + unsigned offset; + unsigned unknown; +} DBI_HASH_RECORD; + +#define DBI_MAX_HASH 4096 +#define DBI_BITMAP_HASH_SIZE ((DBI_MAX_HASH / (8 * sizeof(unsigned)) + 1) * sizeof(unsigned)) + #include "poppack.h" /* =================================================== diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 9fe358aa86a..efedda2d6d4 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -231,6 +231,65 @@ const char* pdb_get_string_table_entry(const PDB_STRING_TABLE* table, unsigned o return (char*)(table + 1) + ofs; } +static void dump_dbi_hash_table(const BYTE* root, unsigned size, const char* name, const char* pfx) +{ + if (size >= sizeof(DBI_HASH_HEADER)) + { + const DBI_HASH_HEADER* hdr = (const DBI_HASH_HEADER*)root; + + printf("%s%s symbols hash:\n", pfx, name); + printf("%s\tSignature: 0x%x\n", pfx, hdr->signature); + printf("%s\tVersion: 0x%x (%u)\n", pfx, hdr->version, hdr->version - 0xeffe0000); + printf("%s\tSize of hash records: %u\n", pfx, hdr->size_hash_records); + printf("%s\tUnknown: %u\n", pfx, hdr->unknown); + + if (hdr->signature != 0xFFFFFFFF || + hdr->version != 0xeffe0000 + 19990810 || + (hdr->size_hash_records % sizeof(DBI_HASH_RECORD)) != 0 || + sizeof(DBI_HASH_HEADER) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE > size || + (size - (sizeof(DBI_HASH_HEADER) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE)) % sizeof(unsigned)) + { + printf("%s\t\tIncorrect hash structure\n", pfx); + } + else + { + unsigned i; + unsigned num_hash_records = hdr->size_hash_records / sizeof(DBI_HASH_RECORD); + const DBI_HASH_RECORD* hr = (const DBI_HASH_RECORD*)(hdr + 1); + unsigned* bitmap = (unsigned*)((char*)(hdr + 1) + hdr->size_hash_records); + unsigned* buckets = (unsigned*)((char*)(hdr + 1) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE); + unsigned index, last_index = (size - (sizeof(DBI_HASH_HEADER) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE)) / sizeof(unsigned); + + /* Yes, offsets for accessiong hr[] are stored as multiple of 12; and not + * as multiple of sizeof(*hr) = 8 as one might expect. + * Perhaps, native implementation likes to keep the same offsets between + * in memory representation vs on file representations. + */ + for (index = 0, i = 0; i <= DBI_MAX_HASH; i++) + { + if (bitmap[i / 32] & (1u << (i % 32))) + { + unsigned j; + printf("%s\t[%u]\n", pfx, i); + for (j = buckets[index] / 12; j < (index + 1 < last_index ? buckets[index + 1] / 12 : num_hash_records); j++) + printf("%s\t\t[%u] offset=%08x unk=%x\n", pfx, j, hr[j].offset - 1, hr[j].unknown); + index++; + } + else + printf("%s\t[%u] <<empty>>\n", pfx, i); + } + /* shouldn't happen */ + if (sizeof(DBI_HASH_HEADER) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE + index * sizeof(unsigned) > size) + { + printf("%s-- left over %u bytes\n", pfx, + size - (unsigned)(sizeof(DBI_HASH_HEADER) + hdr->size_hash_records + DBI_BITMAP_HASH_SIZE + index * sizeof(unsigned))); + } + } + } + else + printf("%sNo header in symbols hash\n", pfx); +} + static void dump_global_symbol(struct pdb_reader* reader, unsigned file) { void* global = NULL; @@ -241,8 +300,7 @@ static void dump_global_symbol(struct pdb_reader* reader, unsigned file) size = pdb_get_file_size(reader, file); - printf("Global symbols table:\n"); - dump_data(global, size, "\t"); + dump_dbi_hash_table(global, size, "Global", ""); free(global); } @@ -290,30 +348,30 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx else sprintf(tcver, "old-%x", symbols->flags); printf("Symbols:\n" - "\tsignature: %08x\n" - "\tversion: %u\n" - "\tage: %08x\n" - "\tglobal_file: %u\n" - "\tbuilder: %s\n" - "\tpublic_file: %u\n" - "\tbldVer: %u\n" - "\tgsym_file: %u\n" - "\trbldVer: %u\n" - "\tmodule_size: %08x\n" - "\toffset_size: %08x\n" - "\thash_size: %08x\n" - "\tsrc_module_size: %08x\n" - "\tpdbimport_size: %08x\n" - "\tresvd0: %08x\n" - "\tstream_idx_size: %08x\n" - "\tunknown2_size: %08x\n" - "\tresvd3: %04x\n" - "\tmachine: %s\n" - "\tresvd4 %08x\n", + "\tsignature: %08x\n" + "\tversion: %u\n" + "\tage: %08x\n" + "\tglobal_hash_file: %u\n" + "\tbuilder: %s\n" + "\tpublic_file: %u\n" + "\tbldVer: %u\n" + "\tgsym_file: %u\n" + "\trbldVer: %u\n" + "\tmodule_size: %08x\n" + "\toffset_size: %08x\n" + "\thash_size: %08x\n" + "\tsrc_module_size: %08x\n" + "\tpdbimport_size: %08x\n" + "\tresvd0: %08x\n" + "\tstream_idx_size: %08x\n" + "\tunknown2_size: %08x\n" + "\tresvd3: %04x\n" + "\tmachine: %s\n" + "\tresvd4 %08x\n", symbols->signature, symbols->version, symbols->age, - symbols->global_file, + symbols->global_hash_file, tcver, /* from symbols->flags */ symbols->public_file, symbols->bldVer, @@ -610,8 +668,9 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file = (char*)((DWORD_PTR)(lib_name + strlen(lib_name) + 1 + 3) & ~3); } - dump_global_symbol(reader, symbols->global_file); + dump_global_symbol(reader, symbols->global_hash_file); dump_public_symbol(reader, symbols->public_file); + free(symbols); free(filesimage); }

1 0

Zebediah Figura : ddraw: Add FPS tracing in ddraw_surface_update_frontbuffer().
by Alexandre Julliard Sept. 27, 2022

Sept. 27, 2022

Module: wine Branch: master Commit: 13163832683a689373cef7d8815bd6e941a8d789 URL: https://gitlab.winehq.org/wine/wine/-/commit/13163832683a689373cef7d8815bd6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 10 16:47:57 2022 -0500 ddraw: Add FPS tracing in ddraw_surface_update_frontbuffer(). This usually doesn't go through the normal presentation paths. --- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/surface.c | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0c2a491d45b..159ce987dc3 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -136,6 +136,9 @@ struct ddraw struct wined3d_stateblock *state; const struct wined3d_stateblock_state *stateblock_state; + + unsigned int frames; + DWORD prev_frame_time; }; #define DDRAW_WINDOW_CLASS_NAME "DirectDrawDeviceWnd" diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e4382a74ecd..4a95067996f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -24,6 +24,7 @@ #include "ddraw_private.h" WINE_DEFAULT_DEBUG_CHANNEL(ddraw); +WINE_DECLARE_DEBUG_CHANNEL(fps); static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface2(IDirectDrawSurface2 *iface); static struct ddraw_surface *unsafe_impl_from_IDirectDrawSurface3(IDirectDrawSurface3 *iface); @@ -87,6 +88,21 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, if (w <= 0 || h <= 0) return DD_OK; + if (!read && TRACE_ON(fps)) + { + DWORD time = GetTickCount(); + ++ddraw->frames; + + /* every 1.5 seconds */ + if (time - ddraw->prev_frame_time > 1500) + { + TRACE_(fps)("%p @ approx %.2ffps\n", + ddraw, 1000.0 * ddraw->frames / (time - ddraw->prev_frame_time)); + ddraw->prev_frame_time = time; + ddraw->frames = 0; + } + } + /* The interaction between ddraw and GDI drawing is not all that well * documented, and somewhat arcane. In ddraw exclusive mode, GDI draws * seemingly go to the *original* frontbuffer/primary surface, while ddraw

1 0