September 2021 - Wine-commits

Eric Pouech : dbghelp: Added support for locating a .dwz file (GNU extension) attached to a debug file.
by Alexandre Julliard 16 Sep '21

16 Sep '21

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

Eric Pouech : dbghelp/dwarf: Store a potential link to an external DWZ file in the dwarf2 module's information.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 16d66561632261e64eb341248bb14cbf87253b67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16d66561632261e64eb34124… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:09:57 2021 +0200 dbghelp/dwarf: Store a potential link to an external DWZ file in the dwarf2 module's information. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 90addb9a6b7..af0244c8311 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -182,9 +182,17 @@ typedef struct dwarf2_parse_module_context_s const struct elf_thunk_area*thunks; struct symt* symt_cache[sc_num]; /* void, unknown */ struct vector unit_contexts; + struct dwarf2_dwz_alternate_s* dwz; DWORD cu_versions; } dwarf2_parse_module_context_t; +typedef struct dwarf2_dwz_alternate_s +{ + struct image_file_map* fmap; + dwarf2_section_t sections[section_max]; + struct image_section_map sectmap[section_max]; +} dwarf2_dwz_alternate_t; + enum unit_status { UNIT_ERROR, @@ -3663,6 +3671,49 @@ static void dwarf2_module_remove(struct process* pcs, struct module_format* modf HeapFree(GetProcessHeap(), 0, modfmt); } +static dwarf2_dwz_alternate_t* dwarf2_load_dwz(struct image_file_map* fmap, struct module* module) +{ + struct image_file_map* fmap_dwz; + dwarf2_dwz_alternate_t* dwz; + + fmap_dwz = image_load_debugaltlink(fmap, module); + if (!fmap_dwz) return NULL; + if (!(dwz = HeapAlloc(GetProcessHeap(), 0, sizeof(*dwz)))) + { + image_unmap_file(fmap_dwz); + HeapFree(GetProcessHeap(), 0, fmap_dwz); + return NULL; + } + + dwz->fmap = fmap_dwz; + dwarf2_init_section(&dwz->sections[section_debug], fmap_dwz, ".debug_info", ".zdebug_info", &dwz->sectmap[section_debug]); + dwarf2_init_section(&dwz->sections[section_abbrev], fmap_dwz, ".debug_abbrev", ".zdebug_abbrev", &dwz->sectmap[section_abbrev]); + dwarf2_init_section(&dwz->sections[section_string], fmap_dwz, ".debug_str", ".zdebug_str", &dwz->sectmap[section_string]); + dwarf2_init_section(&dwz->sections[section_line], fmap_dwz, ".debug_line", ".zdebug_line", &dwz->sectmap[section_line]); + dwarf2_init_section(&dwz->sections[section_ranges], fmap_dwz, ".debug_ranges", ".zdebug_ranges", &dwz->sectmap[section_ranges]); + + return dwz; +} + +static void dwarf2_unload_dwz(dwarf2_dwz_alternate_t* dwz) +{ + if (!dwz) return; + dwarf2_fini_section(&dwz->sections[section_debug]); + dwarf2_fini_section(&dwz->sections[section_abbrev]); + dwarf2_fini_section(&dwz->sections[section_string]); + dwarf2_fini_section(&dwz->sections[section_line]); + dwarf2_fini_section(&dwz->sections[section_ranges]); + + image_unmap_section(&dwz->sectmap[section_debug]); + image_unmap_section(&dwz->sectmap[section_abbrev]); + image_unmap_section(&dwz->sectmap[section_string]); + image_unmap_section(&dwz->sectmap[section_line]); + image_unmap_section(&dwz->sectmap[section_ranges]); + + image_unmap_file(dwz->fmap); + HeapFree(GetProcessHeap(), 0, dwz); +} + BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, const struct elf_thunk_area* thunks, struct image_file_map* fmap) @@ -3676,6 +3727,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_parse_module_context_t module_ctx; unsigned i; + module_ctx.dwz = dwarf2_load_dwz(fmap, module); + if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect)) /* lld produces .eh_fram to avoid generating a long name */ dwarf2_init_section(&eh_frame, fmap, ".eh_fram", NULL, &eh_frame_sect); @@ -3772,6 +3825,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, } leave: + dwarf2_unload_dwz(module_ctx.dwz); + dwarf2_fini_section(&section[section_debug]); dwarf2_fini_section(&section[section_abbrev]); dwarf2_fini_section(&section[section_string]);

