June 2022 - Wine-commits - list.winehq.org

Zebediah Figura : ntdll/tests: Test setting the return value via alertable NtContinue().
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: e39880d9456888fec24cc2b485d779d62e14c98e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e39880d9456888fec24cc2b4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Jun 25 20:12:16 2022 -0500 ntdll/tests: Test setting the return value via alertable NtContinue(). This is currently broken on WoW64. --- dlls/ntdll/tests/exception.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 748ee0e52ee..753a44c769b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -8775,6 +8775,7 @@ static void test_user_apc(void) NTSTATUS status; CONTEXT context; LONG pass; + int ret; if (!pNtQueueApcThread) { @@ -8797,16 +8798,20 @@ static void test_user_apc(void) 0xc9, /* leave */ 0xc3, /* ret */ }; - void (__cdecl *func)(void *capture, CONTEXT *context) = code_mem; + int (__cdecl *func)(void *capture, CONTEXT *context) = code_mem; memcpy(code_mem, code, sizeof(code)); - func(RtlCaptureContext, &context); + ret = func(RtlCaptureContext, &context); /* work around broken RtlCaptureContext on Windows < 7 which doesn't set * ContextFlags */ context.ContextFlags = CONTEXT_FULL; } #else - RtlCaptureContext(&context); + { + int (WINAPI *func)(CONTEXT *context) = (void *)RtlCaptureContext; + + ret = func(&context); + } #endif InterlockedIncrement(&pass); @@ -8815,6 +8820,16 @@ static void test_user_apc(void) /* Try to make sure context data is far enough below context.Esp. */ CONTEXT c[4]; +#ifdef __i386__ + context.Eax = 0xabacab; +#elif defined(__x86_64__) + context.Rax = 0xabacab; +#elif defined(__arm__) + context.R0 = 0xabacab; +#elif defined(__aarch64__) + context.X0 = 0xabacab; +#endif + c[0] = context; test_apc_called = FALSE; @@ -8830,6 +8845,7 @@ static void test_user_apc(void) ok(0, "Should not get here, status %#lx.\n", status); return; } + ok(ret == 0xabacab, "Got return value %#x.\n", ret); ok(pass == 3, "Got unexpected pass %ld.\n", pass); ok(test_apc_called, "Test user APC was not called.\n"); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 39edda8a67070c012e7ae177fce58cd64afb6251 URL: https://source.winehq.org/git/wine.git/?a=commit;h=39edda8a67070c012e7ae177… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jun 28 13:22:41 2022 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 78 +++++++++------------------------------------------------------- 1 file changed, 10 insertions(+), 68 deletions(-) diff --git a/po/de.po b/po/de.po index 9c989dc4bc0..61958c125fe 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-04-11 16:51+0200\n" +"PO-Revision-Date: 2022-06-28 13:20+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -4000,10 +4000,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Nicht-schreibbare Eigenschaft '|' kann nicht geändert werden" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' ist kein Map-Objekt" +msgstr "'this' ist kein |-Objekt" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" @@ -15928,56 +15926,6 @@ msgstr "" "\n" #: programs/reg/reg.rc:67 -#, fuzzy -#| msgid "" -#| "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/" -#| "f]\n" -#| "\n" -#| " Adds a key to the registry or adds a new value to a given registry " -#| "key.\n" -#| "\n" -#| " <key>\n" -#| " The registry key to add or, if either [/v] or [/ve] is specified,\n" -#| " the key in which to add the new registry data.\n" -#| "\n" -#| " Format: ROOT\\Subkey\n" -#| "\n" -#| " ROOT: A predefined registry key. This must be one of the following:\n" -#| "\n" -#| " HKEY_LOCAL_MACHINE | HKLM\n" -#| " HKEY_CURRENT_USER | HKCU\n" -#| " HKEY_CLASSES_ROOT | HKCR\n" -#| " HKEY_USERS | HKU\n" -#| " HKEY_CURRENT_CONFIG | HKCC\n" -#| "\n" -#| " Subkey: The full path to a registry key under a given ROOT key.\n" -#| "\n" -#| " /v <value_name>\n" -#| " The name of the registry value to add.\n" -#| "\n" -#| " /ve\n" -#| " Add an unnamed registry value. This option modifies the (Default)\n" -#| " registry value.\n" -#| "\n" -#| " /t <type>\n" -#| " The type of data to add to the registry. If [/t] is specified,\n" -#| " <type> must be one of the following:\n" -#| "\n" -#| " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -#| " REG_DWORD | REG_BINARY | REG_NONE\n" -#| "\n" -#| " If [/t] is not specified, the default data type is REG_SZ.\n" -#| "\n" -#| " /s <separator>\n" -#| " The character used to separate strings in REG_MULTI_SZ data.\n" -#| " If [/s] is not specified, the default separator is \\0.\n" -#| "\n" -#| " /d <data>\n" -#| " The data to add to the new registry value.\n" -#| "\n" -#| " /f\n" -#| " Modify the registry without prompting for confirmation.\n" -#| "\n" msgid "" "REG ADD <key> [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" "\n" @@ -16061,7 +16009,7 @@ msgstr "" " muss <Typ> einer der folgenden sein:\n" "\n" " REG_SZ | REG_MULTI_SZ | REG_EXPAND_SZ\n" -" REG_DWORD | REG_BINARY | REG_NONE\n" +" REG_DWORD | REG_QWORD | REG_BINARY | REG_NONE\n" "\n" " Falls [/t] nicht angegeben wird, ist der Standardtyp REG_SZ.\n" "\n" @@ -16511,10 +16459,8 @@ msgstr "&DWORD-Wert" #: programs/regedit/regedit.rc:52 programs/regedit/regedit.rc:105 #: programs/regedit/regedit.rc:128 -#, fuzzy -#| msgid "&DWORD Value" msgid "&QWORD Value" -msgstr "&DWORD-Wert" +msgstr "&QWORD-Wert" #: programs/regedit/regedit.rc:53 programs/regedit/regedit.rc:106 #: programs/regedit/regedit.rc:129 @@ -16615,7 +16561,7 @@ msgstr "Von den Favoriten entfernen" #: programs/regedit/regedit.rc:318 msgid "Edit String" -msgstr "Zeichenfolge editieren" +msgstr "Zeichenfolge bearbeiten" #: programs/regedit/regedit.rc:321 programs/regedit/regedit.rc:334 #: programs/regedit/regedit.rc:350 programs/regedit/regedit.rc:363 @@ -16629,7 +16575,7 @@ msgstr "Daten:" #: programs/regedit/regedit.rc:331 msgid "Edit DWORD" -msgstr "DWORD-Wert editieren" +msgstr "DWORD bearbeiten" #: programs/regedit/regedit.rc:338 msgid "Base" @@ -16645,11 +16591,11 @@ msgstr "Dezimal" #: programs/regedit/regedit.rc:347 msgid "Edit Binary" -msgstr "Binären Wert editieren" +msgstr "Binären Wert bearbeiten" #: programs/regedit/regedit.rc:360 msgid "Edit Multi-String" -msgstr "Mehrteilige Zeichenfolge editieren" +msgstr "Mehrteilige Zeichenfolge bearbeiten" #: programs/regedit/regedit.rc:162 msgid "Contains commands for working with the whole registry" @@ -17079,16 +17025,12 @@ msgid "Collapse" msgstr "Reduzieren" #: programs/regedit/regedit.rc:178 -#, fuzzy -#| msgid "Adds a new 32-bit value" msgid "Adds a new 64-bit value" -msgstr "Fügt einen neuen 32-Bit-Wert hinzu" +msgstr "Fügt einen neuen 64-Bit-Wert hinzu" #: programs/regedit/regedit.rc:221 -#, fuzzy -#| msgid "Edit DWORD" msgid "Edit QWORD" -msgstr "DWORD-Wert editieren" +msgstr "QWORD bearbeiten" #: programs/regsvr32/regsvr32.rc:33 msgid ""

