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

Rémi Bernon : hidclass.sys: Use a local NTSTATUS variable to keep IRP status.
by Alexandre Julliard April 26, 2022

April 26, 2022

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: Move handle_minidriver_string inline.
by Alexandre Julliard April 26, 2022

April 26, 2022

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

Jacek Caban : win32u: Use user mode callback for registering builtin classes.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: a37cae58d984b6d7e0c4c3de21f0b7cbef603ffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37cae58d984b6d7e0c4c3de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:11 2022 +0100 win32u: Use user mode callback for registering builtin classes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 15 ++------------- dlls/user32/controls.h | 1 - dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 1 + dlls/win32u/class.c | 16 ++++++++++++++++ dlls/win32u/ntuser_private.h | 2 +- dlls/win32u/window.c | 2 +- dlls/win32u/winstation.c | 2 +- include/ntuser.h | 1 + 9 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index aaa8f75bebe..620477f1b14 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(class); #define MAX_ATOM_LEN 255 /* from dlls/kernel32/atom.c */ -static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -307,9 +305,9 @@ static void load_uxtheme(void) } /*********************************************************************** - * register_builtins + * User32RegisterBuiltinClasses */ -static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **context ) +BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, ULONG size ) { register_builtin( &BUTTON_builtin_class ); register_builtin( &COMBO_builtin_class ); @@ -330,15 +328,6 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte } -/*********************************************************************** - * register_builtin_classes - */ -void register_builtin_classes(void) -{ - InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); -} - - /*********************************************************************** * register_desktop_class */ diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index a410bf27460..5dcdd9bb935 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -104,7 +104,6 @@ extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDE struct tagCLASS; /* opaque structure */ struct tagWND; extern ATOM get_int_atom_value( UNICODE_STRING *name ) DECLSPEC_HIDDEN; -extern void register_builtin_classes(void) DECLSPEC_HIDDEN; extern void register_desktop_class(void) DECLSPEC_HIDDEN; /* defwnd proc */ diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 1258181c88a..1400597eb5d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -172,7 +172,6 @@ static const struct user_callbacks user_funcs = post_dde_message, process_rawinput_message, rawinput_device_get_usages, - register_builtin_classes, SCROLL_SetStandardScrollPainted, unpack_dde_message, register_imm, @@ -207,6 +206,7 @@ static const void *kernel_callback_table[NtUserCallCount] = User32CallWindowsHook, User32FreeCachedClipboardData, User32LoadDriver, + User32RegisterBuiltinClasses, User32RenderSsynthesizedFormat, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f28fc66bbf2..aa3e1565bfa 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -124,6 +124,7 @@ BOOL WINAPI User32CallSendAsyncCallback( const struct send_async_params *params, BOOL WINAPI User32CallWinEventHook( const struct win_event_hook_params *params, ULONG size ); BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ); BOOL WINAPI User32CallWindowsHook( const struct win_hook_params *params, ULONG size ); +BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, ULONG size ); /* message spy definitions */ diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index ba60794ccd7..c52fcad6025 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -972,3 +972,19 @@ WORD get_class_word( HWND hwnd, INT offset ) release_class_ptr( class ); return retvalue; } + +static void register_builtins(void) +{ + void *ret_ptr; + ULONG ret_len; + KeUserModeCallback( NtUserRegisterBuiltinClasses, NULL, 0, &ret_ptr, &ret_len ); +} + +/*********************************************************************** + * register_builtin_classes + */ +void register_builtin_classes(void) +{ + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + pthread_once( &init_once, register_builtins ); +} diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 632cb16d23a..fe9d7e18bc9 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -46,7 +46,6 @@ struct user_callbacks DWORD type ); BOOL (CDECL *process_rawinput_message)( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ); BOOL (CDECL *rawinput_device_get_usages)(HANDLE handle, USHORT *usage_page, USHORT *usage); - void (CDECL *register_builtin_classes)(void); void (WINAPI *set_standard_scroll_painted)( HWND hwnd, INT bar, BOOL visible ); BOOL (CDECL *unpack_dde_message)( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void **buffer, size_t size ); @@ -303,6 +302,7 @@ WNDPROC get_winproc( WNDPROC proc, BOOL ansi ) DECLSPEC_HIDDEN; void get_winproc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN; struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN; +extern void register_builtin_classes(void) DECLSPEC_HIDDEN; /* cursoricon.c */ HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e206881e596..edafc522d14 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4732,7 +4732,7 @@ static WND *create_window_handle( HWND parent, HWND owner, UNICODE_STRING *name, else assert( full_parent == thread_info->top_window ); if (full_parent && !user_driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" ); - if (user_callbacks) user_callbacks->register_builtin_classes(); + register_builtin_classes(); } else /* HWND_MESSAGE parent */ { diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 4cd223750c2..0f6fb66a2b2 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -499,7 +499,7 @@ HWND get_desktop_window(void) if (!thread_info->top_window || !user_driver->pCreateDesktopWindow( thread_info->top_window )) ERR_(win)( "failed to create desktop window\n" ); - if (user_callbacks) user_callbacks->register_builtin_classes(); + register_builtin_classes(); return thread_info->top_window; } diff --git a/include/ntuser.h b/include/ntuser.h index cad90b91882..58486fcfcb0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -34,6 +34,7 @@ enum NtUserCallWindowsHook, NtUserFreeCachedClipboardData, NtUserLoadDriver, + NtUserRegisterBuiltinClasses, NtUserRenderSynthesizedFormat, /* win16 hooks */ NtUserCallFreeIcon,

