January 2022 - Wine-Commits

Arkadiusz Hiler : winebus.sys: Enable extended BT reports for DualShock 4 controllers when requested.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: caefc0bedac7453dfba63a2109f3f2632d53604b URL: https://source.winehq.org/git/wine.git/?a=commit;h=caefc0bedac7453dfba63a21… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Thu Jan 27 19:17:56 2022 +0200 winebus.sys: Enable extended BT reports for DualShock 4 controllers when requested. This happens if any of the vendor-specific reports is used. SDL triggers the mode switch when calling SDL_GameControllerSetSensorEnabled() on supported devices. This is a one-way transition, i.e. cannot be undone without restarting the controller, so it's fine to have it tied to lifetime of winebus. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> 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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 2269f5b904e..4bd0907fdfd 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -360,6 +360,21 @@ static void hidraw_device_read_report(struct unix_device *iface) } } +static void hidraw_disable_sony_quirks(struct unix_device *iface) +{ + struct hidraw_device *impl = hidraw_impl_from_unix_device(iface); + + /* FIXME: we may want to validate CRC at the end of the outbound HID reports, + * as controllers do not switch modes if it is incorrect. + */ + + if ((impl->quirks & QUIRK_DS4_BT)) + { + TRACE("Disabling report quirk for Bluetooth DualShock4 controller iface %p\n", iface); + impl->quirks &= ~QUIRK_DS4_BT; + } +} + static void hidraw_device_set_output_report(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io) { struct hidraw_device *impl = hidraw_impl_from_unix_device(iface); @@ -379,6 +394,7 @@ static void hidraw_device_set_output_report(struct unix_device *iface, HID_XFER_ if (count > 0) { + hidraw_disable_sony_quirks(iface); io->Information = count; io->Status = STATUS_SUCCESS; } @@ -411,6 +427,7 @@ static void hidraw_device_get_feature_report(struct unix_device *iface, HID_XFER if (count > 0) { + hidraw_disable_sony_quirks(iface); io->Information = count; io->Status = STATUS_SUCCESS; } @@ -447,6 +464,7 @@ static void hidraw_device_set_feature_report(struct unix_device *iface, HID_XFER if (count > 0) { + hidraw_disable_sony_quirks(iface); io->Information = count; io->Status = STATUS_SUCCESS; }

1 0

Gerald Pfeifer : iphlpapi: Zero-init prefix_len to avoid a compiler warning.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 56b26e1d66ad9491bd7357a60c31e5df35cdd15c URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b26e1d66ad9491bd7357a6… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Jan 28 08:53:30 2022 +0000 iphlpapi: Zero-init prefix_len to avoid a compiler warning. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index c94f869c9f9..387589cc03d 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1057,6 +1057,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG if (flags & GAA_FLAG_INCLUDE_PREFIX) { memset( &sockaddr, 0, sizeof(sockaddr) ); + prefix_len = 0; if (family == AF_INET) { if (!key4->next_hop.s_addr)

1 0

Rémi Bernon : ntoskrnl.exe: Enforce path case in WM_DEVICECHANGE notifications.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: c489356d0b5bf01f2a09f6df8f5a5b9b1894fb17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c489356d0b5bf01f2a09f6df… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 28 10:02:32 2022 +0100 ntoskrnl.exe: Enforce path case in WM_DEVICECHANGE notifications. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 2 -- dlls/ntoskrnl.exe/pnp.c | 8 +++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 9993ce23c99..10aaeebcfd3 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -201,14 +201,12 @@ static LRESULT CALLBACK devnotify_wndproc( HWND hwnd, UINT msg, WPARAM wparam, L debugstr_guid( &iface->dbcc_classguid ) ); ok( iface->dbcc_size >= offsetof( DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[wcslen( iface->dbcc_name ) + 1] ), "got dbcc_size %u\n", iface->dbcc_size ); - todo_wine ok( !wcsncmp( iface->dbcc_name, expect_prefix, wcslen( expect_prefix ) ), "got dbcc_name %s\n", debugstr_w(iface->dbcc_name) ); upper_end = wcschr( iface->dbcc_name + wcslen( expect_prefix ), '#' ); name_end = iface->dbcc_name + wcslen( iface->dbcc_name ) + 1; ok( !!upper_end, "got dbcc_name %s\n", debugstr_w(iface->dbcc_name) ); - todo_wine ok( all_upper( iface->dbcc_name, upper_end ), "got dbcc_name %s\n", debugstr_w(iface->dbcc_name) ); ok( all_lower( upper_end, name_end ), "got dbcc_name %s\n", debugstr_w(iface->dbcc_name) ); diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 8d3481b2a72..ee1402e0e49 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -698,11 +698,11 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable size_t namelen = name->Length / sizeof(WCHAR); DEV_BROADCAST_DEVICEINTERFACE_W *broadcast; + WCHAR *path, *refstr, *p, *upper_end; struct device_interface *iface; HANDLE iface_key, control_key; OBJECT_ATTRIBUTES attr = {0}; struct wine_rb_entry *entry; - WCHAR *path, *refstr, *p; UNICODE_STRING string; DWORD data = enable; NTSTATUS ret; @@ -788,6 +788,12 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); if (namelen > 1) broadcast->dbcc_name[1] = '\\'; + + upper_end = wcschr( broadcast->dbcc_name, '#' ); + if (upper_end) upper_end = wcschr( upper_end + 1, '#' ); + while (upper_end && upper_end-- != broadcast->dbcc_name) + *upper_end = towupper( *upper_end ); + send_devicechange( enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, broadcast, len ); heap_free( broadcast ); }

