- Wine-Commits - list.winehq.org

Matthew Tran : hidparse.sys: Fix incorrect HID STRING_INDEX tag value.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 17329f342e20908812d2d581963cd6b43cde27fa URL: https://gitlab.winehq.org/wine/wine/-/commit/17329f342e20908812d2d581963cd6… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Sun Nov 20 01:10:59 2022 -0600 hidparse.sys: Fix incorrect HID STRING_INDEX tag value. --- dlls/hidparse.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 9c753c0f365..7058093e03c 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -93,7 +93,7 @@ enum TAG_LOCAL_DESIGNATOR_INDEX, TAG_LOCAL_DESIGNATOR_MINIMUM, TAG_LOCAL_DESIGNATOR_MAXIMUM, - TAG_LOCAL_STRING_INDEX, + TAG_LOCAL_STRING_INDEX = 0x7, TAG_LOCAL_STRING_MINIMUM, TAG_LOCAL_STRING_MAXIMUM, TAG_LOCAL_DELIMITER

1 0

Matthew Tran : winebus.sys: Fix incorrect HID STRING_INDEX tag value.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 1e812da4daec4a5846c3d2e3b03d38517361ba6f URL: https://gitlab.winehq.org/wine/wine/-/commit/1e812da4daec4a5846c3d2e3b03d38… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Sun Nov 20 01:10:59 2022 -0600 winebus.sys: Fix incorrect HID STRING_INDEX tag value. --- dlls/winebus.sys/psh_hid_macros.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/psh_hid_macros.h b/dlls/winebus.sys/psh_hid_macros.h index 4623af20598..8e0a2a9dd6b 100644 --- a/dlls/winebus.sys/psh_hid_macros.h +++ b/dlls/winebus.sys/psh_hid_macros.h @@ -79,7 +79,7 @@ #define DESIGNATOR_INDEX(n,data) SHORT_ITEM_##n(0x3,2,data) #define DESIGNATOR_MINIMUM(n,data) SHORT_ITEM_##n(0x4,2,data) #define DESIGNATOR_MAXIMUM(n,data) SHORT_ITEM_##n(0x5,2,data) -#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x6,2,data) -#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x7,2,data) -#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) -#define DELIMITER(n,data) SHORT_ITEM_##n(0x9,2,data) +#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x7,2,data) +#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) +#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x9,2,data) +#define DELIMITER(n,data) SHORT_ITEM_##n(0xa,2,data)

1 0

Matthew Tran : ntoskrnl.exe/tests: Fix incorrect HID STRING_INDEX tag value.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: c712e571d26e07eb94a0eb5e610f5dc595c3768e URL: https://gitlab.winehq.org/wine/wine/-/commit/c712e571d26e07eb94a0eb5e610f5d… Author: Matthew Tran <0e4ef622(a)gmail.com> Date: Sun Nov 20 01:10:59 2022 -0600 ntoskrnl.exe/tests: Fix incorrect HID STRING_INDEX tag value. --- dlls/ntoskrnl.exe/tests/psh_hid_macros.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/psh_hid_macros.h b/dlls/ntoskrnl.exe/tests/psh_hid_macros.h index 4623af20598..8e0a2a9dd6b 100644 --- a/dlls/ntoskrnl.exe/tests/psh_hid_macros.h +++ b/dlls/ntoskrnl.exe/tests/psh_hid_macros.h @@ -79,7 +79,7 @@ #define DESIGNATOR_INDEX(n,data) SHORT_ITEM_##n(0x3,2,data) #define DESIGNATOR_MINIMUM(n,data) SHORT_ITEM_##n(0x4,2,data) #define DESIGNATOR_MAXIMUM(n,data) SHORT_ITEM_##n(0x5,2,data) -#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x6,2,data) -#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x7,2,data) -#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) -#define DELIMITER(n,data) SHORT_ITEM_##n(0x9,2,data) +#define STRING_INDEX(n,data) SHORT_ITEM_##n(0x7,2,data) +#define STRING_MINIMUM(n,data) SHORT_ITEM_##n(0x8,2,data) +#define STRING_MAXIMUM(n,data) SHORT_ITEM_##n(0x9,2,data) +#define DELIMITER(n,data) SHORT_ITEM_##n(0xa,2,data)

1 0

