August 2021 - Wine-commits - list.winehq.org

Alexandre Julliard : netapi32: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: wine Branch: master Commit: 5d869cad7ac6fa36352540adc627b3feece8310e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d869cad7ac6fa36352540ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 12 16:16:36 2021 +0200 netapi32: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/Makefile.in | 1 + dlls/netapi32/netapi32.c | 46 +++++++----- dlls/netapi32/unixlib.c | 179 ++++++++++++---------------------------------- dlls/netapi32/unixlib.h | 55 ++++++++++++-- 4 files changed, 122 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5d869cad7ac6fa363525…

1 0

Damjan Jovanovic : msxml3: Use XSD regex quantifier format S{0, m} instead of S{, m}.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: wine Branch: master Commit: 53f3cad7fbb19b489419afae4e1e73486384f98d URL: https://source.winehq.org/git/wine.git/?a=commit;h=53f3cad7fbb19b489419afae… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Wed Aug 11 07:16:53 2021 +0200 msxml3: Use XSD regex quantifier format S{0, m} instead of S{, m}. S{,m} is invalid in libxml2 2.9.11 and later, and was never valid in the XSD specification or any XML implementation tested. We should only use S{0,m} for our internal XSD schema used in XDR validation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51358 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/datatypes.xsd | 4 ++-- dlls/msxml3/tests/schema.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/datatypes.xsd b/dlls/msxml3/datatypes.xsd index 9e0479d8ca2..ffbe0e2f858 100644 --- a/dlls/msxml3/datatypes.xsd +++ b/dlls/msxml3/datatypes.xsd @@ -200,7 +200,7 @@ </xsd:annotation> <xsd:restriction base="xsd:decimal"> - <xsd:pattern value="([0-9]{,14})([.][0-9]{,4})?"/> + <xsd:pattern value="([0-9]{0,14})([.][0-9]{0,4})?"/> </xsd:restriction> </xsd:simpleType> @@ -539,7 +539,7 @@ </xsd:annotation> <xsd:restriction base="xsd:string"> - <xsd:pattern value="([0-9A-Fa-f]{4})([-]{,1}[0-9A-Fa-f]{4})*"/> + <xsd:pattern value="([0-9A-Fa-f]{4})([-]{0,1}[0-9A-Fa-f]{4})*"/> </xsd:restriction> </xsd:simpleType> diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index b66be76c159..8dc9dcd7e22 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1115,7 +1115,9 @@ static void test_regex(void) { L"\\~", L"~", TRUE }, { L"\\uCAFE", L"\xCAFE", TRUE }, /* non-BMP character in surrogate pairs: */ - { L"\\uD83D\\uDE00", L"\xD83D\xDE00", TRUE } + { L"\\uD83D\\uDE00", L"\xD83D\xDE00", TRUE }, + /* "x{,2}" is non-standard and only works on libxml2 <= v2.9.10 */ + { L"x{0,2}", L"x", FALSE } }; int i;

1 0

Rémi Bernon : winebus.sys: Return STATUS_SUCCESS from IRP_MN_SURPRISE_REMOVAL.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: wine Branch: master Commit: 199f689ff1e0f7c7fe318c2273aa378710a94e78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=199f689ff1e0f7c7fe318c22… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 12 09:46:59 2021 +0200 winebus.sys: Return STATUS_SUCCESS from IRP_MN_SURPRISE_REMOVAL. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 23195dfa75a..713db9c7f27 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -704,6 +704,7 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) remove_pending_irps(device); ext->removed = TRUE; LeaveCriticalSection(&ext->cs); + status = STATUS_SUCCESS; break; case IRP_MN_REMOVE_DEVICE:

1 0

