April 2022 - Wine-commits - list.winehq.org

Rémi Bernon : hidclass.sys: Move handle_minidriver_string inline.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: ab8c00afbb32d83b5bf30dec8eebfcb6616265ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab8c00afbb32d83b5bf30dec… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 13:10:41 2022 +0200 hidclass.sys: Move handle_minidriver_string inline. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 62 ++++++++++++++++++++-------------------------- 1 file changed, 27 insertions(+), 35 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index d742ea841e5..78f9601ee0d 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -403,11 +403,13 @@ static const struct device_strings device_strings[] = { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, }; -static const WCHAR *find_product_string( const WCHAR *device_id ) +static const WCHAR *find_device_string( const WCHAR *device_id, ULONG index ) { const WCHAR *match_id = wcsrchr( device_id, '\\' ) + 1; DWORD i; + if (index != HID_STRING_ID_IPRODUCT) return NULL; + for (i = 0; i < ARRAY_SIZE(device_strings); ++i) if (!wcsnicmp( device_strings[i].id, match_id, 17 )) return device_strings[i].product; @@ -415,30 +417,6 @@ static const WCHAR *find_product_string( const WCHAR *device_id ) return NULL; } -static void handle_minidriver_string( BASE_DEVICE_EXTENSION *ext, IRP *irp, ULONG index ) -{ - IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); - WCHAR *output_buf = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); - ULONG output_len = stack->Parameters.DeviceIoControl.OutputBufferLength; - const WCHAR *str = NULL; - - if (index == HID_STRING_ID_IPRODUCT) str = find_product_string( ext->device_id ); - - if (!str) call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ), - sizeof(index), output_buf, output_len, &irp->IoStatus ); - else - { - irp->IoStatus.Information = (wcslen( str ) + 1) * sizeof(WCHAR); - if (irp->IoStatus.Information > output_len) - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - else - { - memcpy( output_buf, str, irp->IoStatus.Information ); - irp->IoStatus.Status = STATUS_SUCCESS; - } - } -} - static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); @@ -520,9 +498,10 @@ 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; + ULONG code, index; + const WCHAR *str; NTSTATUS status; BOOL removed; - ULONG code; KIRQL irql; irp->IoStatus.Information = 0; @@ -569,18 +548,31 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) break; } case IOCTL_HID_GET_PRODUCT_STRING: - { - handle_minidriver_string( ext, irp, HID_STRING_ID_IPRODUCT ); - break; - } case IOCTL_HID_GET_SERIALNUMBER_STRING: - { - handle_minidriver_string( ext, irp, HID_STRING_ID_ISERIALNUMBER ); - break; - } case IOCTL_HID_GET_MANUFACTURER_STRING: { - handle_minidriver_string( ext, irp, HID_STRING_ID_IMANUFACTURER ); + WCHAR *output_buf = MmGetSystemAddressForMdlSafe( irp->MdlAddress, NormalPagePriority ); + ULONG output_len = irpsp->Parameters.DeviceIoControl.OutputBufferLength; + + if (code == IOCTL_HID_GET_PRODUCT_STRING) index = HID_STRING_ID_IPRODUCT; + if (code == IOCTL_HID_GET_SERIALNUMBER_STRING) index = HID_STRING_ID_ISERIALNUMBER; + if (code == IOCTL_HID_GET_MANUFACTURER_STRING) index = HID_STRING_ID_IMANUFACTURER; + + if ((str = find_device_string( ext->device_id, index ))) + { + irp->IoStatus.Information = (wcslen( str ) + 1) * sizeof(WCHAR); + if (irp->IoStatus.Information > output_len) + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + else + { + memcpy( output_buf, str, irp->IoStatus.Information ); + irp->IoStatus.Status = STATUS_SUCCESS; + } + break; + } + + call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ), + sizeof(index), output_buf, output_len, &irp->IoStatus ); break; } case IOCTL_HID_GET_COLLECTION_INFORMATION:

1 0

