wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Eric Pouech : dbghelp/dwarf: Separate CU handling from module handling.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: a345a1cf84e41f77306c7228a8c2f4777069d406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a345a1cf84e41f77306c7228… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:37:46 2021 +0200 dbghelp/dwarf: Separate CU handling from module handling. Move out of dwarf2_parse_context_s structure information related to the module and put them into the dwarf2_parse_module_context_s structure (actually the dwarf2_parse_context should be named dwarf2_parse_cu_context as it only related to a compilation unit). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 180 +++++++++++++++++++++++++++------------------------ 1 file changed, 95 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a345a1cf84e41f77306c…

1 0

Rémi Bernon : winebus.sys: Remove the DEVICE_OBJECT arg on device_start.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: cdaf1d9a7f97f02ab92c11f288aaf0cf55d4b195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdaf1d9a7f97f02ab92c11f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:46 2021 +0200 winebus.sys: Remove the DEVICE_OBJECT arg on device_start. 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 | 2 +- dlls/winebus.sys/bus_udev.c | 4 ++-- dlls/winebus.sys/main.c | 7 +------ dlls/winebus.sys/unix_private.h | 2 +- dlls/winebus.sys/unixlib.c | 9 ++++----- dlls/winebus.sys/unixlib.h | 7 ------- 7 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index c16c780bc76..8bdd7857ae6 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -151,7 +151,7 @@ static int iohid_device_compare(struct unix_device *iface, void *context) return 0; } -static NTSTATUS iohid_device_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS iohid_device_start(struct unix_device *iface) { DWORD length; struct platform_private *private = impl_from_unix_device(iface); diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 6eafcb75285..6a6f364edf6 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -502,7 +502,7 @@ 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, DEVICE_OBJECT *device) +static NTSTATUS sdl_device_start(struct unix_device *iface) { struct platform_private *ext = impl_from_unix_device(iface); if (ext->sdl_controller) return build_mapped_report_descriptor(ext); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b94af8db71c..23b649ff511 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -616,7 +616,7 @@ static int udev_device_compare(struct unix_device *iface, void *platform_dev) return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2)); } -static NTSTATUS hidraw_device_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS hidraw_device_start(struct unix_device *iface) { EnterCriticalSection(&udev_cs); start_polling_device(iface); @@ -813,7 +813,7 @@ static void lnxev_device_destroy(struct unix_device *iface) udev_device_unref(ext->base.udev_device); } -static NTSTATUS lnxev_device_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS lnxev_device_start(struct unix_device *iface) { struct wine_input_private *ext = input_impl_from_unix_device(iface); NTSTATUS status; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 3e63a84adcc..162787c4e4a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -160,12 +160,7 @@ static int unix_device_compare(DEVICE_OBJECT *device, void *context) static NTSTATUS unix_device_start(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - struct device_start_params params = - { - .iface = ext->unix_device, - .device = device - }; - return winebus_call(device_start, &params); + return winebus_call(device_start, ext->unix_device); } static NTSTATUS unix_device_get_report_descriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 611873db17f..3f8d73d033a 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -33,7 +33,7 @@ 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, DEVICE_OBJECT *device); + 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); void (*set_output_report)(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io); diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index b91de06e73c..87cc7de3474 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -56,7 +56,7 @@ static int mouse_compare(struct unix_device *iface, void *context) return 0; } -static NTSTATUS mouse_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS mouse_start(struct unix_device *iface) { struct mouse_device *impl = mouse_from_unix_device(iface); @@ -160,7 +160,7 @@ static int keyboard_compare(struct unix_device *iface, void *context) return 0; } -static NTSTATUS keyboard_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS keyboard_start(struct unix_device *iface) { struct keyboard_device *impl = keyboard_from_unix_device(iface); @@ -284,9 +284,8 @@ static NTSTATUS unix_device_compare(void *args) static NTSTATUS unix_device_start(void *args) { - struct device_start_params *params = args; - struct unix_device *iface = params->iface; - return iface->vtbl->start(iface, params->device); + struct unix_device *iface = args; + return iface->vtbl->start(iface); } static NTSTATUS unix_device_get_report_descriptor(void *args) diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 47256e80740..61684d0c0af 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -24,7 +24,6 @@ #include <windef.h> #include <winbase.h> #include <winternl.h> -#include <ddk/wdm.h> #include <ddk/hidclass.h> #include <hidusage.h> @@ -112,12 +111,6 @@ struct device_compare_params void *context; }; -struct device_start_params -{ - struct unix_device *iface; - DEVICE_OBJECT *device; -}; - struct device_descriptor_params { struct unix_device *iface;

1 0

Rémi Bernon : winebus.sys: Remove the now useless get_unix_device.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 5f8ebe7a608855b0afd45dc725934addbbacfda0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f8ebe7a608855b0afd45dc7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:45 2021 +0200 winebus.sys: Remove the now useless get_unix_device. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 2 -- dlls/winebus.sys/main.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 67215019dfc..df53508d2c0 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -27,8 +27,6 @@ #include "unixlib.h" -struct unix_device *get_unix_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; - /* General Bus Functions */ BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index ce548980640..3e63a84adcc 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -217,12 +217,6 @@ static void unix_device_set_feature_report(DEVICE_OBJECT *device, HID_XFER_PACKE winebus_call(device_set_feature_report, &params); } -struct unix_device *get_unix_device(DEVICE_OBJECT *device) -{ - struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - return ext->unix_device; -} - static DWORD get_device_index(struct device_desc *desc) { struct device_extension *ext;

1 0

Rémi Bernon : winebus.sys: Poll all UDEV fds together in the bus_wait thread.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: be503e97fb1d4db580c91521fd9c6f51e484ab9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=be503e97fb1d4db580c91521… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:44 2021 +0200 winebus.sys: Poll all UDEV fds together in the bus_wait thread. 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 | 285 +++++++++++++++++++------------------------- 1 file changed, 124 insertions(+), 161 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be503e97fb1d4db580c9…

1 0

Rémi Bernon : winebus.sys: Return an event from IOHID bus wait on input report.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: bc0ad0e13bb74f43084b92dbd75285512917d715 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc0ad0e13bb74f43084b92db… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:43 2021 +0200 winebus.sys: Return an event from IOHID bus wait on input report. Instead of calling process_hid_report. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 4 ---- dlls/winebus.sys/bus_iohid.c | 9 ++++++--- dlls/winebus.sys/main.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 75ff218c26d..67215019dfc 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -29,10 +29,6 @@ struct unix_device *get_unix_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN; -/* HID Plug and Play Bus */ -DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DECLSPEC_HIDDEN; -void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN; - /* General Bus Functions */ BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index d9de7059be3..c16c780bc76 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -133,8 +133,8 @@ static void handle_IOHIDDeviceIOHIDReportCallback(void *context, IOReturn result, void *sender, IOHIDReportType type, uint32_t reportID, uint8_t *report, CFIndex report_length) { - DEVICE_OBJECT *device = (DEVICE_OBJECT*)context; - process_hid_report(device, report, report_length); + struct unix_device *iface = (struct unix_device *)context; + bus_event_queue_input_report(&event_queue, iface, report, report_length); } static void iohid_device_destroy(struct unix_device *iface) @@ -161,7 +161,7 @@ static NTSTATUS iohid_device_start(struct unix_device *iface, DEVICE_OBJECT *dev length = CFNumberToDWORD(num); private->buffer = HeapAlloc(GetProcessHeap(), 0, length); - IOHIDDeviceRegisterInputReportCallback(private->device, private->buffer, length, handle_IOHIDDeviceIOHIDReportCallback, device); + IOHIDDeviceRegisterInputReportCallback(private->device, private->buffer, length, handle_IOHIDDeviceIOHIDReportCallback, iface); return STATUS_SUCCESS; } @@ -378,6 +378,9 @@ NTSTATUS iohid_bus_wait(void *args) { struct bus_event *result = args; + /* cleanup previously returned event */ + bus_event_cleanup(result); + do { if (bus_event_queue_pop(&event_queue, result)) return STATUS_PENDING; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 87526fc2129..ce548980640 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -370,7 +370,7 @@ static DEVICE_OBJECT *bus_create_hid_device(struct device_desc *desc, struct uni return device; } -DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) +static DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) { struct device_extension *ext; DEVICE_OBJECT *ret = NULL; @@ -477,7 +477,7 @@ static NTSTATUS deliver_last_report(struct device_extension *ext, DWORD buffer_l } } -void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) +static void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) { struct device_extension *ext = (struct device_extension*)device->DeviceExtension; IRP *irp;

1 0

Rémi Bernon : winebus.sys: Return an event from UDEV bus wait on input report.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: e0ac56267fe97ddd4b5137d1f43ce65238fa85bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0ac56267fe97ddd4b5137d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:42 2021 +0200 winebus.sys: Return an event from UDEV bus wait on input report. Instead of calling process_hid_report. We need to guard the event queue as the input reports are read from dedicated threads. 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 | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index e26e11c720d..45c5b2e151a 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -648,6 +648,7 @@ static DWORD CALLBACK device_report_thread(void *args) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; struct platform_private *private = impl_from_DEVICE_OBJECT(device); + struct unix_device *iface = &private->unix_device; struct pollfd plfds[2]; plfds[0].fd = private->device_fd; @@ -671,7 +672,11 @@ static DWORD CALLBACK device_report_thread(void *args) else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else - process_hid_report(device, report_buffer, size); + { + EnterCriticalSection(&udev_cs); + bus_event_queue_input_report(&event_queue, iface, report_buffer, size); + LeaveCriticalSection(&udev_cs); + } } return 0; } @@ -876,6 +881,7 @@ static DWORD CALLBACK lnxev_device_report_thread(void *args) { DEVICE_OBJECT *device = (DEVICE_OBJECT*)args; struct wine_input_private *private = input_impl_from_DEVICE_OBJECT(device); + struct unix_device *iface = &private->base.unix_device; struct pollfd plfds[2]; plfds[0].fd = private->base.device_fd; @@ -899,7 +905,11 @@ static DWORD CALLBACK lnxev_device_report_thread(void *args) else if (size == 0) TRACE_(hid_report)("Failed to read report\n"); else if (set_report_from_event(private, &ie)) - process_hid_report(device, private->current_report_buffer, private->buffer_length); + { + EnterCriticalSection(&udev_cs); + bus_event_queue_input_report(&event_queue, iface, private->current_report_buffer, private->buffer_length); + LeaveCriticalSection(&udev_cs); + } } return 0; } @@ -1276,16 +1286,27 @@ NTSTATUS udev_bus_wait(void *args) pfd[1].events = POLLIN; pfd[1].revents = 0; + /* cleanup previously returned event */ + bus_event_cleanup(result); + while (1) { - if (bus_event_queue_pop(&event_queue, result)) return STATUS_PENDING; + EnterCriticalSection(&udev_cs); + if (bus_event_queue_pop(&event_queue, result)) + { + LeaveCriticalSection(&udev_cs); + return STATUS_PENDING; + } + LeaveCriticalSection(&udev_cs); if (poll(pfd, 2, -1) <= 0) continue; if (pfd[1].revents) break; process_monitor_event(udev_monitor); } TRACE("UDEV main loop exiting\n"); + EnterCriticalSection(&udev_cs); bus_event_queue_destroy(&event_queue); + LeaveCriticalSection(&udev_cs); udev_monitor_unref(udev_monitor); udev_unref(udev_context); udev_context = NULL;