1 0

Jacek Caban : winex11: Directly use win32u and ntdll in a few more places.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 0082d58cb5375a06ce33f431f6cf338e9c4b672b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0082d58cb5375a06ce33f431… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:10 2022 +0100 winex11: Directly use win32u and ntdll in a few more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index eb357ed4643..a0ccc3ebc96 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -203,7 +203,7 @@ static const char *debugstr_format( UINT id ) { WCHAR buffer[256]; - if (GetClipboardFormatNameW( id, buffer, 256 )) + if (NtUserGetClipboardFormatName( id, buffer, ARRAYSIZE(buffer) )) return wine_dbg_sprintf( "%04x %s", id, debugstr_w(buffer) ); switch (id) @@ -349,7 +349,8 @@ static void register_win32_formats( const UINT *ids, UINT size ) for (count = 0; count < 256 && size; ids++, size--) { if (find_win32_format( *ids )) continue; /* it already exists */ - if (!GetClipboardFormatNameW( *ids, buffer, 256 )) continue; /* not a named format */ + if (!NtUserGetClipboardFormatName( *ids, buffer, ARRAYSIZE(buffer) )) + continue; /* not a named format */ if (!(len = WideCharToMultiByte( CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL ))) continue; if (!(names[count] = malloc( len ))) continue; WideCharToMultiByte( CP_UNIXCP, 0, buffer, -1, names[count], len, NULL, NULL ); @@ -434,6 +435,14 @@ static void put_property( Display *display, Window win, Atom prop, Atom type, in } +static void selection_sleep(void) +{ + LARGE_INTEGER timeout; + timeout.QuadPart = (ULONGLONG)SELECTION_WAIT * -10000; + NtDelayExecution( FALSE, &timeout ); +} + + /************************************************************************** * convert_selection */ @@ -455,7 +464,7 @@ static BOOL convert_selection( Display *display, Window win, Atom selection, Bool res = XCheckTypedWindowEvent( display, win, SelectionNotify, &event ); if (res && event.xselection.selection == selection && event.xselection.target == format->atom) return read_property( display, win, event.xselection.property, type, data, size ); - Sleep( SELECTION_WAIT ); + selection_sleep(); } ERR( "Timed out waiting for SelectionNotify event\n" ); return FALSE; @@ -1414,7 +1423,7 @@ static UINT *get_clipboard_formats( UINT *size ) for (;;) { if (!(ids = malloc( *size * sizeof(*ids) ))) return NULL; - if (GetUpdatedClipboardFormats( ids, *size, size )) break; + if (NtUserGetUpdatedClipboardFormats( ids, *size, size )) break; free( ids ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; } @@ -1706,7 +1715,7 @@ static BOOL read_property( Display *display, Window w, Atom prop, if (res && xe.xproperty.atom == prop && xe.xproperty.state == PropertyNewValue) break; - Sleep(SELECTION_WAIT); + selection_sleep(); } if (i >= SELECTION_RETRIES || @@ -1863,14 +1872,14 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_size != size || memcmp( last_data, data, size )); - if (!changed || !OpenClipboard( clipboard_hwnd )) + if (!changed || !NtUserOpenClipboard( clipboard_hwnd, 0 )) { free( data ); return FALSE; } TRACE( "selection changed, importing\n" ); - EmptyClipboard(); + NtUserEmptyClipboard(); is_clipboard_owner = TRUE; rendered_formats = 0; @@ -1884,9 +1893,9 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_data = data; last_size = size; last_clipboard_update = GetTickCount64(); - CloseClipboard(); + NtUserCloseClipboard(); if (!use_xfixes) - SetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL ); + NtUserSetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL, TIMERV_DEFAULT_COALESCING ); return TRUE; }