1 0

Paul Gofman : winhttp: Don't queue socket_close() in WinHttpWebSocketClose() if close frame is already received.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 41ea7fb0e1e35c838c9437d6b51acc4ffa70d3d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41ea7fb0e1e35c838c9437d6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 28 02:06:29 2022 +0300 winhttp: Don't queue socket_close() in WinHttpWebSocketClose() if close frame is already received. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 7 +++++++ dlls/winhttp/tests/notification.c | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5568f04d0d0..04df90f74d7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3959,6 +3959,13 @@ DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reas if (prev_state < SOCKET_STATE_SHUTDOWN && (ret = send_socket_shutdown( socket, status, reason, len, FALSE ))) goto done; + if (!pending_receives && socket->close_frame_received) + { + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) + socket_close_complete( socket, socket->close_frame_receive_err ); + goto done; + } + if (socket->request->connect->hdr.flags & WINHTTP_FLAG_ASYNC) { struct socket_shutdown *s; diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 1ae1bb537b0..3dc94a909b4 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -728,6 +728,8 @@ static const struct notification websocket_test3[] = { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_SHUTDOWN_COMPLETE, NF_MAIN_THREAD }, { winhttp_websocket_shutdown, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, NF_SAVE_BUFFER | NF_SIGNAL }, + { winhttp_websocket_close, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, + NF_MAIN_THREAD| NF_SAVE_BUFFER | NF_SIGNAL }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CLOSING_CONNECTION, NF_WINE_ALLOW }, { winhttp_close_handle, WINHTTP_CALLBACK_STATUS_CONNECTION_CLOSED, NF_WINE_ALLOW }, @@ -1130,6 +1132,14 @@ static void test_websocket(BOOL secure) ok( close_status == 1000, "got %u\n", close_status ); ok( size <= sizeof(buffer), "got %u\n", size ); + info.buflen = 0xdeadbeef; + setup_test( &info, winhttp_websocket_close, __LINE__ ); + err = pWinHttpWebSocketClose( socket, 1000, (void *)"success", sizeof("success") ); + ok( err == ERROR_SUCCESS, "got %u\n", err ); + + WaitForSingleObject( info.wait, INFINITE ); + ok( !info.buflen, "Got unexpected buflen %u.\n", info.buflen ); + setup_test( &info, winhttp_close_handle, __LINE__ ); WinHttpCloseHandle( socket );

1 0

Paul Gofman : winhttp: Factor out socket_close_complete() function.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 1c9ea6cd94ba3219ae6d368fdcd9a4d7d11550ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9ea6cd94ba3219ae6d368f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 28 02:06:28 2022 +0300 winhttp: Factor out socket_close_complete() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8e13e678e22..5568f04d0d0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3886,24 +3886,29 @@ static DWORD socket_close( struct socket *socket ) return receive_close_status( socket, count ); } -static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +static void socket_close_complete( struct socket *socket, DWORD ret ) { - struct socket_shutdown *s = ctx; - DWORD ret; - - ret = socket_close( s->socket ); - - if (!ret) send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NULL, 0 ); + if (!ret) send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_CLOSE_COMPLETE, NULL, 0 ); else { WINHTTP_WEB_SOCKET_ASYNC_RESULT result; result.AsyncResult.dwResult = API_READ_DATA; /* FIXME */ result.AsyncResult.dwError = ret; result.Operation = WINHTTP_WEB_SOCKET_CLOSE_OPERATION; - send_callback( &s->socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); } +} + +static void CALLBACK task_socket_close( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) +{ + struct socket_shutdown *s = ctx; + DWORD ret; TRACE("running %p\n", work); + + ret = socket_close( s->socket ); + socket_close_complete( s->socket, ret ); + release_object( &s->socket->hdr ); free( s ); }