1 0

Eric Pouech : dbghelp/dwarf: Handle DW_FORM_GNU_strp_alt (string located in an alternate DWZ file).
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 9f74ac4b3b8d0e1496ddc0730c8e88291f41df1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f74ac4b3b8d0e1496ddc073… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:03 2021 +0200 dbghelp/dwarf: Handle DW_FORM_GNU_strp_alt (string located in an alternate DWZ file). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index af0244c8311..e3d1e35c179 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -682,9 +682,27 @@ static BOOL dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, attr->u.uvalue = 0; return FALSE; case DW_FORM_GNU_strp_alt: - FIXME("Unhandled FORM_GNU_strp_alt\n"); - attr->u.string = NULL; - return FALSE; + if (ctx->module_ctx->dwz) + { + ULONG_PTR ofs = dwarf2_get_addr(data, ctx->head.offset_size); + if (ofs < ctx->module_ctx->dwz->sections[section_string].size) + { + attr->u.string = (const char*)ctx->module_ctx->dwz->sections[section_string].address + ofs; + TRACE("strp_alt<%s>\n", debugstr_a(attr->u.string)); + } + else + { + ERR("out of bounds strp_alt: 0x%lx 0x%x (%u)\n", ofs, ctx->module_ctx->dwz->sections[section_string].size, ctx->head.offset_size); + attr->u.string = "<<outofbounds-strpalt>>"; + } + } + else + { + ERR("No DWZ file present for GNU_strp_alt in %s\n", debugstr_w(ctx->module_ctx->module->modulename)); + attr->u.string = "<<noDWZ-strpalt>>"; + } + break; + default: FIXME("Unhandled attribute form %lx\n", abbrev_attr->form); break;

1 0