1 0

Piotr Caban : ntdll: Use 32-bit time_t when calling __NR_futex syscall.
by Alexandre Julliard April 26, 2022

April 26, 2022

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

Jacek Caban : win32u: Introduce data-only mode in NtUserGetClipboardData.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 286471a307792dc6662043ce36438a285cb506a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=286471a307792dc6662043ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:06 2022 +0100 win32u: Introduce data-only mode in NtUserGetClipboardData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/clipboard.c | 19 +++++++++++++++---- include/ntuser.h | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 63306702b1c..67bdd0ba391 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -631,7 +631,7 @@ done: */ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params *params ) { - struct cached_format *cache; + struct cached_format *cache = NULL; NTSTATUS status; UINT from, data_seqno; size_t size; @@ -642,7 +642,7 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * { pthread_mutex_lock( &clipboard_mutex ); - cache = get_cached_format( format ); + if (!params->data_only) cache = get_cached_format( format ); SERVER_START_REQ( get_clipboard_data ) { @@ -662,6 +662,8 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * } SERVER_END_REQ; + params->size = size; + if (!status && size) { if (cache) @@ -679,8 +681,18 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * list_add_tail( &formats_to_free, &cache->entry ); } + if (params->data_only) + { + pthread_mutex_unlock( &clipboard_mutex ); + return params->data; + } + /* allocate new cache entry */ - if (!(cache = malloc( sizeof(*cache) ))) return 0; + if (!(cache = malloc( sizeof(*cache) ))) + { + pthread_mutex_unlock( &clipboard_mutex ); + return 0; + } cache->format = format; cache->seqno = data_seqno; @@ -690,7 +702,6 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * pthread_mutex_unlock( &clipboard_mutex ); TRACE( "%s needs unmarshaling\n", debugstr_format( format ) ); params->data_size = ~0; - params->size = size; return 0; } pthread_mutex_unlock( &clipboard_mutex ); diff --git a/include/ntuser.h b/include/ntuser.h index f49c9bc7723..cad90b91882 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -257,6 +257,7 @@ struct get_clipboard_params size_t size; size_t data_size; UINT seqno; + BOOL data_only; }; /* NtUserSetClipboardData params, not compatible with Windows */

1 0

Ziqing Hui : include: Add defines for ID2D1TransformGraph.
by Alexandre Julliard April 26, 2022

April 26, 2022

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

