February 2024 - Wine-Commits

Alexandre Julliard : ntdll: Move the dynamic unwind tables to unwind.c.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 8602a1c24e887b310339a4b75dafe2fbf810a93c URL: https://gitlab.winehq.org/wine/wine/-/commit/8602a1c24e887b310339a4b75dafe2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 19:03:46 2024 +0100 ntdll: Move the dynamic unwind tables to unwind.c. --- dlls/ntdll/exception.c | 204 -------------------------------------- dlls/ntdll/ntdll_misc.h | 4 - dlls/ntdll/signal_arm.c | 13 --- dlls/ntdll/signal_arm64.c | 13 --- dlls/ntdll/signal_arm64ec.c | 29 ------ dlls/ntdll/signal_x86_64.c | 13 --- dlls/ntdll/unwind.c | 234 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 234 insertions(+), 276 deletions(-)

1 0

Rémi Bernon : mouhid.sys: Request preparsed data and inspect device caps.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: a05b67b7e5e63bbe3eabc4aa1b071869160023c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/a05b67b7e5e63bbe3eabc4aa1b0718… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 12:33:18 2024 +0100 mouhid.sys: Request preparsed data and inspect device caps. --- dlls/dinput/tests/device8.c | 1 - dlls/mouhid.sys/Makefile.in | 2 +- dlls/mouhid.sys/main.c | 119 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 120 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index fa5b800b74f..2c44bb4c5c6 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -1906,7 +1906,6 @@ static void test_hid_touch_screen(void) .report_id = 1, .report_len = 2, .report_buf = {1,0x02}, - .todo = TRUE, }; RAWINPUTDEVICE rawdevice = {.usUsagePage = HID_USAGE_PAGE_DIGITIZER, .usUsage = HID_USAGE_DIGITIZER_TOUCH_SCREEN}; diff --git a/dlls/mouhid.sys/Makefile.in b/dlls/mouhid.sys/Makefile.in index 0003f6f5494..331486bc104 100644 --- a/dlls/mouhid.sys/Makefile.in +++ b/dlls/mouhid.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = mouhid.sys -IMPORTS = ntoskrnl +IMPORTS = ntoskrnl hidparse EXTRADLLFLAGS = -Wl,--subsystem,native SOURCES = \ diff --git a/dlls/mouhid.sys/main.c b/dlls/mouhid.sys/main.c index af54ffbd70b..f652857f7ac 100644 --- a/dlls/mouhid.sys/main.c +++ b/dlls/mouhid.sys/main.c @@ -42,6 +42,13 @@ struct device { LONG removed; DEVICE_OBJECT *bus_device; + PHIDP_PREPARSED_DATA preparsed; + + ULONG caps_count; + ULONG contact_max; + HIDP_VALUE_CAPS *id_caps; + HIDP_VALUE_CAPS *x_caps; + HIDP_VALUE_CAPS *y_caps; }; static inline struct device *impl_from_DEVICE_OBJECT( DEVICE_OBJECT *device ) @@ -49,6 +56,21 @@ static inline struct device *impl_from_DEVICE_OBJECT( DEVICE_OBJECT *device ) return (struct device *)device->DeviceExtension; } +static inline LONG sign_extend( ULONG value, const HIDP_VALUE_CAPS *caps ) +{ + UINT sign = 1 << (caps->BitSize - 1); + if (sign <= 1 || caps->LogicalMin >= 0) return value; + return value - ((value & sign) << 1); +} + +static inline LONG scale_value( ULONG value, const HIDP_VALUE_CAPS *caps, LONG min, LONG max ) +{ + LONG tmp = sign_extend( value, caps ); + if (caps->LogicalMin > caps->LogicalMax) return 0; + if (caps->LogicalMin > tmp || caps->LogicalMax < tmp) return 0; + return min + MulDiv( tmp - caps->LogicalMin, max - min, caps->LogicalMax - caps->LogicalMin ); +} + static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -69,6 +91,98 @@ static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) return IoCallDriver( impl->bus_device, irp ); } +static NTSTATUS call_hid_device( DEVICE_OBJECT *device, DWORD major, DWORD code, void *in_buf, + DWORD in_len, void *out_buf, DWORD out_len ) +{ + struct device *impl = impl_from_DEVICE_OBJECT( device ); + IO_STATUS_BLOCK io; + NTSTATUS status; + KEVENT event; + IRP *irp; + + KeInitializeEvent( &event, NotificationEvent, FALSE ); + irp = IoBuildDeviceIoControlRequest( code, device, in_buf, in_len, out_buf, out_len, + FALSE, &event, &io ); + if (!irp) return STATUS_NO_MEMORY; + + status = IoCallDriver( impl->bus_device, irp ); + if (status == STATUS_PENDING) KeWaitForSingleObject( &event, Executive, KernelMode, FALSE, NULL ); + return io.Status; +} + +static NTSTATUS initialize_device( DEVICE_OBJECT *device ) +{ + struct device *impl = impl_from_DEVICE_OBJECT( device ); + HID_COLLECTION_INFORMATION info; + USHORT usage, count, report_len; + HIDP_VALUE_CAPS value_caps; + char *report_buf; + NTSTATUS status; + HIDP_CAPS caps; + + if ((status = call_hid_device( device, IRP_MJ_DEVICE_CONTROL, IOCTL_HID_GET_COLLECTION_INFORMATION, + &info, 0, &info, sizeof(info) ))) + return status; + if (!(impl->preparsed = malloc( info.DescriptorSize ))) return STATUS_NO_MEMORY; + if ((status = call_hid_device( device, IRP_MJ_DEVICE_CONTROL, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, + NULL, 0, impl->preparsed, info.DescriptorSize ))) + return status; + + status = HidP_GetCaps( impl->preparsed, &caps ); + if (status != HIDP_STATUS_SUCCESS) return status; + + count = 1; + usage = HID_USAGE_DIGITIZER_CONTACT_COUNT_MAX; + status = HidP_GetSpecificValueCaps( HidP_Feature, HID_USAGE_PAGE_DIGITIZER, 0, usage, + &value_caps, &count, impl->preparsed ); + if (status == HIDP_STATUS_SUCCESS) + { + report_len = caps.FeatureReportByteLength; + if (!(report_buf = malloc( report_len ))) return STATUS_NO_MEMORY; + report_buf[0] = value_caps.ReportID; + + status = call_hid_device( device, IRP_MJ_DEVICE_CONTROL, IOCTL_HID_GET_FEATURE, NULL, 0, report_buf, report_len ); + if (!status) status = HidP_GetUsageValue( HidP_Feature, HID_USAGE_PAGE_DIGITIZER, 0, usage, + &impl->contact_max, impl->preparsed, report_buf, report_len ); + free( report_buf ); + if (status && status != HIDP_STATUS_SUCCESS) return status; + + count = 1; + usage = HID_USAGE_DIGITIZER_CONTACT_COUNT; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_DIGITIZER, 0, usage, + &value_caps, &count, impl->preparsed ); + if (status != HIDP_STATUS_SUCCESS) goto failed; + + count = caps.NumberLinkCollectionNodes; + usage = HID_USAGE_DIGITIZER_CONTACT_ID; + if (!(impl->id_caps = malloc( sizeof(*impl->id_caps) * caps.NumberLinkCollectionNodes ))) return STATUS_NO_MEMORY; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_DIGITIZER, 0, usage, + impl->id_caps, &count, impl->preparsed ); + if (status != HIDP_STATUS_SUCCESS) goto failed; + impl->caps_count = count; + + count = impl->caps_count; + usage = HID_USAGE_GENERIC_X; + if (!(impl->x_caps = malloc( sizeof(*impl->x_caps) * impl->caps_count ))) return STATUS_NO_MEMORY; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, usage, + impl->x_caps, &count, impl->preparsed ); + if (status != HIDP_STATUS_SUCCESS) goto failed; + + count = impl->caps_count; + usage = HID_USAGE_GENERIC_Y; + if (!(impl->y_caps = malloc( sizeof(*impl->y_caps) * impl->caps_count ))) return STATUS_NO_MEMORY; + status = HidP_GetSpecificValueCaps( HidP_Input, HID_USAGE_PAGE_GENERIC, 0, usage, + impl->y_caps, &count, impl->preparsed ); + if (status != HIDP_STATUS_SUCCESS) goto failed; + + return STATUS_SUCCESS; + } + +failed: + ERR( "%#x usage not found, unsupported device\n", usage ); + return STATUS_NOT_SUPPORTED; +} + static NTSTATUS WINAPI set_event_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { if (irp->PendingReturned) KeSetEvent( (KEVENT *)context, IO_NO_INCREMENT, FALSE ); @@ -98,6 +212,7 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) KeWaitForSingleObject( &event, Executive, KernelMode, FALSE, NULL ); status = irp->IoStatus.Status; } + if (!status) status = initialize_device( device ); if (status) irp->IoStatus.Status = status; IoCompleteRequest( irp, IO_NO_INCREMENT ); @@ -111,6 +226,10 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) IoSkipCurrentIrpStackLocation( irp ); status = IoCallDriver( impl->bus_device, irp ); IoDetachDevice( impl->bus_device ); + free( impl->id_caps ); + free( impl->x_caps ); + free( impl->y_caps ); + free( impl->preparsed ); IoDeleteDevice( device ); return status;