Rémi Bernon : winebus.sys: Remove duplicate LeaveCriticalSection call.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: wine Branch: master Commit: 2d7fa05ce4b8e3898b2251fe946190c9b64271af URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d7fa05ce4b8e3898b2251fe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 12 09:47:00 2021 +0200 winebus.sys: Remove duplicate LeaveCriticalSection call. Breaking out of the switch will leave it already. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 713db9c7f27..3d040b1af5b 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -927,7 +927,6 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) if (status != STATUS_SUCCESS) { irp->IoStatus.u.Status = status; - LeaveCriticalSection(&ext->cs); break; } @@ -946,7 +945,6 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) if (status != STATUS_SUCCESS) { irp->IoStatus.u.Status = status; - LeaveCriticalSection(&ext->cs); break; } if (!ext->last_report_read)

1 0

Rémi Bernon : winebus.sys: Use a local variable to store buffer len.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: wine Branch: master Commit: a446e0e57d13030cdeae0803fdb45c8399bd7e67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a446e0e57d13030cdeae0803… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 12 09:47:01 2021 +0200 winebus.sys: Use a local variable to store buffer len. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 3d040b1af5b..0ae1f01c822 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -822,6 +822,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) NTSTATUS status = irp->IoStatus.u.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); struct device_extension *ext = (struct device_extension *)device->DeviceExtension; + ULONG code, buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; TRACE("(%p, %p)\n", device, irp); @@ -841,14 +842,14 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) return STATUS_DELETE_PENDING; } - switch (irpsp->Parameters.DeviceIoControl.IoControlCode) + switch ((code = irpsp->Parameters.DeviceIoControl.IoControlCode)) { case IOCTL_HID_GET_DEVICE_ATTRIBUTES: { HID_DEVICE_ATTRIBUTES *attr = (HID_DEVICE_ATTRIBUTES *)irp->UserBuffer; TRACE("IOCTL_HID_GET_DEVICE_ATTRIBUTES\n"); - if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(*attr)) + if (buffer_len < sizeof(*attr)) { irp->IoStatus.u.Status = status = STATUS_BUFFER_TOO_SMALL; break; @@ -870,7 +871,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) DWORD length; TRACE("IOCTL_HID_GET_DEVICE_DESCRIPTOR\n"); - if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(*descriptor)) + if (buffer_len < sizeof(*descriptor)) { irp->IoStatus.u.Status = status = STATUS_BUFFER_TOO_SMALL; break; @@ -898,23 +899,18 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) break; } case IOCTL_HID_GET_REPORT_DESCRIPTOR: - { - DWORD length = irpsp->Parameters.DeviceIoControl.OutputBufferLength; TRACE("IOCTL_HID_GET_REPORT_DESCRIPTOR\n"); - - irp->IoStatus.u.Status = status = ext->vtbl->get_reportdescriptor(device, irp->UserBuffer, length, &length); - irp->IoStatus.Information = length; + irp->IoStatus.u.Status = status = ext->vtbl->get_reportdescriptor(device, irp->UserBuffer, buffer_len, &buffer_len); + irp->IoStatus.Information = buffer_len; break; - } case IOCTL_HID_GET_STRING: { - DWORD length = irpsp->Parameters.DeviceIoControl.OutputBufferLength / sizeof(WCHAR); DWORD index = (ULONG_PTR)irpsp->Parameters.DeviceIoControl.Type3InputBuffer; TRACE("IOCTL_HID_GET_STRING[%08x]\n", index); - irp->IoStatus.u.Status = status = hid_get_native_string(device, index, (WCHAR *)irp->UserBuffer, length); + irp->IoStatus.u.Status = status = hid_get_native_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len / sizeof(WCHAR)); if (status != STATUS_SUCCESS) - irp->IoStatus.u.Status = status = ext->vtbl->get_string(device, index, (WCHAR *)irp->UserBuffer, length); + irp->IoStatus.u.Status = status = ext->vtbl->get_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len / sizeof(WCHAR)); if (status == STATUS_SUCCESS) irp->IoStatus.Information = (strlenW((WCHAR *)irp->UserBuffer) + 1) * sizeof(WCHAR); break; @@ -950,8 +946,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) if (!ext->last_report_read) { irp->IoStatus.u.Status = status = deliver_last_report(ext, - irpsp->Parameters.DeviceIoControl.OutputBufferLength, - irp->UserBuffer, &irp->IoStatus.Information); + buffer_len, irp->UserBuffer, &irp->IoStatus.Information); ext->last_report_read = TRUE; } else @@ -991,12 +986,9 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) break; } default: - { - ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); break; - } } LeaveCriticalSection(&ext->cs);