Zebediah Figura : user32: Query CursorBlinkRate from the registry.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 535682cd79251c921121b0c87857a1f77cc27607 URL: https://source.winehq.org/git/wine.git/?a=commit;h=535682cd79251c921121b0c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 26 16:06:03 2022 +0100 user32: Query CursorBlinkRate from the registry. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/caret.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index bdc7780bf8f..7b21e03c764 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -96,6 +96,24 @@ void CDECL toggle_caret( HWND hwnd ) } +static unsigned int get_caret_registry_timeout(void) +{ + unsigned int ret = 500; + WCHAR value[11]; + DWORD size; + HKEY key; + + if (RegOpenKeyExW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_READ, &key )) + return ret; + + size = sizeof(value); + if (!RegQueryValueExW( key, L"CursorBlinkRate", NULL, NULL, (BYTE *)value, &size )) + ret = wcstoul( value, NULL, 10 ); + RegCloseKey( key ); + return ret; +} + + /***************************************************************** * CreateCaret (USER32.@) */ @@ -185,7 +203,8 @@ BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap, INT width, INT height ) if (Caret.hBmp) DeleteObject( Caret.hBmp ); Caret.hBmp = hBmp; - Caret.timeout = GetProfileIntA( "windows", "CursorBlinkRate", 500 ); + + Caret.timeout = get_caret_registry_timeout(); return TRUE; }

1 0

Huw Davies : winex11: Free "path" and "uri" with the correct functions.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: c46630cd4bb49b5440521d7b277f831569e2afe8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c46630cd4bb49b5440521d7b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 26 16:06:00 2022 +0100 winex11: Free "path" and "uri" with the correct functions. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ddcaddec66f..d677aad034b 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -922,7 +922,7 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) lstrcpynA(uri, &uriList[start], end - start + 1); path = uri_to_dos(uri); TRACE("converted URI %s to DOS path %s\n", debugstr_a(uri), debugstr_w(path)); - HeapFree( GetProcessHeap(), 0, uri ); + free( uri ); if (path) { @@ -939,7 +939,7 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) memcpy(&out[total], path, pathSize * sizeof(WCHAR)); total += pathSize; done: - free( path ); + HeapFree( GetProcessHeap(), 0, path ); if (out == NULL) break; }

1 0

Huw Davies : wineoss: Move MIDM_GETDEVCAPS to the unixlib.
by Alexandre Julliard April 26, 2022

April 26, 2022

Module: wine Branch: master Commit: 0cd1affc9a613138ba75bc3ee2eac356130f9237 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cd1affc9a613138ba75bc3e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 26 07:27:59 2022 +0100 wineoss: Move MIDM_GETDEVCAPS to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/midi.c | 17 ----------------- dlls/wineoss.drv/ossmidi.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index ab68d7c8d25..2a1619cced3 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -378,21 +378,6 @@ static DWORD WINAPI midRecThread(void *arg) return 0; } -/************************************************************************** - * midGetDevCaps [internal] - */ -static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) -{ - TRACE("(%04X, %p, %08X);\n", wDevID, lpCaps, dwSize); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (lpCaps == NULL) return MMSYSERR_INVALPARAM; - - memcpy(lpCaps, &MidiInDev[wDevID].caps, min(dwSize, sizeof(*lpCaps))); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * midOpen [internal] */ @@ -620,8 +605,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midClose(wDevID); case MIDM_ADDBUFFER: return midAddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MIDM_GETDEVCAPS: - return midGetDevCaps(wDevID, (LPMIDIINCAPSW)dwParam1,dwParam2); case MIDM_GETNUMDEVS: return MIDM_NumDevs; case MIDM_RESET: diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c index 6b8de674b7b..6ac75284812 100644 --- a/dlls/wineoss.drv/ossmidi.c +++ b/dlls/wineoss.drv/ossmidi.c @@ -1131,6 +1131,18 @@ static UINT midi_in_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) return MMSYSERR_NOERROR; } +static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) +{ + TRACE("(%04X, %p, %08X);\n", dev_id, caps, size); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + if (!caps) return MMSYSERR_INVALPARAM; + + memcpy(caps, &srcs[dev_id].caps, min(size, sizeof(*caps))); + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -1202,6 +1214,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_UNPREPARE: *params->err = midi_in_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; + case MIDM_GETDEVCAPS: + *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED;

1 0