1 0

Rémi Bernon : winebus.sys: Return an event from SDL bus wait on input report.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 8b434bdc7fe98e3bd97e180f31bc18d87161c05a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b434bdc7fe98e3bd97e180f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:41 2021 +0200 winebus.sys: Return an event from SDL bus wait on input report. Instead of calling process_hid_report. This adds a reference count on unix devices to make sure they are kept alive until all their input report events have been processed. This also uses a bus-specific device list, to be able to find devices from joystick ids without having to call back to the win32 side. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_sdl.c | 78 +++++++++++++++++++++++++++-------------- dlls/winebus.sys/main.c | 31 ++++++++++++++-- dlls/winebus.sys/unix_private.h | 4 +++ dlls/winebus.sys/unixlib.c | 50 ++++++++++++++++++++++++-- dlls/winebus.sys/unixlib.h | 8 +++++ 5 files changed, 140 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8b434bdc7fe98e3bd97e…

1 0

Rémi Bernon : winebus.sys: Move process_hid_report helper around.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 5380167ca0733dc52b9606af08479ee6a4f527c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5380167ca0733dc52b9606af… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:40 2021 +0200 winebus.sys: Move process_hid_report helper around. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 124 ++++++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index c6d7859dcfa..72e1f7ded5d 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -442,6 +442,68 @@ static DWORD check_bus_option(const UNICODE_STRING *option, DWORD default_value) return default_value; } +static NTSTATUS deliver_last_report(struct device_extension *ext, DWORD buffer_length, BYTE* buffer, ULONG_PTR *out_length) +{ + if (buffer_length < ext->last_report_size) + { + *out_length = 0; + return STATUS_BUFFER_TOO_SMALL; + } + else + { + if (ext->last_report) + memcpy(buffer, ext->last_report, ext->last_report_size); + *out_length = ext->last_report_size; + return STATUS_SUCCESS; + } +} + +void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) +{ + struct device_extension *ext = (struct device_extension*)device->DeviceExtension; + IRP *irp; + LIST_ENTRY *entry; + + if (!length || !report) + return; + + EnterCriticalSection(&ext->cs); + if (length > ext->buffer_size) + { + HeapFree(GetProcessHeap(), 0, ext->last_report); + ext->last_report = HeapAlloc(GetProcessHeap(), 0, length); + if (!ext->last_report) + { + ERR_(hid_report)("Failed to alloc last report\n"); + ext->buffer_size = 0; + ext->last_report_size = 0; + ext->last_report_read = TRUE; + LeaveCriticalSection(&ext->cs); + return; + } + else + ext->buffer_size = length; + } + + memcpy(ext->last_report, report, length); + ext->last_report_size = length; + ext->last_report_read = FALSE; + + while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) + { + IO_STACK_LOCATION *irpsp; + TRACE_(hid_report)("Processing Request\n"); + irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + irpsp = IoGetCurrentIrpStackLocation(irp); + irp->IoStatus.Status = deliver_last_report(ext, + irpsp->Parameters.DeviceIoControl.OutputBufferLength, + irp->UserBuffer, &irp->IoStatus.Information); + ext->last_report_read = TRUE; + IoCompleteRequest(irp, IO_NO_INCREMENT); + } + LeaveCriticalSection(&ext->cs); +} + static NTSTATUS handle_IRP_MN_QUERY_DEVICE_RELATIONS(IRP *irp) { NTSTATUS status = irp->IoStatus.Status; @@ -794,22 +856,6 @@ static NTSTATUS WINAPI common_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) return pdo_pnp_dispatch(device, irp); } -static NTSTATUS deliver_last_report(struct device_extension *ext, DWORD buffer_length, BYTE* buffer, ULONG_PTR *out_length) -{ - if (buffer_length < ext->last_report_size) - { - *out_length = 0; - return STATUS_BUFFER_TOO_SMALL; - } - else - { - if (ext->last_report) - memcpy(buffer, ext->last_report, ext->last_report_size); - *out_length = ext->last_report_size; - return STATUS_SUCCESS; - } -} - static NTSTATUS hid_get_device_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD buffer_len) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; @@ -996,52 +1042,6 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) return status; } -void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) -{ - struct device_extension *ext = (struct device_extension*)device->DeviceExtension; - IRP *irp; - LIST_ENTRY *entry; - - if (!length || !report) - return; - - EnterCriticalSection(&ext->cs); - if (length > ext->buffer_size) - { - HeapFree(GetProcessHeap(), 0, ext->last_report); - ext->last_report = HeapAlloc(GetProcessHeap(), 0, length); - if (!ext->last_report) - { - ERR_(hid_report)("Failed to alloc last report\n"); - ext->buffer_size = 0; - ext->last_report_size = 0; - ext->last_report_read = TRUE; - LeaveCriticalSection(&ext->cs); - return; - } - else - ext->buffer_size = length; - } - - memcpy(ext->last_report, report, length); - ext->last_report_size = length; - ext->last_report_read = FALSE; - - while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) - { - IO_STACK_LOCATION *irpsp; - TRACE_(hid_report)("Processing Request\n"); - irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); - irpsp = IoGetCurrentIrpStackLocation(irp); - irp->IoStatus.Status = deliver_last_report(ext, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - irp->UserBuffer, &irp->IoStatus.Information); - ext->last_report_read = TRUE; - IoCompleteRequest(irp, IO_NO_INCREMENT); - } - LeaveCriticalSection(&ext->cs); -} - BOOL is_xbox_gamepad(WORD vid, WORD pid) { int i;

1 0

Jan Sikorski : wined3d: Avoid stalling the pipeline on 3D blits.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: bb285f56f9ca843c58ee37328027c9611f2587d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb285f56f9ca843c58ee3732… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Sep 10 15:58:43 2021 +0200 wined3d: Avoid stalling the pipeline on 3D blits. Load the source texture to WINED3D_LOCATION_BUFFER, so that the copy is GPU-side only. 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 | 12 +++++++++--- dlls/wined3d/texture.c | 10 +++++++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 51e5055c4ab..1f03833e0ed 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2550,6 +2550,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * unsigned int row_pitch, slice_pitch; struct wined3d_context *context; struct wined3d_bo_address addr; + unsigned int location; if (op->flags & ~WINED3D_BLT_RAW) { @@ -2582,11 +2583,16 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * context = context_acquire(cs->c.device, NULL, 0); + location = src_texture->resource.map_binding; + if (location == WINED3D_LOCATION_SYSMEM + && wined3d_texture_can_use_pbo(src_texture, &context->device->adapter->d3d_info)) + location = WINED3D_LOCATION_BUFFER; + if (!wined3d_texture_load_location(src_texture, op->src_sub_resource_idx, - context, src_texture->resource.map_binding)) + context, location)) { ERR("Failed to load source sub-resource into %s.\n", - wined3d_debug_location(src_texture->resource.map_binding)); + wined3d_debug_location(location)); context_release(context); goto error; } @@ -2607,7 +2613,7 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * goto error; } - wined3d_texture_get_memory(src_texture, op->src_sub_resource_idx, &addr, src_texture->resource.map_binding); + wined3d_texture_get_memory(src_texture, op->src_sub_resource_idx, &addr, location); wined3d_texture_get_pitch(src_texture, op->src_sub_resource_idx % src_texture->level_count, &row_pitch, &slice_pitch); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d3de37e75db..99a2efa1525 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -47,12 +47,20 @@ struct wined3d_rect_f float b; }; -static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_d3d_info *d3d_info) +BOOL wined3d_texture_can_use_pbo(const struct wined3d_texture *texture, const struct wined3d_d3d_info *d3d_info) { if (!d3d_info->pbo || texture->resource.format->conv_byte_count || (texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED))) return FALSE; + return TRUE; +} + +static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_d3d_info *d3d_info) +{ + if (!wined3d_texture_can_use_pbo(texture, d3d_info)) + return FALSE; + /* Use a PBO for dynamic textures and read-only staging textures. */ return (!(texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) && texture->resource.usage & WINED3DUSAGE_DYNAMIC) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index df9cfc284b9..85e8261e840 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4402,6 +4402,8 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; +BOOL wined3d_texture_can_use_pbo(const struct wined3d_texture *texture, const struct wined3d_d3d_info *d3d_info) + DECLSPEC_HIDDEN; void wined3d_texture_sub_resources_destroyed(struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_texture_translate_drawable_coords(const struct wined3d_texture *texture, HWND window, RECT *rect) DECLSPEC_HIDDEN;

1 0

Jan Sikorski : wined3d: Avoid the pipeline barrier when mapping buffer objects backing textures.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 752551fa309553259887280c40da8ca424f49d37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=752551fa309553259887280c… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Sep 10 15:58:42 2021 +0200 wined3d: Avoid the pipeline barrier when mapping buffer objects backing textures. 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 | 43 +++++++++++++++++++++++------------------- dlls/wined3d/context_vk.c | 2 ++ dlls/wined3d/texture.c | 9 +++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 36 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 69a93f88435..18c73312daf 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -934,9 +934,11 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, { if (wined3d_context_vk_create_bo(context_vk, bo->size, bo->usage, bo->memory_type, &tmp)) { + bool host_synced = bo->host_synced; list_move_head(&tmp.users, &bo->users); wined3d_context_vk_destroy_bo(context_vk, bo); *bo = tmp; + bo->host_synced = host_synced; list_init(&bo->users); list_move_head(&bo->users, &tmp.users); LIST_FOR_EACH_ENTRY(bo_user, &bo->users, struct wined3d_bo_user, entry) @@ -952,25 +954,30 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, if (map_flags & WINED3D_MAP_READ) { - if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + if (!bo->host_synced) { - ERR("Failed to get command buffer.\n"); - return NULL; - } - - wined3d_context_vk_end_current_render_pass(context_vk); + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return NULL; + } - vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; - vk_barrier.pNext = NULL; - vk_barrier.srcAccessMask = vk_access_mask_from_buffer_usage(bo->usage); - vk_barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; - vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vk_barrier.buffer = bo->vk_buffer; - vk_barrier.offset = bo->buffer_offset + (uintptr_t)data->addr; - vk_barrier.size = size; - VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, - VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + wined3d_context_vk_end_current_render_pass(context_vk); + + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier.pNext = NULL; + vk_barrier.srcAccessMask = vk_access_mask_from_buffer_usage(bo->usage); + vk_barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; + vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.buffer = bo->vk_buffer; + vk_barrier.offset = bo->buffer_offset + (uintptr_t)data->addr; + vk_barrier.size = size; + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + + wined3d_context_vk_reference_bo(context_vk, bo); + } if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) { @@ -981,8 +988,6 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, range.size = size; VK_CALL(vkInvalidateMappedMemoryRanges(device_vk->vk_device, 1, &range)); } - - wined3d_context_vk_reference_bo(context_vk, bo); } if (bo->command_buffer_id == context_vk->current_command_buffer.id) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 705f789ed5f..aeaeca322ff 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -415,6 +415,7 @@ static bool wined3d_context_vk_create_slab_bo(struct wined3d_context_vk *context bo->size = size; list_init(&bo->users); bo->command_buffer_id = 0; + bo->host_synced = false; TRACE("Using buffer 0x%s, memory 0x%s, offset 0x%s for bo %p.\n", wine_dbgstr_longlong(bo->vk_buffer), wine_dbgstr_longlong(bo->vk_memory), @@ -494,6 +495,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic list_init(&bo->users); bo->command_buffer_id = 0; bo->slab = NULL; + bo->host_synced = false; TRACE("Created buffer 0x%s, memory 0x%s for bo %p.\n", wine_dbgstr_longlong(bo->vk_buffer), wine_dbgstr_longlong(bo->vk_memory), bo); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 580bbd207e3..d3de37e75db 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5019,6 +5019,12 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, vk_barrier.dstAccessMask = vk_barrier.srcAccessMask; vk_barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT; + if (dst_bo->host_synced) + { + vk_barrier.srcAccessMask |= VK_ACCESS_HOST_READ_BIT; + bo_stage_flags |= VK_PIPELINE_STAGE_HOST_BIT; + } + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, bo_stage_flags, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); } @@ -5198,6 +5204,9 @@ static BOOL wined3d_texture_vk_prepare_buffer_object(struct wined3d_texture_vk * VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, bo)) return FALSE; + /* Texture buffer objects receive a barrier to HOST_READ in wined3d_texture_vk_download_data(), + * so they don't need it when they are mapped for reading. */ + bo->host_synced = true; TRACE("Created buffer object %p for texture %p, sub-resource %u.\n", bo, texture_vk, sub_resource_idx); return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f2b967e82ad..df9cfc284b9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1627,6 +1627,7 @@ struct wined3d_bo_vk struct list users; uint64_t command_buffer_id; + bool host_synced; }; struct wined3d_bo_slab_vk_key

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2021