Rémi Bernon : hidclass.sys: Use a local NTSTATUS variable to keep IRP status.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 313453de29e1364f683b7446d65e8c080209ee20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=313453de29e1364f683b7446… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 13:10:42 2022 +0200 hidclass.sys: Use a local NTSTATUS variable to keep IRP status. So we can handle pending asynchronous calls to minidriver more easily. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 91 ++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 51 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 78f9601ee0d..9d5f78cc27e 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -417,7 +417,7 @@ static const WCHAR *find_device_string( const WCHAR *device_id, ULONG index ) return NULL; } -static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) +static NTSTATUS hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); ULONG offset = 0, report_len = 0, buffer_len = 0; @@ -442,11 +442,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP buffer = irp->AssociatedIrp.SystemBuffer; break; } - if (!buffer || !buffer_len) - { - irp->IoStatus.Status = STATUS_INVALID_USER_BUFFER; - return; - } + if (!buffer || !buffer_len) return STATUS_INVALID_USER_BUFFER; switch (code) { @@ -465,12 +461,7 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP if (report) report_len = report->FeatureLength; break; } - - if (!report || buffer_len < report_len) - { - irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - return; - } + if (!report || buffer_len < report_len) return STATUS_INVALID_PARAMETER; if (!report->ReportID) offset = 1; packet.reportId = report->ReportID; @@ -491,6 +482,8 @@ static void hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP if (code == IOCTL_HID_WRITE_REPORT && packet.reportId) irp->IoStatus.Information--; break; } + + return irp->IoStatus.Status; } NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) @@ -498,9 +491,9 @@ 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; ULONG code, index; const WCHAR *str; - NTSTATUS status; BOOL removed; KIRQL irql; @@ -522,29 +515,26 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) switch ((code = irpsp->Parameters.DeviceIoControl.IoControlCode)) { case IOCTL_HID_GET_POLL_FREQUENCY_MSEC: - TRACE("IOCTL_HID_GET_POLL_FREQUENCY_MSEC\n"); if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_OVERFLOW; + else { - irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; - irp->IoStatus.Information = 0; - break; + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.poll_interval; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; } - *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.poll_interval; - irp->IoStatus.Information = sizeof(ULONG); - irp->IoStatus.Status = STATUS_SUCCESS; break; case IOCTL_HID_SET_POLL_FREQUENCY_MSEC: { ULONG poll_interval; - TRACE("IOCTL_HID_SET_POLL_FREQUENCY_MSEC\n"); if (irpsp->Parameters.DeviceIoControl.InputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_TOO_SMALL; + else { - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - break; + poll_interval = *(ULONG *)irp->AssociatedIrp.SystemBuffer; + if (poll_interval) ext->u.pdo.poll_interval = min( poll_interval, MAX_POLL_INTERVAL_MSEC ); + status = STATUS_SUCCESS; } - poll_interval = *(ULONG *)irp->AssociatedIrp.SystemBuffer; - if (poll_interval) ext->u.pdo.poll_interval = min(poll_interval, MAX_POLL_INTERVAL_MSEC); - irp->IoStatus.Status = STATUS_SUCCESS; break; } case IOCTL_HID_GET_PRODUCT_STRING: @@ -562,29 +552,30 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) { irp->IoStatus.Information = (wcslen( str ) + 1) * sizeof(WCHAR); if (irp->IoStatus.Information > output_len) - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + status = STATUS_BUFFER_TOO_SMALL; else { memcpy( output_buf, str, irp->IoStatus.Information ); - irp->IoStatus.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; } break; } call_minidriver( IOCTL_HID_GET_STRING, ext->u.pdo.parent_fdo, ULongToPtr( index ), sizeof(index), output_buf, output_len, &irp->IoStatus ); + status = irp->IoStatus.Status; break; } case IOCTL_HID_GET_COLLECTION_INFORMATION: { irp->IoStatus.Information = sizeof(HID_COLLECTION_INFORMATION); if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(HID_COLLECTION_INFORMATION)) - irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + status = STATUS_BUFFER_OVERFLOW; else { memcpy( irp->AssociatedIrp.SystemBuffer, &ext->u.pdo.information, sizeof(HID_COLLECTION_INFORMATION) ); - irp->IoStatus.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; } break; } @@ -594,36 +585,31 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) irp->IoStatus.Information = desc->PreparsedDataLength; if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < desc->PreparsedDataLength) - irp->IoStatus.Status = STATUS_INVALID_BUFFER_SIZE; + status = STATUS_INVALID_BUFFER_SIZE; else { memcpy( irp->UserBuffer, desc->PreparsedData, desc->PreparsedDataLength ); - irp->IoStatus.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; } break; } case IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS: { - irp->IoStatus.Information = 0; - if (irpsp->Parameters.DeviceIoControl.InputBufferLength != sizeof(ULONG)) - irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + status = STATUS_BUFFER_OVERFLOW; else - irp->IoStatus.Status = hid_queue_resize( queue, *(ULONG *)irp->AssociatedIrp.SystemBuffer ); + status = hid_queue_resize( queue, *(ULONG *)irp->AssociatedIrp.SystemBuffer ); break; } case IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS: { if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) - { - irp->IoStatus.Information = 0; - irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; - } + status = STATUS_BUFFER_TOO_SMALL; else { *(ULONG *)irp->AssociatedIrp.SystemBuffer = queue->length; irp->IoStatus.Information = sizeof(ULONG); - irp->IoStatus.Status = STATUS_SUCCESS; + status = STATUS_SUCCESS; } break; } @@ -631,20 +617,23 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_FEATURE: case IOCTL_HID_GET_INPUT_REPORT: case IOCTL_HID_SET_OUTPUT_REPORT: - hid_device_xfer_report( ext, code, irp ); + status = hid_device_xfer_report( ext, code, irp ); break; default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; FIXME( "Unsupported ioctl %#lx (device=%lx access=%lx func=%lx method=%lx)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3 ); - irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + status = STATUS_NOT_SUPPORTED; break; } } - status = irp->IoStatus.Status; - if (status != STATUS_PENDING) IoCompleteRequest( irp, IO_NO_INCREMENT ); + if (status != STATUS_PENDING) + { + irp->IoStatus.Status = status; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } return status; } @@ -695,12 +684,12 @@ NTSTATUS WINAPI pdo_read(DEVICE_OBJECT *device, IRP *irp) NTSTATUS WINAPI pdo_write(DEVICE_OBJECT *device, IRP *irp) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - NTSTATUS status; - - hid_device_xfer_report( ext, IOCTL_HID_WRITE_REPORT, irp ); - - status = irp->IoStatus.Status; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + NTSTATUS status = hid_device_xfer_report( ext, IOCTL_HID_WRITE_REPORT, irp ); + if (status != STATUS_PENDING) + { + irp->IoStatus.Status = status; + IoCompleteRequest( irp, IO_NO_INCREMENT ); + } return status; }

1 0

Rémi Bernon : hidclass.sys: Call internal minidriver report ioctls asynchronously.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: a7d67c1c90f39d5ce1f0b9c1c5548be95097a9d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7d67c1c90f39d5ce1f0b9c1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 13:10:43 2022 +0200 hidclass.sys: Call internal minidriver report ioctls asynchronously. Instead of calling it synchronously. Use a completion routine to wait for their completion before returning. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 60 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 12 deletions(-) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d5f78cc27e..9d917bbc674 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -417,12 +417,34 @@ static const WCHAR *find_device_string( const WCHAR *device_id, ULONG index ) return NULL; } +struct completion_params +{ + HID_XFER_PACKET packet; + ULONG padding; + IRP *irp; +}; + +static NTSTATUS CALLBACK xfer_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) +{ + struct completion_params *params = context; + IRP *orig_irp = params->irp; + + TRACE( "device %p, irp %p, context %p\n", device, irp, context ); + + orig_irp->IoStatus = irp->IoStatus; + orig_irp->IoStatus.Information -= params->padding; + IoCompleteRequest( orig_irp, IO_NO_INCREMENT ); + + free( params ); + return STATUS_SUCCESS; +} + static NTSTATUS hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, IRP *irp ) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation( irp ); - ULONG offset = 0, report_len = 0, buffer_len = 0; + ULONG offset, report_len = 0, buffer_len = 0; + struct completion_params *params; HIDP_REPORT_IDS *report = NULL; - HID_XFER_PACKET packet; BYTE *buffer = NULL; switch (code) @@ -462,28 +484,42 @@ static NTSTATUS hid_device_xfer_report( BASE_DEVICE_EXTENSION *ext, ULONG code, break; } if (!report || buffer_len < report_len) return STATUS_INVALID_PARAMETER; + offset = report->ReportID ? 0 : 1; - if (!report->ReportID) offset = 1; - packet.reportId = report->ReportID; - packet.reportBuffer = buffer + offset; + if (!(params = calloc( 1, sizeof(struct completion_params) ))) return STATUS_NO_MEMORY; + params->packet.reportId = report->ReportID; + params->packet.reportBuffer = buffer + offset; + params->irp = irp; switch (code) { case IOCTL_HID_GET_FEATURE: case IOCTL_HID_GET_INPUT_REPORT: - packet.reportBufferLen = buffer_len - offset; - call_minidriver( code, ext->u.pdo.parent_fdo, NULL, 0, &packet, sizeof(packet), &irp->IoStatus ); + params->packet.reportBufferLen = buffer_len - offset; + irp = IoBuildDeviceIoControlRequest( code, ext->u.pdo.parent_fdo, NULL, 0, &params->packet, + sizeof(params->packet), TRUE, NULL, NULL ); break; + case IOCTL_HID_WRITE_REPORT: + params->padding = 1 - offset; + /* fallthrough */ case IOCTL_HID_SET_FEATURE: case IOCTL_HID_SET_OUTPUT_REPORT: - case IOCTL_HID_WRITE_REPORT: - packet.reportBufferLen = report_len - offset; - call_minidriver( code, ext->u.pdo.parent_fdo, NULL, sizeof(packet), &packet, 0, &irp->IoStatus ); - if (code == IOCTL_HID_WRITE_REPORT && packet.reportId) irp->IoStatus.Information--; + params->packet.reportBufferLen = report_len - offset; + irp = IoBuildDeviceIoControlRequest( code, ext->u.pdo.parent_fdo, NULL, sizeof(params->packet), + &params->packet, 0, TRUE, NULL, NULL ); break; } - return irp->IoStatus.Status; + if (!irp) + { + free( params ); + return STATUS_NO_MEMORY; + } + + IoMarkIrpPending( params->irp ); + IoSetCompletionRoutine( irp, xfer_completion, params, TRUE, TRUE, TRUE ); + IoCallDriver( ext->u.pdo.parent_fdo, irp ); + return STATUS_PENDING; } NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp)

