June 2022 - Wine-Devel - list.winehq.org

Re: [PATCH v6 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated - approved
by Alexandre Julliard (＠julliard) June 9, 2022

June 9, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/135

1 0

Re: [PATCH v3 0/1] MR203: ws2_32: Check for valid socket in WSAGetOverlappedResult(). - approved
by Alexandre Julliard (＠julliard) June 9, 2022

June 9, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/203

1 0

[PATCH v2 0/2] MR214: ntdll: tests: Test returning an exception handler on arm/arm64
by Martin Storsjö June 9, 2022

June 9, 2022

Also fix up the error message printed for the handler data. -- v2: ntdll/tests: Test returning an exception handler on arm/arm64. ntdll/tests: Fix printing of incorrect exception handler data. https://gitlab.winehq.org/wine/wine/-/merge_requests/214

2 3

Re: [PATCH v2 0/2] MR209: mfreadwrite: Base MF_SOURCE_READER_ANY_STREAM behavior off timestamps - approved
by Alexandre Julliard (＠julliard) June 9, 2022

June 9, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/209

1 0

[PATCH v2 0/7] MR205: Add support for HRESULT and ID3DX10ThreadPump parameters in D3DX10GetImageInfo functions
by Piotr Caban (＠piotr) June 9, 2022

June 9, 2022

-- v2: d3dx10/tests: Add D3DX10GetImageInfoFromMemory thread pump tests. d3dx10: Support ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromMemory. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceW. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromResourceA. d3dx10: Add support for ID3DX10ThreadPump parameter in D3DX10GetImageInfoFromFileW. d3dx10/tests: Add D3DX10GetImageInfoFromMemory HRESULT argument tests. d3dx10: Don't ignore HRESULT parameter in D3DX10GetImageInfoFrom* functions. https://gitlab.winehq.org/wine/wine/-/merge_requests/205

3 9

[PATCH 1/2] user32/tests: Test intra-thread SendMessage and ReplyMessage behavior.
by Gabriel Ivăncescu June 9, 2022

June 9, 2022

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/user32/tests/msg.c | 90 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2705914..fab3221 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -18521,6 +18521,12 @@ static void test_SendMessage_other_thread(int thread_n) CloseHandle(wnd_event.stop_event); } +static void CALLBACK msg_callback_nested( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT result ) +{ + ok( msg == WM_USER + 10, "wrong msg %x\n", msg ); + ok( result == 0, "wrong result %Ix\n", result ); +} + static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { DWORD flags = InSendMessageEx( NULL ); @@ -18561,6 +18567,80 @@ static LRESULT CALLBACK insendmessage_wnd_proc( HWND hwnd, UINT msg, WPARAM wp, ret = ReplyMessage( msg ); ok( !ret, "ReplyMessage succeeded\n" ); break; + case WM_USER + 4: + ok( flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageCallbackA( hwnd, WM_USER + 10, 0, 0, msg_callback_nested, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED), "wrong flags %lx\n", flags ); + ret = ReplyMessage( msg ); + todo_wine + ok( !ret, "ReplyMessage returned %u\n", ret ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_SEND | ISMEX_REPLIED), "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 5: + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageA( hwnd, WM_USER + 11, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 6: + ok( flags == ISMEX_CALLBACK, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + SendMessageW( hwnd, WM_USER + 12, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_CALLBACK | ISMEX_REPLIED) || flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + todo_wine + ok( !ret, "ReplyMessage returned %u\n", ret ); + flags = InSendMessageEx( NULL ); + ok( flags == (ISMEX_CALLBACK | ISMEX_REPLIED) || flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + break; + case WM_USER + 7: + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned true\n" ); + SendNotifyMessageW( hwnd, WM_USER + 13, 0, 0 ); + flags = InSendMessageEx( NULL ); + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned true\n" ); + ret = ReplyMessage( msg ); + ok( !ret, "ReplyMessage succeeded\n" ); + break; + + case WM_USER + 10: + ok( flags == ISMEX_SEND, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 11: + ok( flags == ISMEX_NOTIFY, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 12: + ok( flags == ISMEX_CALLBACK, "wrong flags %lx\n", flags ); + ok( InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( ret, "ReplyMessage failed err %lu\n", GetLastError() ); + break; + case WM_USER + 13: + ok( flags == ISMEX_NOSEND, "wrong flags %lx\n", flags ); + ok( !InSendMessage(), "InSendMessage returned false\n" ); + ret = ReplyMessage( msg ); + ok( !ret, "ReplyMessage returned %u\n", ret ); + break; } return DefWindowProcA( hwnd, msg, wp, lp ); @@ -18572,6 +18652,12 @@ static void CALLBACK msg_callback( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT r ok( result == WM_USER + 2, "wrong result %Ix\n", result ); } +static void CALLBACK msg_callback2( HWND hwnd, UINT msg, ULONG_PTR arg, LRESULT result ) +{ + ok( msg == WM_USER + 6, "wrong msg %x\n", msg ); + ok( result == WM_USER + 6, "wrong result %Ix\n", result ); +} + static DWORD WINAPI send_message_thread( void *arg ) { HWND win = arg; @@ -18580,6 +18666,10 @@ static DWORD WINAPI send_message_thread( void *arg ) SendNotifyMessageA( win, WM_USER + 1, 0, 0 ); SendMessageCallbackA( win, WM_USER + 2, 0, 0, msg_callback, 0 ); PostMessageA( win, WM_USER + 3, 0, 0 ); + SendMessageA( win, WM_USER + 4, 0, 0 ); + SendNotifyMessageA( win, WM_USER + 5, 0, 0 ); + SendMessageCallbackA( win, WM_USER + 6, 0, 0, msg_callback2, 0 ); + PostMessageA( win, WM_USER + 7, 0, 0 ); PostMessageA( win, WM_QUIT, 0, 0 ); return 0; } -- 2.34.1

2 3

[PATCH v3 1/4] hidclass.sys: Expose an ioctl to retrieve the raw input handle.
by Rémi Bernon June 9, 2022

June 9, 2022

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidclass.sys/device.c | 12 ++++++++++++ include/wine/hid.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d917bbc674..7c0dbdcbc10 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -655,6 +655,18 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: status = hid_device_xfer_report( ext, code, irp ); break; + + case IOCTL_HID_GET_WINE_RAWINPUT_HANDLE: + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_OVERFLOW; + else + { + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.rawinput_handle; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; + } + break; + default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/include/wine/hid.h b/include/wine/hid.h index 236888cbdc7..6a92317551f 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -227,4 +227,6 @@ struct hid_preparsed_data #define PID_USAGE_CREATE_NEW_EFFECT_REPORT ((USAGE) 0xab) #define PID_USAGE_RAM_POOL_AVAILABLE ((USAGE) 0xac) +#define IOCTL_HID_GET_WINE_RAWINPUT_HANDLE HID_BUFFER_CTL_CODE(300) + #endif /* __WINE_PARSE_H */ -- 2.36.1

2 4

[PATCH resend 1/2] comctl32: Set the selection if it's currently invalid in HandleTimer.
by Gabriel Ivăncescu June 9, 2022

June 9, 2022

This can happen in a combo box if the dropdown is shown by a mouse click + release followed by the mouse being moved into the dropped listbox (when the listbox has nothing selected). In this case, the first item (with the index zero) would not be selected the first time the mouse moves over it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This can be easily tested with winecfg. Launch winecfg, go to `Libraries` tab, click on the combobox arrow dropdown for `New override for library` to open the listbox, then hover the mouse over the first entry (acledit). Notice that it does not get highlighted, which is the issue. If you move the mouse to the second entry (aclui) and then back to (acledit), it works. dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index 6724dee..2942952 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -2339,7 +2339,7 @@ static LRESULT LISTBOX_HandleTimer( LB_DESCR *descr, INT index, TIMER_DIRECTION case LB_TIMER_NONE: break; } - if (index == descr->focus_item) return FALSE; + if (index == descr->focus_item && descr->selected_item != -1) return FALSE; LISTBOX_MoveCaret( descr, index, FALSE ); return TRUE; } -- 2.34.1