1 0

Rémi Bernon : mouhid.sys: Read reports from the underlying HID device.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 683710fbc7a9e61da15f5896fc4c4ae073d8d803 URL: https://gitlab.winehq.org/wine/wine/-/commit/683710fbc7a9e61da15f5896fc4c4a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 11:38:46 2024 +0100 mouhid.sys: Read reports from the underlying HID device. --- dlls/mouhid.sys/main.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/mouhid.sys/main.c b/dlls/mouhid.sys/main.c index f652857f7ac..247740301a5 100644 --- a/dlls/mouhid.sys/main.c +++ b/dlls/mouhid.sys/main.c @@ -44,6 +44,11 @@ struct device DEVICE_OBJECT *bus_device; PHIDP_PREPARSED_DATA preparsed; + FILE_OBJECT dummy_file; + IO_STATUS_BLOCK io; + ULONG report_len; + char *report_buf; + ULONG caps_count; ULONG contact_max; HIDP_VALUE_CAPS *id_caps; @@ -71,6 +76,71 @@ static inline LONG scale_value( ULONG value, const HIDP_VALUE_CAPS *caps, LONG m return min + MulDiv( tmp - caps->LogicalMin, max - min, caps->LogicalMax - caps->LogicalMin ); } +static NTSTATUS WINAPI read_completion( DEVICE_OBJECT *device, IRP *irp, void *context ); + +static NTSTATUS start_device_read( DEVICE_OBJECT *device ) +{ + struct device *impl = impl_from_DEVICE_OBJECT( device ); + IO_STACK_LOCATION *stack; + NTSTATUS status; + IRP *irp; + + TRACE( "device %p\n", device ); + + irp = IoBuildAsynchronousFsdRequest( IRP_MJ_READ, device, impl->report_buf, + impl->report_len, NULL, &impl->io ); + if (!irp) return STATUS_NO_MEMORY; + irp->Tail.Overlay.OriginalFileObject = &impl->dummy_file; + stack = IoGetNextIrpStackLocation( irp ); + stack->FileObject = &impl->dummy_file; + + TRACE( "created irp %p\n", irp ); + + IoSetCompletionRoutine( irp, read_completion, device, TRUE, TRUE, TRUE ); + if ((status = IoCallDriver( impl->bus_device, irp )) && status != STATUS_PENDING) return status; + return STATUS_SUCCESS; +} + +static void process_hid_report( struct device *impl, char *report_buf, UINT report_len ) +{ + ULONG contact_count; + NTSTATUS status; + + TRACE( "impl %p, report_buf %p, report_len %u\n", impl, report_buf, report_len ); + + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_DIGITIZER, 0, HID_USAGE_DIGITIZER_CONTACT_COUNT, + &contact_count, impl->preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) return; + if (contact_count > impl->contact_max) + { + WARN( "got %lu contacts, capping to %lu.\n", contact_count, impl->contact_max ); + contact_count = impl->contact_max; + } + + FIXME( "Not implemented\n" ); +} + +static NTSTATUS WINAPI read_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) +{ + struct device *impl = impl_from_DEVICE_OBJECT( context ); + NTSTATUS status; + + TRACE( "device %p, irp %p, context %p\n", device, irp, context ); + + if (irp->IoStatus.Status) + WARN( "device read failed with status %#lx, stopping\n", irp->IoStatus.Status ); + else + { + process_hid_report( impl, impl->report_buf, impl->report_len ); + + if (!InterlockedOr( &impl->removed, FALSE ) && (status = start_device_read( context ))) + ERR( "Failed to start next read, status %#lx\n", status ); + } + + if (irp->PendingReturned) IoMarkIrpPending( irp ); + return STATUS_SUCCESS; +} + static NTSTATUS WINAPI driver_ioctl( DEVICE_OBJECT *device, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -95,16 +165,26 @@ static NTSTATUS call_hid_device( DEVICE_OBJECT *device, DWORD major, DWORD code, DWORD in_len, void *out_buf, DWORD out_len ) { struct device *impl = impl_from_DEVICE_OBJECT( device ); + IO_STACK_LOCATION *stack; IO_STATUS_BLOCK io; NTSTATUS status; KEVENT event; IRP *irp; KeInitializeEvent( &event, NotificationEvent, FALSE ); - irp = IoBuildDeviceIoControlRequest( code, device, in_buf, in_len, out_buf, out_len, - FALSE, &event, &io ); + if (major == IRP_MJ_DEVICE_CONTROL) + irp = IoBuildDeviceIoControlRequest( code, device, in_buf, in_len, out_buf, out_len, + FALSE, &event, &io ); + else + irp = IoBuildSynchronousFsdRequest( code, device, out_buf, out_len, NULL, &event, &io ); if (!irp) return STATUS_NO_MEMORY; + irp->Tail.Overlay.OriginalFileObject = &impl->dummy_file; + if (code == IRP_MJ_CREATE) irp->Flags |= IRP_CREATE_OPERATION; + if (code == IRP_MJ_CLOSE) irp->Flags |= IRP_CLOSE_OPERATION; + stack = IoGetNextIrpStackLocation( irp ); + stack->FileObject = &impl->dummy_file; + status = IoCallDriver( impl->bus_device, irp ); if (status == STATUS_PENDING) KeWaitForSingleObject( &event, Executive, KernelMode, FALSE, NULL ); return io.Status; @@ -120,6 +200,7 @@ static NTSTATUS initialize_device( DEVICE_OBJECT *device ) NTSTATUS status; HIDP_CAPS caps; + if ((status = call_hid_device( device, IRP_MJ_CREATE, 0, NULL, 0, NULL, 0 ))) return status; if ((status = call_hid_device( device, IRP_MJ_DEVICE_CONTROL, IOCTL_HID_GET_COLLECTION_INFORMATION, &info, 0, &info, sizeof(info) ))) return status; @@ -175,6 +256,10 @@ static NTSTATUS initialize_device( DEVICE_OBJECT *device ) impl->y_caps, &count, impl->preparsed ); if (status != HIDP_STATUS_SUCCESS) goto failed; + impl->report_len = caps.InputReportByteLength; + if (!(impl->report_buf = malloc( impl->report_len ))) return STATUS_NO_MEMORY; + impl->report_buf[0] = value_caps.ReportID; + return STATUS_SUCCESS; } @@ -213,6 +298,7 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) status = irp->IoStatus.Status; } if (!status) status = initialize_device( device ); + if (!status) status = start_device_read( device ); if (status) irp->IoStatus.Status = status; IoCompleteRequest( irp, IO_NO_INCREMENT ); @@ -220,6 +306,8 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) case IRP_MN_SURPRISE_REMOVAL: status = STATUS_SUCCESS; + if (InterlockedExchange( &impl->removed, TRUE )) break; + call_hid_device( device, IRP_MJ_CLOSE, 0, NULL, 0, NULL, 0 ); break; case IRP_MN_REMOVE_DEVICE: @@ -229,6 +317,7 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) free( impl->id_caps ); free( impl->x_caps ); free( impl->y_caps ); + free( impl->report_buf ); free( impl->preparsed ); IoDeleteDevice( device ); return status;

