September 2021 - Wine-Commits

Eric Pouech : dbghelp/dwarf: No longer pass a unit context to dwarf2_get_cpp_name.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: e804b0754f02acb555df57112b3c5c616b316476 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e804b0754f02acb555df5711… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:22 2021 +0200 dbghelp/dwarf: No longer pass a unit context to dwarf2_get_cpp_name. Use debug_info's unit context instead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 0bbbe0907e2..122e9b71d7e 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1105,16 +1105,16 @@ static struct symt* dwarf2_lookup_type(const dwarf2_debug_info_t* di) return type->symt; } -static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* di, const char* name) +static const char* dwarf2_get_cpp_name(dwarf2_debug_info_t* di, const char* name) { char* last; struct attribute diname; struct attribute spec; if (di->abbrev->tag == DW_TAG_compile_unit) return name; - if (!ctx->cpp_name) - ctx->cpp_name = pool_alloc(&ctx->pool, MAX_SYM_NAME); - last = ctx->cpp_name + MAX_SYM_NAME - strlen(name) - 1; + if (!di->unit_ctx->cpp_name) + di->unit_ctx->cpp_name = pool_alloc(&di->unit_ctx->pool, MAX_SYM_NAME); + last = di->unit_ctx->cpp_name + MAX_SYM_NAME - strlen(name) - 1; strcpy(last, name); /* if the di is a definition, but has also a (previous) declaration, then scope must @@ -1122,7 +1122,7 @@ static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug */ if (dwarf2_find_attribute(di, DW_AT_specification, &spec) && spec.gotten_from == attr_direct) { - di = sparse_array_find(&ctx->debug_info_table, spec.u.uvalue); + di = sparse_array_find(&di->unit_ctx->debug_info_table, spec.u.uvalue); if (!di) { FIXME("Should have found the debug info entry\n"); @@ -1143,7 +1143,7 @@ static const char* dwarf2_get_cpp_name(dwarf2_parse_context_t* ctx, dwarf2_debug { size_t len = strlen(diname.u.string); last -= 2 + len; - if (last < ctx->cpp_name) return NULL; + if (last < di->unit_ctx->cpp_name) return NULL; memcpy(last, diname.u.string, len); last[len] = last[len + 1] = ':'; } @@ -1568,7 +1568,7 @@ static struct symt* dwarf2_parse_udt_type(dwarf2_parse_context_t* ctx, name.u.string = "zz_anon_zz"; if (!dwarf2_find_attribute(di, DW_AT_byte_size, &size)) size.u.uvalue = 0; - di->symt = &symt_new_udt(ctx->module_ctx->module, dwarf2_get_cpp_name(ctx, di, name.u.string), + di->symt = &symt_new_udt(ctx->module_ctx->module, dwarf2_get_cpp_name(di, name.u.string), size.u.uvalue, udt)->symt; children = dwarf2_get_di_children(di); @@ -1735,7 +1735,7 @@ static void dwarf2_parse_variable(dwarf2_subprogram_t* subpgm, ext.u.uvalue = 0; loc.offset += subpgm->ctx->module_ctx->load_offset; symt_new_global_variable(subpgm->ctx->module_ctx->module, subpgm->ctx->compiland, - dwarf2_get_cpp_name(subpgm->ctx, di, name.u.string), !ext.u.uvalue, + dwarf2_get_cpp_name(di, name.u.string), !ext.u.uvalue, loc, 0, param_type); break; default: @@ -2057,7 +2057,7 @@ static struct symt* dwarf2_parse_subprogram(dwarf2_parse_context_t* ctx, /* FIXME: assuming C source code */ sig_type = symt_new_function_signature(ctx->module_ctx->module, ret_type, CV_CALL_FAR_C); subpgm.func = symt_new_function(ctx->module_ctx->module, ctx->compiland, - dwarf2_get_cpp_name(ctx, di, name.u.string), + dwarf2_get_cpp_name(di, name.u.string), ctx->module_ctx->load_offset + low_pc, high_pc - low_pc, &sig_type->symt); di->symt = &subpgm.func->symt;

