- Wine-Commits - list.winehq.org

Zebediah Figura : vkd3d-shader/hlsl: Store function parameters in an array.
by Alexandre Julliard Feb. 7, 2023

Feb. 7, 2023

Module: vkd3d Branch: master Commit: cb2c89a589f149c7ffff97d4f56fb870eb126d41 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/cb2c89a589f149c7ffff97d4f56fb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jan 31 19:27:01 2023 -0600 vkd3d-shader/hlsl: Store function parameters in an array. --- libs/vkd3d-shader/hlsl.c | 50 ++++++++++++++------------------ libs/vkd3d-shader/hlsl.h | 19 +++++++----- libs/vkd3d-shader/hlsl.y | 62 +++++++++++++++++++++------------------- libs/vkd3d-shader/hlsl_codegen.c | 4 ++- 4 files changed, 70 insertions(+), 65 deletions(-)

1 0

Eric Pouech : winedump: Load once and store global PDB string table.
by Alexandre Julliard Feb. 7, 2023

Feb. 7, 2023

Module: wine Branch: master Commit: 888fd830a17486e76c8075440491f514d7cd02ef URL: https://gitlab.winehq.org/wine/wine/-/commit/888fd830a17486e76c8075440491f5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 17:17:47 2023 +0100 winedump: Load once and store global PDB string table. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/pdb.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 0d690d1b0c0..8a1787dd7f7 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -49,6 +49,7 @@ struct pdb_reader } u; void* (*read_stream)(struct pdb_reader*, DWORD); DWORD stream_used[1024]; + PDB_STRING_TABLE* global_string_table; }; static inline BOOL has_stream_been_read(struct pdb_reader* reader, unsigned stream_nr) @@ -154,7 +155,7 @@ static void pdb_exit(struct pdb_reader* reader) free(stream); } } - + free(reader->global_string_table); if (reader->read_stream == pdb_jg_read_stream) { free((char*)reader->u.jg.root); @@ -346,7 +347,7 @@ static void dump_public_symbol(struct pdb_reader* reader, unsigned stream) } static const void* pdb_dump_dbi_module(struct pdb_reader* reader, const PDB_SYMBOL_FILE_EX* sym_file, - const char* file_name, PDB_STRING_TABLE* filesimage) + const char* file_name) { const char* lib_name; unsigned char* modimage; @@ -414,7 +415,7 @@ static const void* pdb_dump_dbi_module(struct pdb_reader* reader, const PDB_SYMB codeview_dump_linetab((const char*)modimage + sym_file->symbol_size, TRUE, " "); else if (sym_file->lineno2_size) /* actually, only one of the 2 lineno should be present */ codeview_dump_linetab2((const char*)modimage + sym_file->symbol_size, sym_file->lineno2_size, - filesimage, " "); + reader->global_string_table, " "); /* what's that part ??? */ if (0) dump_data(modimage + sym_file->symbol_size + sym_file->lineno_size + sym_file->lineno2_size, @@ -429,7 +430,6 @@ static void pdb_dump_symbols(struct pdb_reader* reader) PDB_SYMBOLS* symbols; unsigned char* modimage; const char* file; - PDB_STRING_TABLE* filesimage; char tcver[32]; PDB_STREAM_INDEXES sidx; @@ -558,8 +558,6 @@ static void pdb_dump_symbols(struct pdb_reader* reader) } } - if (!(filesimage = read_string_table(reader))) printf("string table not found\n"); - if (symbols->srcmodule_size && globals_dump_sect("DBI")) { const PDB_SYMBOL_SOURCE*src; @@ -666,8 +664,8 @@ static void pdb_dump_symbols(struct pdb_reader* reader) printf("\t\t\tOverlay: %04x\n", desc->ovl); printf("\t\t\tGroup: %04x\n", desc->group); printf("\t\t\tFrame: %04x\n", desc->frame); - printf("\t\t\tSegment name: %s\n", desc->iSegName == 0xffff ? "none" : pdb_get_string_table_entry(filesimage, desc->iSegName)); - printf("\t\t\tClass name: %s\n", desc->iClassName == 0xffff ? "none" : pdb_get_string_table_entry(filesimage, desc->iClassName)); + printf("\t\t\tSegment name: %s\n", desc->iSegName == 0xffff ? "none" : pdb_get_string_table_entry(reader->global_string_table, desc->iSegName)); + printf("\t\t\tClass name: %s\n", desc->iClassName == 0xffff ? "none" : pdb_get_string_table_entry(reader->global_string_table, desc->iClassName)); printf("\t\t\tOffset: %08x\n", desc->offset); printf("\t\t\tSize: %04x\n", desc->cbSeg); } @@ -763,10 +761,10 @@ static void pdb_dump_symbols(struct pdb_reader* reader) copy.attribute = sym_file->attribute; copy.reserved[0] = 0; copy.reserved[1] = 0; - file = pdb_dump_dbi_module(reader, &copy, sym_file->filename, filesimage); + file = pdb_dump_dbi_module(reader, &copy, sym_file->filename); } else - file = pdb_dump_dbi_module(reader, (const PDB_SYMBOL_FILE_EX*)file, NULL, filesimage); + file = pdb_dump_dbi_module(reader, (const PDB_SYMBOL_FILE_EX*)file, NULL); } } dump_global_symbol(reader, symbols->global_hash_stream); @@ -780,7 +778,6 @@ static void pdb_dump_symbols(struct pdb_reader* reader) } free(symbols); - free(filesimage); } static BOOL is_bit_set(const unsigned* dw, unsigned len, unsigned i) @@ -819,7 +816,6 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type void* hash = NULL; unsigned i, strmsize; const unsigned* table; - PDB_STRING_TABLE* strbase; unsigned *collision; if (!globals_dump_sect("hash")) return; @@ -887,7 +883,8 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type { printf("\t\t%08x => %08x\n", table[2 * i + 0], table[2 * i + 1]); } - if (types->type_remap_size && (strbase = read_string_table(reader))) + + if (types->type_remap_size) { unsigned num, capa, count_present, count_deleted; const unsigned* present_bitset; @@ -923,13 +920,12 @@ static void pdb_dump_types_hash(struct pdb_reader* reader, const PDB_TYPES* type is_bit_set(deleted_bitset, count_deleted, i) ? 'D' : '_'); if (is_bit_set(present_bitset, count_present, i)) { - printf(" %s => ", pdb_get_string_table_entry(strbase, *table++)); + printf(" %s => ", pdb_get_string_table_entry(reader->global_string_table, *table++)); pdb_dump_hash_value((const BYTE*)table, types->hash_value_size); table = (const unsigned*)((const BYTE*)table + types->hash_value_size); } printf("\n"); } - free(strbase); printf("\n"); } free(hash); @@ -1034,11 +1030,8 @@ static void pdb_dump_fpo_ext(struct pdb_reader* reader, unsigned stream_idx) { PDB_FPO_DATA* fpoext; unsigned i, size; - PDB_STRING_TABLE* strbase; if (stream_idx == (WORD)-1) return; - strbase = read_string_table(reader); - if (!strbase) return; fpoext = reader->read_stream(reader, stream_idx); size = pdb_get_stream_size(reader, stream_idx); @@ -1052,11 +1045,10 @@ static void pdb_dump_fpo_ext(struct pdb_reader* reader, unsigned stream_idx) printf("\t%08x %08x %8x %8x %8x %6x %8x %08x %s\n", fpoext[i].start, fpoext[i].func_size, fpoext[i].locals_size, fpoext[i].params_size, fpoext[i].maxstack_size, fpoext[i].prolog_size, fpoext[i].savedregs_size, fpoext[i].flags, - pdb_get_string_table_entry(strbase, fpoext[i].str_offset)); + pdb_get_string_table_entry(reader->global_string_table, fpoext[i].str_offset)); } } free(fpoext); - free(strbase); } static void pdb_dump_sections(struct pdb_reader* reader, unsigned stream_idx) @@ -1373,6 +1365,8 @@ void pdb_dump(void) } mark_stream_been_read(&reader, 0); /* mark stream #0 (old TOC) as read */ + reader.global_string_table = read_string_table(&reader); + pdb_dump_types(&reader, 2, "TPI"); pdb_dump_types(&reader, 4, "IPI"); pdb_dump_symbols(&reader);