1 0

Rémi Bernon : mouhid.sys: Parse HID reports to track contact points.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: d88f92eb4e5f149e7d2d91a5546a875ad8085eff URL: https://gitlab.winehq.org/wine/wine/-/commit/d88f92eb4e5f149e7d2d91a5546a87… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 11:31:37 2024 +0100 mouhid.sys: Parse HID reports to track contact points. --- dlls/mouhid.sys/main.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/mouhid.sys/main.c b/dlls/mouhid.sys/main.c index 247740301a5..c1b4288e1dd 100644 --- a/dlls/mouhid.sys/main.c +++ b/dlls/mouhid.sys/main.c @@ -38,6 +38,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); +struct contact +{ + struct list entry; + ULONG id; + POINT pos; +}; + struct device { LONG removed; @@ -49,6 +56,9 @@ struct device ULONG report_len; char *report_buf; + ULONG contact_count; + struct list contacts; + ULONG caps_count; ULONG contact_max; HIDP_VALUE_CAPS *id_caps; @@ -101,10 +111,56 @@ static NTSTATUS start_device_read( DEVICE_OBJECT *device ) return STATUS_SUCCESS; } +static void add_contact( struct device *impl, struct list *old_contacts, ULONG id, LONG x, LONG y ) +{ + struct contact *contact; + + LIST_FOR_EACH_ENTRY( contact, old_contacts, struct contact, entry ) + if (contact->id == id) break; + + if (&contact->entry != old_contacts) + { + list_remove( &contact->entry ); + + contact->pos.x = x; + contact->pos.y = y; + TRACE( "updating contact %#lx, pos %s\n", contact->id, wine_dbgstr_point( &contact->pos ) ); + } + else if ((contact = calloc( 1, sizeof(*contact) ))) + { + contact->id = id; + contact->pos.x = x; + contact->pos.y = y; + TRACE( "new contact %#lx, pos %s\n", contact->id, wine_dbgstr_point( &contact->pos ) ); + } + else + { + ERR( "failed to allocate new contact\n" ); + return; + } + + list_add_tail( &impl->contacts, &contact->entry ); +} + +static void release_contacts( struct list *contacts ) +{ + struct contact *contact, *next; + + LIST_FOR_EACH_ENTRY_SAFE( contact, next, contacts, struct contact, entry ) + { + TRACE( "releasing contact %#lx, pos %s\n", contact->id, wine_dbgstr_point( &contact->pos ) ); + list_remove( &contact->entry ); + free( contact ); + } +} + static void process_hid_report( struct device *impl, char *report_buf, UINT report_len ) { - ULONG contact_count; + struct list old_contacts = LIST_INIT( old_contacts ); + ULONG i, value, contact_count, usage_count, id; + LONG x = 0, y = 0; NTSTATUS status; + USHORT usage; TRACE( "impl %p, report_buf %p, report_len %u\n", impl, report_buf, report_len ); @@ -117,7 +173,36 @@ static void process_hid_report( struct device *impl, char *report_buf, UINT repo contact_count = impl->contact_max; } - FIXME( "Not implemented\n" ); + list_move_tail( &old_contacts, &impl->contacts ); + + for (i = 0; i < impl->caps_count; i++) + { + USHORT collection = impl->id_caps[i].LinkCollection; + + usage_count = 1; + usage = HID_USAGE_DIGITIZER_TIP_SWITCH; + status = HidP_GetUsages( HidP_Input, HID_USAGE_PAGE_DIGITIZER, collection, &usage, &usage_count, + impl->preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS || !usage_count) continue; + + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_DIGITIZER, collection, HID_USAGE_DIGITIZER_CONTACT_ID, + &id, impl->preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) continue; + + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, collection, HID_USAGE_GENERIC_X, + &value, impl->preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) continue; + else x = scale_value( value, impl->x_caps + i, 0, 65535 ); + + status = HidP_GetUsageValue( HidP_Input, HID_USAGE_PAGE_GENERIC, collection, HID_USAGE_GENERIC_Y, + &value, impl->preparsed, report_buf, report_len ); + if (status != HIDP_STATUS_SUCCESS) continue; + else y = scale_value( value, impl->y_caps + i, 0, 65535 ); + + add_contact( impl, &old_contacts, id, x, y ); + } + + release_contacts( &old_contacts ); } static NTSTATUS WINAPI read_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) @@ -200,6 +285,8 @@ static NTSTATUS initialize_device( DEVICE_OBJECT *device ) NTSTATUS status; HIDP_CAPS caps; + list_init( &impl->contacts ); + if ((status = call_hid_device( device, IRP_MJ_CREATE, 0, NULL, 0, NULL, 0 ))) return status; if ((status = call_hid_device( device, IRP_MJ_DEVICE_CONTROL, IOCTL_HID_GET_COLLECTION_INFORMATION, &info, 0, &info, sizeof(info) ))) @@ -314,6 +401,7 @@ static NTSTATUS WINAPI driver_pnp( DEVICE_OBJECT *device, IRP *irp ) IoSkipCurrentIrpStackLocation( irp ); status = IoCallDriver( impl->bus_device, irp ); IoDetachDevice( impl->bus_device ); + release_contacts( &impl->contacts ); free( impl->id_caps ); free( impl->x_caps ); free( impl->y_caps );