1 1

[PATCH] advapi32: Fix spec for LookupPrivilegeDisplayName{A,W}
by Louis Lenders June 9, 2022

June 9, 2022

1 0

[PATCH v2 1/4] hidclass.sys: Expose an ioctl to retrieve the raw input handle.
by Rémi Bernon June 9, 2022

June 9, 2022

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Fix some style nitpicks, move the ioctl to wine/hid.h and name it with a wine prefix, similarly to IOCTL_HID_GET_MS_GENRE_DESCRIPTOR. dlls/hidclass.sys/device.c | 12 ++++++++++++ include/wine/hid.h | 2 ++ 2 files changed, 14 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 9d917bbc674..7c0dbdcbc10 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -655,6 +655,18 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_HID_SET_OUTPUT_REPORT: status = hid_device_xfer_report( ext, code, irp ); break; + + case IOCTL_HID_GET_WINE_RAWINPUT_HANDLE: + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(ULONG)) + status = STATUS_BUFFER_OVERFLOW; + else + { + *(ULONG *)irp->AssociatedIrp.SystemBuffer = ext->u.pdo.rawinput_handle; + irp->IoStatus.Information = sizeof(ULONG); + status = STATUS_SUCCESS; + } + break; + default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; diff --git a/include/wine/hid.h b/include/wine/hid.h index 236888cbdc7..6a92317551f 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -227,4 +227,6 @@ struct hid_preparsed_data #define PID_USAGE_CREATE_NEW_EFFECT_REPORT ((USAGE) 0xab) #define PID_USAGE_RAM_POOL_AVAILABLE ((USAGE) 0xac) +#define IOCTL_HID_GET_WINE_RAWINPUT_HANDLE HID_BUFFER_CTL_CODE(300) + #endif /* __WINE_PARSE_H */ -- 2.36.1

2 5