Alexandre Julliard : ntdll: Build the Unix side without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 9f363a69055182c3cba47f664098e9f1bfa98294 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f363a69055182c3cba47f664098e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:34:52 2022 +0100 ntdll: Build the Unix side without -DWINE_NO_LONG_TYPES. --- dlls/ntdll/unix/cdrom.c | 13 +++++---- dlls/ntdll/unix/debug.c | 11 ++++---- dlls/ntdll/unix/env.c | 5 ++-- dlls/ntdll/unix/file.c | 57 ++++++++++++++++++++------------------- dlls/ntdll/unix/loader.c | 3 +-- dlls/ntdll/unix/process.c | 17 ++++++------ dlls/ntdll/unix/registry.c | 37 +++++++++++++------------- dlls/ntdll/unix/security.c | 30 ++++++++++----------- dlls/ntdll/unix/serial.c | 5 ++-- dlls/ntdll/unix/server.c | 5 ++-- dlls/ntdll/unix/signal_arm.c | 34 +++++++++++------------- dlls/ntdll/unix/signal_i386.c | 22 +++++++-------- dlls/ntdll/unix/sync.c | 42 ++++++++++++++--------------- dlls/ntdll/unix/system.c | 52 ++++++++++++++++++------------------ dlls/ntdll/unix/tape.c | 25 +++++++++-------- dlls/ntdll/unix/thread.c | 18 ++++++------- dlls/ntdll/unix/virtual.c | 62 +++++++++++++++++++++---------------------- 17 files changed, 212 insertions(+), 226 deletions(-)

1 0

Alexandre Julliard : ntdll: Build the PE side without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 0adec25f92219b5626b8ee3c1c13396d36e56ed3 URL: https://gitlab.winehq.org/wine/wine/-/commit/0adec25f92219b5626b8ee3c1c1339… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 21 16:27:08 2022 +0100 ntdll: Build the PE side without -DWINE_NO_LONG_TYPES. --- dlls/ntdll/Makefile.in | 2 +- dlls/ntdll/actctx.c | 44 +++++++++++++++---------------- dlls/ntdll/atom.c | 2 +- dlls/ntdll/debugbuffer.c | 42 ++++++++++++++--------------- dlls/ntdll/error.c | 2 +- dlls/ntdll/exception.c | 24 ++++++++--------- dlls/ntdll/handletable.c | 4 +-- dlls/ntdll/heap.c | 36 ++++++++++++------------- dlls/ntdll/loader.c | 57 ++++++++++++++++++++-------------------- dlls/ntdll/locale.c | 28 ++++++++++---------- dlls/ntdll/misc.c | 20 +++++++------- dlls/ntdll/path.c | 4 +-- dlls/ntdll/reg.c | 10 +++---- dlls/ntdll/relay.c | 34 ++++++++++++------------ dlls/ntdll/resource.c | 4 +-- dlls/ntdll/rtl.c | 26 +++++++++--------- dlls/ntdll/rtlbitmap.c | 32 +++++++++++------------ dlls/ntdll/rtlstr.c | 2 +- dlls/ntdll/sec.c | 40 ++++++++++++++-------------- dlls/ntdll/signal_arm.c | 61 +++++++++++++++++++++---------------------- dlls/ntdll/signal_arm64.c | 33 ++++++++++++----------- dlls/ntdll/signal_i386.c | 31 +++++++++++----------- dlls/ntdll/signal_x86_64.c | 31 +++++++++++----------- dlls/ntdll/sync.c | 8 +++--- dlls/ntdll/thread.c | 12 ++++----- dlls/ntdll/threadpool.c | 26 +++++++++--------- dlls/ntdll/unix/cdrom.c | 1 + dlls/ntdll/unix/debug.c | 1 + dlls/ntdll/unix/env.c | 1 + dlls/ntdll/unix/file.c | 1 + dlls/ntdll/unix/loader.c | 1 + dlls/ntdll/unix/process.c | 1 + dlls/ntdll/unix/registry.c | 1 + dlls/ntdll/unix/security.c | 1 + dlls/ntdll/unix/serial.c | 1 + dlls/ntdll/unix/server.c | 1 + dlls/ntdll/unix/signal_arm.c | 1 + dlls/ntdll/unix/signal_i386.c | 1 + dlls/ntdll/unix/sync.c | 1 + dlls/ntdll/unix/system.c | 1 + dlls/ntdll/unix/tape.c | 1 + dlls/ntdll/unix/thread.c | 1 + dlls/ntdll/unix/virtual.c | 1 + dlls/ntdll/version.c | 6 ++--- 44 files changed, 325 insertions(+), 313 deletions(-)

