wine-commits August 2021

wine-commits@winehq.org

1 participants
1051 discussions

Eric Pouech : winedump: Add support for dumping CodeView records about site information.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 3935234265a37413d1acf85fed21f28060ab1464 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3935234265a37413d1acf85f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:11:49 2021 +0200 winedump: Add support for dumping CodeView records about site information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 51 +++++++++++++++++++++++ tools/winedump/msc.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index ca3f120a5d6..20b3314ea04 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -110,6 +110,7 @@ struct p_string typedef unsigned short cv_typ16_t; typedef unsigned int cv_typ_t; +typedef cv_typ_t cv_itemid_t; /* ======================================== * * Type information @@ -1819,6 +1820,56 @@ union codeview_symbol struct cv_addr_range range; struct cv_addr_gap gaps[0]; } defrange_registerrel_v3; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned int pParent; + unsigned int pEnd; + cv_itemid_t inlinee; + unsigned char binaryAnnotations[0]; + } inline_site_v3; + + struct + { + unsigned short int len; + unsigned short int typ; + unsigned int off; + unsigned short sect; + unsigned short _pad0; + cv_typ_t typind; + } callsiteinfo_v3; + + struct + { + unsigned short int len; + unsigned short int id; + unsigned int pParent; + unsigned int pEnd; + cv_itemid_t inlinee; + unsigned int invocations; + unsigned char binaryAnnotations[0]; + } inline_site2_v3; + +}; + +enum BinaryAnnotationOpcode +{ + BA_OP_Invalid, + BA_OP_CodeOffset, + BA_OP_ChangeCodeOffsetBase, + BA_OP_ChangeCodeOffset, + BA_OP_ChangeCodeLength, + BA_OP_ChangeFile, + BA_OP_ChangeLineOffset, + BA_OP_ChangeLineEndDelta, + BA_OP_ChangeRangeKind, + BA_OP_ChangeColumnStart, + BA_OP_ChangeColumnEndDelta, + BA_OP_ChangeCodeOffsetAndLineOffset, + BA_OP_ChangeCodeLengthAndCodeOffset, + BA_OP_ChangeColumnEnd, }; #define S_COMPILE 0x0001 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index d1d3674daca..aba14af8643 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1151,6 +1151,93 @@ static inline const char* get_last(const union codeview_symbol* sym) return (const char*)sym + sym->generic.len + 2; } +static unsigned binannot_uncompress(const unsigned char** pptr) +{ + unsigned res = (unsigned)(-1); + const unsigned char* ptr = *pptr; + + if ((*ptr & 0x80) == 0x00) + res = (unsigned)(*ptr++); + else if ((*ptr & 0xC0) == 0x80) + { + res = (unsigned)((*ptr++ & 0x3f) << 8); + res |= *ptr++; + } + else if ((*ptr & 0xE0) == 0xC0) + { + res = (*ptr++ & 0x1f) << 24; + res |= *ptr++ << 16; + res |= *ptr++ << 8; + res |= *ptr++; + } + else res = (unsigned)(-1); + *pptr = ptr; + return res; +} + +static void dump_binannot(const unsigned char* ba, const char* last, const char* pfx) +{ + while (ba < (const unsigned char*)last) + { + unsigned opcode = binannot_uncompress(&ba); + switch (opcode) + { + case BA_OP_Invalid: + /* not clear if param? */ + printf("%sInvalid\n", pfx); + break; + case BA_OP_CodeOffset: + printf("%sCodeOffset %u\n", pfx, binannot_uncompress(&ba)); + break; + case BA_OP_ChangeCodeOffsetBase: + printf("%sChangeCodeOffsetBase %u\n", pfx, binannot_uncompress(&ba)); + break; + case BA_OP_ChangeCodeOffset: + printf("%sChangeCodeOffset %u\n", pfx, binannot_uncompress(&ba)); + break; + case BA_OP_ChangeCodeLength: + printf("%sChangeCodeLength %u\n", pfx, binannot_uncompress(&ba)); + break; + case BA_OP_ChangeFile: + printf("%sChangeFile %u\n", pfx, binannot_uncompress(&ba)); + break; + case BA_OP_ChangeLineOffset: + printf("%sChangeLineOffset %d\n", pfx, binannot_uncompress(&ba)); + break; + case BA_OP_ChangeLineEndDelta: + printf("%sChangeLineEndDelta %u\n", pfx, binannot_uncompress(&ba)); + break; + case BA_OP_ChangeRangeKind: + printf("%sChangeRangeKind %u\n", pfx, binannot_uncompress(&ba)); + break; + case BA_OP_ChangeColumnStart: + printf("%sChangeColumnStart %u\n", pfx, binannot_uncompress(&ba)); + break; + case BA_OP_ChangeColumnEndDelta: + printf("%sChangeColumnEndDelta %u\n", pfx, binannot_uncompress(&ba)); + break; + case BA_OP_ChangeCodeOffsetAndLineOffset: + { + unsigned p1 = binannot_uncompress(&ba); + printf("%sChangeCodeOffsetAndLineOffset %u %u (0x%x)\n", pfx, p1 & 0xf, p1 >> 4, p1); + } + break; + case BA_OP_ChangeCodeLengthAndCodeOffset: + { + unsigned p1 = binannot_uncompress(&ba); + unsigned p2 = binannot_uncompress(&ba); + printf("%sChangeCodeLengthAndCodeOffset %u %u\n", pfx, p1, p2); + } + break; + case BA_OP_ChangeColumnEnd: + printf("%sChangeColumnEnd %u\n", pfx, binannot_uncompress(&ba)); + break; + + default: printf("%sUnsupported op %d %x\n", pfx, opcode, opcode); /* may cause issues because of param */ + } + } +} + BOOL codeview_dump_symbols(const void* root, unsigned long size) { unsigned int i; @@ -1651,6 +1738,26 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) dump_defrange(&sym->defrange_registerrel_v3.range, get_last(sym), "\t\t"); break; + case S_CALLSITEINFO: + printf("Call-site-info V3 %04x:%08x typeindex:%x\n", + sym->callsiteinfo_v3.sect, sym->callsiteinfo_v3.off, sym->callsiteinfo_v3.typind); + break; + + case S_INLINESITE: + printf("Inline-site V3 parent:%x end:%x inlinee:%x\n", + sym->inline_site_v3.pParent, sym->inline_site_v3.pEnd, sym->inline_site_v3.inlinee); + dump_binannot(sym->inline_site_v3.binaryAnnotations, get_last(sym), "\t\t"); + break; + case S_INLINESITE2: + printf("Inline-site2 V3 parent:%x end:%x inlinee:%x #inv:%u\n", + sym->inline_site2_v3.pParent, sym->inline_site2_v3.pEnd, sym->inline_site2_v3.inlinee, + sym->inline_site2_v3.invocations); + dump_binannot(sym->inline_site2_v3.binaryAnnotations, get_last(sym), "\t\t"); + break; + case S_INLINESITE_END: + printf("Inline-site-end\n"); + 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: Print symbol id when dumping symbols.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: de615a11e5b2496afd7f5f0b338c80c463dd32e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de615a11e5b2496afd7f5f0b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:11:43 2021 +0200 winedump: Print symbol id when dumping symbols. In CV records, the cv_itemid is used to reference other symbols, so we need to print out the symbol id. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 121 ++++++++++++++++++++++++++------------------------- 1 file changed, 61 insertions(+), 60 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de615a11e5b2496afd7f…

