October 2021 - Wine-commits

Rémi Bernon : winexinput.sys: Remove unnecessary IOCTL_HID_GET_STRING condition.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: aa9db743cd757957e7ad90b14a48bff75a174ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa9db743cd757957e7ad90b1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 14:01:47 2021 +0200 winexinput.sys: Remove unnecessary IOCTL_HID_GET_STRING condition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winexinput.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winexinput.sys/main.c b/dlls/winexinput.sys/main.c index d9a6fd5dd70..05d64b05d4f 100644 --- a/dlls/winexinput.sys/main.c +++ b/dlls/winexinput.sys/main.c @@ -400,7 +400,7 @@ static NTSTATUS WINAPI internal_ioctl(DEVICE_OBJECT *device, IRP *irp) TRACE("device %p, irp %p, code %#x, bus_device %p.\n", device, irp, code, fdo->bus_device); if (code == IOCTL_HID_READ_REPORT) return try_complete_pending_read(device, irp); - if (impl->is_gamepad || code == IOCTL_HID_GET_STRING) return gamepad_internal_ioctl(device, irp); + if (impl->is_gamepad) return gamepad_internal_ioctl(device, irp); IoSkipCurrentIrpStackLocation(irp); return IoCallDriver(fdo->bus_device, irp);

1 0

