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

Eric Pouech : winedump: Add support for CALLERS/CALLEES/INLINEES codeview records.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: f5800a7849dfcdad116ff287fd1e94e3262c9719 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5800a7849dfcdad116ff287… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Aug 24 11:11:55 2021 +0200 winedump: Add support for CALLERS/CALLEES/INLINEES 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 | 13 +++++++++++++ tools/winedump/msc.c | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 20b3314ea04..4ab83ef1f02 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1852,6 +1852,16 @@ union codeview_symbol unsigned char binaryAnnotations[0]; } inline_site2_v3; + struct + { + unsigned short int len; + unsigned short int id; + unsigned int count; + cv_typ_t funcs[0]; /* array of cuntions, count entries */ +#if 0 + unsigned int invocations[0]; /* array of count entries, paires with funcs */ +#endif + } function_list_v3; }; enum BinaryAnnotationOpcode @@ -2025,6 +2035,9 @@ enum BinaryAnnotationOpcode #define S_GDATA_HLSL32_EX 0x1164 #define S_LDATA_HLSL32_EX 0x1165 +/* not documented yet on MS CV github repo, but that's how LLVM calls it */ +#define S_INLINEES 0x1168 + /* ======================================== * * Line number information * ======================================== */ diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index aba14af8643..8948428427b 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1758,6 +1758,25 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) printf("Inline-site-end\n"); break; + case S_CALLEES: + case S_CALLERS: + case S_INLINEES: + { + unsigned i, ninvoc; + const unsigned* invoc; + const char* tag; + + if (sym->generic.id == S_CALLERS) tag = "Callers"; + else if (sym->generic.id == S_CALLEES) tag = "Callees"; + else tag = "Inlinees"; + printf("%s V3 count:%u\n", tag, sym->function_list_v3.count); + invoc = (const unsigned*)&sym->function_list_v3.funcs[sym->function_list_v3.count]; + ninvoc = (const unsigned*)get_last(sym) - invoc; + + for (i = 0; i < sym->function_list_v3.count; ++i) + printf("\t\tfunc:%x invoc:%u\n", sym->function_list_v3.funcs[i], i < ninvoc ? invoc[i] : 0); + } + 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

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

Aug. 24, 2021

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

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

Aug. 24, 2021

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

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

Aug. 24, 2021

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

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

Aug. 24, 2021

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

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

Aug. 24, 2021

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 Aug. 24, 2021

Aug. 24, 2021

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: Correctly support flags in public records (V1 and V2).
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

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

Francois Gouget : imm32: Fix an ASCII / ANSI mixup in a comment.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 2eb4b19f5f1beafe5fd123c63ca435bedcabd303 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2eb4b19f5f1beafe5fd123c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Aug 24 10:24:01 2021 +0200 imm32: Fix an ASCII / ANSI mixup in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imm32/imm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 9d2a09f22be..20633041871 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1755,7 +1755,7 @@ UINT WINAPI ImmGetDescriptionA( /* fetch the unicode buffer */ len = ImmGetDescriptionW( hKL, buf, len + 1 ); - /* convert it back to ASCII */ + /* convert it back to ANSI */ len = WideCharToMultiByte( CP_ACP, 0, buf, len + 1, lpszDescription, uBufLen, NULL, NULL );

1 0

Francois Gouget : kernel32/tests: Remove the macros from the GetTimeFormatEx() tests.
by Alexandre Julliard Aug. 24, 2021

Aug. 24, 2021

Module: wine Branch: master Commit: 2ee13997864d3a9c8ae7fcda288b9c2a1f6a489e URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ee13997864d3a9c8ae7fcda… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Aug 24 10:14:57 2021 +0200 kernel32/tests: Remove the macros from the GetTimeFormatEx() tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 247 +++++++++++++++++++++---------------------- 1 file changed, 123 insertions(+), 124 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2ee13997864d3a9c8ae7…

1 0