1 0

Eric Pouech : ucrtbase: Extend ucrtbase's undname tests.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 854eb9990f53fab80ac37af4a44d3436ab00da97 URL: https://gitlab.winehq.org/wine/wine/-/commit/854eb9990f53fab80ac37af4a44d34… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 11:30:10 2022 +0100 ucrtbase: Extend ucrtbase's undname tests. Renumbering entries' comment to match actual output. Adding ability to pass flags. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ucrtbase/tests/cpp.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/ucrtbase/tests/cpp.c b/dlls/ucrtbase/tests/cpp.c index a22138889cb..b9b36a1e740 100644 --- a/dlls/ucrtbase/tests/cpp.c +++ b/dlls/ucrtbase/tests/cpp.c @@ -192,21 +192,36 @@ static void test___std_type_info(void) static void test___unDName(void) { - static struct {const char *in; const char *out; const char *broken;} und_tests[] = + static struct {const char *in; const char *out; const char *broken; unsigned int flags;} und_tests[] = { -/* 1 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", +/* 0 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QAV0@@Z", "public: class QDnsDomainNameRecord & __thiscall QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord &&)"}, -/* 2 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", +/* 1 */ {"??4QDnsDomainNameRecord@@QAEAAV0@$$QEAV0@@Z", "public: class QDnsDomainNameRecord & __thiscall QDnsDomainNameRecord::operator=(class QDnsDomainNameRecord && __ptr64)"}, -/* 3 */ {"??__K_l@@YA?AUCC@@I(a)Z", "struct CC __cdecl operator \"\" _l(unsigned int)", +/* 2 */ {"??__K_l@@YA?AUCC@@I(a)Z", "struct CC __cdecl operator \"\" _l(unsigned int)", "??__K_l@@YA?AUCC@@I(a)Z" /* W10 1507 fails on this :-( */}, +/* 3 */ {"?meth(a)Q@@QEGBA?AV1(a)XZ", + "public: class Q __cdecl Q::meth(void)const __ptr64& ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */}, +/* 4 */ {"?meth(a)Q@@QEHAA?AV1(a)XZ", + "public: class Q __cdecl Q::meth(void) __ptr64&& ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */}, +/* 5 */ {"?meth(a)Q@@QEGBA?AV1(a)XZ", + "public: class Q Q::meth(void)const & ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */, + 0x02 /*UNDNAME_NO_MS_KEYWORDS*/}, +/* 6 */ {"?meth(a)Q@@QEHAA?AV1(a)XZ", + "public: class Q Q::meth(void)&& ", + "public: ?? :: ?? ::XZ::V1" /* W10 1507 fails on this :-( */, + 0x02 /*UNDNAME_NO_MS_KEYWORDS*/}, }; unsigned i; for (i = 0; i < ARRAY_SIZE(und_tests); i++) { - char *name = p___unDName(0, und_tests[i].in, 0, malloc, free, 0); + char *name = p___unDName(0, und_tests[i].in, 0, malloc, free, und_tests[i].flags); + todo_wine_if(i >= 3) ok(!strcmp(name, und_tests[i].out) || - (broken(und_tests[i].broken && !strcmp(und_tests[i].broken, name))), + broken(und_tests[i].broken && !strcmp(und_tests[i].broken, name)), "unDName returned %s for #%u\n", wine_dbgstr_a(name), i); free(name); }

1 0