1 0

Alexandre Julliard : ntdll: Move exception unwinding code to a separate file.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: a5a253820f3a4a21e2eafc80e4f9a80540c87d68 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5a253820f3a4a21e2eafc80e4f9a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 12:38:05 2024 +0100 ntdll: Move exception unwinding code to a separate file. --- dlls/ntdll/Makefile.in | 1 + dlls/ntdll/signal_arm.c | 626 ---------------- dlls/ntdll/signal_arm64.c | 537 -------------- dlls/ntdll/signal_arm64ec.c | 100 --- dlls/ntdll/signal_x86_64.c | 530 -------------- dlls/ntdll/unwind.c | 1685 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 1686 insertions(+), 1793 deletions(-)

1 0

Alexandre Julliard : ntdll: Move RtlUnwind to unwind.c.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 3b85ab31a9179f46de12ab4cc8807eb8f701efc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b85ab31a9179f46de12ab4cc8807e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 14 19:13:27 2024 +0100 ntdll: Move RtlUnwind to unwind.c. --- dlls/ntdll/ntdll.spec | 2 +- dlls/ntdll/signal_arm.c | 19 ------------------- dlls/ntdll/signal_arm64.c | 18 ------------------ dlls/ntdll/signal_arm64ec.c | 19 ------------------- dlls/ntdll/signal_x86_64.c | 19 ------------------- dlls/ntdll/unwind.c | 24 ++++++++++++++++++++++++ 6 files changed, 25 insertions(+), 76 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ccd270fee95..66995346e57 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1513,7 +1513,7 @@ @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) -@ stdcall -arch=arm __jump_unwind(ptr ptr) +@ stdcall -arch=arm __jump_unwind(ptr ptr) _local_unwind @ cdecl __toascii(long) @ cdecl -norelay -arch=i386 -ret64 _alldiv(int64 int64) @ cdecl -arch=i386 -norelay _alldvrm(int64 int64) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 12ab2860fa7..b07f91464a9 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -827,25 +827,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/*********************************************************************** - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); -} - - -/******************************************************************* - * __jump_unwind (NTDLL.@) - */ -void WINAPI __jump_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PEXCEPTION_FILTER filter, PUCHAR nonvolatile); diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 53d8cbfe304..0d6a88ed799 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -841,24 +841,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/*********************************************************************** - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); -} - -/******************************************************************* - * _local_unwind (NTDLL.@) - */ -void WINAPI _local_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - extern LONG __C_ExecuteExceptionFilter(PEXCEPTION_POINTERS ptrs, PVOID frame, PEXCEPTION_FILTER filter, PUCHAR nonvolatile); diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 8b4fd399c09..3f1869a644f 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1792,25 +1792,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/******************************************************************* - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - FIXME( "not implemented\n" ); -} - - -/******************************************************************* - * _local_unwind (NTDLL.@) - */ -void WINAPI _local_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - - /******************************************************************* * __C_specific_handler (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1dc4c9b75df..1396887bcc9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -981,25 +981,6 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec } -/******************************************************************* - * RtlUnwind (NTDLL.@) - */ -void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); -} - - -/******************************************************************* - * _local_unwind (NTDLL.@) - */ -void WINAPI _local_unwind( void *frame, void *target_ip ) -{ - CONTEXT context; - RtlUnwindEx( frame, target_ip, NULL, NULL, &context, NULL ); -} - /******************************************************************* * __C_specific_handler (NTDLL.@) */ diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 42b119544fa..db95f12ebb2 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -1916,4 +1916,28 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_P #endif /* __x86_64__ */ + +/*********************************************************************** + * Generic unwind functions + */ + + +/*********************************************************************** + * RtlUnwind (NTDLL.@) + */ +void WINAPI RtlUnwind( void *frame, void *target_ip, EXCEPTION_RECORD *rec, void *retval ) +{ + CONTEXT context; + RtlUnwindEx( frame, target_ip, rec, retval, &context, NULL ); +} + + +/******************************************************************* + * _local_unwind (NTDLL.@) + */ +void WINAPI _local_unwind( void *frame, void *target_ip ) +{ + RtlUnwind( frame, target_ip, NULL, NULL ); +} + #endif /* !__i386__ */