1 0

Eric Pouech : winedump: Enhance dumping of string tables.
by Alexandre Julliard Feb. 7, 2023

Feb. 7, 2023

Module: wine Branch: master Commit: e53a49830d573744e155821cb93925c7074f7f18 URL: https://gitlab.winehq.org/wine/wine/-/commit/e53a49830d573744e155821cb93925… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 17:17:49 2023 +0100 winedump: Enhance dumping of string tables. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/pdb.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 8a1787dd7f7..f57f52e73ae 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -218,6 +218,46 @@ static unsigned get_stream_by_name(struct pdb_reader* reader, const char* name) return -1; } +static void dump_string_table(const PDB_STRING_TABLE* strtable, const char* name, const char* pfx) +{ + const char* end; + const char* ptr; + unsigned* table; + unsigned num_buckets; + unsigned i; + + if (!strtable) + { + printf("%sString table (%s) isn't present\n", pfx, name); + return; + } + printf("%sString table (%s)\n" + "%s\tHeader: %08x\n" + "%s\tLength: %08x\n" + "%s\tHash version: %u\n", + pfx, name, pfx, strtable->magic, pfx, strtable->length, pfx, strtable->hash_version); + ptr = (const char*)(strtable + 1); + end = ptr + strtable->length; + while (ptr < end) + { + printf("%s\t%zu] %s\n", pfx, ptr - (const char*)(strtable + 1), ptr); + ptr += strlen(ptr) + 1; + } + table = (unsigned *)((char*)(strtable + 1) + strtable->length); + num_buckets = *table++; + + if (globals_dump_sect("hash")) + { + printf("%s\tHash:\n" + "%s\t\tnum_strings: %x\n" + "%s\t\tnum_buckets: %x\n", + pfx, pfx, table[num_buckets], pfx, num_buckets); + + for (i = 0; i < num_buckets; i++) + printf("%s\t\t%x] %x\n", pfx, i, table[i]); + } +} + static PDB_STRING_TABLE* read_string_table(struct pdb_reader* reader) { unsigned stream_idx; @@ -229,6 +269,7 @@ static PDB_STRING_TABLE* read_string_table(struct pdb_reader* reader) ret = reader->read_stream(reader, stream_idx); if (!ret) return NULL; stream_size = pdb_get_stream_size(reader, stream_idx); + if (globals_dump_sect("PDB")) dump_string_table(ret, "Global", " "); if (ret->magic == 0xeffeeffe && sizeof(*ret) + ret->length < stream_size) return ret; printf("Improper string table header (magic=%x)\n", ret->magic); dump_data((const unsigned char*)ret, stream_size, " "); @@ -670,6 +711,14 @@ static void pdb_dump_symbols(struct pdb_reader* reader) printf("\t\t\tSize: %04x\n", desc->cbSeg); } } + if (symbols->unknown2_size && globals_dump_sect("PDB")) + { + const char* ptr = (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + + symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size + + symbols->pdbimport_size; + printf("\t------------Unknown2--------------\n"); + dump_string_table((const PDB_STRING_TABLE*)ptr, "Unknown from DBI", "\t"); + } if (symbols->stream_index_size && globals_dump_sect("image")) { printf("\t------------stream indexes--------------\n");