Eric Pouech : dbghelp: Convert of couple more of string literals.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 69108af65496021157daa4bcaaaa53ab15e8901a URL: https://gitlab.winehq.org/wine/wine/-/commit/69108af65496021157daa4bcaaaa53… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 16:42:21 2022 +0100 dbghelp: Convert of couple more of string literals. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/path.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 2320c9da5c3..d23a4b5733e 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -741,17 +741,14 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma if ((env = process_getenv(process, L"WINEBUILDDIR"))) { - const WCHAR dllsW[] = { '\\','d','l','l','s','\\' }; - const WCHAR programsW[] = { '\\','p','r','o','g','r','a','m','s','\\' }; - len = lstrlenW(env); - if (!(buf = heap_alloc((len + ARRAY_SIZE(programsW) + machine_dir_len + + if (!(buf = heap_alloc((len + wcslen(L"\\programs\\") + machine_dir_len + 2 * lstrlenW(name) + 1) * sizeof(WCHAR)))) return FALSE; wcscpy(buf, env); end = buf + len; - memcpy(end, dllsW, sizeof(dllsW)); - lstrcpyW(end + ARRAY_SIZE(dllsW), name); + wcscpy(end, L"\\dlls\\"); + wcscat(end, name); if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".so")) *p = 0; if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".dll")) *p = 0; p = end + lstrlenW(end); @@ -764,9 +761,9 @@ BOOL search_dll_path(const struct process *process, const WCHAR *name, BOOL (*ma lstrcpyW(p, name); if (try_match_file(buf, match, param)) goto found; - memcpy(end, programsW, sizeof(programsW)); - end += ARRAY_SIZE(programsW); - lstrcpyW(end, name); + wcscpy(end, L"\\programs\\"); + end += wcslen(end); + wcscpy(end, name); if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".so")) *p = 0; if ((p = wcsrchr(end, '.')) && !lstrcmpW(p, L".exe")) *p = 0; p = end + lstrlenW(end);

1 0

Eric Pouech : dbghelp: Search debug info files into local cache of debuginfod.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: b718fbc31fb4e28bf05e939652553d4fc6b73c8b URL: https://gitlab.winehq.org/wine/wine/-/commit/b718fbc31fb4e28bf05e939652553d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 16:42:23 2022 +0100 dbghelp: Search debug info files into local cache of debuginfod. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/module.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 4840a44f5de..27ed915389a 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -745,6 +745,7 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) { struct image_file_map* fmap_link = NULL; + DWORD sz; WCHAR* p; WCHAR* z; @@ -764,7 +765,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE z = append_hex(z, id + 1, id + idlen); } } - memcpy(z, L".debug", sizeof(L".debug")); + wcscpy(z, L".debug"); TRACE("checking %s\n", wine_dbgstr_w(p)); if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) @@ -774,6 +775,27 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE return TRUE; } + sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0); + if (sz) + { + p = realloc(p, sz * sizeof(WCHAR) + + sizeof(L"\\.cache\\debuginfod_client\\") + + idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500); + GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz); + z = p + sz - 1; + wcscpy(z, L"\\.cache\\debuginfod_client\\"); + z += wcslen(z); + z = append_hex(z, id, id + idlen); + wcscpy(z, L"\\debuginfo"); + TRACE("checking %ls\n", p); + if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) + { + free(p); + fmap->alternate = fmap_link; + return TRUE; + } + } + TRACE("not found\n"); free(p); HeapFree(GetProcessHeap(), 0, fmap_link);

1 0