Eric Pouech : dbghelp/dwarf: Load the alternate dwarf file content as we do for a regular dwarf module.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 517f614bc8fedd2866114f83433fc23aefea1b52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=517f614bc8fedd2866114f83… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 16 11:10:10 2021 +0200 dbghelp/dwarf: Load the alternate dwarf file content as we do for a regular dwarf module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 90 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 36 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index e3d1e35c179..34e59aa3a75 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -191,6 +191,7 @@ typedef struct dwarf2_dwz_alternate_s struct image_file_map* fmap; dwarf2_section_t sections[section_max]; struct image_section_map sectmap[section_max]; + dwarf2_parse_module_context_t module_ctx; } dwarf2_dwz_alternate_t; enum unit_status @@ -3689,6 +3690,41 @@ static void dwarf2_module_remove(struct process* pcs, struct module_format* modf HeapFree(GetProcessHeap(), 0, modfmt); } +static BOOL dwarf2_load_CU_module(dwarf2_parse_module_context_t* module_ctx, struct module* module, + dwarf2_section_t* sections, ULONG_PTR load_offset, + const struct elf_thunk_area* thunks) +{ + dwarf2_traverse_context_t mod_ctx; + unsigned i; + + module_ctx->sections = sections; + module_ctx->module = module; + module_ctx->thunks = thunks; + module_ctx->load_offset = load_offset; + memset(module_ctx->symt_cache, 0, sizeof(module_ctx->symt_cache)); + module_ctx->symt_cache[sc_void] = &symt_new_basic(module_ctx->module, btVoid, "void", 0)->symt; + module_ctx->symt_cache[sc_unknown] = &symt_new_basic(module_ctx->module, btNoType, "# unknown", 0)->symt; + vector_init(&module_ctx->unit_contexts, sizeof(dwarf2_parse_context_t), 16); + module_ctx->cu_versions = 0; + + /* phase I: parse all CU heads */ + mod_ctx.data = sections[section_debug].address; + mod_ctx.end_data = mod_ctx.data + sections[section_debug].size; + while (mod_ctx.data < mod_ctx.end_data) + { + dwarf2_parse_context_t* unit_ctx = vector_add(&module_ctx->unit_contexts, &module_ctx->module->pool); + + unit_ctx->module_ctx = module_ctx; + dwarf2_parse_compilation_unit_head(unit_ctx, &mod_ctx); + } + + /* phase2: load content of all CU */ + for (i = 0; i < module_ctx->unit_contexts.num_elts; ++i) + dwarf2_parse_compilation_unit((dwarf2_parse_context_t*)vector_at(&module_ctx->unit_contexts, i)); + + return TRUE; +} + static dwarf2_dwz_alternate_t* dwarf2_load_dwz(struct image_file_map* fmap, struct module* module) { struct image_file_map* fmap_dwz; @@ -3710,6 +3746,8 @@ static dwarf2_dwz_alternate_t* dwarf2_load_dwz(struct image_file_map* fmap, stru dwarf2_init_section(&dwz->sections[section_line], fmap_dwz, ".debug_line", ".zdebug_line", &dwz->sectmap[section_line]); dwarf2_init_section(&dwz->sections[section_ranges], fmap_dwz, ".debug_ranges", ".zdebug_ranges", &dwz->sectmap[section_ranges]); + dwz->module_ctx.dwz = NULL; + dwarf2_load_CU_module(&dwz->module_ctx, module, dwz->sections, 0/*FIXME*/, NULL); return dwz; } @@ -3732,20 +3770,29 @@ static void dwarf2_unload_dwz(dwarf2_dwz_alternate_t* dwz) HeapFree(GetProcessHeap(), 0, dwz); } +static BOOL dwarf2_unload_CU_module(dwarf2_parse_module_context_t* module_ctx) +{ + unsigned i; + for (i = 0; i < module_ctx->unit_contexts.num_elts; ++i) + { + dwarf2_parse_context_t* unit = vector_at(&module_ctx->unit_contexts, i); + if (unit->status != UNIT_ERROR) + pool_destroy(&unit->pool); + } + dwarf2_unload_dwz(module_ctx->dwz); + return TRUE; +} + BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, const struct elf_thunk_area* thunks, struct image_file_map* fmap) { dwarf2_section_t eh_frame, section[section_max]; - dwarf2_traverse_context_t mod_ctx; struct image_section_map debug_sect, debug_str_sect, debug_abbrev_sect, debug_line_sect, debug_ranges_sect, eh_frame_sect; BOOL ret = TRUE; struct module_format* dwarf2_modfmt; dwarf2_parse_module_context_t module_ctx; - unsigned i; - - module_ctx.dwz = dwarf2_load_dwz(fmap, module); if (!dwarf2_init_section(&eh_frame, fmap, ".eh_frame", NULL, &eh_frame_sect)) /* lld produces .eh_fram to avoid generating a long name */ @@ -3798,30 +3845,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->u.dwarf2_info->cuheads = NULL; dwarf2_modfmt->u.dwarf2_info->num_cuheads = 0; - module_ctx.sections = section; - module_ctx.module = dwarf2_modfmt->module; - module_ctx.thunks = thunks; - module_ctx.load_offset = load_offset; - memset(module_ctx.symt_cache, 0, sizeof(module_ctx.symt_cache)); - module_ctx.symt_cache[sc_void] = &symt_new_basic(module_ctx.module, btVoid, "void", 0)->symt; - module_ctx.symt_cache[sc_unknown] = &symt_new_basic(module_ctx.module, btNoType, "# unknown", 0)->symt; - vector_init(&module_ctx.unit_contexts, sizeof(dwarf2_parse_context_t), 16); - module_ctx.cu_versions = 0; - - /* phase I: parse all CU heads */ - mod_ctx.data = section[section_debug].address; - mod_ctx.end_data = mod_ctx.data + section[section_debug].size; - while (mod_ctx.data < mod_ctx.end_data) - { - dwarf2_parse_context_t* unit_ctx = vector_add(&module_ctx.unit_contexts, &module_ctx.module->pool); - - unit_ctx->module_ctx = &module_ctx; - dwarf2_parse_compilation_unit_head(unit_ctx, &mod_ctx); - } - - /* phase2: load content of all CU */ - for (i = 0; i < module_ctx.unit_contexts.num_elts; ++i) - dwarf2_parse_compilation_unit((dwarf2_parse_context_t*)vector_at(&module_ctx.unit_contexts, i)); + module_ctx.dwz = dwarf2_load_dwz(fmap, module); + dwarf2_load_CU_module(&module_ctx, module, section, load_offset, thunks); dwarf2_modfmt->module->module.SymType = SymDia; /* hide dwarf versions in CVSig @@ -3835,15 +3860,8 @@ BOOL dwarf2_parse(struct module* module, ULONG_PTR load_offset, dwarf2_modfmt->module->module.SourceIndexed = TRUE; dwarf2_modfmt->module->module.Publics = TRUE; - for (i = 0; i < module_ctx.unit_contexts.num_elts; ++i) - { - dwarf2_parse_context_t* unit = vector_at(&module_ctx.unit_contexts, i); - if (unit->status != UNIT_ERROR) - pool_destroy(&unit->pool); - } - + dwarf2_unload_CU_module(&module_ctx); leave: - dwarf2_unload_dwz(module_ctx.dwz); dwarf2_fini_section(&section[section_debug]); dwarf2_fini_section(&section[section_abbrev]);

1 0

Eric Pouech : dbghelp/dwarf: No longer pass a parse context to dwarf2_find_attribute.
by Alexandre Julliard 16 Sep '21

16 Sep '21

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

Rémi Bernon : winebus.sys: Pass a unix_device pointer in every bus event.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 421a6f53ad9682696f6c4116cadc7cb1bfd15963 URL: https://source.winehq.org/git/wine.git/?a=commit;h=421a6f53ad9682696f6c4116… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:52 2021 +0200 winebus.sys: Pass a unix_device pointer in every bus event. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 38 +++++++++++++++++++++++++++-- dlls/winebus.sys/bus_sdl.c | 4 +++- dlls/winebus.sys/bus_udev.c | 25 ++++++++++++------- dlls/winebus.sys/main.c | 53 +++++++---------------------------------- dlls/winebus.sys/unix_private.h | 2 +- dlls/winebus.sys/unixlib.c | 17 +++++++------ dlls/winebus.sys/unixlib.h | 9 +------ 7 files changed, 75 insertions(+), 73 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=421a6f53ad9682696f6c…

1 0

Rémi Bernon : winebus.sys: Remove the now useless device_compare callback.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 2a2fc11d8cef6cac96b1348e51c9e623b96c31b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a2fc11d8cef6cac96b1348e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:53 2021 +0200 winebus.sys: Remove the now useless device_compare callback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 11 ----------- dlls/winebus.sys/bus_sdl.c | 6 ------ dlls/winebus.sys/bus_udev.c | 9 --------- dlls/winebus.sys/unix_private.h | 1 - dlls/winebus.sys/unixlib.c | 20 -------------------- dlls/winebus.sys/unixlib.h | 7 ------- 6 files changed, 54 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 492d5a70ddb..f3b55cc0f70 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -161,16 +161,6 @@ static void iohid_device_destroy(struct unix_device *iface) { } -static int iohid_device_compare(struct unix_device *iface, void *context) -{ - struct platform_private *private = impl_from_unix_device(iface); - IOHIDDeviceRef dev2 = (IOHIDDeviceRef)context; - if (private->device != dev2) - return 1; - else - return 0; -} - static NTSTATUS iohid_device_start(struct unix_device *iface) { DWORD length; @@ -273,7 +263,6 @@ static void iohid_device_set_feature_report(struct unix_device *iface, HID_XFER_ static const struct unix_device_vtbl iohid_device_vtbl = { iohid_device_destroy, - iohid_device_compare, iohid_device_start, iohid_device_stop, iohid_device_get_report_descriptor, diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index d48f9507abb..bc7abcb933b 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -497,11 +497,6 @@ static void sdl_device_destroy(struct unix_device *iface) { } -static int sdl_device_compare(struct unix_device *iface, void *context) -{ - return impl_from_unix_device(iface)->id - PtrToUlong(context); -} - static NTSTATUS sdl_device_start(struct unix_device *iface) { struct platform_private *ext = impl_from_unix_device(iface); @@ -596,7 +591,6 @@ static void sdl_device_set_feature_report(struct unix_device *iface, HID_XFER_PA static const struct unix_device_vtbl sdl_device_vtbl = { sdl_device_destroy, - sdl_device_compare, sdl_device_start, sdl_device_stop, sdl_device_get_reportdescriptor, diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 8cbcabf25e8..bfeb7bfc09b 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -619,13 +619,6 @@ static void hidraw_device_destroy(struct unix_device *iface) udev_device_unref(private->udev_device); } -static int udev_device_compare(struct unix_device *iface, void *platform_dev) -{ - struct udev_device *dev1 = impl_from_unix_device(iface)->udev_device; - struct udev_device *dev2 = platform_dev; - return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2)); -} - static NTSTATUS hidraw_device_start(struct unix_device *iface) { EnterCriticalSection(&udev_cs); @@ -796,7 +789,6 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER static const struct unix_device_vtbl hidraw_device_vtbl = { hidraw_device_destroy, - udev_device_compare, hidraw_device_start, hidraw_device_stop, hidraw_device_get_report_descriptor, @@ -898,7 +890,6 @@ static void lnxev_device_set_feature_report(struct unix_device *iface, HID_XFER_ static const struct unix_device_vtbl lnxev_device_vtbl = { lnxev_device_destroy, - udev_device_compare, lnxev_device_start, lnxev_device_stop, lnxev_device_get_report_descriptor, diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 9b2c6d81fa2..f2af846473a 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -32,7 +32,6 @@ struct unix_device_vtbl { void (*destroy)(struct unix_device *iface); - int (*compare)(struct unix_device *iface, void *platform_dev); NTSTATUS (*start)(struct unix_device *iface); void (*stop)(struct unix_device *iface); NTSTATUS (*get_report_descriptor)(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length); diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index 008fb6e77a2..b6fcdf18ffe 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -51,11 +51,6 @@ static void mouse_destroy(struct unix_device *iface) hid_descriptor_free(&impl->desc); } -static int mouse_compare(struct unix_device *iface, void *context) -{ - return 0; -} - static NTSTATUS mouse_start(struct unix_device *iface) { struct mouse_device *impl = mouse_from_unix_device(iface); @@ -111,7 +106,6 @@ static void mouse_set_feature_report(struct unix_device *iface, HID_XFER_PACKET static const struct unix_device_vtbl mouse_vtbl = { mouse_destroy, - mouse_compare, mouse_start, mouse_stop, mouse_get_report_descriptor, @@ -155,11 +149,6 @@ static void keyboard_destroy(struct unix_device *iface) hid_descriptor_free(&impl->desc); } -static int keyboard_compare(struct unix_device *iface, void *context) -{ - return 0; -} - static NTSTATUS keyboard_start(struct unix_device *iface) { struct keyboard_device *impl = keyboard_from_unix_device(iface); @@ -215,7 +204,6 @@ static void keyboard_set_feature_report(struct unix_device *iface, HID_XFER_PACK static const struct unix_device_vtbl keyboard_vtbl = { keyboard_destroy, - keyboard_compare, keyboard_start, keyboard_stop, keyboard_get_report_descriptor, @@ -275,13 +263,6 @@ static NTSTATUS unix_device_remove(void *args) return STATUS_SUCCESS; } -static NTSTATUS unix_device_compare(void *args) -{ - struct device_compare_params *params = args; - struct unix_device *iface = params->iface; - return iface->vtbl->compare(iface, params->context); -} - static NTSTATUS unix_device_start(void *args) { struct unix_device *iface = args; @@ -333,7 +314,6 @@ const unixlib_entry_t __wine_unix_call_funcs[] = mouse_device_create, keyboard_device_create, unix_device_remove, - unix_device_compare, unix_device_start, unix_device_get_report_descriptor, unix_device_set_output_report, diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index cd5f64cbb51..ccca8d12e8b 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -98,12 +98,6 @@ struct device_create_params struct unix_device *device; }; -struct device_compare_params -{ - struct unix_device *iface; - void *context; -}; - struct device_descriptor_params { struct unix_device *iface; @@ -133,7 +127,6 @@ enum unix_funcs mouse_create, keyboard_create, device_remove, - device_compare, device_start, device_get_report_descriptor, device_set_output_report,

1 0

Rémi Bernon : winebus.sys: Move is_xbox_gamepad to unixlib.c.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 7032b41747a1f75d3d200d7dad06754d78106a8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7032b41747a1f75d3d200d7d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:54 2021 +0200 winebus.sys: Move is_xbox_gamepad to unixlib.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 3 --- dlls/winebus.sys/main.c | 38 -------------------------------------- dlls/winebus.sys/unix_private.h | 2 ++ dlls/winebus.sys/unixlib.c | 19 +++++++++++++++++++ 4 files changed, 21 insertions(+), 41 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index df53508d2c0..96503a8267f 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -27,7 +27,4 @@ #include "unixlib.h" -/* General Bus Functions */ -BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; - extern HANDLE driver_key DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index a80bd8a186e..f1b0430509a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -57,31 +57,6 @@ __ASM_STDCALL_FUNC( wrap_fastcall_func1, 8, #endif -struct product_desc -{ - WORD vid; - WORD pid; -}; - -#define VID_MICROSOFT 0x045e - -static const struct product_desc XBOX_CONTROLLERS[] = -{ - {VID_MICROSOFT, 0x0202}, /* Xbox Controller */ - {VID_MICROSOFT, 0x0285}, /* Xbox Controller S */ - {VID_MICROSOFT, 0x0289}, /* Xbox Controller S */ - {VID_MICROSOFT, 0x028e}, /* Xbox360 Controller */ - {VID_MICROSOFT, 0x028f}, /* Xbox360 Wireless Controller */ - {VID_MICROSOFT, 0x02d1}, /* Xbox One Controller */ - {VID_MICROSOFT, 0x02dd}, /* Xbox One Controller (Covert Forces/Firmware 2015) */ - {VID_MICROSOFT, 0x02e0}, /* Xbox One X Controller */ - {VID_MICROSOFT, 0x02e3}, /* Xbox One Elite Controller */ - {VID_MICROSOFT, 0x02e6}, /* Wireless XBox Controller Dongle */ - {VID_MICROSOFT, 0x02ea}, /* Xbox One S Controller */ - {VID_MICROSOFT, 0x02fd}, /* Xbox One S Controller (Firmware 2017) */ - {VID_MICROSOFT, 0x0719}, /* Xbox 360 Wireless Adapter */ -}; - static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *mouse_obj; @@ -1021,19 +996,6 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) return status; } -BOOL is_xbox_gamepad(WORD vid, WORD pid) -{ - int i; - - if (vid != VID_MICROSOFT) - return FALSE; - - for (i = 0; i < ARRAY_SIZE(XBOX_CONTROLLERS); i++) - if (pid == XBOX_CONTROLLERS[i].pid) return TRUE; - - return FALSE; -} - static NTSTATUS WINAPI driver_add_device(DRIVER_OBJECT *driver, DEVICE_OBJECT *pdo) { NTSTATUS ret; diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index f2af846473a..cdc2be9b318 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -89,4 +89,6 @@ extern BOOL hid_descriptor_add_axes(struct hid_descriptor *desc, BYTE count, USA extern BOOL hid_descriptor_add_haptics(struct hid_descriptor *desc) DECLSPEC_HIDDEN; +BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; + #endif /* __WINEBUS_UNIX_PRIVATE_H */ diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index b6fcdf18ffe..57e81d3cba8 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -34,6 +34,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); +BOOL is_xbox_gamepad(WORD vid, WORD pid) +{ + if (vid != 0x045e) return FALSE; + if (pid == 0x0202) return TRUE; /* Xbox Controller */ + if (pid == 0x0285) return TRUE; /* Xbox Controller S */ + if (pid == 0x0289) return TRUE; /* Xbox Controller S */ + if (pid == 0x028e) return TRUE; /* Xbox360 Controller */ + if (pid == 0x028f) return TRUE; /* Xbox360 Wireless Controller */ + if (pid == 0x02d1) return TRUE; /* Xbox One Controller */ + if (pid == 0x02dd) return TRUE; /* Xbox One Controller (Covert Forces/Firmware 2015) */ + if (pid == 0x02e0) return TRUE; /* Xbox One X Controller */ + if (pid == 0x02e3) return TRUE; /* Xbox One Elite Controller */ + if (pid == 0x02e6) return TRUE; /* Wireless XBox Controller Dongle */ + if (pid == 0x02ea) return TRUE; /* Xbox One S Controller */ + if (pid == 0x02fd) return TRUE; /* Xbox One S Controller (Firmware 2017) */ + if (pid == 0x0719) return TRUE; /* Xbox 360 Wireless Adapter */ + return FALSE; +} + struct mouse_device { struct unix_device unix_device;

1 0

Rémi Bernon : winebus.sys: Load SDL bus mappings before calling bus_init.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 0017b5eb636ee4963636eaf83ae34f6077d695fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0017b5eb636ee4963636eaf8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:55 2021 +0200 winebus.sys: Load SDL bus mappings before calling bus_init. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 30 --------------- dlls/winebus.sys/bus_iohid.c | 1 - dlls/winebus.sys/bus_sdl.c | 69 +++++++++------------------------- dlls/winebus.sys/bus_udev.c | 1 - dlls/winebus.sys/main.c | 88 ++++++++++++++++++++++++++++++++++++++++++-- dlls/winebus.sys/unixlib.h | 3 ++ 6 files changed, 105 insertions(+), 87 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h deleted file mode 100644 index 96503a8267f..00000000000 --- a/dlls/winebus.sys/bus.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2016 Aric Stewart - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include <windef.h> -#include <winbase.h> -#include <winternl.h> -#include <ddk/wdm.h> -#include <ddk/hidclass.h> -#include <hidusage.h> - -#include "unixlib.h" - -extern HANDLE driver_key DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index f3b55cc0f70..6d3f621a15a 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -89,7 +89,6 @@ #include "ddk/hidtypes.h" #include "wine/debug.h" -#include "bus.h" #include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index bc7abcb933b..ff3a7ca09d8 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -50,7 +50,6 @@ # define LE_WORD(x) (x) #endif -#include "bus.h" #include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); @@ -815,59 +814,11 @@ static void process_device_event(SDL_Event *event) LeaveCriticalSection(&sdl_cs); } -static void sdl_load_mappings(void) +NTSTATUS sdl_bus_init(void *args) { - HKEY key; - static const WCHAR szPath[] = {'m','a','p',0}; const char *mapping; + int i; - if ((mapping = getenv("SDL_GAMECONTROLLERCONFIG"))) - { - TRACE("Setting environment mapping %s\n", debugstr_a(mapping)); - if (pSDL_GameControllerAddMapping(mapping) < 0) - WARN("Failed to add environment mapping %s\n", pSDL_GetError()); - } - else if (!RegOpenKeyExW(driver_key, szPath, 0, KEY_QUERY_VALUE, &key)) - { - DWORD index = 0; - CHAR *buffer = NULL; - DWORD buffer_len = 0; - LSTATUS rc; - - do - { - CHAR name[255]; - DWORD name_len; - DWORD type; - DWORD data_len = buffer_len; - - name_len = sizeof(name); - rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); - if (rc == ERROR_MORE_DATA || buffer == NULL) - { - if (buffer) buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, data_len); - else buffer = HeapAlloc(GetProcessHeap(), 0, data_len); - buffer_len = data_len; - - name_len = sizeof(name); - rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); - } - - if (rc == STATUS_SUCCESS) - { - TRACE("Setting registry mapping %s\n", debugstr_a(buffer)); - if (pSDL_GameControllerAddMapping(buffer) < 0) - WARN("Failed to add registry mapping %s\n", pSDL_GetError()); - index++; - } - } while (rc == STATUS_SUCCESS); - HeapFree(GetProcessHeap(), 0, buffer); - NtClose(key); - } -} - -NTSTATUS sdl_bus_init(void *args) -{ TRACE("args %p\n", args); options = *(struct sdl_bus_options *)args; @@ -942,7 +893,21 @@ NTSTATUS sdl_bus_init(void *args) pSDL_GameControllerEventState(SDL_ENABLE); /* Process mappings */ - if (pSDL_GameControllerAddMapping != NULL) sdl_load_mappings(); + if (pSDL_GameControllerAddMapping) + { + if ((mapping = getenv("SDL_GAMECONTROLLERCONFIG"))) + { + TRACE("Setting environment mapping %s\n", debugstr_a(mapping)); + if (pSDL_GameControllerAddMapping(mapping) < 0) + WARN("Failed to add environment mapping %s\n", pSDL_GetError()); + } + else for (i = 0; i < options.mappings_count; ++i) + { + TRACE("Setting registry mapping %s\n", debugstr_a(options.mappings[i])); + if (pSDL_GameControllerAddMapping(options.mappings[i]) < 0) + WARN("Failed to add registry mapping %s\n", pSDL_GetError()); + } + } return STATUS_SUCCESS; diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index bfeb7bfc09b..b8b3a0f0a84 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -79,7 +79,6 @@ #define LE_DWORD(x) (x) #endif -#include "bus.h" #include "unix_private.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index f1b0430509a..4528673f880 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -34,7 +34,6 @@ #include "wine/list.h" #include "wine/unixlib.h" -#include "bus.h" #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(plugplay); @@ -66,7 +65,7 @@ static DEVICE_OBJECT *keyboard_obj; static DEVICE_OBJECT *bus_pdo; static DEVICE_OBJECT *bus_fdo; -HANDLE driver_key; +static HANDLE driver_key; enum device_state { @@ -630,6 +629,85 @@ static NTSTATUS bus_main_thread_start(struct bus_main_params *bus) return STATUS_SUCCESS; } +static void sdl_bus_free_mappings(struct sdl_bus_options *options) +{ + DWORD count = options->mappings_count; + char **mappings = options->mappings; + + while (count) HeapFree(GetProcessHeap(), 0, mappings[--count]); + HeapFree(GetProcessHeap(), 0, mappings); +} + +static void sdl_bus_load_mappings(struct sdl_bus_options *options) +{ + static const WCHAR szPath[] = {'m','a','p',0}; + + ULONG idx = 0, len, count = 0, capacity, info_size, info_max_size; + KEY_VALUE_FULL_INFORMATION *info; + OBJECT_ATTRIBUTES attr = {0}; + char **mappings = NULL; + UNICODE_STRING path; + NTSTATUS status; + HANDLE key; + + options->mappings_count = 0; + options->mappings = NULL; + + RtlInitUnicodeString(&path, szPath); + InitializeObjectAttributes(&attr, &path, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, driver_key, NULL); + status = NtOpenKey(&key, KEY_ALL_ACCESS, &attr); + if (status) return; + + capacity = 1024; + mappings = HeapAlloc(GetProcessHeap(), 0, capacity * sizeof(*mappings)); + info_max_size = offsetof(KEY_VALUE_FULL_INFORMATION, Name) + 512; + info = HeapAlloc(GetProcessHeap(), 0, info_max_size); + + while (!status && info && mappings) + { + status = NtEnumerateValueKey(key, idx, KeyValueFullInformation, info, info_max_size, &info_size); + while (status == STATUS_BUFFER_OVERFLOW) + { + info_max_size = info_size; + if (!(info = HeapReAlloc(GetProcessHeap(), 0, info, info_max_size))) break; + status = NtEnumerateValueKey(key, idx, KeyValueFullInformation, info, info_max_size, &info_size); + } + + if (status == STATUS_NO_MORE_ENTRIES) + { + options->mappings_count = count; + options->mappings = mappings; + goto done; + } + + idx++; + if (status) break; + if (info->Type != REG_SZ) continue; + + RtlUnicodeToMultiByteSize(&len, (WCHAR *)((char *)info + info->DataOffset), info_size - info->DataOffset); + if (!len) continue; + + if (!(mappings[count++] = HeapAlloc(GetProcessHeap(), 0, len + 1))) break; + if (count > capacity) + { + capacity = capacity * 3 / 2; + if (!(mappings = HeapReAlloc(GetProcessHeap(), 0, mappings, capacity * sizeof(*mappings)))) + break; + } + + RtlUnicodeToMultiByteN(mappings[count], len, NULL, (WCHAR *)((char *)info + info->DataOffset), + info_size - info->DataOffset); + if (mappings[len - 1]) mappings[len] = 0; + } + + if (mappings) while (count) HeapFree(GetProcessHeap(), 0, mappings[--count]); + HeapFree(GetProcessHeap(), 0, mappings); + +done: + HeapFree(GetProcessHeap(), 0, info); + NtClose(key); +} + static NTSTATUS sdl_driver_init(void) { static const WCHAR bus_name[] = {'S','D','L',0}; @@ -643,11 +721,15 @@ static NTSTATUS sdl_driver_init(void) .init_code = sdl_init, .wait_code = sdl_wait, }; + NTSTATUS status; bus_options.map_controllers = check_bus_option(&controller_mode, 1); if (!bus_options.map_controllers) TRACE("SDL controller to XInput HID gamepad mapping disabled\n"); + sdl_bus_load_mappings(&bus_options); - return bus_main_thread_start(&bus); + status = bus_main_thread_start(&bus); + sdl_bus_free_mappings(&bus_options); + return status; } static NTSTATUS udev_driver_init(void) diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index ccca8d12e8b..55ba42500cf 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -49,6 +49,9 @@ struct device_desc struct sdl_bus_options { BOOL map_controllers; + /* freed after bus_init */ + DWORD mappings_count; + char **mappings; }; struct udev_bus_options

1 0

Rémi Bernon : winebus.sys: Use Rtl heap functions.
by Alexandre Julliard 16 Sep '21

16 Sep '21

Module: wine Branch: master Commit: 35a6148acff836fe442ce78016dc7f0f4f4b0291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35a6148acff836fe442ce780… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 16 10:17:56 2021 +0200 winebus.sys: Use Rtl heap functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 8 ++++---- dlls/winebus.sys/bus_udev.c | 12 ++++++------ dlls/winebus.sys/hid.c | 8 ++++---- dlls/winebus.sys/main.c | 30 +++++++++++++++--------------- dlls/winebus.sys/unixlib.c | 14 +++++++------- 6 files changed, 37 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=35a6148acff836fe442c…

1 0