October 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Handle zero-length reads in src_getrange_cb().
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 8e9d7b031f7b0c93471cfbffe8f720c34623a273 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e9d7b031f7b0c93471cfbff… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 6 11:46:32 2021 -0500 winegstreamer: Handle zero-length reads in src_getrange_cb(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 72dfab8f3d6..9a382cb724c 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1272,7 +1272,7 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, GstMapInfo map_info; bool ret; - GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, length %u, buffer %p.", pad, offset, size, *buffer); + GST_LOG("pad %p, offset %" G_GINT64_MODIFIER "u, size %u, buffer %p.", pad, offset, size, *buffer); if (offset == GST_BUFFER_OFFSET_NONE) offset = parser->next_pull_offset; @@ -1281,6 +1281,16 @@ static GstFlowReturn src_getrange_cb(GstPad *pad, GstObject *parent, if (!*buffer) *buffer = new_buffer = gst_buffer_new_and_alloc(size); + if (!size) + { + /* asfreader occasionally asks for zero bytes. gst_buffer_map() will + * return NULL in this case. Avoid confusing the read thread by asking + * it for zero bytes. */ + gst_buffer_set_size(*buffer, 0); + GST_LOG("Returning empty buffer."); + return GST_FLOW_OK; + } + gst_buffer_map(*buffer, &map_info, GST_MAP_WRITE); pthread_mutex_lock(&parser->mutex);

1 0

Jan Sikorski : wined3d: Implement UAV clears on the Vulkan backend.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: fa410970d911cae9b75be9340728e5c48cca90d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa410970d911cae9b75be934… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Oct 6 10:50:11 2021 +0200 wined3d: Implement UAV clears on the Vulkan backend. Based on the vkd3d implementation. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 +- dlls/wined3d/arb_program_shader.c | 8 + dlls/wined3d/context_vk.c | 2 +- dlls/wined3d/glsl_shader.c | 8 + dlls/wined3d/shader.c | 7 + dlls/wined3d/shader_spirv.c | 14 +- dlls/wined3d/utils.c | 29 +-- dlls/wined3d/view.c | 441 ++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 52 +++++ dlls/wined3d/wined3d_shaders.h | 388 +++++++++++++++++++++++++++++++++ 10 files changed, 899 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fa410970d911cae9b75b…

1 0

Gabriel Ivăncescu : mshtml: Use dispex_to_string when retrieving the value of an object.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: d9eb90e6ab7989868ef613f6104c22004918b396 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9eb90e6ab7989868ef613f6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Oct 6 18:11:33 2021 +0300 mshtml: Use dispex_to_string when retrieving the value of an object. Rather than always returning "[object]" in every mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 14 ++++++++------ dlls/mshtml/tests/dom.c | 6 +++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 1adcc675681..96a776d9594 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -715,15 +715,17 @@ HRESULT dispex_get_dynid(DispatchEx *This, const WCHAR *name, DISPID *id) static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) { + HRESULT hres; + if(This->info->desc->vtbl && This->info->desc->vtbl->value) return This->info->desc->vtbl->value(This, lcid, flags, params, res, ei, caller); switch(flags) { case DISPATCH_PROPERTYGET: V_VT(res) = VT_BSTR; - V_BSTR(res) = SysAllocString(L"[object]"); - if(!V_BSTR(res)) - return E_OUTOFMEMORY; + hres = dispex_to_string(This, &V_BSTR(res)); + if(FAILED(hres)) + return hres; break; default: FIXME("Unimplemented flags %x\n", flags); @@ -1305,9 +1307,9 @@ static HRESULT function_invoke(DispatchEx *This, func_info_t *func, WORD flags, if(func->id == DISPID_VALUE) { BSTR ret; - ret = SysAllocString(L"[object]"); - if(!ret) - return E_OUTOFMEMORY; + hres = dispex_to_string(This, &ret); + if(FAILED(hres)) + return hres; V_VT(res) = VT_BSTR; V_BSTR(res) = ret; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 3bae9e08225..9daaf9de51d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -107,7 +107,11 @@ static const char noscript_str[] = "<body><noscript><div>test</div></noscript></body></html>"; static const char doctype_str[] = "<!DOCTYPE html>" - "<html><head><title>emptydiv test</title></head>" + "<html>" + " <head>" + " <meta http-equiv=\"x-ua-compatible\" content=\"IE=8\" />" + " <title>emptydiv test</title>" + " </head>" "<body><div id=\"divid\"></div></body></html>"; static WCHAR characterW[] = {'c','h','a','r','a','c','t','e','r',0};

1 0

Jan Sikorski : wined3d: Use a single allocation for command list data.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 89d61c28e4ba9d23279c437069236e6a25231c60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89d61c28e4ba9d23279c4370… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Oct 6 10:42:34 2021 +0200 wined3d: Use a single allocation for command list data. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 54 +++++++++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8307ce0fa96..576a3ccd50e 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -76,11 +76,6 @@ static void wined3d_command_list_destroy_object(void *object) for (i = 0; i < list->upload_count; ++i) heap_free(list->uploads[i].sysmem); - heap_free(list->command_lists); - heap_free(list->uploads); - heap_free(list->resources); - heap_free(list->data); - heap_free(list->queries); heap_free(list); } @@ -3734,45 +3729,54 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device { struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); struct wined3d_command_list *object; + void *memory; TRACE("context %p, list %p.\n", context, list); - if (!(object = heap_alloc_zero(sizeof(*object)))) + memory = heap_alloc(sizeof(*object) + deferred->resource_count * sizeof(*object->resources) + + deferred->upload_count * sizeof(*object->uploads) + + deferred->command_list_count * sizeof(*object->command_lists) + + deferred->query_count * sizeof(*object->queries) + + deferred->data_size); + + if (!memory) return E_OUTOFMEMORY; + object = memory; + memory = &object[1]; + memset(object, 0, sizeof(*object)); object->refcount = 1; object->device = deferred->c.device; - if (!(object->data = heap_alloc(deferred->data_size))) - goto out_free_list; - object->data_size = deferred->data_size; - memcpy(object->data, deferred->data, deferred->data_size); - - if (!(object->resources = heap_alloc(deferred->resource_count * sizeof(*object->resources)))) - goto out_free_data; + object->resources = memory; + memory = &object->resources[deferred->resource_count]; object->resource_count = deferred->resource_count; memcpy(object->resources, deferred->resources, deferred->resource_count * sizeof(*object->resources)); /* Transfer our references to the resources to the command list. */ - if (!(object->uploads = heap_alloc(deferred->upload_count * sizeof(*object->uploads)))) - goto out_free_resources; + object->uploads = memory; + memory = &object->uploads[deferred->upload_count]; object->upload_count = deferred->upload_count; memcpy(object->uploads, deferred->uploads, deferred->upload_count * sizeof(*object->uploads)); /* Transfer our references to the resources to the command list. */ - if (!(object->command_lists = heap_alloc(deferred->command_list_count * sizeof(*object->command_lists)))) - goto out_free_uploads; + object->command_lists = memory; + memory = &object->command_lists[deferred->command_list_count]; object->command_list_count = deferred->command_list_count; memcpy(object->command_lists, deferred->command_lists, deferred->command_list_count * sizeof(*object->command_lists)); /* Transfer our references to the command lists to the command list. */ - if (!(object->queries = heap_alloc(deferred->query_count * sizeof(*object->queries)))) - goto out_free_command_lists; + object->queries = memory; + memory = &object->queries[deferred->query_count]; object->query_count = deferred->query_count; memcpy(object->queries, deferred->queries, deferred->query_count * sizeof(*object->queries)); /* Transfer our references to the queries to the command list. */ + object->data = memory; + object->data_size = deferred->data_size; + memcpy(object->data, deferred->data, deferred->data_size); + deferred->data_size = 0; deferred->resource_count = 0; deferred->upload_count = 0; @@ -3789,16 +3793,4 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device *list = object; return S_OK; - -out_free_command_lists: - heap_free(object->command_lists); -out_free_uploads: - heap_free(object->uploads); -out_free_resources: - heap_free(object->resources); -out_free_data: - heap_free(object->data); -out_free_list: - heap_free(object); - return E_OUTOFMEMORY; }

1 0

Gabriel Ivăncescu : mshtml: Add names for each object and use it in the Navigator.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: c667bbe80aa08514d1197a92acf402c3dc80b211 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c667bbe80aa08514d1197a92… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Oct 6 18:11:31 2021 +0300 mshtml: Add names for each object and use it in the Navigator. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 29 +++++++++++++++++++++++++++++ dlls/mshtml/htmlanchor.c | 1 + dlls/mshtml/htmlarea.c | 1 + dlls/mshtml/htmlattr.c | 1 + dlls/mshtml/htmlbody.c | 1 + dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmlcurstyle.c | 1 + dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlelem.c | 6 ++++++ dlls/mshtml/htmlelemcol.c | 1 + dlls/mshtml/htmlevent.c | 6 ++++++ dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 2 ++ dlls/mshtml/htmlgeneric.c | 1 + dlls/mshtml/htmlhead.c | 4 ++++ dlls/mshtml/htmlimg.c | 2 ++ dlls/mshtml/htmlinput.c | 3 +++ dlls/mshtml/htmllink.c | 1 + dlls/mshtml/htmllocation.c | 1 + dlls/mshtml/htmlnode.c | 2 ++ dlls/mshtml/htmlobject.c | 2 ++ dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 3 +++ dlls/mshtml/htmlstorage.c | 1 + dlls/mshtml/htmlstyle.c | 2 ++ dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmlstylesheet.c | 4 ++++ dlls/mshtml/htmltable.c | 3 +++ dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmltextnode.c | 1 + dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/omnavigator.c | 18 ++++++++++++------ dlls/mshtml/range.c | 2 ++ dlls/mshtml/selection.c | 1 + dlls/mshtml/xmlhttprequest.c | 2 ++ 36 files changed, 106 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c667bbe80aa08514d119…

1 0

Zebediah Figura : winegstreamer: Use array_reserve() to reallocate read buffers.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 59997c355fdc9cb5857c767b3bf16c9513b3d1f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59997c355fdc9cb5857c767b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 6 11:46:33 2021 -0500 winegstreamer: Use array_reserve() to reallocate read buffers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/main.c | 27 +++++++++++++++++++++++++++ dlls/winegstreamer/media_source.c | 8 ++++---- dlls/winegstreamer/quartz_parser.c | 8 ++++---- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index ebe0bf6f50d..986c8ca695d 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -38,6 +38,8 @@ #include "unixlib.h" +bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) DECLSPEC_HIDDEN; + static inline const char *debugstr_time(REFERENCE_TIME time) { ULONGLONG abstime = time >= 0 ? time : -time; diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index c799aa06d1b..d6f19fb4ad1 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -31,6 +31,33 @@ static unixlib_handle_t unix_handle; WINE_DEFAULT_DEBUG_CHANNEL(quartz); +bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + unsigned int new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + + return TRUE; +} + struct wg_parser *wg_parser_create(enum wg_parser_type type, bool unlimited_buffering) { struct wg_parser_create_params params = diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index da898f20f66..703bdd7c57d 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -613,7 +613,7 @@ static DWORD CALLBACK read_thread(void *arg) { struct media_source *source = arg; IMFByteStream *byte_stream = source->byte_stream; - uint32_t buffer_size = 0; + size_t buffer_size = 0; uint64_t file_size; void *data = NULL; @@ -636,10 +636,10 @@ static DWORD CALLBACK read_thread(void *arg) else if (offset + size >= file_size) size = file_size - offset; - if (size > buffer_size) + if (!array_reserve(&data, &buffer_size, size, 1)) { - buffer_size = size; - data = realloc(data, size); + free(data); + return 0; } ret_size = 0; diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 6ae1a99a14a..b6655d5da3c 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -786,7 +786,7 @@ static DWORD CALLBACK read_thread(void *arg) { struct parser *filter = arg; LONGLONG file_size, unused; - uint32_t buffer_size = 0; + size_t buffer_size = 0; void *data = NULL; IAsyncReader_Length(filter->reader, &file_size, &unused); @@ -807,10 +807,10 @@ static DWORD CALLBACK read_thread(void *arg) else if (offset + size >= file_size) size = file_size - offset; - if (size > buffer_size) + if (!array_reserve(&data, &buffer_size, size, 1)) { - buffer_size = size; - data = realloc(data, size); + free(data); + return 0; } hr = IAsyncReader_SyncRead(filter->reader, offset, size, data);

1 0

Zebediah Figura : winegstreamer: Avoid seeking past the end of an IMFByteStream.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 3efb72de5aca01d3d979ce697728e51bc3e99901 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3efb72de5aca01d3d979ce69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 6 11:46:35 2021 -0500 winegstreamer: Avoid seeking past the end of an IMFByteStream. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51837 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index dab85e4689d..6ecd345cb73 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -639,6 +639,14 @@ static DWORD CALLBACK read_thread(void *arg) else if (offset + size >= file_size) size = file_size - offset; + /* Some IMFByteStreams (including the standard file-based stream) return + * an error when reading past the file size. */ + if (!size) + { + wg_parser_push_data(source->wg_parser, data, 0); + continue; + } + if (!array_reserve(&data, &buffer_size, size, 1)) { free(data);

1 0

Zebediah Figura : winegstreamer: Trace the unfiltered caps in sink_query_cb().
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: fd6315eb8f6809b89b7449f4b9dd01453de32eda URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd6315eb8f6809b89b7449f4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 6 11:46:36 2021 -0500 winegstreamer: Trace the unfiltered caps in sink_query_cb(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/wg_parser.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 9a382cb724c..0c23ae6d351 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1006,6 +1006,7 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) case GST_QUERY_CAPS: { GstCaps *caps, *filter, *temp; + gchar *str; gst_query_parse_caps(query, &filter); @@ -1016,6 +1017,10 @@ static gboolean sink_query_cb(GstPad *pad, GstObject *parent, GstQuery *query) if (!caps) return FALSE; + str = gst_caps_to_string(caps); + GST_LOG("Stream caps are \"%s\".", str); + g_free(str); + if (filter) { temp = gst_caps_intersect(caps, filter);

1 0

Rémi Bernon : winebus.sys: Don't enter critical section in bus_find_unix_device.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 2c0da820500b2665b630f49a4496cc0cb7cfeba8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c0da820500b2665b630f49a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 14:04:01 2021 +0200 winebus.sys: Don't enter critical section in bus_find_unix_device. Callers are already holding it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 6a4695cd3be..c9e930632e2 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -309,20 +309,11 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct uni static DEVICE_OBJECT *bus_find_unix_device(struct unix_device *unix_device) { struct device_extension *ext; - DEVICE_OBJECT *ret = NULL; - RtlEnterCriticalSection(&device_list_cs); LIST_FOR_EACH_ENTRY(ext, &device_list, struct device_extension, entry) - { - if (ext->unix_device == unix_device) - { - ret = ext->device; - break; - } - } - RtlLeaveCriticalSection(&device_list_cs); + if (ext->unix_device == unix_device) return ext->device; - return ret; + return NULL; } static void bus_unlink_hid_device(DEVICE_OBJECT *device)

1 0

Rémi Bernon : winebus.sys: Parse product string from uevent HID_NAME.
by Alexandre Julliard Oct. 6, 2021

Oct. 6, 2021

Module: wine Branch: master Commit: 57d99dcfb7c814a76098da96c15879e243b80db7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d99dcfb7c814a76098da96… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 14:04:02 2021 +0200 winebus.sys: Parse product string from uevent HID_NAME. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1f563ebb56f..f780aac2785 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1048,6 +1048,7 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy { struct udev_device *parent = NULL; const char *ptr, *next, *tmp; + char buffer[MAX_PATH]; DWORD bus = 0; if (!(parent = udev_device_get_parent_with_subsystem_devtype(dev, subsystem, NULL))) return; @@ -1062,11 +1063,16 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy if (!strncmp(ptr, "HID_UNIQ=", 9)) { - char buffer[MAX_PATH]; if (desc->serialnumber[0]) continue; if (sscanf(ptr, "HID_UNIQ=%256s\n", buffer) == 1) ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc->serialnumber, ARRAY_SIZE(desc->serialnumber)); } + if (!strncmp(ptr, "HID_NAME=", 7)) + { + if (desc->product[0]) continue; + if (sscanf(ptr, "HID_NAME=%256s\n", buffer) == 1) + ntdll_umbstowcs(buffer, strlen(buffer) + 1, desc->product, ARRAY_SIZE(desc->product)); + } if (!strncmp(ptr, "HID_PHYS=", 9) || !strncmp(ptr, "PHYS=\"", 6)) { if (!(tmp = strstr(ptr, "/input")) || tmp >= next) continue;

1 0