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

Eric Pouech : dbghelp:: Add proper support for S_OBJNAME records.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 9adf73be7e6d2b9655f38dda421692994591c6c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9adf73be7e6d2b9655f38dda… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Aug 21 10:23:00 2021 +0200 dbghelp:: Add proper support for S_OBJNAME records. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 20 ++++++-------------- include/wine/mscvpdb.h | 10 +++++++++- tools/winedump/msc.c | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 25300aa6f90..2712d352a17 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1844,23 +1844,15 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo } } break; + case S_OBJNAME: - TRACE("S-Compiland-V3 %s\n", sym->compiland_v3.name); - if (TRACE_ON(dbghelp_msc)) - { - const char* ptr1 = sym->compiland_v3.name + strlen(sym->compiland_v3.name); - const char* ptr2; - while (*ptr1) - { - ptr2 = ptr1 + strlen(ptr1) + 1; - TRACE("\t%s => %s\n", ptr1, debugstr_a(ptr2)); - ptr1 = ptr2 + strlen(ptr2) + 1; - } - } - break; + TRACE("S-ObjName-V3 %s\n", sym->objname_v3.name); + compiland = symt_new_compiland(msc_dbg->module, 0 /* FIXME */, + source_new(msc_dbg->module, NULL, + sym->objname_v3.name)); case S_OBJNAME_ST: - TRACE("S-ObjName %s\n", terminate_string(&sym->objname_v1.p_name)); + TRACE("S-ObjName-V1 %s\n", terminate_string(&sym->objname_v1.p_name)); compiland = symt_new_compiland(msc_dbg->module, 0 /* FIXME */, source_new(msc_dbg->module, NULL, terminate_string(&sym->objname_v1.p_name))); diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 036c65df0c1..a66334dbc90 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1557,10 +1557,18 @@ union codeview_symbol { short int len; short int id; - char signature[4]; + unsigned signature; struct p_string p_name; } objname_v1; + struct + { + short int len; + short int id; + unsigned signature; + char name[1]; + } objname_v3; + struct { short int len; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 8053c79e450..5def00df8ed 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1352,12 +1352,12 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) break; case S_OBJNAME: - printf("\tS-Compiland V3 '%s' unknown:%x\n", - sym->compiland_v3.name, sym->compiland_v3.unknown); + printf("\tS-ObjName V3 sig:%x '%s'\n", + sym->objname_v3.signature, sym->objname_v3.name); break; case S_OBJNAME_ST: - printf("\tS-ObjName V1 sig:%.4s '%s'\n", + printf("\tS-ObjName V1 sig:%x '%s'\n", sym->objname_v1.signature, p_string(&sym->objname_v1.p_name)); break;

1 0

Eric Pouech : winedump: Move string conversion of machine and language into dedicated helpers.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: bde14eac321ffc30085c80ff40ccf11f06e3d13e URL: https://source.winehq.org/git/wine.git/?a=commit;h=bde14eac321ffc30085c80ff… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Aug 21 10:22:22 2021 +0200 winedump: Move string conversion of machine and language into dedicated helpers. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 96 +++++++++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 43 deletions(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index fbbbfe4ab7f..d037cec89dd 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -264,6 +264,54 @@ static const char* get_property(unsigned prop) return tmp; } +static const char* get_machine(unsigned m) +{ + const char* machine; + + switch (m) + { + case 0x00: machine = "Intel 8080"; break; + case 0x01: machine = "Intel 8086"; break; + case 0x02: machine = "Intel 80286"; break; + case 0x03: machine = "Intel 80386"; break; + case 0x04: machine = "Intel 80486"; break; + case 0x05: machine = "Intel Pentium"; break; + case 0x10: machine = "MIPS R4000"; break; + default: + { + static char tmp[16]; + sprintf(tmp, "machine=%x", m); + machine = tmp; + } + break; + } + return machine; +} + +static const char* get_language(unsigned l) +{ + const char* lang; + + switch (l) + { + case 0x00: lang = "C"; break; + case 0x01: lang = "C++"; break; + case 0x02: lang = "Fortran"; break; + case 0x03: lang = "Masm"; break; + case 0x04: lang = "Pascal"; break; + case 0x05: lang = "Basic"; break; + case 0x06: lang = "Cobol"; break; + default: + { + static char tmp[16]; + sprintf(tmp, "lang=%x", l); + lang = tmp; + } + break; + } + return lang; +} + static void do_field(const unsigned char* start, const unsigned char* end) { /* @@ -1131,49 +1179,11 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) break; case S_COMPILE: - { - const char* machine; - const char* lang; - - switch (sym->compiland_v1.unknown & 0xFF) - { - case 0x00: machine = "Intel 8080"; break; - case 0x01: machine = "Intel 8086"; break; - case 0x02: machine = "Intel 80286"; break; - case 0x03: machine = "Intel 80386"; break; - case 0x04: machine = "Intel 80486"; break; - case 0x05: machine = "Intel Pentium"; break; - case 0x10: machine = "MIPS R4000"; break; - default: - { - static char tmp[16]; - sprintf(tmp, "machine=%x", sym->compiland_v1.unknown & 0xFF); - machine = tmp; - } - break; - } - switch ((sym->compiland_v1.unknown >> 8) & 0xFF) - { - case 0x00: lang = "C"; break; - case 0x01: lang = "C++"; break; - case 0x02: lang = "Fortran"; break; - case 0x03: lang = "Masm"; break; - case 0x04: lang = "Pascal"; break; - case 0x05: lang = "Basic"; break; - case 0x06: lang = "Cobol"; break; - default: - { - static char tmp[16]; - sprintf(tmp, "language=%x", (sym->compiland_v1.unknown >> 8) & 0xFF); - lang = tmp; - } - break; - } - - printf("\tS-Compiland V1 '%s' %s %s unk:%x\n", - p_string(&sym->compiland_v1.p_name), machine, lang, - sym->compiland_v1.unknown >> 16); - } + printf("\tS-Compiland V1 '%s' %s %s unk:%x\n", + p_string(&sym->compiland_v1.p_name), + get_machine(sym->compiland_v1.unknown & 0xFF), + get_language((sym->compiland_v1.unknown >> 8) & 0xFF), + sym->compiland_v1.unknown >> 16); break; case S_COMPILE2_ST:

1 0

Zebediah Figura : wineusb.sys: Mark child PDOs as removed as soon as they are hot-unplugged.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 33f7b14c6c82b5f59535379ec20ea0a0e44cae0f URL: https://source.winehq.org/git/wine.git/?a=commit;h=33f7b14c6c82b5f59535379e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 20 19:01:26 2021 -0500 wineusb.sys: Mark child PDOs as removed as soon as they are hot-unplugged. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index fae297915fc..a19da6df8f4 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -144,6 +144,7 @@ static void remove_usb_device(libusb_device *libusb_device) { if (device->libusb_device == libusb_device) { + device->removed = TRUE; list_remove(&device->entry); break; }

1 0

Eric Pouech : winedump: Add a bunch of new CPU definitions for PDB.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: b5b20310780ad446ca01efb64697e9cb734ef539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b20310780ad446ca01efb6… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Aug 21 10:22:35 2021 +0200 winedump: Add a bunch of new CPU definitions for PDB. Update cvinfo.h accordingly. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/cvconst.h | 68 +++++++++++++++++++++++++++++++++++++++++++ tools/winedump/msc.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 143 insertions(+), 7 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index adb18d420fb..39829c73592 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -743,3 +743,71 @@ typedef enum CV_CFL_LANG CV_CFL_MSIL, CV_CFL_HLSL, } CV_CFL_LANG; + +typedef enum CV_CPU_TYPE_e +{ + CV_CFL_8080, + CV_CFL_8086, + CV_CFL_80286, + CV_CFL_80386, + CV_CFL_80486, + CV_CFL_PENTIUM, + CV_CFL_PENTIUMII, + CV_CFL_PENTIUMPRO = CV_CFL_PENTIUMII, + CV_CFL_PENTIUMIII, + CV_CFL_MIPS = 0x10, + CV_CFL_MIPSR4000 = CV_CFL_MIPS, + CV_CFL_MIPS16, + CV_CFL_MIPS32, + CV_CFL_MIPS64, + CV_CFL_MIPSI, + CV_CFL_MIPSII, + CV_CFL_MIPSIII, + CV_CFL_MIPSIV, + CV_CFL_MIPSV, + CV_CFL_M68000 = 0x20, + CV_CFL_M68010, + CV_CFL_M68020, + CV_CFL_M68030, + CV_CFL_M68040, + CV_CFL_ALPHA = 0x30, + CV_CFL_ALPHA_21064 = 0x30, + CV_CFL_ALPHA_21164, + CV_CFL_ALPHA_21164A, + CV_CFL_ALPHA_21264, + CV_CFL_ALPHA_21364, + CV_CFL_PPC601 = 0x40, + CV_CFL_PPC603, + CV_CFL_PPC604, + CV_CFL_PPC620, + CV_CFL_PPCFP, + CV_CFL_SH3 = 0x50, + CV_CFL_SH3E, + CV_CFL_SH3DSP, + CV_CFL_SH4, + CV_CFL_SHMEDIA, + CV_CFL_ARM3 = 0x60, + CV_CFL_ARM4, + CV_CFL_ARM4T, + CV_CFL_ARM5, + CV_CFL_ARM5T, + CV_CFL_ARM6, + CV_CFL_ARM_XMAC, + CV_CFL_ARM_WMMX, + CV_CFL_ARM7, + CV_CFL_OMNI = 0x70, + CV_CFL_IA64 = 0x80, + CV_CFL_IA64_1 = 0x80, + CV_CFL_IA64_2, + CV_CFL_CEE = 0x90, + CV_CFL_AM33 = 0xA0, + CV_CFL_M32R = 0xB0, + CV_CFL_TRICORE = 0xC0, + CV_CFL_X64 = 0xD0, + CV_CFL_AMD64 = CV_CFL_X64, + CV_CFL_EBC = 0xE0, + CV_CFL_THUMB = 0xF0, + CV_CFL_ARMNT = 0xF4, + CV_CFL_ARM64 = 0xF6, + CV_CFL_D3D11_SHADER = 0x100, +} CV_CPU_TYPE_e; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 01c0fff3052..2155d876696 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -271,13 +271,81 @@ static const char* get_machine(unsigned m) switch (m) { - case 0x00: machine = "Intel 8080"; break; - case 0x01: machine = "Intel 8086"; break; - case 0x02: machine = "Intel 80286"; break; - case 0x03: machine = "Intel 80386"; break; - case 0x04: machine = "Intel 80486"; break; - case 0x05: machine = "Intel Pentium"; break; - case 0x10: machine = "MIPS R4000"; break; + case CV_CFL_8080: machine = "Intel 8080"; break; + case CV_CFL_8086: machine = "Intel 8086"; break; + case CV_CFL_80286: machine = "Intel 80286"; break; + case CV_CFL_80386: machine = "Intel 80386"; break; + case CV_CFL_80486: machine = "Intel 80486"; break; + case CV_CFL_PENTIUM: machine = "Intel Pentium"; break; + case CV_CFL_PENTIUMII: machine = "Intel Pentium II"; break; + case CV_CFL_PENTIUMIII: machine = "Intel Pentium III"; break; + + case CV_CFL_MIPS: machine = "MIPS R4000"; break; + case CV_CFL_MIPS16: machine = "MIPS16"; break; + case CV_CFL_MIPS32: machine = "MIPS32"; break; + case CV_CFL_MIPS64: machine = "MIPS64"; break; + case CV_CFL_MIPSI: machine = "MIPS I"; break; + case CV_CFL_MIPSII: machine = "MIPS II"; break; + case CV_CFL_MIPSIII: machine = "MIPS III"; break; + case CV_CFL_MIPSIV: machine = "MIPS IV"; break; + case CV_CFL_MIPSV: machine = "MIPS V"; break; + + case CV_CFL_M68000: machine = "M68000"; break; + case CV_CFL_M68010: machine = "M68010"; break; + case CV_CFL_M68020: machine = "M68020"; break; + case CV_CFL_M68030: machine = "M68030"; break; + case CV_CFL_M68040: machine = "M68040"; break; + + case CV_CFL_ALPHA_21064: machine = "Alpha 21064"; break; + case CV_CFL_ALPHA_21164: machine = "Alpha 21164"; break; + case CV_CFL_ALPHA_21164A: machine = "Alpha 21164A"; break; + case CV_CFL_ALPHA_21264: machine = "Alpha 21264"; break; + case CV_CFL_ALPHA_21364: machine = "Alpha 21364"; break; + + case CV_CFL_PPC601: machine = "PowerPC 601"; break; + case CV_CFL_PPC603: machine = "PowerPC 603"; break; + case CV_CFL_PPC604: machine = "PowerPC 604"; break; + case CV_CFL_PPC620: machine = "PowerPC 620"; break; + case CV_CFL_PPCFP: machine = "PowerPC FP"; break; + + case CV_CFL_SH3: machine = "SH3"; break; + case CV_CFL_SH3E: machine = "SH3E"; break; + case CV_CFL_SH3DSP: machine = "SH3DSP"; break; + case CV_CFL_SH4: machine = "SH4"; break; + case CV_CFL_SHMEDIA: machine = "SHMEDIA"; break; + + case CV_CFL_ARM3: machine = "ARM 3"; break; + case CV_CFL_ARM4: machine = "ARM 4"; break; + case CV_CFL_ARM4T: machine = "ARM 4T"; break; + case CV_CFL_ARM5: machine = "ARM 5"; break; + case CV_CFL_ARM5T: machine = "ARM 5T"; break; + case CV_CFL_ARM6: machine = "ARM 6"; break; + case CV_CFL_ARM_XMAC: machine = "ARM XMAC"; break; + case CV_CFL_ARM_WMMX: machine = "ARM WMMX"; break; + case CV_CFL_ARM7: machine = "ARM 7"; break; + + case CV_CFL_OMNI: machine = "OMNI"; break; + + case CV_CFL_IA64_1: machine = "Itanium"; break; + case CV_CFL_IA64_2: machine = "Itanium 2"; break; + + case CV_CFL_CEE: machine = "CEE"; break; + + case CV_CFL_AM33: machine = "AM33"; break; + + case CV_CFL_M32R: machine = "M32R"; break; + + case CV_CFL_TRICORE: machine = "TRICORE"; break; + + case CV_CFL_X64: machine = "x86_64"; break; + + case CV_CFL_EBC: machine = "EBC"; break; + + case CV_CFL_THUMB: machine = "Thumb"; break; + case CV_CFL_ARMNT: machine = "ARM NT"; break; + case CV_CFL_ARM64: machine = "ARM 64"; break; + + case CV_CFL_D3D11_SHADER: machine = "D3D11 shader"; break; default: { static char tmp[16];

1 0

Huw Davies : iphlpapi: Use the correct physical address.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 6460f72db498748a3616b82f937ecbc7d798b65b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6460f72db498748a3616b82f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 23 07:33:04 2021 +0100 iphlpapi: Use the correct physical address. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51642 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 7d75ce5af3a..47c8a507e38 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1280,9 +1280,9 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD aa[i].FriendlyName = (WCHAR *)str_ptr; str_ptr += sizeof(rw[i].alias.String); } - aa[i].PhysicalAddressLength = rw->phys_addr.Length; + aa[i].PhysicalAddressLength = rw[i].phys_addr.Length; if (aa[i].PhysicalAddressLength > sizeof(aa[i].PhysicalAddress)) aa[i].PhysicalAddressLength = 0; - memcpy( aa[i].PhysicalAddress, rw->phys_addr.Address, aa[i].PhysicalAddressLength ); + memcpy( aa[i].PhysicalAddress, rw[i].phys_addr.Address, aa[i].PhysicalAddressLength ); aa[i].Mtu = dyn[i].mtu; aa[i].IfType = stat[i].type; aa[i].OperStatus = dyn[i].oper_status;

1 0

Huw Davies : iphlpapi: Don't truncate 64-bit ptrs.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 773c585193ac10a488716d8eb6094485b1a883f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=773c585193ac10a488716d8e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Aug 23 07:33:03 2021 +0100 iphlpapi: Don't truncate 64-bit ptrs. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51620 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51626 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 408ac14bd1b..7d75ce5af3a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -864,7 +864,8 @@ ULONG adapters_addresses_size( IP_ADAPTER_ADDRESSES *info ) void adapters_addresses_copy( IP_ADAPTER_ADDRESSES *dst, IP_ADAPTER_ADDRESSES *src ) { char *ptr; - DWORD len, align = sizeof(ULONGLONG) - 1; + DWORD len; + UINT_PTR align = sizeof(ULONGLONG) - 1; struct address_entry_copy_params params; while (src)

1 0

Eric Pouech : winedump: Add more supported languages from .pdb COMPILE records.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: fca405402d65da4e88d5ec6c2011aa5244af48e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fca405402d65da4e88d5ec6c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Aug 21 10:22:29 2021 +0200 winedump: Add more supported languages from .pdb COMPILE records. Update cvconst.h accordingly. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/cvconst.h | 21 +++++++++++++++++++++ tools/winedump/msc.c | 25 ++++++++++++++++++------- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/include/cvconst.h b/include/cvconst.h index 80b8e440edc..adb18d420fb 100644 --- a/include/cvconst.h +++ b/include/cvconst.h @@ -722,3 +722,24 @@ typedef enum CV_call_e CV_CALL_M32RCALL, CV_CALL_RESERVED, } CV_call_e; + +typedef enum CV_CFL_LANG +{ + CV_CFL_C, + CV_CFL_CXX, + CV_CFL_FORTRAN, + CV_CFL_MASM, + CV_CFL_PASCAL, + CV_CFL_BASIC, + CV_CFL_COBOL, + CV_CFL_LINK, + CV_CFL_CVTRES, + CV_CFL_CVTPGD, + CV_CFL_CSHARP, + CV_CFL_VB, + CV_CFL_ILASM, + CV_CFL_JAVA, + CV_CFL_JSCRIPT, + CV_CFL_MSIL, + CV_CFL_HLSL, +} CV_CFL_LANG; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index d037cec89dd..01c0fff3052 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -42,6 +42,7 @@ #include "windef.h" #include "winbase.h" #include "winedump.h" +#include "cvconst.h" #include "wine/mscvpdb.h" #define PSTRING(adr, ofs) \ @@ -294,13 +295,23 @@ static const char* get_language(unsigned l) switch (l) { - case 0x00: lang = "C"; break; - case 0x01: lang = "C++"; break; - case 0x02: lang = "Fortran"; break; - case 0x03: lang = "Masm"; break; - case 0x04: lang = "Pascal"; break; - case 0x05: lang = "Basic"; break; - case 0x06: lang = "Cobol"; break; + case CV_CFL_C: lang = "C"; break; + case CV_CFL_CXX: lang = "C++"; break; + case CV_CFL_FORTRAN: lang = "Fortran"; break; + case CV_CFL_MASM: lang = "Masm"; break; + case CV_CFL_PASCAL: lang = "Pascal"; break; + case CV_CFL_BASIC: lang = "Basic"; break; + case CV_CFL_COBOL: lang = "Cobol"; break; + case CV_CFL_LINK: lang = "Link"; break; + case CV_CFL_CVTRES: lang = "Resource"; break; + case CV_CFL_CVTPGD: lang = "PoGo"; break; + case CV_CFL_CSHARP: lang = "C#"; break; + case CV_CFL_VB: lang = "VisualBasic"; break; + case CV_CFL_ILASM: lang = "IL ASM"; break; + case CV_CFL_JAVA: lang = "Java"; break; + case CV_CFL_JSCRIPT: lang = "JavaScript"; break; + case CV_CFL_MSIL: lang = "MSIL"; break; + case CV_CFL_HLSL: lang = "HLSL"; break; default: { static char tmp[16];

1 0

Eric Pouech : mscvpdb.h: Add typedefs for type-id references.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: 84b0bd45835ec8b4f49ef658237183f3685decc6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84b0bd45835ec8b4f49ef658… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Aug 21 10:23:19 2021 +0200 mscvpdb.h: Add typedefs for type-id references. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 225 +++++++++++++++++++++++++------------------------ 1 file changed, 116 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84b0bd45835ec8b4f49e…

1 0

Zebediah Figura : wineusb.sys: Unlink devices from the list in the PDO IRP_MN_SURPRISE_REMOVAL.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: b6a20450f47807a162318ef63e50278488d146f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6a20450f47807a162318ef6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Aug 20 19:01:27 2021 -0500 wineusb.sys: Unlink devices from the list in the PDO IRP_MN_SURPRISE_REMOVAL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51479 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index a19da6df8f4..441ed338f1e 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -144,8 +144,11 @@ static void remove_usb_device(libusb_device *libusb_device) { if (device->libusb_device == libusb_device) { - device->removed = TRUE; - list_remove(&device->entry); + if (!device->removed) + { + device->removed = TRUE; + list_remove(&device->entry); + } break; } } @@ -257,8 +260,24 @@ static NTSTATUS fdo_pnp(IRP *irp) CloseHandle(event_thread); EnterCriticalSection(&wineusb_cs); + /* Normally we unlink all devices either: + * + * - as a result of hot-unplug, which unlinks the device, and causes + * a subsequent IRP_MN_REMOVE_DEVICE which will free it; + * + * - if the parent is deleted (at shutdown time), in which case + * ntoskrnl will send us IRP_MN_SURPRISE_REMOVAL and + * IRP_MN_REMOVE_DEVICE unprompted. + * + * But we can get devices hotplugged between when shutdown starts + * and now, in which case they'll be stuck in this list and never + * freed. + * + * FIXME: This is still broken, though. If a device is hotplugged + * and then removed, it'll be unlinked and never freed. */ LIST_FOR_EACH_ENTRY_SAFE(device, cursor, &device_list, struct usb_device, entry) { + assert(!device->removed); libusb_unref_device(device->libusb_device); libusb_close(device->handle); list_remove(&device->entry); @@ -408,12 +427,17 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) case IRP_MN_SURPRISE_REMOVAL: EnterCriticalSection(&wineusb_cs); remove_pending_irps(device); - device->removed = TRUE; + if (!device->removed) + { + device->removed = TRUE; + list_remove(&device->entry); + } LeaveCriticalSection(&wineusb_cs); ret = STATUS_SUCCESS; break; case IRP_MN_REMOVE_DEVICE: + assert(device->removed); remove_pending_irps(device); libusb_unref_device(device->libusb_device);

1 0

Eric Pouech : winedump: Fix public and data/proc ref definitions of Codeview records.
by Alexandre Julliard Aug. 23, 2021

Aug. 23, 2021

Module: wine Branch: master Commit: bf6ac26f750ca1e89f398abf3a359b08201a4a23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf6ac26f750ca1e89f398abf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Aug 21 10:23:25 2021 +0200 winedump: Fix public and data/proc ref definitions of 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 | 2 +- include/wine/mscvpdb.h | 12 +++++++++++- tools/winedump/msc.c | 22 +++++++++++++++------- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index ff7507c797c..380511d0b55 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2077,7 +2077,7 @@ static BOOL codeview_snarf_public(const struct msc_debug_info* msc_dbg, const BY { symt_new_public(msc_dbg->module, compiland, sym->public_v3.name, - sym->public_v3.symtype == SYMTYPE_FUNCTION, + sym->public_v3.pubsymflags == SYMTYPE_FUNCTION, codeview_get_address(msc_dbg, sym->public_v3.segment, sym->public_v3.offset), 1); } break; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 8623f8ed8a3..2ed9a9fe192 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1386,7 +1386,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; char name[1]; @@ -1679,6 +1679,16 @@ union codeview_symbol char name[1]; } thread_v3; + struct + { + unsigned short int len; + unsigned short int id; + unsigned int sumName; + unsigned int ibSym; + unsigned short imod; + char name[1]; + } refsym2_v3; + struct { unsigned short int len; diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index d2cf7b36d80..7f93f3e7701 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1142,15 +1142,23 @@ BOOL codeview_dump_symbols(const void* root, unsigned long size) break; case S_PUB32: - /* not completely sure of those two anyway */ + printf("\tS-Public V3 '%s' %04x:%08x flags%s%s%s%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" : ""); + break; + + case S_DATAREF: case S_PROCREF: case S_LPROCREF: - printf("\tS-Public%s V3 '%s' %04x:%08x type:%08x\n", - sym->generic.id == S_PUB32 ? "" : - (sym->generic.id == S_PROCREF ? "<subkind1" : "<subkind2"), - get_symbol_str(sym->public_v3.name), - sym->public_v3.segment, - sym->public_v3.offset, sym->public_v3.symtype); + printf("\tS-%sref V3 '%s' mod:%04x sym:%08x name:%08x\n", + sym->generic.id == S_DATAREF ? "Data" : + (sym->generic.id == S_PROCREF ? "Proc" : "Lproc"), + get_symbol_str(sym->refsym2_v3.name), + sym->refsym2_v3.imod, sym->refsym2_v3.ibSym, sym->refsym2_v3.sumName); break; /*

1 0