1 0

Eric Pouech : winedump: Make use of -j option in PDB dumping.
by Alexandre Julliard Feb. 7, 2023

Feb. 7, 2023

Module: wine Branch: master Commit: 94867b19360b2717cfec01b5a33e420f1b6ca1c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/94867b19360b2717cfec01b5a33e42… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 17:17:44 2023 +0100 winedump: Make use of -j option in PDB dumping. Allowing section names: DBI, TPI, IPI, hash. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/main.c | 4 +- tools/winedump/pdb.c | 197 +++++++++++++++++++++++++++----------------------- 2 files changed, 110 insertions(+), 91 deletions(-)

1 0

Eric Pouech : winedump: Dump some more MSF related information.
by Alexandre Julliard Feb. 7, 2023

Feb. 7, 2023

Module: wine Branch: master Commit: 8f8877b2c8b45628bb1683f2d9f3beb618f850be URL: https://gitlab.winehq.org/wine/wine/-/commit/8f8877b2c8b45628bb1683f2d9f3be… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 17:17:46 2023 +0100 winedump: Dump some more MSF related information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/pdb.c | 341 ++++++++++++++++++++++++++++----------------------- 1 file changed, 185 insertions(+), 156 deletions(-)

1 0

Eric Pouech : winedump: Dump some more bits out of public stream.
by Alexandre Julliard Feb. 7, 2023

Feb. 7, 2023

Module: wine Branch: master Commit: cb3388f76ad2698f09d4d837666027bf54b56277 URL: https://gitlab.winehq.org/wine/wine/-/commit/cb3388f76ad2698f09d4d837666027… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 17:17:50 2023 +0100 winedump: Dump some more bits out of public stream. Especially thunk related information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/mscvpdb.h | 4 ++-- tools/winedump/pdb.c | 27 ++++++++++++++++++++++++--- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 19fcab33ab9..29dd83e73b9 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2656,11 +2656,11 @@ typedef struct unsigned hash_size; unsigned address_map_size; unsigned num_thunks; - unsigned size_thunk; + unsigned thunk_size; unsigned short section_thunk_table; unsigned short _pad0; unsigned offset_thunk_table; - unsigned num_sects; + unsigned num_sections; } DBI_PUBLIC_HEADER; #include "poppack.h" diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index f57f52e73ae..c76c19fec89 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -366,6 +366,8 @@ static void dump_public_symbol(struct pdb_reader* reader, unsigned stream) { unsigned size; DBI_PUBLIC_HEADER* hdr; + const BYTE* ptr; + unsigned i; if (!globals_dump_sect("public")) return; hdr = reader->read_stream(reader, stream); @@ -378,12 +380,31 @@ static void dump_public_symbol(struct pdb_reader* reader, unsigned stream) 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("\tSize of thunk map: %u\n", hdr->thunk_size); 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); + printf("\tNumber of sections: %u\n", hdr->num_sections); - dump_dbi_hash_table((const BYTE*)(hdr + 1), hdr->hash_size, "Public", "\t"); + ptr = (const BYTE*)(hdr + 1); + dump_dbi_hash_table(ptr, hdr->hash_size, "Public", "\t"); + + ptr += hdr->hash_size; + printf("\tAddress map:\n"); + for (i = 0; i < hdr->address_map_size / sizeof(unsigned); i++) + printf("\t\t%u] %08x\n", i, ((const unsigned*)ptr)[i]); + + ptr += hdr->address_map_size; + printf("\tThunk map:\n"); + for (i = 0; i < hdr->num_thunks; i++) + printf("\t\t%u] %08x\n", i, ((const unsigned*)ptr)[i]); + + ptr += hdr->num_thunks * sizeof(unsigned); + printf("\tSection map:\n"); + for (i = 0; i < hdr->num_sections; i++) + printf("\t\t%u] %04x:%08x\n", i, (unsigned short)((const unsigned*)ptr)[2 * i + 1], ((const unsigned*)ptr)[2 * i + 0]); + + if (ptr + hdr->num_sections * 8 != ((const BYTE*)hdr) + size) + printf("Incorrect stream\n"); free(hdr); }