1 0

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

24 Aug '21

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

Eric Pouech : winedump: Add support for dumping S_LOCAL symbol record.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 5c9c3428588865bcded2f6a4eca8e65d7dea3889 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c9c3428588865bcded2f6a4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:11:31 2021 +0200 winedump: Add support for dumping S_LOCAL symbol record. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 9 +++++++++ tools/winedump/msc.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 9e544108bdd..4d4b8166473 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1727,6 +1727,15 @@ union codeview_symbol unsigned short inst_len; unsigned int index; } heap_alloc_site; + + struct + { + unsigned short int len; + unsigned short int id; + cv_typ_t symtype; + unsigned short varflags; + char name[1]; + } local_v3; }; #define S_COMPILE 0x0001 diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index c7ca3eea77a..6d463c0ee1b 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -288,6 +288,33 @@ static const char* get_funcattr(unsigned attr) return tmp; } +static const char* get_varflags(unsigned flags) +{ + static char tmp[1024]; + unsigned pos = 0; + + if (!flags) return "none"; +#define X(s) {if (pos) tmp[pos++] = ';'; strcpy(tmp + pos, s); pos += strlen(s);} + if (flags & 0x0001) X("param"); + if (flags & 0x0002) X("addr-taken"); + if (flags & 0x0004) X("compiler-gen"); + if (flags & 0x0008) X("aggregated"); + if (flags & 0x0010) X("in-aggreate"); + if (flags & 0x0020) X("aliased"); + if (flags & 0x0040) X("alias"); + if (flags & 0x0080) X("retval"); + if (flags & 0x0100) X("optimized-out"); + if (flags & 0x0200) X("enreg-global"); + if (flags & 0x0400) X("enreg-static"); + if (flags & 0xf800) pos += sprintf(tmp, "unk:%x", flags & 0xf800); +#undef X + + tmp[pos] = '\0'; + assert(pos < sizeof(tmp)); + + return tmp; +} + static const char* get_machine(unsigned m) { const char* machine; @@ -1564,6 +1591,13 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) sym->thread_v3.segment, sym->thread_v3.offset, sym->thread_v3.symtype); break; + case S_LOCAL: + printf("\tS-Local V3 '%s' type=%x flags=%s\n", + sym->local_v3.name, sym->local_v3.symtype, + get_varflags(sym->local_v3.varflags)); + + 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