1 0

Rémi Bernon : wmadmod: Introduce new DLL and tests.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 85747f0abe0b013d9f287a33e10738e28d7418e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85747f0abe0b013d9f287a33… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 28 09:59:25 2022 +0100 wmadmod: Introduce new DLL and tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 3 + configure.ac | 2 + dlls/wmadmod/Makefile.in | 4 + dlls/wmadmod/main.c | 35 ++++++++ dlls/wmadmod/tests/Makefile.in | 5 ++ dlls/wmadmod/tests/wmadmod.c | 183 +++++++++++++++++++++++++++++++++++++++++ dlls/wmadmod/wmadmod.spec | 5 ++ 7 files changed, 237 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85747f0abe0b013d9f28…

1 0

Rémi Bernon : include: Add more WMA GUIDs to wmcodecdsp.idl.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: a87e758a8521fa4f5c291a51d4902d0d5e4f3631 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a87e758a8521fa4f5c291a51… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 28 09:59:24 2022 +0100 include: Add more WMA GUIDs to wmcodecdsp.idl. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51931 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52391 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmcodecdsp.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/wmcodecdsp.idl b/include/wmcodecdsp.idl index 809e528d7e2..2d74790179c 100644 --- a/include/wmcodecdsp.idl +++ b/include/wmcodecdsp.idl @@ -21,6 +21,9 @@ import "strmif.idl"; cpp_quote("DEFINE_GUID(MEDIASUBTYPE_I420,0x30323449,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") cpp_quote("DEFINE_GUID(MEDIASUBTYPE_MSAUDIO1,0x00000160,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMAUDIO2,0x00000161,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMAUDIO3,0x00000162,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") +cpp_quote("DEFINE_GUID(MEDIASUBTYPE_WMAUDIO_LOSSLESS,0x00000163,0x0000,0x0010,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71);") [ uuid(bbeea841-0a63-4f52-a7ab-a9b3a84ed38a)

1 0

Rémi Bernon : sechost: Support device interface notifications filtering.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 439d126a998ba0885d90e6a5f9e3526a75e48cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=439d126a998ba0885d90e6a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 28 10:02:31 2022 +0100 sechost: Support device interface notifications filtering. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 7 ++----- dlls/sechost/service.c | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 5cb8358e3a9..9993ce23c99 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -197,7 +197,6 @@ static LRESULT CALLBACK devnotify_wndproc( HWND hwnd, UINT msg, WPARAM wparam, L winetest_push_context( "%u", device_change_count ); - todo_wine_if( IsEqualGUID( &iface->dbcc_classguid, &control_class ) && !device_change_all ) ok( IsEqualGUID( &iface->dbcc_classguid, &expect_guid ), "got dbch_classguid %s\n", debugstr_guid( &iface->dbcc_classguid ) ); ok( iface->dbcc_size >= offsetof( DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_name[wcslen( iface->dbcc_name ) + 1] ), @@ -315,8 +314,7 @@ static void test_RegisterDeviceNotification(void) while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); device_change_count = 0; - if (!strcmp( winetest_platform, "wine" )) device_change_expect = 4; - else device_change_expect = 2; + device_change_expect = 2; device_change_hwnd = hwnd; device_change_all = FALSE; stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -349,8 +347,7 @@ static void test_RegisterDeviceNotification(void) while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); device_change_count = 0; - if (!strcmp( winetest_platform, "wine" )) device_change_expect = 4; - else device_change_expect = 2; + device_change_expect = 2; device_change_hwnd = hwnd; device_change_all = FALSE; stop_event = CreateEventW( NULL, FALSE, FALSE, NULL ); diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index 00485869e9c..fee3b52b6ac 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -1990,6 +1990,23 @@ struct device_notify_registration struct device_notification_details details; }; +static BOOL notification_filter_matches( DEV_BROADCAST_HDR *filter, DEV_BROADCAST_HDR *event ) +{ + if (!filter->dbch_devicetype) return TRUE; + if (filter->dbch_devicetype != event->dbch_devicetype) return FALSE; + + if (filter->dbch_devicetype == DBT_DEVTYP_DEVICEINTERFACE) + { + DEV_BROADCAST_DEVICEINTERFACE_W *filter_iface = (DEV_BROADCAST_DEVICEINTERFACE_W *)filter; + DEV_BROADCAST_DEVICEINTERFACE_W *event_iface = (DEV_BROADCAST_DEVICEINTERFACE_W *)event; + if (filter_iface->dbcc_size == offsetof(DEV_BROADCAST_DEVICEINTERFACE_W, dbcc_classguid)) return TRUE; + return IsEqualGUID( &filter_iface->dbcc_classguid, &event_iface->dbcc_classguid ); + } + + FIXME( "Filter dbch_devicetype %u not implemented\n", filter->dbch_devicetype ); + return TRUE; +} + static DWORD WINAPI device_notify_proc( void *arg ) { WCHAR endpoint[] = L"\\pipe\\wine_plugplay"; @@ -2074,6 +2091,7 @@ static DWORD WINAPI device_notify_proc( void *arg ) for (i = 0; i < details_copy_nelems; i++) { + if (!notification_filter_matches( &details_copy[i].filter.header, (DEV_BROADCAST_HDR *)buf )) continue; details_copy[i].cb( details_copy[i].handle, code, (DEV_BROADCAST_HDR *)buf ); } MIDL_user_free(buf); @@ -2104,8 +2122,6 @@ HDEVNOTIFY WINAPI I_ScRegisterDeviceNotification( struct device_notification_det TRACE("callback %p, handle %p, filter %p, flags %#x\n", details->cb, details->handle, filter, flags); - if (filter) FIXME("Notification filters are not yet implemented.\n"); - if (!(registration = heap_alloc(sizeof(struct device_notify_registration)))) { SetLastError(ERROR_NOT_ENOUGH_MEMORY);

1 0

Paul Gofman : winhttp: Don't allow queueing websocket receive if another is pending.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: d44e752fa26403b41da7d7c6ac34b2884f287984 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d44e752fa26403b41da7d7c6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jan 28 02:06:31 2022 +0300 winhttp: Don't allow queueing websocket receive if another is pending. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 15 +++++++++++++-- dlls/winhttp/tests/notification.c | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a61355da7b9..728b1895ba7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3743,13 +3743,24 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D { struct socket_receive *r; - if (!(r = malloc( sizeof(*r) ))) return FALSE; + if (InterlockedIncrement( &socket->hdr.pending_receives ) > 1) + { + InterlockedDecrement( &socket->hdr.pending_receives ); + WARN( "Attempt to queue receive while another is pending.\n" ); + release_object( &socket->hdr ); + return ERROR_INVALID_OPERATION; + } + + if (!(r = malloc( sizeof(*r) ))) + { + InterlockedDecrement( &socket->hdr.pending_receives ); + return ERROR_OUTOFMEMORY; + } r->socket = socket; r->buf = buf; r->len = len; addref_object( &socket->hdr ); - InterlockedIncrement( &socket->hdr.pending_receives ); if ((ret = queue_task( &socket->recv_q, task_socket_receive, r ))) { InterlockedDecrement( &socket->hdr.pending_receives ); diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index fabc5a03a46..121190ba9d2 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -1104,6 +1104,8 @@ static void test_websocket(BOOL secure) err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); ok( err == ERROR_SUCCESS, "got %u\n", err ); + err = pWinHttpWebSocketReceive( socket, buffer, sizeof(buffer), &size, &type ); + ok( err == ERROR_INVALID_OPERATION, "got %u\n", err ); setup_test( &info, winhttp_websocket_shutdown, __LINE__ ); ws_status = (WINHTTP_WEB_SOCKET_STATUS *)info.buffer;

1 0

Rémi Bernon : user32: Remove FIXME from RegisterDeviceNotificationA.
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: master Commit: 30af95f45da07dbdc20f6c1684140803354b23db URL: https://source.winehq.org/git/wine.git/?a=commit;h=30af95f45da07dbdc20f6c16… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 28 10:02:30 2022 +0100 user32: Remove FIXME from RegisterDeviceNotificationA. There's no conversion to do, the device name in the filter is ignored. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 67ca7e178f2..fde4b9965ed 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -1186,13 +1186,9 @@ extern BOOL WINAPI I_ScUnregisterDeviceNotification( HDEVNOTIFY handle ); * * See RegisterDeviceNotificationW. */ -HDEVNOTIFY WINAPI RegisterDeviceNotificationA(HANDLE hRecipient, LPVOID pNotificationFilter, DWORD dwFlags) +HDEVNOTIFY WINAPI RegisterDeviceNotificationA( HANDLE handle, void *filter, DWORD flags ) { - TRACE("(hwnd=%p, filter=%p,flags=0x%08x)\n", - hRecipient,pNotificationFilter,dwFlags); - if (pNotificationFilter) - FIXME("The notification filter will requires an A->W when filter support is implemented\n"); - return RegisterDeviceNotificationW(hRecipient, pNotificationFilter, dwFlags); + return RegisterDeviceNotificationW( handle, filter, flags ); } /***********************************************************************

1 0