Rémi Bernon : winebus.sys: Remove "stub!" from lnxev_device_haptics_start trace.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: cf464a4d0b33f8c4ada4aa35d526b94193eab28d URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf464a4d0b33f8c4ada4aa35… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Oct 6 14:04:00 2021 +0200 winebus.sys: Remove "stub!" from lnxev_device_haptics_start trace. 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 0aade2fd104..1f563ebb56f 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -791,7 +791,7 @@ static NTSTATUS lnxev_device_haptics_start(struct unix_device *iface, DWORD dura }; struct input_event event; - TRACE("iface %p, duration_ms %u, rumble_intensity %u, buzz_intensity %u stub!\n", iface, + TRACE("iface %p, duration_ms %u, rumble_intensity %u, buzz_intensity %u.\n", iface, duration_ms, rumble_intensity, buzz_intensity); effect.replay.length = duration_ms;

1 0

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

06 Oct '21

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 06 Oct '21

06 Oct '21

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

Huw Davies : cryptnet/tests: Explicitly set cbSize before each test.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: be0004820342e49dcc21e85279a19da5f65e2ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0004820342e49dcc21e852… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 6 12:11:43 2021 +0100 cryptnet/tests: Explicitly set cbSize before each test. This is clearer and also avoids out-of-bounds compiler warnings relating to the memset()s. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptnet/tests/cryptnet.c | 59 ++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be0004820342e49dcc21…

1 0

Jan Sikorski : wined3d: Use a single allocation for command list data.
by Alexandre Julliard 06 Oct '21

06 Oct '21

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

Jan Sikorski : wined3d: Set VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT for unordered access images.
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: bacd0301ef56ba84c8a299d6a3a3291c9802ea5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=bacd0301ef56ba84c8a299d6… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Wed Oct 6 10:50:10 2021 +0200 wined3d: Set VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT for unordered access images. 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/texture.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index db32274960f..339bf4e205a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5092,8 +5092,13 @@ BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *texture_vk, resource = &texture_vk->t.resource; format_vk = wined3d_format_vk(resource->format); - if (wined3d_format_is_typeless(&format_vk->f) || texture_vk->t.swapchain) + if (wined3d_format_is_typeless(&format_vk->f) || texture_vk->t.swapchain + || (texture_vk->t.resource.bind_flags & WINED3D_BIND_UNORDERED_ACCESS)) + { + /* For UAVs, we need this in case a clear necessitates creation of a new view + * with a different format. */ flags |= VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; + } switch (resource->type) {

1 0

Jan Sikorski : wined3d: Implement UAV clears on the Vulkan backend.
by Alexandre Julliard 06 Oct '21

06 Oct '21

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

Matteo Bruni : d3d10core/tests: Use test contexts in test_stream_output().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: 9290f167972f5ad7661230ae329c58fcb4aec373 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9290f167972f5ad7661230ae… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 6 15:53:55 2021 +0200 d3d10core/tests: Use test contexts in test_stream_output(). Sneaked in a couple small changes: add a simpler gap test case, move a gap test in the proper place. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index e2fb870279e..c1178749345 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -15250,6 +15250,10 @@ static void test_stream_output(void) {"ATTRIB", 1, 0, 4, 0}, }, /* Gaps */ + { + {"SV_POSITION", 0, 0, 4, 0}, + {NULL, 0, 0, 8, 0}, + }, { {"SV_POSITION", 0, 0, 4, 0}, {NULL, 0, 0, 8, 0}, @@ -15261,6 +15265,13 @@ static void test_stream_output(void) {NULL, 0, 0, 4, 0}, {"ATTRIB", 1, 0, 4, 0}, }, + { + {"attrib", 1, 0, 4, 0}, + {"attrib", 2, 0, 3, 0}, + {"attrib", 3, 0, 2, 0}, + {NULL, 0, 0, 1, 0}, + {"attrib", 4, 0, 1, 0}, + }, /* ComponentCount */ { {"ATTRIB", 1, 0, 4, 0}, @@ -15316,13 +15327,6 @@ static void test_stream_output(void) {"attrib", 1, 0, 4, 0}, {"attrib", 2, 0, 3, 3}, }, - { - {"attrib", 1, 0, 4, 0}, - {"attrib", 2, 0, 3, 0}, - {"attrib", 3, 0, 2, 0}, - {NULL, 0, 0, 1, 0}, - {"attrib", 4, 0, 1, 0}, - }, /* Multiple occurrences of the same output */ { {"ATTRIB", 1, 0, 2, 0}, @@ -15460,6 +15464,8 @@ static void test_stream_output(void) for (i = 0; i < ARRAY_SIZE(valid_so_declarations); ++i) { unsigned int max_output_slot = 0; + + winetest_push_context("Test %u", i); for (count = 0; count < ARRAY_SIZE(valid_so_declarations[i]); ++count) { const D3D10_SO_DECLARATION_ENTRY *e = &valid_so_declarations[i][count]; @@ -15470,10 +15476,12 @@ static void test_stream_output(void) check_so_desc(device, gs_code, sizeof(gs_code), valid_so_declarations[i], count, 0, !!max_output_slot); check_so_desc(device, gs_code, sizeof(gs_code), valid_so_declarations[i], count, 64, !max_output_slot); + winetest_pop_context(); } for (i = 0; i < ARRAY_SIZE(invalid_so_declarations); ++i) { + winetest_push_context("Test %u", i); for (count = 0; count < ARRAY_SIZE(invalid_so_declarations[i]); ++count) { const D3D10_SO_DECLARATION_ENTRY *e = &invalid_so_declarations[i][count]; @@ -15483,6 +15491,7 @@ static void test_stream_output(void) check_so_desc(device, gs_code, sizeof(gs_code), invalid_so_declarations[i], count, 0, FALSE); check_so_desc(device, gs_code, sizeof(gs_code), invalid_so_declarations[i], count, 64, FALSE); + winetest_pop_context(); } /* Buffer stride */

1 0

Matteo Bruni : wined3d: Get rid of a WARN() in init_format_filter_info().
by Alexandre Julliard 06 Oct '21

06 Oct '21

Module: wine Branch: master Commit: dc3408b1f4ee825bbf90acdfb049946f908a7580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc3408b1f4ee825bbf90acdf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Oct 6 15:53:58 2021 +0200 wined3d: Get rid of a WARN() in init_format_filter_info(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0cf7e5776d0..47718c9f710 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3414,7 +3414,6 @@ static void init_format_filter_info(struct wined3d_adapter *adapter, if (wined3d_settings.offscreen_rendering_mode != ORM_FBO || !gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { - WARN("No FBO support, or no FBO ORM, guessing filter info from GL caps\n"); if (vendor == HW_VENDOR_NVIDIA && gl_info->supported[ARB_TEXTURE_FLOAT]) { TRACE("Nvidia card with texture_float support: Assuming float16 blending\n");

1 0