August 2021 - Wine-Commits - list.winehq.org

Eric Pouech : winedump: Correct and update a couple of infos in PDB symbol stream header.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 5ddcb94af6c438e639a1d1e38b8ee950e08931e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ddcb94af6c438e639a1d1e3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:12:45 2021 +0200 winedump: Correct and update a couple of infos in PDB symbol stream header. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 4 +-- include/wine/mscvpdb.h | 14 +++++----- tools/winedump/pdb.c | 69 +++++++++++++++++++++++++++++++++++++++++--------- 3 files changed, 67 insertions(+), 20 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 6d623f336ed..72b03960803 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2392,8 +2392,8 @@ 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->hash1_file = old->hash1_file; - symbols->hash2_file = old->hash2_file; + symbols->global_file = old->global_file; + symbols->public_file = old->public_file; symbols->gsym_file = old->gsym_file; *header_size = sizeof(PDB_SYMBOLS_OLD); diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 35143291f22..c9ab4abb166 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2367,8 +2367,8 @@ typedef struct _PDB_SYMBOL_IMPORT typedef struct _PDB_SYMBOLS_OLD { - WORD hash1_file; - WORD hash2_file; + WORD global_file; + WORD public_file; WORD gsym_file; WORD pad; DWORD module_size; @@ -2381,11 +2381,13 @@ typedef struct _PDB_SYMBOLS { DWORD signature; DWORD version; - DWORD unknown; - DWORD hash1_file; - DWORD hash2_file; + DWORD age; + WORD global_file; + WORD flags; + WORD public_file; + WORD bldVer; WORD gsym_file; - WORD unknown1; + WORD rbldVer; DWORD module_size; DWORD offset_size; DWORD hash_size; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 05e02c841e3..dc89308bd67 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -222,6 +222,36 @@ static void *read_string_table(struct pdb_reader* reader) return NULL; } +static void dump_global_symbol(struct pdb_reader* reader, unsigned file) +{ + void* global = NULL; + DWORD size; + + global = reader->read_file(reader, file); + if (!global) return; + + size = pdb_get_file_size(reader, file); + + printf("Global symbols table:\n"); + dump_data(global, size, "\t"); + free(global); +} + +static void dump_public_symbol(struct pdb_reader* reader, unsigned file) +{ + void* public = NULL; + DWORD size; + + public = reader->read_file(reader, file); + if (!public) return; + + size = pdb_get_file_size(reader, file); + + printf("Public symbols table:\n"); + dump_data(public, size, "\t"); + free(public); +} + static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx) { PDB_SYMBOLS* symbols; @@ -229,6 +259,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx const char* file; char* filesimage; DWORD filessize = 0; + char tcver[32]; sidx->FPO = sidx->unk0 = sidx->unk1 = sidx->unk2 = sidx->unk3 = sidx->segments = sidx->unk4 = sidx->unk5 = sidx->unk6 = sidx->FPO_EXT = sidx->unk7 = -1; @@ -246,14 +277,20 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx default: printf("-Unknown symbol info version %d\n", symbols->version); } + if (symbols->flags & 0x8000) /* new */ + snprintf(tcver, sizeof(tcver), "%u.%u", (symbols->flags >> 8) & 0x7f, symbols->flags & 0xff); + else + snprintf(tcver, sizeof(tcver), "old-%x", symbols->flags); printf("Symbols:\n" "\tsignature: %08x\n" "\tversion: %u\n" - "\tunknown: %08x\n" - "\thash1_file: %08x\n" - "\thash2_file: %08x\n" - "\tgsym_file: %04x\n" - "\tunknown1: %04x\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" @@ -264,14 +301,16 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\tunknown2_size: %08x\n" "\tresvd3: %04x\n" "\tmachine: %s\n" - "\tresvd[4] %08x\n", + "\tresvd4 %08x\n", symbols->signature, symbols->version, - symbols->unknown, - symbols->hash1_file, - symbols->hash2_file, + symbols->age, + symbols->global_file, + tcver, /* from symbols->flags */ + symbols->public_file, + symbols->bldVer, symbols->gsym_file, - symbols->unknown1, + symbols->rbldVer, symbols->module_size, symbols->offset_size, symbols->hash_size, @@ -558,6 +597,8 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file_name += strlen(file_name) + 1; file = (char*)((DWORD_PTR)(file_name + strlen(file_name) + 1 + 3) & ~3); } + dump_global_symbol(reader, symbols->global_file); + dump_public_symbol(reader, symbols->public_file); free(symbols); free(filesimage); } @@ -883,18 +924,22 @@ static void pdb_ds_dump(void) reader.u.ds.header->unknown2, reader.u.ds.header->toc_page); - /* files: - * 0: JG says old toc pages, I'd say free pages (tbc, low prio) + /* files with static indexes: + * 0: JG says old toc pages * 1: root structure * 2: types * 3: modules + * 4: types (second stream) * other known streams: * - string table: its index is in the stream table from ROOT object under "/names" + * - type hash table: its index is in the types header (2 and 4) + * - global and public streams: from symbol stream header * those streams get their indexes out of the PDB_STREAM_INDEXES object * - FPO data * - segments * - extended FPO data */ + reader.file_used[0] |= 1; /* mark stream #0 as read */ reader.u.ds.root = reader.read_file(&reader, 1); if (reader.u.ds.root) {

1 0

Luke Deller : server: Implement file access hints using posix_fadvise.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: a87bafc5b92c9f2deaa399e32a8ec42d28f7ea45 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a87bafc5b92c9f2deaa399e3… Author: Luke Deller <luke(a)deller.id.au> Date: Fri Aug 20 21:12:53 2021 +1000 server: Implement file access hints using posix_fadvise. Signed-off-by: Luke Deller <luke(a)deller.id.au> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + include/config.h.in | 3 +++ server/fd.c | 13 +++++++++++++ 4 files changed, 18 insertions(+) diff --git a/configure b/configure index 2e61fcbc685..a53367f0172 100755 --- a/configure +++ b/configure @@ -18010,6 +18010,7 @@ for ac_func in \ pipe2 \ poll \ port_create \ + posix_fadvise \ prctl \ pread \ proc_pidinfo \ diff --git a/configure.ac b/configure.ac index a9750330443..837f41c34aa 100644 --- a/configure.ac +++ b/configure.ac @@ -2186,6 +2186,7 @@ AC_CHECK_FUNCS(\ pipe2 \ poll \ port_create \ + posix_fadvise \ prctl \ pread \ proc_pidinfo \ diff --git a/include/config.h.in b/include/config.h.in index b1918d46ed1..2b488894a49 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -513,6 +513,9 @@ /* Define to 1 if you have the <port.h> header file. */ #undef HAVE_PORT_H +/* Define to 1 if you have the `posix_fadvise' function. */ +#undef HAVE_POSIX_FADVISE + /* Define to 1 if you have the `prctl' function. */ #undef HAVE_PRCTL diff --git a/server/fd.c b/server/fd.c index de7c5d7e36d..a09fc9edfcf 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2026,6 +2026,19 @@ struct fd *open_fd( struct fd *root, const char *name, struct unicode_str nt_nam free( closed_fd ); fd->cacheable = 1; } + +#ifdef HAVE_POSIX_FADVISE + switch (options & (FILE_SEQUENTIAL_ONLY | FILE_RANDOM_ACCESS)) + { + case FILE_SEQUENTIAL_ONLY: + posix_fadvise( fd->unix_fd, 0, 0, POSIX_FADV_SEQUENTIAL ); + break; + case FILE_RANDOM_ACCESS: + posix_fadvise( fd->unix_fd, 0, 0, POSIX_FADV_RANDOM ); + break; + } +#endif + if (root_fd != -1) fchdir( server_dir_fd ); /* go back to the server dir */ return fd;

1 0

Eric Pouech : winedump: Add support for dumping information about type's hash stream.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: d3c9d645e6c44fc51e327471e1b2df672512a3e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3c9d645e6c44fc51e327471… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:12:33 2021 +0200 winedump: Add support for dumping information about type's hash stream. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pdb.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index a2c4360b67a..05e02c841e3 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -562,6 +562,21 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx free(filesimage); } +static void pdb_dump_types_hash(struct pdb_reader* reader, unsigned file, const char* strmname) +{ + void* hash = NULL; + DWORD size; + + hash = reader->read_file(reader, file); + if (!hash) return; + + size = pdb_get_file_size(reader, file); + + printf("Types (%s) hash:\n", strmname); + dump_data(hash, size, " "); + free(hash); +} + /* there are two 'type' related streams, but with different indexes... */ static void pdb_dump_types(struct pdb_reader* reader, unsigned strmidx, const char* strmname) { @@ -616,6 +631,7 @@ static void pdb_dump_types(struct pdb_reader* reader, unsigned strmidx, const ch types->unknown_offset, types->unknown_len); codeview_dump_types_from_block((const char*)types + types->type_offset, types->type_size); + pdb_dump_types_hash(reader, types->file, strmname); free(types); }

1 0

Eric Pouech : winedump: Add support for dumping stream of fixed index 4.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 1d03a4febc47082df3116c31c2a6bec4437ac7aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d03a4febc47082df3116c31… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:12:26 2021 +0200 winedump: Add support for dumping stream of fixed index 4. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pdb.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index dcfbea85b4c..a2c4360b67a 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -562,11 +562,13 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx free(filesimage); } -static void pdb_dump_types(struct pdb_reader* reader) +/* there are two 'type' related streams, but with different indexes... */ +static void pdb_dump_types(struct pdb_reader* reader, unsigned strmidx, const char* strmname) { PDB_TYPES* types = NULL; - types = reader->read_file(reader, 2); + types = reader->read_file(reader, strmidx); + if (!types) return; switch (types->version) { @@ -581,7 +583,7 @@ static void pdb_dump_types(struct pdb_reader* reader) } /* Read type table */ - printf("Types:\n" + printf("Types (%s):\n" "\tversion: %u\n" "\ttype_offset: %08x\n" "\tfirst_index: %x\n" @@ -597,6 +599,7 @@ static void pdb_dump_types(struct pdb_reader* reader) "\tsearch_len: %x\n" "\tunknown_offset: %x\n" "\tunknown_len: %x\n", + strmname, types->version, types->type_offset, types->first_index, @@ -782,7 +785,8 @@ static void pdb_jg_dump(void) default: printf("-Unknown root block version %d\n", reader.u.jg.root->Version); } - pdb_dump_types(&reader); + pdb_dump_types(&reader, 2, "TPI"); + pdb_dump_types(&reader, 4, "IPI"); pdb_dump_symbols(&reader, &sidx); pdb_dump_fpo(&reader, sidx.FPO); pdb_dump_segments(&reader, sidx.segments); @@ -926,7 +930,8 @@ static void pdb_ds_dump(void) } if (numok) printf(">>> unmatched present field with found\n"); - pdb_dump_types(&reader); + pdb_dump_types(&reader, 2, "TPI"); + pdb_dump_types(&reader, 4, "IPI"); pdb_dump_symbols(&reader, &sidx); pdb_dump_fpo(&reader, sidx.FPO); pdb_dump_fpo_ext(&reader, sidx.FPO_EXT);

1 0

Eric Pouech : winedump: Add support for dumping CodeView types records found in IPI stream (#4).
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 8a9117ef681db7b2d2330b3dc97cc3fd45cb21e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a9117ef681db7b2d2330b3d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:12:39 2021 +0200 winedump: Add support for dumping CodeView types records found in IPI stream (#4). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/msc.c | 44 +++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index a72e0b58158..35143291f22 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -124,6 +124,7 @@ union codeview_type unsigned short int id; } generic; + /* types found in TPI stream (#2) */ struct { unsigned short int len; @@ -360,6 +361,61 @@ union codeview_type cv_typ_t arglist; unsigned int this_adjust; } mfunction_v2; + + /* types found in IPI stream (#4) */ + struct + { + unsigned short int len; + unsigned short int id; /* LF_FUNC_ID */ + cv_itemid_t scopeId; + cv_typ_t type; + char name[1]; + } func_id_v3; + + struct + { + unsigned short int len; + unsigned short int id; /* LF_MFUNC_ID */ + cv_typ_t parentType; + cv_typ_t type; + char name[1]; + } mfunc_id_v3; + + struct + { + unsigned short int len; + unsigned short int id; /* LF_STRING_ID */ + cv_itemid_t strid; + char name[1]; + } string_id_v3; + + struct + { + unsigned short int len; + unsigned short int id; /* LF_UDT_SRC_LINE */ + cv_typ_t type; + cv_itemid_t src; + unsigned int line; + } udt_src_line_v3; + + struct + { + unsigned short int len; + unsigned short int id; /* LF_UDT_MOD_SRC_LINE */ + cv_typ_t type; + cv_itemid_t src; + unsigned int line; + unsigned short imod; + } udt_mod_src_line_v3; + + struct + { + unsigned short int len; + unsigned short int id; /* LF_BUILDINFO */ + unsigned short count; + cv_itemid_t arg[1]; + } buildinfo_v3; + }; union codeview_reftype @@ -1216,6 +1272,17 @@ union codeview_fieldtype #define LF_NESTTYPE_V3 0x1510 #define LF_ONEMETHOD_V3 0x1511 +/* leaves found in second type type (aka IPI) + * for simplicity, stored in the same union as other TPI leaves + */ +#define LF_FUNC_ID 0x1601 +#define LF_MFUNC_ID 0x1602 +#define LF_BUILDINFO 0x1603 +#define LF_SUBSTR_LIST 0x1604 +#define LF_STRING_ID 0x1605 +#define LF_UDT_SRC_LINE 0x1606 +#define LF_UDT_MOD_SRC_LINE 0x1607 + #define LF_NUMERIC 0x8000 /* numeric leaf types */ #define LF_CHAR 0x8000 #define LF_SHORT 0x8001 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 65e6beb1006..25cfcba0630 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -814,6 +814,7 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type switch (type->generic.id) { + /* types from TPI (aka #2) stream */ case LF_POINTER_V1: printf("\t%x => Pointer V1 to type:%x\n", curr_type, type->pointer_v1.datatype); @@ -1099,6 +1100,49 @@ static void codeview_dump_one_type(unsigned curr_type, const union codeview_type printf("\n"); break; + /* types from IPI (aka #4) stream */ + case LF_FUNC_ID: + printf("\t%x => FuncId %s scopeId:%04x type:%04x\n", + curr_type, type->func_id_v3.name, + type->func_id_v3.scopeId, type->func_id_v3.type); + break; + case LF_MFUNC_ID: + printf("\t%x => MFuncId %s parent:%04x type:%04x\n", + curr_type, type->mfunc_id_v3.name, + type->mfunc_id_v3.parentType, type->mfunc_id_v3.type); + break; + case LF_BUILDINFO: + printf("\t%x => BuildInfo count:%d\n", curr_type, type->buildinfo_v3.count); + if (type->buildinfo_v3.count >= 1) printf("\t\tcurrent dir: %04x\n", type->buildinfo_v3.arg[0]); + if (type->buildinfo_v3.count >= 2) printf("\t\tbuild tool: %04x\n", type->buildinfo_v3.arg[1]); + if (type->buildinfo_v3.count >= 3) printf("\t\tsource file: %04x\n", type->buildinfo_v3.arg[2]); + if (type->buildinfo_v3.count >= 4) printf("\t\tPDB file: %04x\n", type->buildinfo_v3.arg[3]); + if (type->buildinfo_v3.count >= 5) printf("\t\tArguments: %04x\n", type->buildinfo_v3.arg[4]); + break; + case LF_SUBSTR_LIST: + printf("\t%x => SubstrList V3(#%u):", curr_type, reftype->arglist_v2.num); + for (j = 0; j < reftype->arglist_v2.num; j++) + { + printf("\t %x", reftype->arglist_v2.args[j]); + } + printf("\t\n"); + break; + case LF_STRING_ID: + printf("\t%x => StringId %s strid:%04x\n", + curr_type, type->string_id_v3.name, type->string_id_v3.strid); + break; + case LF_UDT_SRC_LINE: + printf("\t%x => Udt-SrcLine type:%04x src:%04x line:%d\n", + curr_type, type->udt_src_line_v3.type, + type->udt_src_line_v3.src, type->udt_src_line_v3.line); + break; + case LF_UDT_MOD_SRC_LINE: + printf("\t%x => Udt-ModSrcLine type:%04x src:%04x line:%d mod:%d\n", + curr_type, type->udt_mod_src_line_v3.type, + type->udt_mod_src_line_v3.src, type->udt_mod_src_line_v3.line, + type->udt_mod_src_line_v3.imod); + break; + default: printf(">>> Unsupported type-id %x for %x\n", type->generic.id, curr_type); dump_data((const void*)type, type->generic.len + 2, "");

1 0

Eric Pouech : winedump: Add support for dumping heap_alloc_site CodeView records.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: d6aff64ccf6bb15c065b3442f2de0c010198472d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6aff64ccf6bb15c065b3442… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:12:14 2021 +0200 winedump: Add support for dumping heap_alloc_site CodeView records. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 6 +++--- include/wine/mscvpdb.h | 4 ++-- tools/winedump/msc.c | 9 +++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index f77592664ef..6d623f336ed 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1993,9 +1993,9 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo TRACE("S-Align V1\n"); break; case S_HEAPALLOCSITE: - TRACE("heap site: offset=0x%08x at sect_idx 0x%04x, inst_len 0x%08x, index 0x%08x\n", - sym->heap_alloc_site.offset, sym->heap_alloc_site.sect_idx, - sym->heap_alloc_site.inst_len, sym->heap_alloc_site.index); + TRACE("S-heap site V3: offset=0x%08x at sect_idx 0x%04x, inst_len 0x%08x, index 0x%08x\n", + sym->heap_alloc_site_v3.offset, sym->heap_alloc_site_v3.sect_idx, + sym->heap_alloc_site_v3.inst_len, sym->heap_alloc_site_v3.index); break; /* the symbols we can safely ignore for now */ diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 42455cbd0fe..766f20d2732 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1751,8 +1751,8 @@ union codeview_symbol unsigned int offset; unsigned short sect_idx; unsigned short inst_len; - unsigned int index; - } heap_alloc_site; + cv_typ_t index; + } heap_alloc_site_v3; struct { diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index f5d2d15774d..62152ed6ea0 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1791,6 +1791,15 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) printf("\t\tfunc:%x invoc:%u\n", sym->function_list_v3.funcs[i], i < ninvoc ? invoc[i] : 0); } break; + + case S_HEAPALLOCSITE: + printf("Heap-alloc-site V3 %04x:%08x#%x type:%04x\n", + sym->heap_alloc_site_v3.sect_idx, + sym->heap_alloc_site_v3.offset, + sym->heap_alloc_site_v3.inst_len, + sym->heap_alloc_site_v3.index); + break; + default: printf("\n\t\t>>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Eric Pouech : winedump: Add support for dumping filestatic Codeview records.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 36961eef16d1c98051b5da6ebeb1a013b5af156d URL: https://source.winehq.org/git/wine.git/?a=commit;h=36961eef16d1c98051b5da6e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:12:20 2021 +0200 winedump: Add support for dumping filestatic Codeview records. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 10 ++++++++++ tools/winedump/msc.c | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 766f20d2732..a72e0b58158 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1881,6 +1881,16 @@ union codeview_symbol unsigned int invocations[0]; /* array of count entries, paires with funcs */ #endif } function_list_v3; + + struct + { + unsigned short int len; + unsigned short int id; + cv_typ_t typind; + unsigned int modOffset; + unsigned short varflags; + char name[1]; + } file_static_v3; }; enum BinaryAnnotationOpcode diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 62152ed6ea0..65e6beb1006 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1800,6 +1800,14 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) sym->heap_alloc_site_v3.index); break; + case S_FILESTATIC: + printf("File-static V3 '%s' type:%04x modOff:%08x flags:%s\n", + sym->file_static_v3.name, + sym->file_static_v3.typind, + sym->file_static_v3.modOffset, + get_varflags(sym->file_static_v3.varflags)); + break; + default: printf("\n\t\t>>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Eric Pouech : winedump: Add support for S_DEFRANGE* family of CodeView records.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: d1e1d80c0e9d434e0e5eebd3a5b7656b371bf82a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1e1d80c0e9d434e0e5eebd3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:11:37 2021 +0200 winedump: Add support for S_DEFRANGE* family of CodeView records. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++ tools/winedump/msc.c | 52 +++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 4d4b8166473..ca3f120a5d6 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1245,6 +1245,19 @@ union codeview_fieldtype * Symbol information * ======================================== */ +struct cv_addr_range +{ + unsigned int offStart; + unsigned short isectStart; + unsigned short cbRange; +}; + +struct cv_addr_gap +{ + unsigned short gapStartOffset; + unsigned short cbRange; +}; + union codeview_symbol { struct @@ -1736,6 +1749,76 @@ union codeview_symbol unsigned short varflags; char name[1]; } local_v3; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned int program; + struct cv_addr_range range; + struct cv_addr_gap gaps[0]; + } defrange_v3; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned int program; + unsigned int offParent; + struct cv_addr_range range; + struct cv_addr_gap gaps[0]; + } defrange_subfield_v3; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned short reg; + unsigned short attr; + struct cv_addr_range range; + struct cv_addr_gap gaps[0]; + } defrange_register_v3; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned int offFramePointer; + struct cv_addr_range range; + struct cv_addr_gap gaps[0]; + } defrange_frameptrrel_v3; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned int offFramePointer; + } defrange_frameptr_relfullscope_v3; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned short reg; + unsigned short attr; + unsigned int offParent : 12; + unsigned int padding : 20; + struct cv_addr_range range; + struct cv_addr_gap gaps[0]; + } defrange_subfield_register_v3; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned short baseReg; + unsigned short spilledUdtMember : 1; + unsigned short padding : 3; + unsigned short offsetParent : 12; + unsigned int offBasePointer; + struct cv_addr_range range; + struct cv_addr_gap gaps[0]; + } defrange_registerrel_v3; }; #define S_COMPILE 0x0001 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 6d463c0ee1b..20471bd23bc 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1136,6 +1136,21 @@ BOOL codeview_dump_types_from_block(const void* table, unsigned long len) return TRUE; } +static void dump_defrange(const struct cv_addr_range* range, const void* last, const char* pfx) +{ + const struct cv_addr_gap* gap; + + printf("%s%04x:%08x range:#%x\n", pfx, range->isectStart, range->offStart, range->cbRange); + for (gap = (const struct cv_addr_gap*)(range + 1); (const void*)(gap + 1) <= last; ++gap) + printf("%s\toffset:%x range:#%x\n", pfx, gap->gapStartOffset, gap->cbRange); +} + +/* return adress of first byte after the symbol */ +static inline const char* get_last(const union codeview_symbol* sym) +{ + return (const char*)sym + sym->generic.len + 2; +} + BOOL codeview_dump_symbols(const void* root, unsigned long size) { unsigned int i; @@ -1598,6 +1613,43 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) break; + case S_DEFRANGE: + printf("\tS-DefRange dia:%x\n", sym->defrange_v3.program); + dump_defrange(&sym->defrange_v3.range, get_last(sym), "\t\t"); + break; + case S_DEFRANGE_SUBFIELD: + printf("\tS-DefRange-subfield V3 dia:%x off-parent:%x\n", + sym->defrange_subfield_v3.program, sym->defrange_subfield_v3.offParent); + dump_defrange(&sym->defrange_subfield_v3.range, get_last(sym), "\t\t"); + break; + case S_DEFRANGE_REGISTER: + printf("\tS-DefRange-register V3 reg:%x attr-unk:%x\n", + sym->defrange_register_v3.reg, sym->defrange_register_v3.attr); + dump_defrange(&sym->defrange_register_v3.range, get_last(sym), "\t\t"); + break; + case S_DEFRANGE_FRAMEPOINTER_REL: + printf("\tS-DefRange-framepointer-rel V3 offFP:%x\n", + sym->defrange_frameptrrel_v3.offFramePointer); + dump_defrange(&sym->defrange_frameptrrel_v3.range, get_last(sym), "\t\t"); + break; + case S_DEFRANGE_FRAMEPOINTER_REL_FULL_SCOPE: + printf("\tS-DefRange-framepointer-rel-fullscope V3 offFP:%x\n", + sym->defrange_frameptr_relfullscope_v3.offFramePointer); + break; + case S_DEFRANGE_SUBFIELD_REGISTER: + printf("\tS-DefRange-subfield-register V3 reg:%d attr-unk:%x off-parent:%x\n", + sym->defrange_subfield_register_v3.reg, + sym->defrange_subfield_register_v3.attr, + sym->defrange_subfield_register_v3.offParent); + dump_defrange(&sym->defrange_subfield_register_v3.range, get_last(sym), "\t\t"); + break; + case S_DEFRANGE_REGISTER_REL: + printf("\tS-DefRange-register-rel V3 reg:%x off-parent:%x off-BP:%x\n", + sym->defrange_registerrel_v3.baseReg, sym->defrange_registerrel_v3.offsetParent, + sym->defrange_registerrel_v3.offBasePointer); + dump_defrange(&sym->defrange_registerrel_v3.range, get_last(sym), "\t\t"); + break; + default: printf(">>> Unsupported symbol-id %x sz=%d\n", sym->generic.id, sym->generic.len + 2); dump_data((const void*)sym, sym->generic.len + 2, " ");

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Server EnumServiceProviders.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: d4565f1541b2b8fae2030cceed4487c3d8a06518 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4565f1541b2b8fae2030cce… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 24 16:43:54 2021 +1000 dpnet: Implement IDirectPlay8Server EnumServiceProviders. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/server.c | 14 ++++++-- dlls/dpnet/tests/server.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/dpnet/server.c b/dlls/dpnet/server.c index 977771697ac..26dd76388b1 100644 --- a/dlls/dpnet/server.c +++ b/dlls/dpnet/server.c @@ -126,9 +126,19 @@ static HRESULT WINAPI IDirectPlay8ServerImpl_EnumServiceProviders(IDirectPlay8Se PDWORD pcReturned, DWORD dwFlags) { IDirectPlay8ServerImpl *This = impl_from_IDirectPlay8Server(iface); - FIXME("(%p)->(%s %s %p %p %p %d)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), + TRACE("(%p)->(%s %s %p %p %p %d)\n", This, debugstr_guid(pguidServiceProvider), debugstr_guid(pguidApplication), pSPInfoBuffer, pcbEnumData, pcReturned, dwFlags); - return E_NOTIMPL; + + if(!This->msghandler) + return DPNERR_UNINITIALIZED; + + if(dwFlags) + FIXME("Unhandled flags %x\n", dwFlags); + + if(pguidApplication) + FIXME("Application guid %s is currently being ignored\n", debugstr_guid(pguidApplication)); + + return enum_services_providers(pguidServiceProvider, pSPInfoBuffer, pcbEnumData, pcReturned); } static HRESULT WINAPI IDirectPlay8ServerImpl_CancelAsyncOperation(IDirectPlay8Server *iface, DPNHANDLE hAsyncHandle, DWORD dwFlags) diff --git a/dlls/dpnet/tests/server.c b/dlls/dpnet/tests/server.c index 74a0e5adfcf..4314c69ccc1 100644 --- a/dlls/dpnet/tests/server.c +++ b/dlls/dpnet/tests/server.c @@ -184,6 +184,91 @@ static void test_server_info(void) } } +static void test_enum_service_providers(void) +{ + DPN_SERVICE_PROVIDER_INFO *serv_prov_info = NULL; + IDirectPlay8Server *server = NULL; + DWORD items, size; + DWORD i; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_DirectPlay8Server, NULL, CLSCTX_ALL, &IID_IDirectPlay8Server, (LPVOID*)&server); + ok(hr == S_OK, "Failed to create IDirectPlay8Server object\n"); + if (FAILED(hr)) + return; + + size = 0; + items = 0; + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_UNINITIALIZED, "got %x\n", hr); + + hr = IDirectPlay8Server_Initialize(server, NULL, DirectPlayMessageHandler, 0); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) + { + IDirectPlay8Server_Release(server); + return; + } + + size = 0; + items = 0; + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, &size, NULL, 0); + ok(hr == E_POINTER, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, NULL, &items, 0); + ok(hr == E_POINTER, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, NULL, &size, &items, 0); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Server_EnumServiceProviders(server, NULL, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no service providers\n"); + + trace("number of items found: %d\n", items); + + for (i=0;i<items;i++) + { + trace("Found Service Provider: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + ok(HeapFree(GetProcessHeap(), 0, serv_prov_info), "Failed freeing server provider info\n"); + + size = 0; + items = 0; + + hr = IDirectPlay8Server_EnumServiceProviders(server, &CLSID_DP8SP_TCPIP, NULL, NULL, &size, &items, 0); + ok(hr == DPNERR_BUFFERTOOSMALL, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(size != 0, "size is unexpectedly 0\n"); + + serv_prov_info = HeapAlloc(GetProcessHeap(), 0, size); + + hr = IDirectPlay8Server_EnumServiceProviders(server, &CLSID_DP8SP_TCPIP, NULL, serv_prov_info, &size, &items, 0); + ok(hr == S_OK, "IDirectPlay8Server_EnumServiceProviders failed with %x\n", hr); + ok(items != 0, "Found unexpectedly no adapter\n"); + + + for (i=0;i<items;i++) + { + trace("Found adapter: %s\n", wine_dbgstr_w(serv_prov_info[i].pwszName)); + trace("Found adapter guid: %s\n", wine_dbgstr_guid(&serv_prov_info[i].guid)); + } + + /* Invalid GUID */ + items = 88; + hr = IDirectPlay8Server_EnumServiceProviders(server, &appguid, NULL, serv_prov_info, &size, &items, 0); + ok(hr == DPNERR_DOESNOTEXIST, "IDirectPlay8Peer_EnumServiceProviders failed with %x\n", hr); + ok(items == 88, "Found adapter %d\n", items); + + HeapFree(GetProcessHeap(), 0, serv_prov_info); + IDirectPlay8Server_Release(server); +} + BOOL is_process_elevated(void) { HANDLE token; @@ -398,6 +483,7 @@ START_TEST(server) create_server(); test_server_info(); + test_enum_service_providers(); CoUninitialize();

1 0

Jacek Caban : gdi32: Merge enhmfdrv/objects.c into emfdc.c.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 1d940b62d10f6cc10f64fefdb8bfb6f6c31b793e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d940b62d10f6cc10f64fefd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 24 13:40:13 2021 +0200 gdi32: Merge enhmfdrv/objects.c into emfdc.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 1 - dlls/gdi32/emfdc.c | 433 +++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/objects.c | 514 ------------------------------------------ 3 files changed, 433 insertions(+), 515 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1d940b62d10f6cc10f64…

1 0