1 0

Eric Pouech : dbghelp/dwarf: Fold printing info about unit context when printing debug_info's.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 87b70fb272a8b0e1059ccc083e27a09e970af217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87b70fb272a8b0e1059ccc08… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:28 2021 +0200 dbghelp/dwarf: Fold printing info about unit context when printing debug_info's. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 81 ++++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=87b70fb272a8b0e1059c…

1 0

Eric Pouech : dbghelp/dwarf: No longer pass a parse context to dwarf2_find_attribute.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 61af17e6cf5ef5e9ec076569fbb13e58332d9573 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61af17e6cf5ef5e9ec076569… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:16 2021 +0200 dbghelp/dwarf: No longer pass a parse context to dwarf2_find_attribute. Use debug_info's unit context instead. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 89 ++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=61af17e6cf5ef5e9ec07…

1 0

Zhiyi Zhang : winex11.drv: Register GUID_DEVINTERFACE_DISPLAY_ADAPTER interface for GPUs.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: a7ec245f844762cce6fb789fe3ffb1bf42d44249 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7ec245f844762cce6fb789f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 16 15:10:20 2021 +0800 winex11.drv: Register GUID_DEVINTERFACE_DISPLAY_ADAPTER interface for GPUs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index ca81f169f9f..1ef728791fa 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -27,9 +27,11 @@ #include "winuser.h" #include "rpc.h" #include "winreg.h" +#include "cfgmgr32.h" #include "initguid.h" #include "devguid.h" #include "devpkey.h" +#include "ntddvdeo.h" #include "setupapi.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -405,6 +407,57 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) } } +/* Set device interface link state to enabled. The link state should be set via + * IoSetDeviceInterfaceState(). However, IoSetDeviceInterfaceState() requires a PnP driver, which + * currently doesn't exist for display devices. */ +static BOOL link_device(const WCHAR *instance, const GUID *guid) +{ + static const WCHAR device_instanceW[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; + static const WCHAR hash_controlW[] = {'#','\\','C','o','n','t','r','o','l',0}; + static const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + static const DWORD enabled = 1; + WCHAR device_key_name[MAX_PATH], device_instance[MAX_PATH]; + HKEY iface_key, device_key, control_key; + DWORD length, index = 0; + BOOL ret = FALSE; + LSTATUS lr; + + iface_key = SetupDiOpenClassRegKeyExW(guid, KEY_ALL_ACCESS, DIOCR_INTERFACE, NULL, NULL); + while (1) + { + length = ARRAY_SIZE(device_key_name); + lr = RegEnumKeyExW(iface_key, index++, device_key_name, &length, NULL, NULL, NULL, NULL); + if (lr) + break; + + lr = RegOpenKeyExW(iface_key, device_key_name, 0, KEY_ALL_ACCESS, &device_key); + if (lr) + continue; + + length = ARRAY_SIZE(device_instance); + lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); + if (lr || lstrcmpiW(device_instance, instance)) + { + RegCloseKey(device_key); + continue; + } + + lr = RegCreateKeyExW(device_key, hash_controlW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &control_key, NULL); + RegCloseKey(device_key); + if (lr) + break; + + lr = RegSetValueExW(control_key, linkedW, 0, REG_DWORD, (const BYTE *)&enabled, sizeof(enabled)); + if (!lr) + ret = TRUE; + + RegCloseKey(control_key); + break; + } + RegCloseKey(iface_key); + return ret; +} + /* Initialize a GPU instance. * Return its GUID string in guid_string, driver value in driver parameter and LUID in gpu_luid */ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, @@ -434,6 +487,13 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g goto done; } + /* Register GUID_DEVINTERFACE_DISPLAY_ADAPTER */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DEVINTERFACE_DISPLAY_ADAPTER, NULL, 0, NULL)) + goto done; + + if (!link_device(instanceW, &GUID_DEVINTERFACE_DISPLAY_ADAPTER)) + goto done; + /* Write HardwareID registry property, REG_MULTI_SZ */ written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); bufferW[written + 1] = 0;