1 0

Arkadiusz Hiler : winepulse.drv: Set device path for all devices.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 3180ed32377a5109c6d986e291d28053562360a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3180ed32377a5109c6d986e2… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Jun 27 16:57:32 2022 +0300 winepulse.drv: Set device path for all devices. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 0e504b6b6dd..42d73db45f9 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2207,27 +2207,26 @@ static BOOL get_device_path(PhysDevice *dev, struct get_prop_value_params *param { const GUID *guid = params->guid; UINT serial_number; - const char *fmt; char path[128]; int len; + /* As hardly any audio devices have serial numbers, Windows instead + appears to use a persistent random number. We emulate this here + by instead using the last 8 hex digits of the GUID. */ + serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; + switch (dev->bus_type) { case phys_device_bus_pci: - fmt = "{1}.HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X\\%u&%08X"; + len = sprintf(path, "{1}.HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X\\%u&%08X", dev->vendor_id, dev->product_id, dev->index, serial_number); break; case phys_device_bus_usb: - fmt = "{1}.USB\\VID_%04X&PID_%04X\\%u&%08X"; + len = sprintf(path, "{1}.USB\\VID_%04X&PID_%04X\\%u&%08X", dev->vendor_id, dev->product_id, dev->index, serial_number); break; default: - return FALSE; + len = sprintf(path, "{1}.ROOT\\MEDIA\\%04u", dev->index); + break; } - /* As hardly any audio devices have serial numbers, Windows instead - appears to use a persistent random number. We emulate this here - by instead using the last 8 hex digits of the GUID. */ - serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; - - len = sprintf(path, fmt, dev->vendor_id, dev->product_id, dev->index, serial_number); ntdll_umbstowcs(path, len + 1, params->wstr, ARRAY_SIZE(params->wstr)); params->vt = VT_LPWSTR;

1 0

Arkadiusz Hiler : winealsa.drv: Set device path for all devices.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 5d0d812dfd8d408d0cf499d96f0fb77eca278591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d0d812dfd8d408d0cf499d9… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Mon Jun 27 16:58:15 2022 +0300 winealsa.drv: Set device path for all devices. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 74 +++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 41 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index b91606603a2..8439262428f 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2318,21 +2318,21 @@ static NTSTATUS get_prop_value(void *args) if(IsEqualPropertyKey(*prop, devicepath_key)) { + enum AudioDeviceConnectionType connection = AudioDeviceConnectionType_Unknown; + USHORT vendor_id = 0, product_id = 0; char uevent[MAX_PATH]; - FILE *fuevent; + FILE *fuevent = NULL; int card, device; + UINT serial_number; + char buf[128]; + int len; - /* only implemented for identifiable devices, i.e. not "default" */ - if(!sscanf(name, "plughw:%u,%u", &card, &device)){ - params->result = E_NOTIMPL; - return STATUS_SUCCESS; + if(sscanf(name, "plughw:%u,%u", &card, &device)){ + sprintf(uevent, "/sys/class/sound/card%u/device/uevent", card); + fuevent = fopen(uevent, "r"); } - sprintf(uevent, "/sys/class/sound/card%u/device/uevent", card); - fuevent = fopen(uevent, "r"); if(fuevent){ - enum AudioDeviceConnectionType connection = AudioDeviceConnectionType_Unknown; - USHORT vendor_id = 0, product_id = 0; char line[256]; while (fgets(line, sizeof(line), fuevent)) { @@ -2365,41 +2365,33 @@ static NTSTATUS get_prop_value(void *args) } fclose(fuevent); + } - if(connection == AudioDeviceConnectionType_USB || connection == AudioDeviceConnectionType_PCI){ - UINT serial_number; - char buf[128]; - int len; - - /* As hardly any audio devices have serial numbers, Windows instead - appears to use a persistent random number. We emulate this here - by instead using the last 8 hex digits of the GUID. */ - serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; - - if(connection == AudioDeviceConnectionType_USB) - sprintf(buf, "{1}.USB\\VID_%04X&PID_%04X\\%u&%08X", - vendor_id, product_id, device, serial_number); - else /* AudioDeviceConnectionType_PCI */ - sprintf(buf, "{1}.HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X\\%u&%08X", - vendor_id, product_id, device, serial_number); - - len = strlen(buf) + 1; - if(*params->buffer_size < len * sizeof(WCHAR)){ - params->result = E_NOT_SUFFICIENT_BUFFER; - *params->buffer_size = len * sizeof(WCHAR); - return STATUS_SUCCESS; - } - out->vt = VT_LPWSTR; - out->pwszVal = params->buffer; - ntdll_umbstowcs(buf, len, out->pwszVal, len); - params->result = S_OK; - return STATUS_SUCCESS; - } - }else{ - WARN("Could not open %s for reading\n", uevent); - params->result = E_NOTIMPL; + /* As hardly any audio devices have serial numbers, Windows instead + appears to use a persistent random number. We emulate this here + by instead using the last 8 hex digits of the GUID. */ + serial_number = (guid->Data4[4] << 24) | (guid->Data4[5] << 16) | (guid->Data4[6] << 8) | guid->Data4[7]; + + if(connection == AudioDeviceConnectionType_USB) + sprintf(buf, "{1}.USB\\VID_%04X&PID_%04X\\%u&%08X", + vendor_id, product_id, device, serial_number); + else if (connection == AudioDeviceConnectionType_PCI) + sprintf(buf, "{1}.HDAUDIO\\FUNC_01&VEN_%04X&DEV_%04X\\%u&%08X", + vendor_id, product_id, device, serial_number); + else + sprintf(buf, "{1}.ROOT\\MEDIA\\%04u", serial_number & 0x1FF); + + len = strlen(buf) + 1; + if(*params->buffer_size < len * sizeof(WCHAR)){ + params->result = E_NOT_SUFFICIENT_BUFFER; + *params->buffer_size = len * sizeof(WCHAR); return STATUS_SUCCESS; } + out->vt = VT_LPWSTR; + out->pwszVal = params->buffer; + ntdll_umbstowcs(buf, len, out->pwszVal, len); + params->result = S_OK; + return STATUS_SUCCESS; } else if (flow != eCapture && IsEqualPropertyKey(*prop, PKEY_AudioEndpoint_PhysicalSpeakers)) { unsigned int num_speakers, card, device; char hwname[255];

1 0

Eric Pouech : winedump: Explore a bit more TPI hash elements.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: ba12b5ae8838beadc32a32a34b267b6629ede7c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba12b5ae8838beadc32a32a3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 22 16:28:08 2022 +0200 winedump: Explore a bit more TPI hash elements. Rename a couple of fields in PDB structures for clarity. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 2 +- include/wine/mscvpdb.h | 10 +-- tools/winedump/pdb.c | 189 ++++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 168 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ba12b5ae8838beadc32a…

1 0

Eric Pouech : dbghelp: Rely on first/last type index from type header.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: b7c231c78f84402b47c79ba744884c32ca2a8323 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7c231c78f84402b47c79ba7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 22 16:28:08 2022 +0200 dbghelp: Rely on first/last type index from type header. Code now follows these guidelines: - define PDB & Codeview internals in cvconst.h and mscvinfo.h (instead of having definitions in .c files, some of them being duplicate of .h content, and their "duplicate" values eventually diverged over time) - index of first type comes from PDB type header (instead of always being hardcoded as FIRST_DEFINABLE_TYPE) - use index of last typex from type header (instead of guessing the right value while parsing types, which also allows a single allocation instead of enlarging buffer while parsing). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 108 ++++++++++++++++++++++--------------------------- include/wine/mscvpdb.h | 3 +- 2 files changed, 50 insertions(+), 61 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b7c231c78f84402b47c7…

1 0

Eric Pouech : mscvpdb.h: Redefine property with bitfields.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: eb14fad72afe7d507f439c10ef42998dbb733858 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb14fad72afe7d507f439c10… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 22 16:28:09 2022 +0200 mscvpdb.h: Redefine property with bitfields. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 10 +++++----- include/wine/mscvpdb.h | 37 ++++++++++++++++++++++++++++--------- tools/winedump/msc.c | 38 +++++++++++++++++++------------------- 3 files changed, 52 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb14fad72afe7d507f43…

1 0

Eric Pouech : dbghelp: Clearly separate the type loading into two passes.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: ddbd341bd0baa663338326246e2b05d8651743ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddbd341bd0baa66333832624… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 22 16:28:09 2022 +0200 dbghelp: Clearly separate the type loading into two passes. - create (contentless) UDT & enum in first pass - fill UDT&enum content and load the rest of types in second pass. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 491 +++++++++++++++++++++++++++-------------------------- 1 file changed, 246 insertions(+), 245 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddbd341bd0baa6633383…

1 0

Eric Pouech : dbghelp: Preserve PDB's partial order for types of same name.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: d12d5c7245635c9df26505c8b1aa3080404ca616 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d12d5c7245635c9df26505c8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 22 16:28:09 2022 +0200 dbghelp: Preserve PDB's partial order for types of same name. The PDB types can contain several times a type definition with an identical name. It seems to appear when modifying a type in source (like adding new fields to a struct): - as the PDB file (generated from first compilation) is updated (and not fully rewritten), the debug information for the old type is not flushed; a new record (for the same struct name) is emitted, and inserted before the old one in the hash table (bucket list). Even if dbghelp's hash table is different from PDB's internal one (ie number of buckets & bucket lists are different), we must maintain the order of records of identical names (they end up in the same bucket) as a lookup by name *must* return the first record in PDB's order. Lookup by name is used: - when resolving a forward definition (to get the full UDT definition including for example a struct/class fields's list) - when searching by type name from dbghelp APIs, like SymGetTypeFromName() This patch implements the preservation of that order. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 373 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 284 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d12d5c7245635c9df265…

1 0

Eric Pouech : dbghelp: Use remap table from PDB hash stream.
by Alexandre Julliard 28 Jun '22

28 Jun '22

Module: wine Branch: master Commit: 29dd84443976005a8ec713dd1c75458e27346591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29dd84443976005a8ec713dd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Jun 22 16:28:09 2022 +0200 dbghelp: Use remap table from PDB hash stream. The PDB hash stream from TPI header contains information to force a remap to a given type record (whatever the order in the bucket hash list). This is generated by the incremental linker in some occasions. Use that information to remap the corresponding types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 2e7336163bb..1c58b0e9cf6 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3201,6 +3201,12 @@ static void pdb_dispose_type_parse(struct codeview_type_parse* ctp) free((DWORD*)ctp->alloc_hash); } +static BOOL pdb_bitfield_is_bit_set(const unsigned* dw, unsigned len, unsigned i) +{ + if (i >= len * sizeof(unsigned) * 8) return FALSE; + return (dw[i >> 5] & (1u << (i & 31u))) != 0; +} + static BOOL pdb_init_type_parse(const struct msc_debug_info* msc_dbg, const struct pdb_file_info* pdb_file, struct codeview_type_parse* ctp, @@ -3268,6 +3274,42 @@ static BOOL pdb_init_type_parse(const struct msc_debug_info* msc_dbg, ctp->alloc_hash[i - ctp->header.first_index].next = ctp->hash[hash_i]; ctp->hash[hash_i] = &ctp->alloc_hash[i - ctp->header.first_index]; } + /* parse the remap table + * => move listed type_id at first position of their hash buckets so that we force remap to them + */ + if (ctp->header.type_remap_len) + { + const unsigned* remap = (const unsigned*)((const BYTE*)ctp->hash_stream + ctp->header.type_remap_offset); + unsigned i, capa, count_present; + const unsigned* present_bitset; + remap++; /* no need of num */ + capa = *remap++; + count_present = *remap++; + present_bitset = remap; + remap += count_present; + remap += *remap + 1; /* skip deleted bit set */ + for (i = 0; i < capa; ++i) + { + if (pdb_bitfield_is_bit_set(present_bitset, count_present, i)) + { + unsigned hash_i; + struct hash_link** phl; + /* remap[0] is an offset for a string in /string stream, followed by type_id to force */ + hash_i = pdb_read_hash_value(ctp, remap[1]); + for (phl = &ctp->hash[hash_i]; *phl; phl = &(*phl)->next) + if ((*phl)->id == remap[1]) + { + struct hash_link* hl = *phl; + /* move hl node at first position of its hash bucket */ + *phl = hl->next; + hl->next = ctp->hash[hash_i]; + ctp->hash[hash_i] = hl; + break; + } + remap += 2; + } + } + } return TRUE; oom: pdb_dispose_type_parse(ctp);

1 0