1 0

Eric Pouech : winedump: Introduce ability to pass several section names to -j option.
by Alexandre Julliard Feb. 7, 2023

Feb. 7, 2023

Module: wine Branch: master Commit: 7370e15c9384df65675402d5a09df6a9735b4401 URL: https://gitlab.winehq.org/wine/wine/-/commit/7370e15c9384df65675402d5a09df6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 17:17:41 2023 +0100 winedump: Introduce ability to pass several section names to -j option. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/main.c | 36 ++++++++++++++++++++++++++++---- tools/winedump/ne.c | 12 ++++------- tools/winedump/pe.c | 52 ++++++++++++++++++++++------------------------- tools/winedump/winedump.h | 4 +++- 4 files changed, 63 insertions(+), 41 deletions(-) diff --git a/tools/winedump/main.c b/tools/winedump/main.c index f9557983465..15b1813de5e 100644 --- a/tools/winedump/main.c +++ b/tools/winedump/main.c @@ -169,7 +169,23 @@ static void do_dumphead (const char *arg) static void do_dumpsect (const char* arg) { - globals.dumpsect = arg; + unsigned count = 2; + char* p; + const char** out; + + for (p = (char*)arg; (p = strchr(p, ',')) != NULL; p++, count++); + out = malloc(count * sizeof(char*)); + globals.dumpsect = out; + count = 0; + p = strdup(arg); + for (;;) + { + out[count++] = p; + p = strchr(p, ','); + if (!p) break; + *p++ = '\0'; + } + out[count] = NULL; } static void do_rawdebug (const char *arg) @@ -182,7 +198,7 @@ static void do_dumpall(const char *arg) globals.do_dumpheader = TRUE; globals.do_dump_rawdata = TRUE; globals.do_symbol_table = TRUE; - globals.dumpsect = "ALL"; + do_dumpsect ("ALL"); } static void do_symtable(const char* arg) @@ -207,8 +223,10 @@ static const struct my_option option_table[] = { {"-C", DUMP, 0, do_symdmngl, "-C Turn on symbol demangling"}, {"-f", DUMP, 0, do_dumphead, "-f Dump file header information"}, {"-G", DUMP, 0, do_rawdebug, "-G Dump raw debug information"}, - {"-j", DUMP, 1, do_dumpsect, "-j <sect_name> Dump only the content of section 'sect_name'\n" - " (import, export, debug, resource, tls, loadcfg, clr, reloc, except, apiset)"}, + {"-j", DUMP, 1, do_dumpsect, "-j <sect_name> Dump the content of section 'sect_name'\n" + " (use '-j sect_name,sect_name2' to dump several sections)\n" + " for NE: export, resource\n" + " for PE: import, export, debug, resource, tls, loadcfg, clr, reloc, except, apiset"}, {"-t", DUMP, 0, do_symtable, "-t Dump symbol table"}, {"-x", DUMP, 0, do_dumpall, "-x Dump everything"}, {"sym", DMGL, 0, do_demangle, "sym <sym> Demangle C++ symbol <sym> and exit"}, @@ -370,6 +388,16 @@ static BOOL symbol_finish(void) return started; } +BOOL globals_dump_sect(const char* s) +{ + const char** sect; + + if (!s || !globals.dumpsect) return FALSE; + for (sect = globals.dumpsect; *sect; sect++) + if (!strcmp(*sect, s) || !strcmp(*sect, "ALL")) return TRUE; + return FALSE; +} + /******************************************************************* * main */ diff --git a/tools/winedump/ne.c b/tools/winedump/ne.c index 9b4ede6c86e..c27d7d6a9b7 100644 --- a/tools/winedump/ne.c +++ b/tools/winedump/ne.c @@ -429,15 +429,11 @@ void ne_dump( void ) dump_ne_header( ne ); if (globals.do_dumpheader) dump_ne_names( ne ); - if (globals.dumpsect) - { - BOOL all = strcmp(globals.dumpsect, "ALL") == 0; - if (all || !strcmp(globals.dumpsect, "resource")) - dump_ne_resources( ne ); - if (all || !strcmp(globals.dumpsect, "export")) - dump_ne_exports( ne ); - } + if (globals_dump_sect("resource")) + dump_ne_resources( ne ); + if (globals_dump_sect("export")) + dump_ne_exports( ne ); if (globals.do_dumpheader) for (i = 1; i <= ne->ne_cseg; i++) dump_ne_segment( ne, i ); } diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 8b005372f5a..37cdffee0df 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -2525,8 +2525,6 @@ enum FileSig get_kind_exec(void) void pe_dump(void) { - int all = (globals.dumpsect != NULL) && strcmp(globals.dumpsect, "ALL") == 0; - PE_nt_headers = get_nt_header(); print_fake_dll(); @@ -2543,32 +2541,30 @@ void pe_dump(void) dump_pe_header(); } - if (globals.dumpsect) - { - if (all || !strcmp(globals.dumpsect, "import")) - { - dump_dir_imported_functions(); - dump_dir_delay_imported_functions(); - } - if (all || !strcmp(globals.dumpsect, "export")) - dump_dir_exported_functions(); - if (all || !strcmp(globals.dumpsect, "debug")) - dump_dir_debug(); - if (all || !strcmp(globals.dumpsect, "resource")) - dump_dir_resource(); - if (all || !strcmp(globals.dumpsect, "tls")) - dump_dir_tls(); - if (all || !strcmp(globals.dumpsect, "loadcfg")) - dump_dir_loadconfig(); - if (all || !strcmp(globals.dumpsect, "clr")) - dump_dir_clr_header(); - if (all || !strcmp(globals.dumpsect, "reloc")) - dump_dir_reloc(); - if (all || !strcmp(globals.dumpsect, "except")) - dump_dir_exceptions(); - if (all || !strcmp(globals.dumpsect, "apiset")) - dump_section_apiset(); - } + if (globals_dump_sect("import")) + { + dump_dir_imported_functions(); + dump_dir_delay_imported_functions(); + } + if (globals_dump_sect("export")) + dump_dir_exported_functions(); + if (globals_dump_sect("debug")) + dump_dir_debug(); + if (globals_dump_sect("resource")) + dump_dir_resource(); + if (globals_dump_sect("tls")) + dump_dir_tls(); + if (globals_dump_sect("loadcfg")) + dump_dir_loadconfig(); + if (globals_dump_sect("clr")) + dump_dir_clr_header(); + if (globals_dump_sect("reloc")) + dump_dir_reloc(); + if (globals_dump_sect("except")) + dump_dir_exceptions(); + if (globals_dump_sect("apiset")) + dump_section_apiset(); + if (globals.do_symbol_table) dump_symbol_table(); if (globals.do_debug) diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 9228c4cf225..4561ca3751a 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -135,13 +135,15 @@ typedef struct __globals const char *uc_dll_name; /* -o */ /* Option arguments: dump mode */ - const char *dumpsect; /* -j */ + const char **dumpsect; /* -j */ } _globals; extern _globals globals; extern void *dump_base; extern size_t dump_total_len; +BOOL globals_dump_sect(const char*); + /* Names to use for output DLL */ #define OUTPUT_DLL_NAME \ (globals.dll_name ? globals.dll_name : (globals.input_module ? globals.input_module : globals.input_name))