1 0

Zhiyi Zhang : winemac.drv: Register GUID_DEVINTERFACE_DISPLAY_ADAPTER interface for GPUs.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 9a370223aba09735cf00ebcd4f1ac09a866f8ba7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a370223aba09735cf00ebcd… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 16 15:10:50 2021 +0800 winemac.drv: Register GUID_DEVINTERFACE_DISPLAY_ADAPTER interface for GPUs. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/display.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 5a87e2331be..6cb53cb092f 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -26,9 +26,11 @@ #include "winreg.h" #include "ddrawi.h" #include "rpc.h" +#include "cfgmgr32.h" #include "initguid.h" #include "devguid.h" #include "devpkey.h" +#include "ntddvdeo.h" #include "setupapi.h" #define WIN32_NO_STATUS #include "winternl.h" @@ -1440,6 +1442,63 @@ void macdrv_displays_changed(const macdrv_event *event) } } +/*********************************************************************** + * link_device + * + * Set device interface link state to enabled. The link state should be set via + * IoSetDeviceInterfaceState(). However, IoSetDeviceInterfaceState() requires a PnP driver, which + * currently doesn't exist for display devices. + * + * Return FALSE on failure and TRUE on success. + */ +static BOOL link_device(const WCHAR *instance, const GUID *guid) +{ + static const WCHAR device_instanceW[] = {'D','e','v','i','c','e','I','n','s','t','a','n','c','e',0}; + static const WCHAR hash_controlW[] = {'#','\\','C','o','n','t','r','o','l',0}; + static const WCHAR linkedW[] = {'L','i','n','k','e','d',0}; + static const DWORD enabled = 1; + WCHAR device_key_name[MAX_PATH], device_instance[MAX_PATH]; + HKEY iface_key, device_key, control_key; + DWORD length, index = 0; + BOOL ret = FALSE; + LSTATUS lr; + + iface_key = SetupDiOpenClassRegKeyExW(guid, KEY_ALL_ACCESS, DIOCR_INTERFACE, NULL, NULL); + while (1) + { + length = ARRAY_SIZE(device_key_name); + lr = RegEnumKeyExW(iface_key, index++, device_key_name, &length, NULL, NULL, NULL, NULL); + if (lr) + break; + + lr = RegOpenKeyExW(iface_key, device_key_name, 0, KEY_ALL_ACCESS, &device_key); + if (lr) + continue; + + length = ARRAY_SIZE(device_instance); + lr = RegQueryValueExW(device_key, device_instanceW, NULL, NULL, (BYTE *)device_instance, &length); + if (lr || lstrcmpiW(device_instance, instance)) + { + RegCloseKey(device_key); + continue; + } + + lr = RegCreateKeyExW(device_key, hash_controlW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &control_key, NULL); + RegCloseKey(device_key); + if (lr) + break; + + lr = RegSetValueExW(control_key, linkedW, 0, REG_DWORD, (const BYTE *)&enabled, sizeof(enabled)); + if (!lr) + ret = TRUE; + + RegCloseKey(control_key); + break; + } + RegCloseKey(iface_key); + return ret; +} + /*********************************************************************** * macdrv_init_gpu * @@ -1474,6 +1533,13 @@ static BOOL macdrv_init_gpu(HDEVINFO devinfo, const struct macdrv_gpu *gpu, int goto done; } + /* Register GUID_DEVINTERFACE_DISPLAY_ADAPTER */ + if (!SetupDiCreateDeviceInterfaceW(devinfo, &device_data, &GUID_DEVINTERFACE_DISPLAY_ADAPTER, NULL, 0, NULL)) + goto done; + + if (!link_device(instanceW, &GUID_DEVINTERFACE_DISPLAY_ADAPTER)) + goto done; + /* Write HardwareID registry property, REG_MULTI_SZ */ written = sprintfW(bufferW, gpu_hardware_id_fmtW, gpu->vendor_id, gpu->device_id); bufferW[written + 1] = 0;