Eric Pouech : dbghelp: Locate alternate debug info files by their build id.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 4119430e57a8e713cb5143f6e1bac44150145527 URL: https://gitlab.winehq.org/wine/wine/-/commit/4119430e57a8e713cb5143f6e1bac4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 16:42:24 2022 +0100 dbghelp: Locate alternate debug info files by their build id. (including debuginfo client cache) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/module.c | 146 ++++++++++++++++++++++++++------------------------ 1 file changed, 77 insertions(+), 69 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 27ed915389a..d590877497d 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -643,6 +643,71 @@ static WCHAR* append_hex(WCHAR* dst, const BYTE* id, const BYTE* end) return dst; } +/****************************************************************** + * image_locate_build_id_target + * + * Try to find the .so file containing the debug info out of the build-id note information + */ +static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) +{ + struct image_file_map* fmap_link = NULL; + DWORD sz; + WCHAR* p; + WCHAR* z; + + fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); + if (!fmap_link) return FALSE; + + p = malloc(sizeof(L"/usr/lib/debug/.build-id/") + + (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); + wcscpy(p, L"/usr/lib/debug/.build-id/"); + z = p + wcslen(p); + if (idlen) + { + z = append_hex(z, id, id + 1); + if (idlen > 1) + { + *z++ = L'/'; + z = append_hex(z, id + 1, id + idlen); + } + } + wcscpy(z, L".debug"); + TRACE("checking %s\n", wine_dbgstr_w(p)); + + if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) + { + free(p); + fmap->alternate = fmap_link; + return TRUE; + } + + sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0); + if (sz) + { + p = realloc(p, sz * sizeof(WCHAR) + + sizeof(L"\\.cache\\debuginfod_client\\") + + idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500); + GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz); + z = p + sz - 1; + wcscpy(z, L"\\.cache\\debuginfod_client\\"); + z += wcslen(z); + z = append_hex(z, id, id + idlen); + wcscpy(z, L"\\debuginfo"); + TRACE("checking %ls\n", p); + if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) + { + free(p); + fmap->alternate = fmap_link; + return TRUE; + } + } + + TRACE("not found\n"); + free(p); + HeapFree(GetProcessHeap(), 0, fmap_link); + return FALSE; +} + /****************************************************************** * image_load_debugaltlink * @@ -674,9 +739,12 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru unsigned sect_len; const BYTE* id; /* The content of the section is: - * + a \0 terminated string + * + a \0 terminated string (filename) * + followed by the build-id - * We try loading the dwz_alternate, either as absolute path, or relative to the embedded build-id + * We try loading the dwz_alternate: + * - from the filename: either as absolute path, or relative to the embedded build-id + * - from the build-id + * In both cases, checking that found .so file matches the requested build-id */ sect_len = image_get_map_size(&debugaltlink_sect); id = memchr(data, '\0', sect_len); @@ -726,8 +794,13 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru if (!ret) { HeapFree(GetProcessHeap(), 0, fmap_link); - WARN("Couldn't find a match for .gnu_debugaltlink section %s for %s\n", data, debugstr_w(module->modulename)); - fmap_link = NULL; + /* didn't work out with filename, try file lookup based on build-id */ + ret = image_locate_build_id_target(fmap, id, idlen); + if (!ret) + { + WARN("Couldn't find a match for .gnu_debugaltlink section %s for %s\n", data, debugstr_w(module->modulename)); + fmap_link = NULL; + } } } } @@ -737,71 +810,6 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru return fmap_link; } -/****************************************************************** - * image_locate_build_id_target - * - * Try to find the .so file containing the debug info out of the build-id note information - */ -static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) -{ - struct image_file_map* fmap_link = NULL; - DWORD sz; - WCHAR* p; - WCHAR* z; - - fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); - if (!fmap_link) return FALSE; - - p = malloc(sizeof(L"/usr/lib/debug/.build-id/") + - (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); - wcscpy(p, L"/usr/lib/debug/.build-id/"); - z = p + wcslen(p); - if (idlen) - { - z = append_hex(z, id, id + 1); - if (idlen > 1) - { - *z++ = L'/'; - z = append_hex(z, id + 1, id + idlen); - } - } - wcscpy(z, L".debug"); - TRACE("checking %s\n", wine_dbgstr_w(p)); - - if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) - { - free(p); - fmap->alternate = fmap_link; - return TRUE; - } - - sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0); - if (sz) - { - p = realloc(p, sz * sizeof(WCHAR) + - sizeof(L"\\.cache\\debuginfod_client\\") + - idlen * 2 * sizeof(WCHAR) + sizeof(L"\\debuginfo") + 500); - GetEnvironmentVariableW(L"WINEHOMEDIR", p, sz); - z = p + sz - 1; - wcscpy(z, L"\\.cache\\debuginfod_client\\"); - z += wcslen(z); - z = append_hex(z, id, id + idlen); - wcscpy(z, L"\\debuginfo"); - TRACE("checking %ls\n", p); - if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) - { - free(p); - fmap->alternate = fmap_link; - return TRUE; - } - } - - TRACE("not found\n"); - free(p); - HeapFree(GetProcessHeap(), 0, fmap_link); - return FALSE; -} - /****************************************************************** * image_check_alternate *

1 0

Eric Pouech : msvcrt: Rename modifier into qualifier.
by Alexandre Julliard Nov. 21, 2022

Nov. 21, 2022

Module: wine Branch: master Commit: 56b973cdb9c0323b98d11fc53e9d1663486619c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/56b973cdb9c0323b98d11fc53e9d16… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Nov 21 11:30:11 2022 +0100 msvcrt: Rename modifier into qualifier. That's how they are defined in C/C++ standard. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msvcrt/undname.c | 106 +++++++++++++++++++++++++------------------------- 1 file changed, 53 insertions(+), 53 deletions(-)

1 0