1 0

Eric Pouech : winedump: Refactor PDB DBI per-module dump in a dedicated function.
by Alexandre Julliard Feb. 7, 2023

Feb. 7, 2023

Module: wine Branch: master Commit: e2c87ebef48d1b970d7c62b5e63da23d79e86d50 URL: https://gitlab.winehq.org/wine/wine/-/commit/e2c87ebef48d1b970d7c62b5e63da2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Feb 6 17:17:43 2023 +0100 winedump: Refactor PDB DBI per-module dump in a dedicated function. Also better taking care of various PDB_SYMBOL_FILE formats. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/pdb.c | 240 ++++++++++++++++++++++++--------------------------- 1 file changed, 111 insertions(+), 129 deletions(-)

1 0

Gabriel Ivăncescu : kernelbase: Fix grouping repeat for number formatting.
by Alexandre Julliard Feb. 7, 2023

Feb. 7, 2023

Module: wine Branch: master Commit: 8d02e4e2e9fffc6ceca90900acf0d97ba5cdde90 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d02e4e2e9fffc6ceca90900acf0d9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Jan 19 18:47:14 2023 +0200 kernelbase: Fix grouping repeat for number formatting. Fixes a regression introduced by 56099a31242dcc522fb94643e70553e152c522ec. LOCALE_SGROUPING's string and the `Grouping` field in NUMBERFMTW are confusingly different. The former, which is what is fixed here, treats a '0' as a repeat of the previous grouping. But a 0 at the end of the `Grouping` field prevents it from repeating (it repeats by default otherwise) so it's the opposite. Note that without a '0' in the LOCALE_SGROUPING string, it shouldn't even repeat in the first place. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/kernel32/tests/locale.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/locale.c | 66 ++++++++++++++++++++++++++++++++++--- 2 files changed, 139 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 886240cc22c..b2c581dc518 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -1404,6 +1404,7 @@ static void test_GetNumberFormatA(void) static char szComma[] = { ',', '\0' }; int ret; LCID lcid = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + WCHAR grouping[32], t1000[8], dec[8], frac[8], lzero[8]; char buffer[BUFFER_SIZE]; NUMBERFMTA format; @@ -1522,6 +1523,22 @@ static void test_GetNumberFormatA(void) ret = GetNumberFormatA(lcid, 0, "123456789", &format, buffer, ARRAY_SIZE(buffer)); expect_str(ret, buffer, "1234,567,89.0"); + format.Grouping = 203; + ret = GetNumberFormatA(lcid, 0, "123456789", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "1,234,567,,89.0"); + + format.Grouping = 2030; + ret = GetNumberFormatA(lcid, 0, "123456789", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "1234,567,,89.0"); + + format.Grouping = 2003; + ret = GetNumberFormatA(lcid, 0, "123456789", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "1,234,567,,,89.0"); + + format.Grouping = 1200; + ret = GetNumberFormatA(lcid, 0, "123456789", &format, buffer, ARRAY_SIZE(buffer)); + expect_str(ret, buffer, "123456,,78,9.0"); + /* Grouping of a negative number */ format.NegativeOrder = NEG_LEFT; format.Grouping = 3; @@ -1563,6 +1580,67 @@ static void test_GetNumberFormatA(void) ret = GetNumberFormatA(lcid, NUO, "-12345", NULL, buffer, ARRAY_SIZE(buffer)); expect_str(ret, buffer, "-12\xa0\x33\x34\x35,00"); /* Non breaking space */ } + + /* Test the actual LOCALE_SGROUPING string, the rules for repeats are opposite */ + if (GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping, ARRAY_SIZE(grouping)) && + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, t1000, ARRAY_SIZE(t1000)) && + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, dec, ARRAY_SIZE(dec)) && + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IDIGITS, frac, ARRAY_SIZE(frac)) && + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO, lzero, ARRAY_SIZE(lzero))) + { + static const struct + { + const char *grouping; + const char *expected; + } tests[] = { + { "3;0", "1,234,567,890.54321" }, + { "2;3", "12345,678,90.54321" }, + { "1", "123456789,0.54321" }, + { "1;0", "1,2,3,4,5,6,7,8,9,0.54321" }, + { "1;0;3", "123456,789,,0.54321" }, + { "0", "1234567890.54321" }, + { "0;0", "1234567890.54321" }, + { "0;1", "123456789,0.54321" }, + { "0;0;0", "1234567890.54321" }, + { "0;1;0", "1,2,3,4,5,6,7,8,9,0.54321" }, + { "2;0;0", "12345678,90.54321" }, + { "2;0;0;0", "12345678,,90.54321" }, + { "2;0;0;0;0", "12345678,,,90.54321" }, + { "2;0;0;1;0", "1,2,3,4,5,6,7,8,,,90.54321" }, + { "1;3;2", "1234,56,789,0.54321" }, + { "1;3;2;0", "12,34,56,789,0.54321" }, + { "3;1;1;2;0", "1,23,45,6,7,890.54321" }, + { "6;1", "123,4,567890.54321" }, + }; + unsigned i; + + SetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, ","); + SetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, "."); + SetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_IDIGITS, "5"); + SetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_ILZERO, "0"); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + SetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, tests[i].grouping); + SetLastError(0xdeadbeef); + ret = GetNumberFormatA(LOCALE_USER_DEFAULT, 0, "1234567890.54321", NULL, buffer, ARRAY_SIZE(buffer)); + if (ret) + { + ok(GetLastError() == 0xdeadbeef, "[%u] unexpected error %lu\n", i, GetLastError()); + ok(ret == strlen(tests[i].expected) + 1, "[%u] unexpected ret %d\n", i, ret); + ok(!strcmp(buffer, tests[i].expected), "[%u] unexpected string %s\n", i, buffer); + } + else + ok(0, "[%u] expected success, got error %ld\n", i, GetLastError()); + } + + /* Restore */ + ok(SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SGROUPING, grouping), "Restoring SGROUPING failed\n"); + ok(SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, t1000), "Restoring STHOUSAND failed\n"); + ok(SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, dec), "Restoring SDECIMAL failed\n"); + ok(SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IDIGITS, frac), "Restoring IDIGITS failed\n"); + ok(SetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_ILZERO, lzero), "Restoring ILZERO failed\n"); + } } static void test_GetNumberFormatEx(void) diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 1e96e49622e..13ec1ebeb3a 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -7245,8 +7245,20 @@ BOOL WINAPI SetUserGeoName(PWSTR geo_name) static void grouping_to_string( UINT grouping, WCHAR *buffer ) { + UINT last_digit = grouping % 10; WCHAR tmp[10], *p = tmp; + /* The string is confusingly different when it comes to repetitions (trailing zeros). For a string, + * a 0 signals that the format needs to be repeated, which is the opposite of the grouping integer. */ + if (last_digit == 0) + { + grouping /= 10; + + /* Special case: two or more trailing zeros result in zero-sided groupings, with no repeats */ + if (grouping % 10 == 0) + last_digit = ~0; + } + while (grouping) { *p++ = '0' + grouping % 10; @@ -7257,6 +7269,17 @@ static void grouping_to_string( UINT grouping, WCHAR *buffer ) *buffer++ = *(--p); if (p > tmp) *buffer++ = ';'; } + if (last_digit != 0) + { + *buffer++ = ';'; + *buffer++ = '0'; + if (last_digit == ~0) + { + /* Add another trailing zero due to the weird way trailing zeros work in grouping string */ + *buffer++ = ';'; + *buffer++ = '0'; + } + } *buffer = 0; } @@ -7272,9 +7295,9 @@ static WCHAR *prepend_str( WCHAR *end, const WCHAR *str ) static WCHAR *format_number( WCHAR *end, const WCHAR *value, const WCHAR *decimal_sep, const WCHAR *thousand_sep, const WCHAR *grouping, UINT digits, BOOL lzero ) { + BOOL round = FALSE, repeat = FALSE; + UINT i, len = 0, prev = ~0; const WCHAR *frac = NULL; - BOOL round = FALSE; - UINT i, len = 0; *(--end) = 0; @@ -7327,9 +7350,43 @@ static WCHAR *format_number( WCHAR *end, const WCHAR *value, const WCHAR *decima } if (len) lzero = FALSE; + /* leading 0s are ignored */ + while (grouping[0] == '0' && grouping[1] == ';') + grouping += 2; + while (len) { - UINT limit = *grouping == '0' ? ~0u : *grouping - '0'; + UINT limit = prev; + + if (!repeat) + { + limit = *grouping - '0'; + if (grouping[1] == ';') + { + grouping += 2; + if (limit) + prev = limit; + else + { + /* Trailing 0;0 is a special case */ + prev = ~0; + if (grouping[0] == '0' && grouping[1] != ';') + { + repeat = TRUE; + limit = prev; + } + } + } + else + { + repeat = TRUE; + if (!limit) + limit = prev; + else + prev = ~0; + } + } + while (len && limit--) { WCHAR ch = value[--len]; @@ -7345,7 +7402,6 @@ static WCHAR *format_number( WCHAR *end, const WCHAR *value, const WCHAR *decima *(--end) = ch; } if (len) end = prepend_str( end, thousand_sep ); - if (grouping[1] == ';') grouping += 2; } if (round) *(--end) = '1'; else if (lzero) *(--end) = '0'; @@ -7356,7 +7412,7 @@ static WCHAR *format_number( WCHAR *end, const WCHAR *value, const WCHAR *decima static int get_number_format( const NLS_LOCALE_DATA *locale, DWORD flags, const WCHAR *value, const NUMBERFMTW *format, WCHAR *buffer, int len ) { - WCHAR *num, fmt_decimal[4], fmt_thousand[4], fmt_neg[5], grouping[20], output[256]; + WCHAR *num, fmt_decimal[4], fmt_thousand[4], fmt_neg[5], grouping[24], output[256]; const WCHAR *decimal_sep = fmt_decimal, *thousand_sep = fmt_thousand; DWORD digits, lzero, order; int ret = 0;

