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

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

24 Aug '21

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 dumping stream of fixed index 4.
by Alexandre Julliard 24 Aug '21

24 Aug '21

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 information about type's hash stream.
by Alexandre Julliard 24 Aug '21

24 Aug '21

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 CodeView types records found in IPI stream (#4).
by Alexandre Julliard 24 Aug '21

24 Aug '21

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: Correct and update a couple of infos in PDB symbol stream header.
by Alexandre Julliard 24 Aug '21

24 Aug '21

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

Eric Pouech : dbghelp: Fix a failure about 'wrong name EntryPoint'.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 7d54682ffc941f42d8918bc4ad3ad6ae1f4d4ff9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d54682ffc941f42d8918bc4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Aug 21 22:30:10 2021 +0200 dbghelp: Fix a failure about 'wrong name EntryPoint'. Regression was introduced in d614ac46718311f49541b32ac726c17a06077ae1 by allowing to return the symbol with the lowest address in the module even if the requested address was strictly below. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index b2b4d578910..570e2adb8b6 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -893,11 +893,7 @@ struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) high = module->num_sorttab; symt_get_address(&module->addr_sorttab[0]->symt, &ref_addr); - if (addr <= ref_addr) - { - low = symt_get_best_at(module, 0); - return module->addr_sorttab[low]; - } + if (addr < ref_addr) return NULL; if (high) {

1 0

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

24 Aug '21

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

Francois Gouget : dpnet: Fix an ASCII / ANSI mixup in a warning message.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: c0198a65615ae87ad6f4a5a80f8c86741364d221 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0198a65615ae87ad6f4a5a8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:24:51 2021 +0200 dpnet: Fix an ASCII / ANSI mixup in a warning message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/address.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 6aa62a97785..b616d221b38 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -500,7 +500,7 @@ static HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(IDirectPlay8Address * case DPNA_DATATYPE_STRING_ANSI: if ((strlen((const CHAR*)lpvData)+1) != dwDataSize) { - WARN("Invalid ASCII size, returning DPNERR_INVALIDPARAM\n"); + WARN("Invalid ANSI size, returning DPNERR_INVALIDPARAM\n"); return DPNERR_INVALIDPARAM; } break;

1 0

Alexandre Julliard : ntdll: Consistently fixup the machine type for IL-only binaries.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 88c5184b4d1ba4f230b0248f974974bb6a314371 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88c5184b4d1ba4f230b0248f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 24 17:39:58 2021 +0200 ntdll: Consistently fixup the machine type for IL-only binaries. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51668 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 -- dlls/ntdll/unix/loader.c | 6 +++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index a30db6dda8b..ae1afb2797b 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2148,8 +2148,6 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params( void **module ) if (!status) { if (main_image_info.ImageCharacteristics & IMAGE_FILE_DLL) status = STATUS_INVALID_IMAGE_FORMAT; - if (main_image_info.ImageFlags & IMAGE_FLAGS_ComPlusNativeReady) - main_image_info.Machine = native_machine; if (main_image_info.Machine != current_machine) status = STATUS_INVALID_IMAGE_FORMAT; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 2dde2332a6a..8a5314a1117 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1569,7 +1569,11 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO *module = NULL; status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &size, ViewShare, 0, PAGE_EXECUTE_READ ); - if (!status) NtQuerySection( mapping, SectionImageInformation, info, sizeof(*info), NULL ); + if (!status) + { + NtQuerySection( mapping, SectionImageInformation, info, sizeof(*info), NULL ); + if (info->u.s.ComPlusNativeReady) info->Machine = native_machine; + } NtClose( mapping ); } else if (status == STATUS_INVALID_IMAGE_NOT_MZ && loadorder != LO_NATIVE)

1 0

Jacek Caban : gdi32: Move enhmfdrv/dc.c into new emfdc.c file.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 3303e00a1042d90d537e4e996e7dc82806020776 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3303e00a1042d90d537e4e99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 24 13:39:43 2021 +0200 gdi32: Move enhmfdrv/dc.c into new emfdc.c file. 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 | 2 +- dlls/gdi32/{enhmfdrv/dc.c => emfdc.c} | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 36748bf1a35..96beb74134b 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -22,10 +22,10 @@ C_SRCS = \ dibdrv/opengl.c \ dibdrv/primitives.c \ driver.c \ + emfdc.c \ emfdrv.c \ enhmetafile.c \ enhmfdrv/bitblt.c \ - enhmfdrv/dc.c \ enhmfdrv/graphics.c \ enhmfdrv/init.c \ enhmfdrv/objects.c \ diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/emfdc.c similarity index 99% rename from dlls/gdi32/enhmfdrv/dc.c rename to dlls/gdi32/emfdc.c index be9c00257a3..73cfcc8f490 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/emfdc.c @@ -1,8 +1,9 @@ /* - * Enhanced MetaFile driver dc value functions + * Enhanced MetaFile recording functions * * Copyright 1999 Huw D M Davies * Copyright 2016 Alexandre Julliard + * Copyright 2021 Jacek Caban for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +21,13 @@ */ #include <assert.h> + #include "enhmfdrv/enhmetafiledrv.h" BOOL EMFDC_SaveDC( DC_ATTR *dc_attr ) { EMRSAVEDC emr; + emr.emr.iType = EMR_SAVEDC; emr.emr.nSize = sizeof(emr); return emfdc_record( dc_attr->emf, &emr.emr ); @@ -48,6 +51,7 @@ BOOL EMFDC_RestoreDC( DC_ATTR *dc_attr, INT level ) BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) { EMRSETTEXTALIGN emr; + emr.emr.iType = EMR_SETTEXTALIGN; emr.emr.nSize = sizeof(emr); emr.iMode = align; @@ -57,6 +61,7 @@ BOOL EMFDC_SetTextAlign( DC_ATTR *dc_attr, UINT align ) BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) { EMRSETTEXTJUSTIFICATION emr; + emr.emr.iType = EMR_SETTEXTJUSTIFICATION; emr.emr.nSize = sizeof(emr); emr.nBreakExtra = extra; @@ -67,6 +72,7 @@ BOOL EMFDC_SetTextJustification( DC_ATTR *dc_attr, INT extra, INT breaks ) BOOL EMFDC_SetBkMode( DC_ATTR *dc_attr, INT mode ) { EMRSETBKMODE emr; + emr.emr.iType = EMR_SETBKMODE; emr.emr.nSize = sizeof(emr); emr.iMode = mode; @@ -97,6 +103,7 @@ BOOL EMFDC_SetTextColor( DC_ATTR *dc_attr, COLORREF color ) BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) { EMRSETROP2 emr; + emr.emr.iType = EMR_SETROP2; emr.emr.nSize = sizeof(emr); emr.iMode = rop; @@ -106,6 +113,7 @@ BOOL EMFDC_SetROP2( DC_ATTR *dc_attr, INT rop ) BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ) { EMRSETPOLYFILLMODE emr; + emr.emr.iType = EMR_SETPOLYFILLMODE; emr.emr.nSize = sizeof(emr); emr.iMode = mode; @@ -115,6 +123,7 @@ BOOL EMFDC_SetPolyFillMode( DC_ATTR *dc_attr, INT mode ) BOOL EMFDC_SetStretchBltMode( DC_ATTR *dc_attr, INT mode ) { EMRSETSTRETCHBLTMODE emr; + emr.emr.iType = EMR_SETSTRETCHBLTMODE; emr.emr.nSize = sizeof(emr); emr.iMode = mode; @@ -325,7 +334,6 @@ BOOL EMFDC_SetMapperFlags( DC_ATTR *dc_attr, DWORD flags ) emr.emr.iType = EMR_SETMAPPERFLAGS; emr.emr.nSize = sizeof(emr); emr.dwFlags = flags; - return emfdc_record( dc_attr->emf, &emr.emr ); } @@ -348,8 +356,8 @@ BOOL EMFDC_BeginPath( DC_ATTR *dc_attr ) emr.emr.iType = EMR_BEGINPATH; emr.emr.nSize = sizeof(emr); - if (!emfdc_record( emf, &emr.emr )) return FALSE; + emf->path = TRUE; return TRUE; } @@ -360,7 +368,6 @@ BOOL EMFDC_CloseFigure( DC_ATTR *dc_attr ) emr.emr.iType = EMR_CLOSEFIGURE; emr.emr.nSize = sizeof(emr); - return emfdc_record( dc_attr->emf, &emr.emr ); } @@ -369,10 +376,10 @@ BOOL EMFDC_EndPath( DC_ATTR *dc_attr ) struct emf *emf = dc_attr->emf; EMRENDPATH emr; + emf->path = FALSE; + emr.emr.iType = EMR_ENDPATH; emr.emr.nSize = sizeof(emr); - - emf->path = FALSE; return emfdc_record( emf, &emr.emr ); }

1 0