1 0

Zhiyi Zhang : user32/tests: Fix some test failures on the w7u_2qxl TestBot.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: c58d9cf744f9c182576bd8de723e261e3e419a46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c58d9cf744f9c182576bd8de… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 16 15:17:38 2021 +0800 user32/tests: Fix some test failures on the w7u_2qxl TestBot. The first adapter reported by EnumDisplayDevices() is not guaranteed to be primary. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/monitor.c | 44 ++++---------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/dlls/user32/tests/monitor.c b/dlls/user32/tests/monitor.c index cee7b629cd7..bd348576726 100644 --- a/dlls/user32/tests/monitor.c +++ b/dlls/user32/tests/monitor.c @@ -105,21 +105,6 @@ static int get_bitmap_stride(int width, int bpp) return ((width * bpp + 15) >> 3) & ~1; } -static BOOL CALLBACK monitor_enum_proc(HMONITOR hmon, HDC hdc, LPRECT lprc, - LPARAM lparam) -{ - MONITORINFOEXA mi; - char *primary = (char *)lparam; - - mi.cbSize = sizeof(mi); - - ok(GetMonitorInfoA(hmon, (MONITORINFO*)&mi), "GetMonitorInfo failed\n"); - if (mi.dwFlags & MONITORINFOF_PRIMARY) - strcpy(primary, mi.szDevice); - - return TRUE; -} - static int adapter_count = 0; static int monitor_count = 0; @@ -150,11 +135,6 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de *device->DeviceString, "#%d: expect DeviceString not empty\n", index); /* StateFlags */ - if (index == 0) - ok(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE, "#%d: adapter should be primary\n", index); - else - ok(!(device->StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE), "#%d: adapter should not be primary\n", index); - if (device->StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP) { /* Test creating DC */ @@ -180,7 +160,7 @@ static void test_enumdisplaydevices_adapter(int index, const DISPLAY_DEVICEA *de } } -static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index, const char *adapter_name, +static void test_enumdisplaydevices_monitor(int monitor_index, const char *adapter_name, DISPLAY_DEVICEA *device, DWORD flags) { static const char device_key_prefix[] = "\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Class" @@ -200,11 +180,8 @@ static void test_enumdisplaydevices_monitor(int adapter_index, int monitor_index ok(*device->DeviceString, "#%d: expect DeviceString not empty\n", monitor_index); /* StateFlags */ - if (adapter_index == 0 && monitor_index == 0) - ok(device->StateFlags & DISPLAY_DEVICE_ATTACHED, "#%d expect to have a primary monitor attached\n", monitor_index); - else - ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), "#%d wrong state %#x\n", monitor_index, - device->StateFlags); + ok(device->StateFlags <= (DISPLAY_DEVICE_ATTACHED | DISPLAY_DEVICE_ACTIVE), + "#%d wrong state %#x\n", monitor_index, device->StateFlags); /* DeviceID */ CharLowerA(device->DeviceID); @@ -236,8 +213,6 @@ static void test_enumdisplaydevices(void) { static const DWORD flags[] = {0, EDD_GET_DEVICE_INTERFACE_NAME}; DISPLAY_DEVICEA dd; - char primary_device_name[32]; - char primary_monitor_device_name[32]; char adapter_name[32]; int number; int flag_index; @@ -266,23 +241,12 @@ static void test_enumdisplaydevices(void) for (monitor_index = 0; EnumDisplayDevicesA(adapter_name, monitor_index, &dd, flags[flag_index]); monitor_index++) - test_enumdisplaydevices_monitor(adapter_index, monitor_index, adapter_name, &dd, flags[flag_index]); + test_enumdisplaydevices_monitor(monitor_index, adapter_name, &dd, flags[flag_index]); } ok(adapter_count > 0, "Expect at least one adapter found\n"); /* XP on Testbot doesn't report a monitor, whereas XP on real machine does */ ok(broken(monitor_count == 0) || monitor_count > 0, "Expect at least one monitor found\n"); - - ret = EnumDisplayDevicesA(NULL, 0, &dd, 0); - ok(ret, "Expect success\n"); - lstrcpyA(primary_device_name, dd.DeviceName); - - primary_monitor_device_name[0] = 0; - ret = EnumDisplayMonitors(NULL, NULL, monitor_enum_proc, (LPARAM)primary_monitor_device_name); - ok(ret, "EnumDisplayMonitors failed\n"); - ok(!strcmp(primary_monitor_device_name, primary_device_name), - "monitor device name %s, device name %s\n", primary_monitor_device_name, - primary_device_name); } struct vid_mode