1 0

Rémi Bernon : windows.gaming.input: Import IAsyncOperation from windows.media.speech.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 730b35ba46e6e17f1ac9043167ddfc175e61cb5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=730b35ba46e6e17f1ac90431… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 13:10:44 2022 +0200 windows.gaming.input: Import IAsyncOperation from windows.media.speech. Adapting it for the IAsyncOperation_boolean interface and use it to implement IForceFeedbackMotor_Try(Enable|Disable|Reset)Async. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 32 +-- dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/async.c | 369 +++++++++++++++++++++++++++++ dlls/windows.gaming.input/force_feedback.c | 57 ++++- dlls/windows.gaming.input/private.h | 4 + 5 files changed, 431 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=730b35ba46e6e17f1ac9…

1 0

Piotr Caban : ntdll: Use 32-bit time_t when calling __NR_futex syscall.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 4ec67b7a6447dfc4af8c03c141c600b41b90ef53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ec67b7a6447dfc4af8c03c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 25 21:23:38 2022 +0200 ntdll: Use 32-bit time_t when calling __NR_futex syscall. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/sync.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 1695e6ed570..1194ee514b5 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -111,6 +111,17 @@ static int futex_private = 128; static inline int futex_wait( const int *addr, int val, struct timespec *timeout ) { +#if (defined(__i386__) || defined(__arm__)) && _TIME_BITS==64 + if (timeout && sizeof(*timeout) != 8) + { + struct { + long tv_sec; + long tv_nsec; + } timeout32 = { timeout->tv_sec, timeout->tv_nsec }; + + return syscall( __NR_futex, addr, FUTEX_WAIT | futex_private, val, &timeout32, 0, 0 ); + } +#endif return syscall( __NR_futex, addr, FUTEX_WAIT | futex_private, val, timeout, 0, 0 ); }

1 0

Ziqing Hui : include: Add defines for ID2D1DrawInfo.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 04de217c266e667a60276aa6eb054db90bc87fc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=04de217c266e667a60276aa6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:36 2022 +0800 include: Add defines for ID2D1DrawInfo. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 93 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 91c8fc20141..1f98999a117 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -40,12 +40,73 @@ typedef enum D2D1_CHANNEL_DEPTH D2D1_CHANNEL_DEPTH_FORCE_DWORD = 0xffffffff } D2D1_CHANNEL_DEPTH; +typedef enum D2D1_PIXEL_OPTIONS +{ + D2D1_PIXEL_OPTIONS_NONE = 0x0, + D2D1_PIXEL_OPTIONS_TRIVIAL_SAMPLING = 0x1, + D2D1_PIXEL_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_PIXEL_OPTIONS; + +typedef enum D2D1_VERTEX_OPTIONS +{ + D2D1_VERTEX_OPTIONS_NONE = 0x0, + D2D1_VERTEX_OPTIONS_DO_NOT_CLEAR = 0x1, + D2D1_VERTEX_OPTIONS_USE_DEPTH_BUFFER = 0x2, + D2D1_VERTEX_OPTIONS_ASSUME_NO_OVERLAP = 0x4, + D2D1_VERTEX_OPTIONS_FORCE_DWORD = 0xffffffff +} D2D1_VERTEX_OPTIONS; + +typedef enum D2D1_BLEND_OPERATION +{ + D2D1_BLEND_OPERATION_ADD = 0x1, + D2D1_BLEND_OPERATION_SUBTRACT = 0x2, + D2D1_BLEND_OPERATION_REV_SUBTRACT = 0x3, + D2D1_BLEND_OPERATION_MIN = 0x4, + D2D1_BLEND_OPERATION_MAX = 0x5, + D2D1_BLEND_OPERATION_FORCE_DWORD = 0xffffffff +} D2D1_BLEND_OPERATION; + +typedef enum D2D1_BLEND +{ + D2D1_BLEND_ZERO = 1, + D2D1_BLEND_ONE = 2, + D2D1_BLEND_SRC_COLOR = 3, + D2D1_BLEND_INV_SRC_COLOR = 4, + D2D1_BLEND_SRC_ALPHA = 5, + D2D1_BLEND_INV_SRC_ALPHA = 6, + D2D1_BLEND_DEST_ALPHA = 7, + D2D1_BLEND_INV_DEST_ALPHA = 8, + D2D1_BLEND_DEST_COLOR = 9, + D2D1_BLEND_INV_DEST_COLOR = 10, + D2D1_BLEND_SRC_ALPHA_SAT = 11, + D2D1_BLEND_BLEND_FACTOR = 14, + D2D1_BLEND_INV_BLEND_FACTOR = 15, + D2D1_BLEND_FORCE_DWORD = 0xffffffff +} D2D1_BLEND; + typedef struct D2D1_INPUT_DESCRIPTION { D2D1_FILTER filter; UINT32 levelOfDetailCount; } D2D1_INPUT_DESCRIPTION; +typedef struct D2D1_VERTEX_RANGE +{ + UINT32 startVertex; + UINT32 vertexCount; +} D2D1_VERTEX_RANGE; + +typedef struct D2D1_BLEND_DESCRIPTION +{ + D2D1_BLEND sourceBlend; + D2D1_BLEND destinationBlend; + D2D1_BLEND_OPERATION blendOperation; + D2D1_BLEND sourceBlendAlpha; + D2D1_BLEND destinationBlendAlpha; + D2D1_BLEND_OPERATION blendOperationAlpha; + float blendFactor[4]; +} D2D1_BLEND_DESCRIPTION; + [ object, uuid(9b8b1336-00a5-4668-92b7-ced5d8bf9b7b), @@ -99,3 +160,35 @@ interface ID2D1RenderInfo : IUnknown [in] UINT32 count ); } + +[ + object, + uuid(693ce632-7f2f-45de-93fe-18d88b37aa21), + local, +] +interface ID2D1DrawInfo : ID2D1RenderInfo +{ + HRESULT SetPixelShaderConstantBuffer( + [in] const BYTE *buffer, + [in] UINT32 size + ); + HRESULT SetResourceTexture( + [in] UINT32 index, + [in] ID2D1ResourceTexture *texture + ); + HRESULT SetVertexShaderConstantBuffer( + [in] const BYTE *buffer, + [in] UINT32 size + ); + HRESULT SetPixelShader( + [in] REFGUID id, + [in] D2D1_PIXEL_OPTIONS options + ); + HRESULT SetVertexProcessing( + [in, optional] ID2D1VertexBuffer *buffer, + [in] D2D1_VERTEX_OPTIONS options, + [in, optional] const D2D1_BLEND_DESCRIPTION *description, + [in, optional] const D2D1_VERTEX_RANGE *range, + [in, optional] const GUID *shader + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1ComputeInfo.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 3d891e413057aa2e2657752aa0f13897207a81c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d891e413057aa2e2657752a… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:37 2022 +0800 include: Add defines for ID2D1ComputeInfo. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 1f98999a117..442c0156227 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -192,3 +192,23 @@ interface ID2D1DrawInfo : ID2D1RenderInfo [in, optional] const GUID *shader ); } + +[ + object, + uuid(5598b14b-9fd7-48b7-9bdb-8f0964eb38bc), + local, +] +interface ID2D1ComputeInfo : ID2D1RenderInfo +{ + HRESULT SetComputeShaderconstantBuffer( + [in] const BYTE *buffer, + [in] UINT32 size + ); + HRESULT SetComputeShader( + [in] REFGUID id + ); + HRESULT SetResourceTexture( + [in] UINT32 index, + [in] ID2D1ResourceTexture *texture + ); +}