1 0

Rémi Bernon : winebus.sys: Use nameless unions.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: wine Branch: master Commit: 8f37267f9221fbc48cb36b1e0dbde42385304941 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f37267f9221fbc48cb36b1e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 12 09:47:02 2021 +0200 winebus.sys: Use nameless unions. 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 | 2 -- dlls/winebus.sys/main.c | 67 +++++++++++++++++++++----------------------- 4 files changed, 32 insertions(+), 41 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8f37267f9221fbc48cb3…

1 0

Rémi Bernon : winebus.sys: Use irp IoStatus.Status consistently.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: wine Branch: master Commit: 5679e006ca3ff73334efe9113d7357556f12b0aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=5679e006ca3ff73334efe911… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 12 09:47:03 2021 +0200 winebus.sys: Use irp IoStatus.Status consistently. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 61 +++++++++++++++++++++---------------------------- 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 335a1528941..6ceccd21442 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -816,10 +816,10 @@ static NTSTATUS hid_get_native_string(DEVICE_OBJECT *device, DWORD index, WCHAR static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { - NTSTATUS status = irp->IoStatus.Status; IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation(irp); struct device_extension *ext = (struct device_extension *)device->DeviceExtension; ULONG code, buffer_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + NTSTATUS status; TRACE("(%p, %p)\n", device, irp); @@ -848,7 +848,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) if (buffer_len < sizeof(*attr)) { - irp->IoStatus.Status = status = STATUS_BUFFER_TOO_SMALL; + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; break; } @@ -858,7 +858,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) attr->ProductID = ext->pid; attr->VersionNumber = ext->version; - irp->IoStatus.Status = status = STATUS_SUCCESS; + irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = sizeof(*attr); break; } @@ -870,15 +870,15 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) if (buffer_len < sizeof(*descriptor)) { - irp->IoStatus.Status = status = STATUS_BUFFER_TOO_SMALL; + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; break; } - status = ext->vtbl->get_reportdescriptor(device, NULL, 0, &length); - if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL) + irp->IoStatus.Status = ext->vtbl->get_reportdescriptor(device, NULL, 0, &length); + if (irp->IoStatus.Status != STATUS_SUCCESS && + irp->IoStatus.Status != STATUS_BUFFER_TOO_SMALL) { WARN("Failed to get platform report descriptor length\n"); - irp->IoStatus.Status = status; break; } @@ -891,13 +891,13 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) descriptor->DescriptorList[0].bReportType = HID_REPORT_DESCRIPTOR_TYPE; descriptor->DescriptorList[0].wReportLength = length; - irp->IoStatus.Status = status = STATUS_SUCCESS; + irp->IoStatus.Status = STATUS_SUCCESS; irp->IoStatus.Information = sizeof(*descriptor); break; } case IOCTL_HID_GET_REPORT_DESCRIPTOR: TRACE("IOCTL_HID_GET_REPORT_DESCRIPTOR\n"); - irp->IoStatus.Status = status = ext->vtbl->get_reportdescriptor(device, irp->UserBuffer, buffer_len, &buffer_len); + irp->IoStatus.Status = ext->vtbl->get_reportdescriptor(device, irp->UserBuffer, buffer_len, &buffer_len); irp->IoStatus.Information = buffer_len; break; case IOCTL_HID_GET_STRING: @@ -905,10 +905,10 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) DWORD index = (ULONG_PTR)irpsp->Parameters.DeviceIoControl.Type3InputBuffer; TRACE("IOCTL_HID_GET_STRING[%08x]\n", index); - irp->IoStatus.Status = status = hid_get_native_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len / sizeof(WCHAR)); - if (status != STATUS_SUCCESS) - irp->IoStatus.Status = status = ext->vtbl->get_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len / sizeof(WCHAR)); - if (status == STATUS_SUCCESS) + irp->IoStatus.Status = hid_get_native_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len / sizeof(WCHAR)); + if (irp->IoStatus.Status != STATUS_SUCCESS) + irp->IoStatus.Status = ext->vtbl->get_string(device, index, (WCHAR *)irp->UserBuffer, buffer_len / sizeof(WCHAR)); + if (irp->IoStatus.Status == STATUS_SUCCESS) irp->IoStatus.Information = (strlenW((WCHAR *)irp->UserBuffer) + 1) * sizeof(WCHAR); break; } @@ -916,40 +916,32 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); TRACE_(hid_report)("IOCTL_HID_GET_INPUT_REPORT\n"); - status = ext->vtbl->begin_report_processing(device); - if (status != STATUS_SUCCESS) - { - irp->IoStatus.Status = status; - break; - } + irp->IoStatus.Status = ext->vtbl->begin_report_processing(device); + if (irp->IoStatus.Status != STATUS_SUCCESS) break; - irp->IoStatus.Status = status = deliver_last_report(ext, + irp->IoStatus.Status = deliver_last_report(ext, packet->reportBufferLen, packet->reportBuffer, &irp->IoStatus.Information); - if (status == STATUS_SUCCESS) + if (irp->IoStatus.Status == STATUS_SUCCESS) packet->reportBufferLen = irp->IoStatus.Information; break; } case IOCTL_HID_READ_REPORT: { TRACE_(hid_report)("IOCTL_HID_READ_REPORT\n"); - status = ext->vtbl->begin_report_processing(device); - if (status != STATUS_SUCCESS) - { - irp->IoStatus.Status = status; - break; - } + irp->IoStatus.Status = ext->vtbl->begin_report_processing(device); + if (irp->IoStatus.Status != STATUS_SUCCESS) break; if (!ext->last_report_read) { - irp->IoStatus.Status = status = deliver_last_report(ext, + irp->IoStatus.Status = deliver_last_report(ext, buffer_len, irp->UserBuffer, &irp->IoStatus.Information); ext->last_report_read = TRUE; } else { InsertTailList(&ext->irp_queue, &irp->Tail.Overlay.ListEntry); - status = STATUS_PENDING; + irp->IoStatus.Status = STATUS_PENDING; } break; } @@ -958,7 +950,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); TRACE_(hid_report)("IOCTL_HID_WRITE_REPORT / IOCTL_HID_SET_OUTPUT_REPORT\n"); - irp->IoStatus.Status = status = ext->vtbl->set_output_report( + irp->IoStatus.Status = ext->vtbl->set_output_report( device, packet->reportId, packet->reportBuffer, packet->reportBufferLen, &irp->IoStatus.Information); break; @@ -967,7 +959,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); TRACE_(hid_report)("IOCTL_HID_GET_FEATURE\n"); - irp->IoStatus.Status = status = ext->vtbl->get_feature_report( + irp->IoStatus.Status = ext->vtbl->get_feature_report( device, packet->reportId, packet->reportBuffer, packet->reportBufferLen, &irp->IoStatus.Information); packet->reportBufferLen = irp->IoStatus.Information; @@ -977,7 +969,7 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) { HID_XFER_PACKET *packet = (HID_XFER_PACKET*)(irp->UserBuffer); TRACE_(hid_report)("IOCTL_HID_SET_FEATURE\n"); - irp->IoStatus.Status = status = ext->vtbl->set_feature_report( + irp->IoStatus.Status = ext->vtbl->set_feature_report( device, packet->reportId, packet->reportBuffer, packet->reportBufferLen, &irp->IoStatus.Information); break; @@ -990,9 +982,8 @@ static NTSTATUS WINAPI hid_internal_dispatch(DEVICE_OBJECT *device, IRP *irp) LeaveCriticalSection(&ext->cs); - if (status != STATUS_PENDING) - IoCompleteRequest(irp, IO_NO_INCREMENT); - + status = irp->IoStatus.Status; + if (status != STATUS_PENDING) IoCompleteRequest(irp, IO_NO_INCREMENT); return status; }

1 0

Rémi Bernon : hid: Return HIDP_STATUS_SUCCESS even if no usages are found.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: wine Branch: master Commit: b36b2999c83e3f6240b1af7830c982f80990e1d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b36b2999c83e3f6240b1af78… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 12 10:26:54 2021 +0200 hid: Return HIDP_STATUS_SUCCESS even if no usages are found. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 -- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 ++++++ dlls/xinput1_3/tests/xinput.c | 1 - 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 2690b9b0f27..31f1b85f14a 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -328,7 +328,6 @@ NTSTATUS WINAPI HidP_GetUsages( HIDP_REPORT_TYPE report_type, USAGE usage_page, *usages_len = params.usages - usages; if (status != HIDP_STATUS_SUCCESS) return status; - if (*usages_len == 0) return HIDP_STATUS_USAGE_NOT_FOUND; if (params.usages > params.usages_end) return HIDP_STATUS_BUFFER_TOO_SMALL; return status; } @@ -672,7 +671,6 @@ NTSTATUS WINAPI HidP_GetUsagesEx( HIDP_REPORT_TYPE report_type, USHORT collectio *usages_len = params.usages - usages; if (status != HIDP_STATUS_SUCCESS) return status; - if (*usages_len == 0) return HIDP_STATUS_USAGE_NOT_FOUND; if (params.usages > params.usages_end) return HIDP_STATUS_BUFFER_TOO_SMALL; return status; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 40f9b8622e3..50e381c8983 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2220,6 +2220,12 @@ static void test_hidp(HANDLE file, HANDLE async_file, int report_id, BOOL polled report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsages returned %#x\n", status); + value = ARRAY_SIZE(usages); + status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_KEYBOARD, 0, usages, &value, preparsed_data, + report, caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); + ok(value == 0, "got usage count %d, expected %d\n", value, 2); + usages[0] = 0x9; usages[1] = 0xb; usages[2] = 0xa; diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 41769e23ec9..0c94bfed982 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -678,7 +678,6 @@ static void check_hid_caps(DWORD index, HANDLE device, PHIDP_PREPARSED_DATA pre length = ARRAY_SIZE(usages); status = HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, usages, &length, preparsed, buffer, hid_caps->InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsages returned %#x\n", status); ok(length == 0, "got length %u\n", length);

1 0

Rémi Bernon : winebus.sys: Fix lnxev button start byte vs bit index.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: wine Branch: master Commit: 5b9c1e91637a899aa0e7d7c6532b3b6460e122c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b9c1e91637a899aa0e7d7c6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 12 10:26:55 2021 +0200 winebus.sys: Fix lnxev button start byte vs bit index. 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 090df3b0529..261d24d011b 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -618,7 +618,7 @@ static BOOL set_report_from_event(struct wine_input_private *ext, struct input_e return FALSE; #endif case EV_KEY: - set_button_value(ext->button_start + ext->button_map[ie->code], ie->value, ext->current_report_buffer); + set_button_value(ext->button_start * 8 + ext->button_map[ie->code], ie->value, ext->current_report_buffer); return FALSE; case EV_ABS: set_abs_axis_value(ext, ie->code, ie->value);

1 0

Rémi Bernon : winebus.sys: Introduce new HID report descriptor helpers.
by Alexandre Julliard 12 Aug '21

12 Aug '21

Module: wine Branch: master Commit: 2ea19ff3578c16392a01fcb8a4ab9b372143b39c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ea19ff3578c16392a01fcb8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 12 10:26:56 2021 +0200 winebus.sys: Introduce new HID report descriptor helpers. And use them for mouse and keyboard. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 1 + dlls/winebus.sys/controller.h | 20 ++++++++++ dlls/winebus.sys/hid.c | 91 +++++++++++++++++++++++++++++++++++++++++++ dlls/winebus.sys/main.c | 41 ++++++++++--------- 4 files changed, 134 insertions(+), 19 deletions(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index 9011bbb6075..8cde3c7b422 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -8,6 +8,7 @@ C_SRCS = \ bus_iohid.c \ bus_sdl.c \ bus_udev.c \ + hid.c \ main.c RC_SRCS = winebus.rc diff --git a/dlls/winebus.sys/controller.h b/dlls/winebus.sys/controller.h index 2f4a72a94cd..aa838129ce2 100644 --- a/dlls/winebus.sys/controller.h +++ b/dlls/winebus.sys/controller.h @@ -18,6 +18,26 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <hidusage.h> + +struct hid_descriptor +{ + BYTE *data; + SIZE_T size; + SIZE_T max_size; +}; + +extern BOOL hid_descriptor_append(struct hid_descriptor *desc, const BYTE *buffer, SIZE_T size) DECLSPEC_HIDDEN; +extern BOOL hid_descriptor_begin(struct hid_descriptor *desc, USAGE usage_page, USAGE usage) DECLSPEC_HIDDEN; +extern BOOL hid_descriptor_end(struct hid_descriptor *desc) DECLSPEC_HIDDEN; + +extern BOOL hid_descriptor_add_buttons(struct hid_descriptor *desc, USAGE usage_page, + USAGE usage_min, USAGE usage_max) DECLSPEC_HIDDEN; + /* Blocks of data for building HID device descriptions */ #include "psh_hid_macros.h" diff --git a/dlls/winebus.sys/hid.c b/dlls/winebus.sys/hid.c new file mode 100644 index 00000000000..052037ec19e --- /dev/null +++ b/dlls/winebus.sys/hid.c @@ -0,0 +1,91 @@ +/* + * Common HID report descriptor helpers + * + * Copyright 2021 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "controller.h" + +BOOL hid_descriptor_append(struct hid_descriptor *desc, const BYTE *buffer, SIZE_T size) +{ + BYTE *tmp = desc->data; + + if (desc->size + size > desc->max_size) + { + desc->max_size = max(desc->max_size * 3 / 2, desc->size + size); + if (!desc->data) desc->data = HeapAlloc(GetProcessHeap(), 0, desc->max_size); + else desc->data = HeapReAlloc(GetProcessHeap(), 0, tmp, desc->max_size); + } + + if (!desc->data) + { + HeapFree(GetProcessHeap(), 0, tmp); + return FALSE; + } + + memcpy(desc->data + desc->size, buffer, size); + desc->size += size; + return TRUE; +} + +#include "psh_hid_macros.h" + +BOOL hid_descriptor_begin(struct hid_descriptor *desc, USAGE usage_page, USAGE usage) +{ + const BYTE template[] = + { + USAGE_PAGE(2, usage_page), + USAGE(2, usage), + COLLECTION(1, Application), + USAGE(1, 0), + }; + + memset(desc, 0, sizeof(*desc)); + return hid_descriptor_append(desc, template, sizeof(template)); +} + +BOOL hid_descriptor_end(struct hid_descriptor *desc) +{ + static const BYTE template[] = + { + END_COLLECTION, + }; + + return hid_descriptor_append(desc, template, sizeof(template)); +} + +BOOL hid_descriptor_add_buttons(struct hid_descriptor *desc, USAGE usage_page, + USAGE usage_min, USAGE usage_max) +{ + const BYTE template[] = + { + USAGE_PAGE(2, usage_page), + USAGE_MINIMUM(2, usage_min), + USAGE_MAXIMUM(2, usage_max), + LOGICAL_MINIMUM(1, 0), + LOGICAL_MAXIMUM(1, 1), + PHYSICAL_MINIMUM(1, 0), + PHYSICAL_MAXIMUM(1, 1), + REPORT_COUNT(2, usage_max - usage_min + 1), + REPORT_SIZE(1, 1), + INPUT(1, Data|Var|Abs), + }; + + return hid_descriptor_append(desc, template, sizeof(template)); +} + +#include "pop_hid_macros.h" diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 6ceccd21442..84885bdcce9 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -94,7 +94,9 @@ static const struct product_desc XBOX_CONTROLLERS[] = { static DRIVER_OBJECT *driver_obj; static DEVICE_OBJECT *mouse_obj; +static struct hid_descriptor mouse_desc; static DEVICE_OBJECT *keyboard_obj; +static struct hid_descriptor keyboard_desc; /* The root-enumerated device stack. */ DEVICE_OBJECT *bus_pdo; @@ -483,16 +485,10 @@ static NTSTATUS mouse_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, { TRACE("buffer %p, length %u.\n", buffer, length); - *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL); - if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL)) - return STATUS_BUFFER_TOO_SMALL; - - memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); - add_button_block(buffer + sizeof(REPORT_HEADER), 1, 3); - memcpy(buffer + sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS), REPORT_TAIL, sizeof(REPORT_TAIL)); - buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; - buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_MOUSE; + *ret_length = mouse_desc.size; + if (length < mouse_desc.size) return STATUS_BUFFER_TOO_SMALL; + memcpy(buffer, mouse_desc.data, mouse_desc.size); return STATUS_SUCCESS; } @@ -545,6 +541,13 @@ static void mouse_device_create(void) { static const WCHAR busidW[] = {'W','I','N','E','M','O','U','S','E',0}; + if (!hid_descriptor_begin(&mouse_desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_MOUSE)) + return; + if (!hid_descriptor_add_buttons(&mouse_desc, HID_USAGE_PAGE_BUTTON, 1, 3)) + return; + if (!hid_descriptor_end(&mouse_desc)) + return; + mouse_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &mouse_vtbl, 0); IoInvalidateDeviceRelations(bus_pdo, BusRelations); } @@ -557,17 +560,10 @@ static NTSTATUS keyboard_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffe { TRACE("buffer %p, length %u.\n", buffer, length); - *ret_length = sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL); - if (length < sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS) + sizeof(REPORT_TAIL)) - return STATUS_BUFFER_TOO_SMALL; - - memcpy(buffer, REPORT_HEADER, sizeof(REPORT_HEADER)); - add_button_block(buffer + sizeof(REPORT_HEADER), 0, 101); - buffer[sizeof(REPORT_HEADER) + IDX_BUTTON_USAGE_PAGE] = HID_USAGE_PAGE_KEYBOARD; - memcpy(buffer + sizeof(REPORT_HEADER) + sizeof(REPORT_BUTTONS), REPORT_TAIL, sizeof(REPORT_TAIL)); - buffer[IDX_HEADER_PAGE] = HID_USAGE_PAGE_GENERIC; - buffer[IDX_HEADER_USAGE] = HID_USAGE_GENERIC_KEYBOARD; + *ret_length = keyboard_desc.size; + if (length < keyboard_desc.size) return STATUS_BUFFER_TOO_SMALL; + memcpy(buffer, keyboard_desc.data, keyboard_desc.size); return STATUS_SUCCESS; } @@ -620,6 +616,13 @@ static void keyboard_device_create(void) { static const WCHAR busidW[] = {'W','I','N','E','K','E','Y','B','O','A','R','D',0}; + if (!hid_descriptor_begin(&keyboard_desc, HID_USAGE_PAGE_GENERIC, HID_USAGE_GENERIC_KEYBOARD)) + return; + if (!hid_descriptor_add_buttons(&keyboard_desc, HID_USAGE_PAGE_KEYBOARD, 0, 101)) + return; + if (!hid_descriptor_end(&keyboard_desc)) + return; + keyboard_obj = bus_create_hid_device(busidW, 0, 0, -1, 0, 0, busidW, FALSE, &keyboard_vtbl, 0); IoInvalidateDeviceRelations(bus_pdo, BusRelations); }

1 0