1 0

Eric Pouech : dbghelp: Separate alternate debug file lookup functions.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: fc380e06914683a0d64d8c62c10c22433fc37b4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc380e06914683a0d64d8c62… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:09:45 2021 +0200 dbghelp: Separate alternate debug file lookup functions. Split in two different (and disjoint) the functions for checking that an alternate debug file matches the expected one - the first based on crc - the second based on GNU build-id Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/module.c | 99 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 59 insertions(+), 40 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index cda12f4c350..c71e016b824 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -467,12 +467,13 @@ static BOOL module_is_container_loaded(const struct process* pcs, return FALSE; } -static BOOL image_check_debug_link(const WCHAR* file, struct image_file_map* fmap, DWORD link_crc) +static BOOL image_check_debug_link_crc(const WCHAR* file, struct image_file_map* fmap, DWORD link_crc) { DWORD read_bytes; HANDLE handle; WCHAR *path; WORD magic; + DWORD crc; BOOL ret; path = get_dos_file_name(file); @@ -480,15 +481,12 @@ static BOOL image_check_debug_link(const WCHAR* file, struct image_file_map* fma heap_free(path); if (handle == INVALID_HANDLE_VALUE) return FALSE; - if (link_crc) + crc = calc_crc32(handle); + if (crc != link_crc) { - DWORD crc = calc_crc32(handle); - if (crc != link_crc) - { - WARN("Bad CRC for file %s (got %08x while expecting %08x)\n", debugstr_w(file), crc, link_crc); - CloseHandle(handle); - return FALSE; - } + WARN("Bad CRC for file %s (got %08x while expecting %08x)\n", debugstr_w(file), crc, link_crc); + CloseHandle(handle); + return FALSE; } SetFilePointer(handle, 0, 0, FILE_BEGIN); @@ -500,6 +498,49 @@ static BOOL image_check_debug_link(const WCHAR* file, struct image_file_map* fma return ret; } +static BOOL image_check_debug_link_gnu_id(const WCHAR* file, struct image_file_map* fmap, const BYTE* id, unsigned idlen) +{ + struct image_section_map buildid_sect; + DWORD read_bytes; + HANDLE handle; + WCHAR *path; + WORD magic; + BOOL ret; + + path = get_dos_file_name(file); + handle = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); + heap_free(path); + if (handle == INVALID_HANDLE_VALUE) return FALSE; + + TRACE("Located debug information file at %s\n", debugstr_w(file)); + + if (ReadFile(handle, &magic, sizeof(magic), &read_bytes, NULL) && magic == IMAGE_DOS_SIGNATURE) + ret = pe_map_file(handle, fmap, DMT_PE); + else + ret = elf_map_handle(handle, fmap); + CloseHandle(handle); + + if (ret && image_find_section(fmap, ".note.gnu.build-id", &buildid_sect)) + { + const UINT32* note; + + note = (const UINT32*)image_map_section(&buildid_sect); + if (note != IMAGE_NO_MAP) + { + /* the usual ELF note structure: name-size desc-size type <name> <desc> */ + if (note[2] == NOTE_GNU_BUILD_ID) + { + if (note[1] == idlen && !memcmp(note + 3 + ((note[0] + 3) >> 2), id, idlen)) + return TRUE; + WARN("mismatch in buildid information for %s\n", wine_dbgstr_w(file)); + } + } + image_unmap_section(&buildid_sect); + image_unmap_file(fmap); + } + return FALSE; +} + /****************************************************************** * image_locate_debug_link * @@ -548,12 +589,12 @@ static BOOL image_locate_debug_link(const struct module* module, struct image_fi /* testing execdir/filename */ MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); - if (image_check_debug_link(p, fmap_link, crc)) goto found; + if (image_check_debug_link_crc(p, fmap_link, crc)) goto found; /* testing execdir/.debug/filename */ memcpy(slash, dotDebugW, sizeof(dotDebugW)); MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash + ARRAY_SIZE(dotDebugW), filename_len); - if (image_check_debug_link(p, fmap_link, crc)) goto found; + if (image_check_debug_link_crc(p, fmap_link, crc)) goto found; if (module->real_path) { @@ -562,7 +603,7 @@ static BOOL image_locate_debug_link(const struct module* module, struct image_fi if ((slash2 = wcsrchr(slash, '/'))) slash = slash2 + 1; if ((slash2 = wcsrchr(slash, '\\'))) slash = slash2 + 1; MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); - if (image_check_debug_link(p, fmap_link, crc)) goto found; + if (image_check_debug_link_crc(p, fmap_link, crc)) goto found; } /* testing globaldebugdir/execdir/filename */ @@ -570,10 +611,10 @@ static BOOL image_locate_debug_link(const struct module* module, struct image_fi memcpy(p, globalDebugDirW, globalDebugDirLen * sizeof(WCHAR)); slash += globalDebugDirLen; MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, slash, filename_len); - if (image_check_debug_link(p, fmap_link, crc)) goto found; + if (image_check_debug_link_crc(p, fmap_link, crc)) goto found; /* finally testing filename */ - if (image_check_debug_link(slash, fmap_link, crc)) goto found; + if (image_check_debug_link_crc(slash, fmap_link, crc)) goto found; WARN("Couldn't locate or map %s\n", filename); @@ -632,33 +673,11 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE memcpy(z, dotDebug0W, sizeof(dotDebug0W)); TRACE("checking %s\n", wine_dbgstr_w(p)); - if (image_check_debug_link(p, fmap_link, 0)) + if (image_check_debug_link_gnu_id(p, fmap_link, idend - idlen, idlen)) { - struct image_section_map buildid_sect; - if (image_find_section(fmap_link, ".note.gnu.build-id", &buildid_sect)) - { - const UINT32* note; - - note = (const UINT32*)image_map_section(&buildid_sect); - if (note != IMAGE_NO_MAP) - { - /* the usual ELF note structure: name-size desc-size type <name> <desc> */ - if (note[2] == NOTE_GNU_BUILD_ID) - { - if (note[1] == idlen && - !memcmp(note + 3 + ((note[0] + 3) >> 2), idend - idlen, idlen)) - { - TRACE("Located debug information file at %s\n", debugstr_w(p)); - HeapFree(GetProcessHeap(), 0, p); - fmap->alternate = fmap_link; - return TRUE; - } - WARN("mismatch in buildid information for %s\n", wine_dbgstr_w(p)); - } - } - image_unmap_section(&buildid_sect); - } - image_unmap_file(fmap_link); + HeapFree(GetProcessHeap(), 0, p); + fmap->alternate = fmap_link; + return TRUE; } TRACE("not found\n");