1 0

Ziqing Hui : include: Add defines for ID2D1TransformGraph.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 7597fa6ed5a35a282c24851dd507a3e3bb28556b URL: https://source.winehq.org/git/wine.git/?a=commit;h=7597fa6ed5a35a282c24851d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:40:38 2022 +0800 include: Add defines for ID2D1TransformGraph. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1effectauthor.idl | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/include/d2d1effectauthor.idl b/include/d2d1effectauthor.idl index 442c0156227..cec7de8c311 100644 --- a/include/d2d1effectauthor.idl +++ b/include/d2d1effectauthor.idl @@ -212,3 +212,49 @@ interface ID2D1ComputeInfo : ID2D1RenderInfo [in] ID2D1ResourceTexture *texture ); } + +[ + object, + uuid(b2efe1e7-729f-4102-949f-505fa21bf666), + local, +] +interface ID2D1TransformNode : IUnknown +{ + UINT32 GetInputCount(); +} + +[ + object, + uuid(13d29038-c3e6-4034-9081-13b53a417992), + local, +] +interface ID2D1TransformGraph : IUnknown +{ + UINT32 GetInputCount(); + HRESULT SetSingleTransformNode( + [in] ID2D1TransformNode *node + ); + HRESULT AddNode( + [in] ID2D1TransformNode *node + ); + HRESULT RemoveNode( + [in] ID2D1TransformNode *node + ); + HRESULT SetOutputNode( + [in] ID2D1TransformNode *node + ); + HRESULT ConnectNode( + [in] ID2D1TransformNode *from_node, + [in] ID2D1TransformNode *to_node, + [in] UINT32 index + ); + HRESULT ConnectToEffectInput( + [in] UINT32 input_index, + [in] ID2D1TransformNode *node, + [in] UINT32 node_index + ); + void Clear(); + HRESULT SetPassthroughGraph( + [in] UINT32 index + ); +}