1 0

Alex Henrie : rpcrt4/tests: Use CRT allocation functions.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: a38e05636df9596ff3e41301c771fe93523808f1 URL: https://gitlab.winehq.org/wine/wine/-/commit/a38e05636df9596ff3e41301c771fe… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 6 00:10:47 2023 -0700 rpcrt4/tests: Use CRT allocation functions. --- dlls/rpcrt4/tests/cstub.c | 7 +-- dlls/rpcrt4/tests/ndr_marshall.c | 116 +++++++++++++++++++-------------------- dlls/rpcrt4/tests/rpc.c | 4 +- dlls/rpcrt4/tests/server.c | 116 ++++++++++++++++++--------------------- 4 files changed, 116 insertions(+), 127 deletions(-)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 998111eca16ca2ba412242d3b705780f28532c13 URL: https://gitlab.winehq.org/wine/wine/-/commit/998111eca16ca2ba412242d3b70578… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Feb 14 00:13:56 2024 +0200 po: Update Lithuanian translation. --- po/lt.po | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/po/lt.po b/po/lt.po index ab2391cf842..eb5073fd86b 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2024-01-26 00:51+0200\n" +"PO-Revision-Date: 2024-02-14 00:13+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -4082,22 +4082,21 @@ msgid "Cannot modify non-writable property '|'" msgstr "Negalima modifikuoti nerašomos savybės „|“" #: dlls/jscript/jscript.rc:80 -#, fuzzy -#| msgid "'this' is not a | object" msgid "'this' is not a DataView object" -msgstr "„Šis“ nėra | objektas" +msgstr "„Šis“ nėra DataView objektas" #: dlls/jscript/jscript.rc:81 msgid "Required argument offset or value in DataView method is not specified" msgstr "" +"DataView metode nenurodytas reikalingas argumentas poslinkis ar reikšmė" #: dlls/jscript/jscript.rc:82 msgid "DataView operation access beyond specified buffer length" -msgstr "" +msgstr "DataView operacijos kreiptis už nurodyto buferio ilgio" #: dlls/jscript/jscript.rc:83 msgid "DataView constructor argument offset is invalid" -msgstr "" +msgstr "DataView konstruktoriaus argumentas poslinkis yra netinkamas" #: dlls/jscript/jscript.rc:84 msgid "'this' is not a | object" @@ -4108,10 +4107,8 @@ msgid "'key' is not an object" msgstr "„raktas“ nėra objektas" #: dlls/jscript/jscript.rc:86 -#, fuzzy -#| msgid "Array object expected" msgid "ArrayBuffer object expected" -msgstr "Tikėtasi masyvo objekto" +msgstr "Tikėtasi ArrayBuffer objekto" #: dlls/jscript/jscript.rc:87 msgid "Property cannot have both accessors and a value"