1 0

Rémi Bernon : win32u: Use KBDTABLES for NtUserToUnicodeEx.
by Alexandre Julliard Feb. 7, 2023

Feb. 7, 2023

Module: wine Branch: master Commit: 2d3516cde91f4e574d0970a7609c98ba72986272 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d3516cde91f4e574d0970a7609c98… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 7 21:41:11 2023 +0100 win32u: Use KBDTABLES for NtUserToUnicodeEx. --- dlls/win32u/input.c | 122 ++++++++++++++++++++++------------------------------ 1 file changed, 52 insertions(+), 70 deletions(-) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index fd4d11e8b82..36f2a45f4ef 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -462,6 +462,20 @@ static UINT kbd_tables_get_mod_bits( const KBDTABLES *tables, UINT mod ) return -1; } +static UINT kbd_tables_get_mod_num( const KBDTABLES *tables, const BYTE *state, BOOL caps ) +{ + const MODIFIERS *mods = tables->pCharModifiers; + const VK_TO_BIT *entry; + WORD bits = 0; + + for (entry = mods->pVkToBit; entry->Vk; ++entry) + if (state[entry->Vk] & 0x80) bits |= entry->ModBits; + if (caps) bits |= KBDSHIFT; + + if (bits > mods->wMaxModBits) return -1; + return mods->ModNumber[bits]; +} + static WORD kbd_tables_wchar_to_vkey( const KBDTABLES *tables, WCHAR wch ) { const VK_TO_WCHAR_TABLE *table; @@ -488,6 +502,37 @@ static WORD kbd_tables_wchar_to_vkey( const KBDTABLES *tables, WCHAR wch ) return wch >= 0x0080 ? -1 : 0; } +static WCHAR kbd_tables_vkey_to_wchar( const KBDTABLES *tables, UINT vkey, const BYTE *state ) +{ + UINT mod, caps_mod, alt, ctrl, caps; + const VK_TO_WCHAR_TABLE *table; + const VK_TO_WCHARS1 *entry; + + alt = state[VK_MENU] & 0x80; + ctrl = state[VK_CONTROL] & 0x80; + caps = state[VK_CAPITAL] & 1; + + if (ctrl && alt) return WCH_NONE; + if (!ctrl && vkey == VK_ESCAPE) return VK_ESCAPE; + + mod = caps_mod = kbd_tables_get_mod_num( tables, state, FALSE ); + if (caps) caps_mod = kbd_tables_get_mod_num( tables, state, TRUE ); + + for (table = tables->pVkToWcharTable; table->pVkToWchars; table++) + { + if (table->nModifications <= mod) continue; + for (entry = table->pVkToWchars; entry->VirtualKey; entry = NEXT_ENTRY(table, entry)) + { + if (entry->VirtualKey != vkey) continue; + if ((entry->Attributes & CAPLOK) && table->nModifications > caps_mod) return entry->wch[caps_mod]; + return entry->wch[mod]; + } + } + + if (ctrl && vkey >= 'A' && vkey <= 'Z') return vkey - 'A' + 1; + return WCH_NONE; +} + #undef NEXT_ENTRY /********************************************************************** @@ -1079,86 +1124,23 @@ INT WINAPI NtUserGetKeyNameText( LONG lparam, WCHAR *buffer, INT size ) INT WINAPI NtUserToUnicodeEx( UINT virt, UINT scan, const BYTE *state, WCHAR *str, int size, UINT flags, HKL layout ) { - BOOL shift, ctrl, alt, numlock; - WCHAR buffer[2]; + const KBDTABLES *kbd_tables = &kbdus_tables; + WCHAR buffer[2] = {0}; INT len; - TRACE_(keyboard)( "virt %u, scan %u, state %p, str %p, size %d, flags %x, layout %p.\n", + TRACE_(keyboard)( "virt %#x, scan %#x, state %p, str %p, size %d, flags %#x, layout %p.\n", virt, scan, state, str, size, flags, layout ); if (!state) return 0; if ((len = user_driver->pToUnicodeEx( virt, scan, state, str, size, flags, layout )) >= -1) return len; - alt = state[VK_MENU] & 0x80; - shift = state[VK_SHIFT] & 0x80; - ctrl = state[VK_CONTROL] & 0x80; - numlock = state[VK_NUMLOCK] & 0x01; + if (scan & 0x8000) buffer[0] = 0; /* key up */ + else buffer[0] = kbd_tables_vkey_to_wchar( kbd_tables, virt, state ); - /* FIXME: English keyboard layout specific */ + if (buffer[0] != WCH_NONE) len = 1; + else buffer[0] = len = 0; - if (scan & 0x8000) buffer[0] = 0; /* key up */ - else if (virt == VK_ESCAPE) buffer[0] = VK_ESCAPE; - else if (!ctrl) - { - switch (virt) - { - case VK_BACK: buffer[0] = '\b'; break; - case VK_OEM_1: buffer[0] = shift ? ':' : ';'; break; - case VK_OEM_2: buffer[0] = shift ? '?' : '/'; break; - case VK_OEM_3: buffer[0] = shift ? '~' : '`'; break; - case VK_OEM_4: buffer[0] = shift ? '{' : '['; break; - case VK_OEM_5: buffer[0] = shift ? '|' : '\\'; break; - case VK_OEM_6: buffer[0] = shift ? '}' : ']'; break; - case VK_OEM_7: buffer[0] = shift ? '"' : '\''; break; - case VK_OEM_COMMA: buffer[0] = shift ? '<' : ','; break; - case VK_OEM_MINUS: buffer[0] = shift ? '_' : '-'; break; - case VK_OEM_PERIOD: buffer[0] = shift ? '>' : '.'; break; - case VK_OEM_PLUS: buffer[0] = shift ? '+' : '='; break; - case VK_RETURN: buffer[0] = '\r'; break; - case VK_SPACE: buffer[0] = ' '; break; - case VK_TAB: buffer[0] = '\t'; break; - case VK_MULTIPLY: buffer[0] = '*'; break; - case VK_ADD: buffer[0] = '+'; break; - case VK_SUBTRACT: buffer[0] = '-'; break; - case VK_DIVIDE: buffer[0] = '/'; break; - default: - if (virt >= '0' && virt <= '9') - buffer[0] = shift ? ")!@#$%^&*("[virt - '0'] : virt; - else if (virt >= 'A' && virt <= 'Z') - buffer[0] = shift || (state[VK_CAPITAL] & 0x01) ? virt : virt + 'a' - 'A'; - else if (virt >= VK_NUMPAD0 && virt <= VK_NUMPAD9 && numlock && !shift) - buffer[0] = '0' + virt - VK_NUMPAD0; - else if (virt == VK_DECIMAL && numlock && !shift) - buffer[0] = '.'; - else - buffer[0] = 0; - break; - } - } - else if (!alt) /* Control codes */ - { - switch (virt) - { - case VK_OEM_4: buffer[0] = 0x1b; break; - case VK_OEM_5: buffer[0] = 0x1c; break; - case VK_OEM_6: buffer[0] = 0x1d; break; - case '6': buffer[0] = shift ? 0x1e : 0; break; - case VK_OEM_MINUS: buffer[0] = shift ? 0x1f : 0; break; - case VK_BACK: buffer[0] = 0x7f; break; - case VK_RETURN: buffer[0] = shift ? 0 : '\n'; break; - case '2': buffer[0] = shift ? 0xffff : 0xf000; break; - case VK_SPACE: buffer[0] = ' '; break; - default: - if (virt >= 'A' && virt <= 'Z') buffer[0] = virt - 'A' + 1; - else buffer[0] = 0; - break; - } - } - else buffer[0] = 0; - buffer[1] = 0; - len = lstrlenW( buffer ); - if (buffer[0] == 0xffff) buffer[0] = 0; lstrcpynW( str, buffer, size ); TRACE_(keyboard)( "ret %d, str %s.\n", len, debugstr_w(str) );

1 0