1 0

Ziqing Hui : include: Remove useless semi-colon in d2d1_3.idl.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 795bc4804b226da34ffd54e1891a99cee62dea90 URL: https://source.winehq.org/git/wine.git/?a=commit;h=795bc4804b226da34ffd54e1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Apr 26 10:43:53 2022 +0800 include: Remove useless semi-colon in d2d1_3.idl. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d2d1_3.idl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d2d1_3.idl b/include/d2d1_3.idl index 91835ee1a77..07dc98968f8 100644 --- a/include/d2d1_3.idl +++ b/include/d2d1_3.idl @@ -143,7 +143,7 @@ interface ID2D1InkStyle : ID2D1Resource [in] D2D1_INK_NIB_SHAPE shape ); D2D1_INK_NIB_SHAPE GetNibShape(); -}; +} [ object, @@ -188,7 +188,7 @@ interface ID2D1Ink : ID2D1Resource [in, optional] const D2D1_MATRIX_3X2_F *world_transform, [out] D2D1_RECT_F *bounds ); -}; +} [ object, @@ -203,7 +203,7 @@ interface ID2D1GradientMesh : ID2D1Resource [out] D2D1_GRADIENT_MESH_PATCH *patches, [in] UINT32 patch_count ); -}; +} [ object, @@ -216,7 +216,7 @@ interface ID2D1ImageSource : ID2D1Image HRESULT TryReclaimResources( [out] BOOL *resources_discarded ); -}; +} [ object, @@ -234,7 +234,7 @@ interface ID2D1ImageSourceFromWic : ID2D1ImageSource void GetSource( [out] IWICBitmapSource **source ); -}; +} [ object, @@ -249,7 +249,7 @@ interface ID2D1TransformedImageSource : ID2D1Image void GetProperties( [out] D2D1_TRANSFORMED_IMAGE_SOURCE_PROPERTIES *out ); -}; +} [ object,

1 0

Drew Ronneberg : shell32: Remove obsolete -D_SHELL32_ from Makefile.in.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 89f67708d20c328e3b5e3451426fc481f7f248b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89f67708d20c328e3b5e3451… Author: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Date: Mon Apr 25 06:44:11 2022 -0400 shell32: Remove obsolete -D_SHELL32_ from Makefile.in. Signed-off-by: Drew Ronneberg <drew_ronneberg(a)yahoo.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in index eeb6cd63d60..9e2395126fc 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -D_SHELL32_ MODULE = shell32.dll IMPORTLIB = shell32 IMPORTS = uuid shlwapi user32 gdi32 advapi32

1 0