1 0

Rémi Bernon : hidclass: Make HID hardware ids more similar to windows.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 677107956f984d49679898a29f744442c30dd47d URL: https://gitlab.winehq.org/wine/wine/-/commit/677107956f984d49679898a29f7444… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 14 14:47:49 2024 +0100 hidclass: Make HID hardware ids more similar to windows. --- dlls/hidclass.sys/pnp.c | 156 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 105 insertions(+), 51 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index ab3cd5b2cb5..39714abc6b1 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -372,6 +372,80 @@ static NTSTATUS fdo_pnp(DEVICE_OBJECT *device, IRP *irp) } } +static WCHAR *query_hardware_ids(DEVICE_OBJECT *device) +{ + static const WCHAR vid_pid_format[] = L"HID\\VID_%04X&PID_%04X"; + static const WCHAR vid_usage_format[] = L"HID\\VID_%04X&UP:%04X_U:%04X"; + static const WCHAR usage_format[] = L"HID_DEVICE_UP:%04X_U:%04X"; + static const WCHAR hid_format[] = L"HID_DEVICE"; + + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + HIDP_COLLECTION_DESC *desc = ext->u.pdo.device_desc.CollectionDesc; + HID_COLLECTION_INFORMATION *info = &ext->u.pdo.information; + WCHAR *dst; + DWORD size; + + size = sizeof(vid_pid_format); + size += sizeof(vid_usage_format); + size += sizeof(usage_format); + size += sizeof(hid_format); + + if ((dst = ExAllocatePool(PagedPool, size + sizeof(WCHAR)))) + { + DWORD len = size / sizeof(WCHAR), pos = 0; + pos += swprintf( dst + pos, len - pos, vid_pid_format, info->VendorID, info->ProductID ) + 1; + pos += swprintf( dst + pos, len - pos, vid_usage_format, info->VendorID, desc->UsagePage, desc->Usage ) + 1; + pos += swprintf( dst + pos, len - pos, usage_format, desc->UsagePage, desc->Usage ) + 1; + pos += swprintf( dst + pos, len - pos, hid_format ) + 1; + dst[pos] = 0; + } + + return dst; +} + +static WCHAR *query_compatible_ids(DEVICE_OBJECT *device) +{ + WCHAR *dst; + if ((dst = ExAllocatePool(PagedPool, sizeof(WCHAR)))) dst[0] = 0; + return dst; +} + +static WCHAR *query_device_id(DEVICE_OBJECT *device) +{ + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + DWORD size = (wcslen(ext->device_id) + 1) * sizeof(WCHAR); + WCHAR *dst; + + if ((dst = ExAllocatePool(PagedPool, size))) + memcpy(dst, ext->device_id, size); + + return dst; +} + +static WCHAR *query_instance_id(DEVICE_OBJECT *device) +{ + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + DWORD size = (wcslen(ext->instance_id) + 1) * sizeof(WCHAR); + WCHAR *dst; + + if ((dst = ExAllocatePool(PagedPool, size))) + memcpy(dst, ext->instance_id, size); + + return dst; +} + +static WCHAR *query_container_id(DEVICE_OBJECT *device) +{ + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + DWORD size = (wcslen(ext->container_id) + 1) * sizeof(WCHAR); + WCHAR *dst; + + if ((dst = ExAllocatePool(PagedPool, size))) + memcpy(dst, ext->instance_id, size); + + return dst; +} + static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); @@ -387,60 +461,40 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device, IRP *irp) { case IRP_MN_QUERY_ID: { - WCHAR *id = ExAllocatePool(PagedPool, sizeof(WCHAR) * REGSTR_VAL_MAX_HCID_LEN); - TRACE("IRP_MN_QUERY_ID[%i]\n", irpsp->Parameters.QueryId.IdType); - switch (irpsp->Parameters.QueryId.IdType) + BUS_QUERY_ID_TYPE type = irpsp->Parameters.QueryId.IdType; + switch (type) { - case BusQueryHardwareIDs: - case BusQueryCompatibleIDs: + case BusQueryHardwareIDs: + irp->IoStatus.Information = (ULONG_PTR)query_hardware_ids(device); + if (!irp->IoStatus.Information) status = STATUS_NO_MEMORY; + else status = STATUS_SUCCESS; + break; + case BusQueryCompatibleIDs: + irp->IoStatus.Information = (ULONG_PTR)query_compatible_ids(device); + if (!irp->IoStatus.Information) status = STATUS_NO_MEMORY; + else status = STATUS_SUCCESS; + break; + case BusQueryDeviceID: + irp->IoStatus.Information = (ULONG_PTR)query_device_id(device); + if (!irp->IoStatus.Information) status = STATUS_NO_MEMORY; + else status = STATUS_SUCCESS; + break; + case BusQueryInstanceID: + irp->IoStatus.Information = (ULONG_PTR)query_instance_id(device); + if (!irp->IoStatus.Information) status = STATUS_NO_MEMORY; + else status = STATUS_SUCCESS; + break; + case BusQueryContainerID: + if (ext->container_id[0]) { - WCHAR *ptr; - ptr = id; - /* Device instance ID */ - lstrcpyW(ptr, ext->device_id); - ptr += lstrlenW(ext->device_id); - lstrcpyW(ptr, L"\\"); - ptr += 1; - lstrcpyW(ptr, ext->instance_id); - ptr += lstrlenW(ext->instance_id) + 1; - /* Device ID */ - lstrcpyW(ptr, ext->device_id); - ptr += lstrlenW(ext->device_id) + 1; - /* Bus ID */ - lstrcpyW(ptr, L"HID"); - ptr += lstrlenW(L"HID") + 1; - *ptr = 0; - irp->IoStatus.Information = (ULONG_PTR)id; - status = STATUS_SUCCESS; - break; + irp->IoStatus.Information = (ULONG_PTR)query_container_id(device); + if (!irp->IoStatus.Information) status = STATUS_NO_MEMORY; + else status = STATUS_SUCCESS; } - case BusQueryDeviceID: - lstrcpyW(id, ext->device_id); - irp->IoStatus.Information = (ULONG_PTR)id; - status = STATUS_SUCCESS; - break; - case BusQueryInstanceID: - lstrcpyW(id, ext->instance_id); - irp->IoStatus.Information = (ULONG_PTR)id; - status = STATUS_SUCCESS; - break; - case BusQueryContainerID: - if (ext->container_id[0]) - { - lstrcpyW(id, ext->container_id); - irp->IoStatus.Information = (ULONG_PTR)id; - status = STATUS_SUCCESS; - } - else - { - ExFreePool(id); - } - break; - - case BusQueryDeviceSerialNumber: - FIXME("unimplemented id type %#x\n", irpsp->Parameters.QueryId.IdType); - ExFreePool(id); - break; + break; + default: + WARN("IRP_MN_QUERY_ID type %u, not implemented!\n", type); + break; } break; }