Eric Pouech : winedump: Correctly support flags in public records (V1 and V2).
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 0003c64e5ba53929778774ca3f41815efa053e70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0003c64e5ba53929778774ca… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:11:24 2021 +0200 winedump: Correctly support flags in public records (V1 and V2). 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 | 4 ++-- tools/winedump/msc.c | 32 +++++++++++++++++++++++++------- 3 files changed, 29 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 380511d0b55..f77592664ef 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2058,7 +2058,7 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, terminate_string(&sym->public_v1.p_name), - sym->public_v1.symtype == SYMTYPE_FUNCTION, + sym->public_v1.pubsymflags == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v1.segment, sym->public_v1.offset), 1); } break; @@ -2067,7 +2067,7 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, terminate_string(&sym->public_v2.p_name), - sym->public_v2.symtype == SYMTYPE_FUNCTION, + sym->public_v2.pubsymflags == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v2.segment, sym->public_v2.offset), 1); } break; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 2ed9a9fe192..9e544108bdd 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1368,7 +1368,7 @@ union codeview_symbol unsigned short int id; unsigned int offset; unsigned short segment; - cv_typ16_t symtype; + unsigned short pubsymflags; struct p_string p_name; } public_v1; @@ -1376,7 +1376,7 @@ union codeview_symbol { unsigned short int len; unsigned short int id; - cv_typ_t symtype; + unsigned int pubsymflags; unsigned int offset; unsigned short segment; struct p_string p_name; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 7f93f3e7701..c7ca3eea77a 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -457,6 +457,20 @@ static const char* get_callconv(unsigned cc) return callconv; } +static const char* get_pubflags(unsigned flags) +{ + static char ret[32]; + + ret[0] = '\0'; +#define X(s) {if (ret[0]) strcat(ret, ";"); strcat(ret, s);} + if (flags & 1) X("code"); + if (flags & 2) X("func"); + if (flags & 4) X("manage"); + if (flags & 8) X("msil"); +#undef X + return ret; +} + static void do_field(const unsigned char* start, const unsigned char* end) { /* @@ -1134,21 +1148,25 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) sym->data_v3.symtype); break; + case S_PUB32_16t: + printf("\tS-Public V1 '%s' %04x:%08x flags:%s\n", + get_symbol_str(p_string(&sym->public_v1.p_name)), + sym->public_v1.segment, sym->public_v1.offset, + get_pubflags(sym->public_v1.pubsymflags)); + break; + case S_PUB32_ST: - printf("\tS-Public V2 '%s' %04x:%08x type:%08x\n", + printf("\tS-Public V2 '%s' %04x:%08x flags:%s\n", get_symbol_str(p_string(&sym->public_v2.p_name)), sym->public_v2.segment, sym->public_v2.offset, - sym->public_v2.symtype); + get_pubflags(sym->public_v2.pubsymflags)); break; case S_PUB32: - printf("\tS-Public V3 '%s' %04x:%08x flags%s%s%s%s\n", + printf("\tS-Public V3 '%s' %04x:%08x flags:%s\n", get_symbol_str(sym->public_v3.name), sym->public_v3.segment, sym->public_v3.offset, - (sym->public_v3.pubsymflags & 1) ? "-code" : "", - (sym->public_v3.pubsymflags & 2) ? "-func" : "", - (sym->public_v3.pubsymflags & 4) ? "-manage" : "", - (sym->public_v3.pubsymflags & 8) ? "-msil" : ""); + get_pubflags(sym->public_v3.pubsymflags)); break; case S_DATAREF:

1 0

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Server EnumServiceProviders.
by Alexandre Julliard 24 Aug '21

24 Aug '21

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

Akihiro Sagawa : ws2_32: Disallow NULL in socket lookups.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: ee2e5c0242462b0a1538253cc69c6c3043027790 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee2e5c0242462b0a1538253c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 24 21:50:39 2021 +0900 ws2_32: Disallow NULL in socket lookups. NULL means an unused slot, not a valid socket. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f58f7cea5cc..bf87e7824e5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -379,6 +379,8 @@ static BOOL socket_list_find( SOCKET socket ) { unsigned int i; + if (!socket) return FALSE; + EnterCriticalSection( &cs_socket_list ); for (i = 0; i < socket_list_size; ++i) { @@ -397,6 +399,8 @@ static BOOL socket_list_remove( SOCKET socket ) { unsigned int i; + if (!socket) return FALSE; + EnterCriticalSection(&cs_socket_list); for (i = 0; i < socket_list_size; ++i) {

1 0

Akihiro Sagawa : ws2_32: Explicitly return WSAENOTSOCK for a file handle in getsockopt() except SO_OPENTYPE.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: ffe20add5812fc45267af22aaa2af7d4e9a39d0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ffe20add5812fc45267af22a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 24 21:50:37 2021 +0900 ws2_32: Explicitly return WSAENOTSOCK for a file handle in getsockopt() except SO_OPENTYPE. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51671 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 7 +++++++ dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 30f233fa78f..f58f7cea5cc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1363,6 +1363,13 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl debugstr_sockopt(level, optname), debugstr_optval(optval, 0), optlen, optlen ? *optlen : 0); + if ((level != SOL_SOCKET || optname != SO_OPENTYPE) && + !socket_list_find( s )) + { + SetLastError( WSAENOTSOCK ); + return SOCKET_ERROR; + } + switch(level) { case SOL_SOCKET: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d3f2459aa3a..ec010acebc6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11693,8 +11693,8 @@ static void test_sockopt_validity(void) }; static const struct sockopt_validity_test file_handle_tests[] = { - { -1, WSAENOTSOCK, 0, TRUE }, - { SO_TYPE, WSAENOTSOCK, 0, TRUE }, + { -1, WSAENOTSOCK }, + { SO_TYPE, WSAENOTSOCK }, { SO_OPENTYPE }, {} };

1 0

Akihiro Sagawa : ws2_32/tests: Add socket option validity tests for a file handle.
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: 2a45917ae264108f1a4ddd8adb1c65af0b73aaee URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a45917ae264108f1a4ddd8a… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Aug 24 21:50:35 2021 +0900 ws2_32/tests: Add socket option validity tests for a file handle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a8d415c3cea..d3f2459aa3a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -11691,6 +11691,15 @@ static void test_sockopt_validity(void) { IPV6_USER_MTU, 0, 0, TRUE }, {} }; + static const struct sockopt_validity_test file_handle_tests[] = + { + { -1, WSAENOTSOCK, 0, TRUE }, + { SO_TYPE, WSAENOTSOCK, 0, TRUE }, + { SO_OPENTYPE }, + {} + }; + char path[MAX_PATH]; + HANDLE file; SOCKET sock; sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -11736,6 +11745,12 @@ static void test_sockopt_validity(void) do_sockopt_validity_tests("IPv6 raw", sock, IPPROTO_IPV6, ipv6_raw_tests); closesocket(sock); } + + GetSystemWindowsDirectoryA(path, ARRAY_SIZE(path)); + strcat(path, "\\system.ini"); + file = CreateFileA(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0x0, NULL); + do_sockopt_validity_tests("file", (SOCKET)file, SOL_SOCKET, file_handle_tests); + CloseHandle(file); } START_TEST( sock )

1 0

Nikolay Sivov : oleaut32: Fully initialize VARIANT structure in VariantInit().
by Alexandre Julliard 24 Aug '21

24 Aug '21

Module: wine Branch: master Commit: b560dbaebc125f80a8e34d4595e4eca02ae046c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b560dbaebc125f80a8e34d45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 24 16:13:05 2021 +0300 oleaut32: Fully initialize VARIANT structure in VariantInit(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 13 +++++++++---- dlls/oleaut32/variant.c | 17 +++-------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 05efb5a888b..f25a448645c 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -673,11 +673,16 @@ static void _test_bstr_var(unsigned line, const VARIANT *v, const WCHAR *str) static void test_VariantInit(void) { - VARIANT v; + VARIANT v, v2, v3; - memset(&v, -1, sizeof(v)); - VariantInit(&v); - ok(V_VT(&v) == VT_EMPTY, "VariantInit() returned vt %d\n", V_VT(&v)); + memset(&v, -1, sizeof(v)); + memset(&v2, 0, sizeof(v2)); + memset(&v3, -1, sizeof(v3)); + V_VT(&v3) = VT_EMPTY; + + VariantInit(&v); + ok(!memcmp(&v, &v2, sizeof(v)) || + broken(!memcmp(&v, &v3, sizeof(v3)) /* pre Win8 */), "Unexpected contents.\n"); } /* All possible combinations of extra V_VT() flags */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 40a1170e247..2c60f920f5e 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -545,24 +545,13 @@ static inline HRESULT VARIANT_ValidateType(VARTYPE vt) /****************************************************************************** * VariantInit [OLEAUT32.8] * - * Initialise a variant. - * - * PARAMS - * pVarg [O] Variant to initialise - * - * RETURNS - * Nothing. - * - * NOTES - * This function simply sets the type of the variant to VT_EMPTY. It does not - * free any existing value, use VariantClear() for that. + * Since Windows 8.1 whole structure is initialized, before that only type field was reset to VT_EMPTY. */ void WINAPI VariantInit(VARIANTARG* pVarg) { - TRACE("(%p)\n", pVarg); + TRACE("(%p)\n", pVarg); - /* Win8.1 zeroes whole struct. Previous implementations don't set any other fields. */ - V_VT(pVarg) = VT_EMPTY; + memset(pVarg, 0, sizeof(*pVarg)); } HRESULT VARIANT_ClearInd(VARIANTARG *pVarg)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2021