1 0

Eric Pouech : dbghelp: Added support for locating a .dwz file (GNU extension) attached to a debug file.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: e5dbf5f74e4ec6a3a61007afe09c34df42d7ecf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5dbf5f74e4ec6a3a61007af… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:09:51 2021 +0200 dbghelp: Added support for locating a .dwz file (GNU extension) attached to a debug file. A DWZ file contains additional Dwarf debug information, and can be shared across several debug info files. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/image_private.h | 1 + dlls/dbghelp/module.c | 100 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h index 83442ffb9e1..964e974e49d 100644 --- a/dlls/dbghelp/image_private.h +++ b/dlls/dbghelp/image_private.h @@ -194,6 +194,7 @@ struct macho64_nlist }; BOOL image_check_alternate(struct image_file_map* fmap, const struct module* module) DECLSPEC_HIDDEN; +struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, struct module* module) DECLSPEC_HIDDEN; BOOL elf_map_handle(HANDLE handle, struct image_file_map* fmap) DECLSPEC_HIDDEN; BOOL pe_map_file(HANDLE file, struct image_file_map* fmap, enum module_type mt) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c71e016b824..826306cfb38 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -629,6 +629,106 @@ found: return TRUE; } +/****************************************************************** + * image_load_debugaltlink + * + * Handle a (potential) .gnu_debugaltlink section and the link to + * (another) alternate debug file. + * Return an heap-allocated image_file_map when the section .gnu_debugaltlink is present, + * and a matching debug file has been located. + */ +struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, struct module* module) +{ + struct image_section_map debugaltlink_sect; + const char* data; + struct image_file_map* fmap_link = NULL; + BOOL ret = FALSE; + + for (; fmap; fmap = fmap->alternate) + { + if (image_find_section(fmap, ".gnu_debugaltlink", &debugaltlink_sect)) break; + } + if (!fmap) + { + TRACE("No .gnu_debugaltlink section found for %s\n", debugstr_w(module->modulename)); + return NULL; + } + + data = image_map_section(&debugaltlink_sect); + if (data != IMAGE_NO_MAP) + { + unsigned sect_len; + const BYTE* id; + /* The content of the section is: + * + a \0 terminated string + * + followed by the build-id + * We try loading the dwz_alternate, either as absolute path, or relative to the embedded build-id + */ + sect_len = image_get_map_size(&debugaltlink_sect); + id = memchr(data, '\0', sect_len); + if (id) + { + id++; + fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); + if (fmap_link) + { + unsigned filename_len = MultiByteToWideChar(CP_UNIXCP, 0, data, -1, NULL, 0); + /* Trying absolute path */ + WCHAR* dst = HeapAlloc(GetProcessHeap(), 0, filename_len * sizeof(WCHAR)); + if (dst) + { + MultiByteToWideChar(CP_UNIXCP, 0, data, -1, dst, filename_len); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + HeapFree(GetProcessHeap(), 0, dst); + } + /* Trying relative path to build-id directory */ + if (!ret) + { + static const WCHAR globalDebugDirW[] = + {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/','.','b','u','i','l','d','-','i','d','/'}; + dst = HeapAlloc(GetProcessHeap(), 0, sizeof(globalDebugDirW) + (3 + filename_len) * sizeof(WCHAR)); + if (dst) + { + WCHAR* p; + + /* SIGH.... + * some relative links are relative to /usr/lib/debug/.build-id, some others are from the directory + * where the alternate file is... + * so try both + */ + p = memcpy(dst, globalDebugDirW, sizeof(globalDebugDirW)); + p += ARRAY_SIZE(globalDebugDirW); + MultiByteToWideChar(CP_UNIXCP, 0, data, -1, p, filename_len); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + if (!ret) + { + p = dst + ARRAY_SIZE(globalDebugDirW); + if ((const char*)id < data + sect_len) + { + *p++ = "0123456789abcdef"[*id >> 4 ]; + *p++ = "0123456789abcdef"[*id & 0x0F]; + } + *p++ = '/'; + MultiByteToWideChar(CP_UNIXCP, 0, data, -1, p, filename_len); + ret = image_check_debug_link_gnu_id(dst, fmap_link, id, data + sect_len - (const char*)id); + } + HeapFree(GetProcessHeap(), 0, dst); + } + } + 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; + } + } + } + } + image_unmap_section(&debugaltlink_sect); + if (fmap_link) TRACE("Found match .gnu_debugaltlink section for %s\n", debugstr_w(module->modulename)); + return fmap_link; +} + /****************************************************************** * image_locate_build_id_target *

1 0

Piotr Caban : msvcrt: Use unaligned data types in memset.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 2c01333d03153a2d3cc2622fa18a9ad323dd9edb URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c01333d03153a2d3cc2622f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 16 13:51:58 2021 +0200 msvcrt: Use unaligned data types in memset. This fixes a regression in memset on ARM described by Martin: ARM can do 64 bit writes with the STRD instruction, but that instruction requires a 32 bit aligned address - while these stores are unaligned. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f2b1b4a5b11..5655fbfe68a 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2872,21 +2872,25 @@ static inline void memset_aligned_32(unsigned char *d, uint64_t v, size_t n) */ void *__cdecl memset(void *dst, int c, size_t n) { + typedef uint64_t DECLSPEC_ALIGN(1) unaligned_ui64; + typedef uint32_t DECLSPEC_ALIGN(1) unaligned_ui32; + typedef uint16_t DECLSPEC_ALIGN(1) unaligned_ui16; + uint64_t v = 0x101010101010101ull * (unsigned char)c; unsigned char *d = (unsigned char *)dst; size_t a = 0x20 - ((uintptr_t)d & 0x1f); if (n >= 16) { - *(uint64_t *)(d + 0) = v; - *(uint64_t *)(d + 8) = v; - *(uint64_t *)(d + n - 16) = v; - *(uint64_t *)(d + n - 8) = v; + *(unaligned_ui64 *)(d + 0) = v; + *(unaligned_ui64 *)(d + 8) = v; + *(unaligned_ui64 *)(d + n - 16) = v; + *(unaligned_ui64 *)(d + n - 8) = v; if (n <= 32) return dst; - *(uint64_t *)(d + 16) = v; - *(uint64_t *)(d + 24) = v; - *(uint64_t *)(d + n - 32) = v; - *(uint64_t *)(d + n - 24) = v; + *(unaligned_ui64 *)(d + 16) = v; + *(unaligned_ui64 *)(d + 24) = v; + *(unaligned_ui64 *)(d + n - 32) = v; + *(unaligned_ui64 *)(d + n - 24) = v; if (n <= 64) return dst; n = (n - a) & ~0x1f; @@ -2895,20 +2899,20 @@ void *__cdecl memset(void *dst, int c, size_t n) } if (n >= 8) { - *(uint64_t *)d = v; - *(uint64_t *)(d + n - 8) = v; + *(unaligned_ui64 *)d = v; + *(unaligned_ui64 *)(d + n - 8) = v; return dst; } if (n >= 4) { - *(uint32_t *)d = v; - *(uint32_t *)(d + n - 4) = v; + *(unaligned_ui32 *)d = v; + *(unaligned_ui32 *)(d + n - 4) = v; return dst; } if (n >= 2) { - *(uint16_t *)d = v; - *(uint16_t *)(d + n - 2) = v; + *(unaligned_ui16 *)d = v; + *(unaligned_ui16 *)(d + n - 2) = v; return dst; } if (n >= 1)

1 0

Hans Leidekker : winhttp: Don't fail the request if authorization fails.
by Alexandre Julliard Sept. 16, 2021

Sept. 16, 2021

Module: wine Branch: master Commit: 5731c38ae1f58f63e66b64f1c00c1cecc16b5cf7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5731c38ae1f58f63e66b64f1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Sep 16 11:49:43 2021 +0200 winhttp: Don't fail the request if authorization fails. Fixes a regression from 080dfbee311f2684280fafaa3f458f6bce6844bd. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 001fff74a87..f2cb24d4486 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2736,7 +2736,7 @@ static DWORD receive_response( struct request *request, BOOL async ) { if (request->hdr.disable_flags & WINHTTP_DISABLE_AUTHENTICATION) break; - if ((ret = handle_authorization( request, status ))) break; + if (handle_authorization( request, status )) break; /* recurse synchronously */ if (!(ret = send_request( request, NULL, 0, request->optional, request->optional_len, 0, 0, FALSE ))) continue;

1 0