1 0

Rémi Bernon : hidclass: Only access Tail.Overlay.OriginalFileObject when needed.
by Alexandre Julliard Feb. 14, 2024

Feb. 14, 2024

Module: wine Branch: master Commit: 8db5dec9d224a9cb2a319275cccc77843bc3e2fd URL: https://gitlab.winehq.org/wine/wine/-/commit/8db5dec9d224a9cb2a319275cccc77… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 14 18:04:56 2024 +0100 hidclass: Only access Tail.Overlay.OriginalFileObject when needed. --- dlls/hidclass.sys/device.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 8fde1fe10a5..62dc9f86379 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -527,7 +527,6 @@ static NTSTATUS hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) { - struct hid_queue *queue = irp->Tail.Overlay.OriginalFileObject->FsContext; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; NTSTATUS status = irp->IoStatus.Status; @@ -637,7 +636,10 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(ULONG)) status = STATUS_BUFFER_OVERFLOW; else + { + struct hid_queue *queue = irp->Tail.Overlay.OriginalFileObject->FsContext; status = hid_queue_resize( queue, *(ULONG *)irp->AssociatedIrp.SystemBuffer ); + } break; } case IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS: @@ -646,6 +648,7 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) status = STATUS_BUFFER_TOO_SMALL; else { + struct hid_queue *queue = irp->Tail.Overlay.OriginalFileObject->FsContext; *(ULONG *)irp->AssociatedIrp.SystemBuffer = queue->length; irp->IoStatus.Information = sizeof(ULONG); status = STATUS_SUCCESS;

1 0