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

Jacek Caban : win32u: Use KeUserModeCallback interface for DDE message callbacks.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: d3c57dec71e714d4922daa45fee019fbc7dc7180 URL: https://gitlab.winehq.org/wine/wine/-/commit/d3c57dec71e714d4922daa45fee019… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 9 15:13:42 2022 +0200 win32u: Use KeUserModeCallback interface for DDE message callbacks. --- dlls/user32/message.c | 14 +++++++------- dlls/user32/user_main.c | 20 ++++++++++++++++++-- dlls/user32/user_private.h | 2 +- dlls/win32u/message.c | 36 +++++++++++++++++++++++++++++++----- dlls/win32u/ntuser_private.h | 4 ---- include/ntuser.h | 30 ++++++++++++++++++++++++++++++ 6 files changed, 87 insertions(+), 19 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index eff0c4efbcf..f4e9b5b404e 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -477,7 +477,7 @@ BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD * Unpack a posted DDE message received from another process. */ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void **buffer, size_t size ) + const void *buffer, size_t size ) { UINT_PTR uiLo, uiHi; HGLOBAL hMem = 0; @@ -491,9 +491,9 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam ULONGLONG hpack; /* hMem is being passed */ if (size != sizeof(hpack)) return FALSE; - if (!buffer || !*buffer) return FALSE; + if (!size) return FALSE; uiLo = *lparam; - memcpy( &hpack, *buffer, size ); + memcpy( &hpack, buffer, size ); hMem = unpack_ptr( hpack ); uiHi = (UINT_PTR)hMem; TRACE("recv dde-ack %Ix mem=%Ix[%Ix]\n", uiLo, uiHi, GlobalSize( hMem )); @@ -509,7 +509,7 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam case WM_DDE_ADVISE: case WM_DDE_DATA: case WM_DDE_POKE: - if ((!buffer || !*buffer) && message != WM_DDE_DATA) return FALSE; + if (!size && message != WM_DDE_DATA) return FALSE; uiHi = *lparam; if (size) { @@ -517,7 +517,7 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam return FALSE; if ((ptr = GlobalLock( hMem ))) { - memcpy( ptr, *buffer, size ); + memcpy( ptr, buffer, size ); GlobalUnlock( hMem ); } else @@ -533,11 +533,11 @@ BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam case WM_DDE_EXECUTE: if (size) { - if (!buffer || !*buffer) return FALSE; + if (!size) return FALSE; if (!(hMem = GlobalAlloc( GMEM_MOVEABLE|GMEM_DDESHARE, size ))) return FALSE; if ((ptr = GlobalLock( hMem ))) { - memcpy( ptr, *buffer, size ); + memcpy( ptr, buffer, size ); GlobalUnlock( hMem ); TRACE( "exec: pairing c=%08Ix s=%p\n", *lparam, hMem ); if (!dde_add_pair( (HGLOBAL)*lparam, hMem )) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index f9bc4985368..16ce5c6a854 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -134,8 +134,6 @@ static NTSTATUS try_finally( NTSTATUS (CDECL *func)( void *), void *arg, static const struct user_callbacks user_funcs = { NtWaitForMultipleObjects, - post_dde_message, - unpack_dde_message, try_finally, }; @@ -192,6 +190,12 @@ static NTSTATUS WINAPI User32FreeCachedClipboardData( const struct free_cached_d return 0; } +static NTSTATUS WINAPI User32PostDDEMessage( const struct post_dde_message_params *params, ULONG size ) +{ + return post_dde_message( params->hwnd, params->msg, params->wparam, params->lparam, + params->dest_tid, params->type ); +} + static NTSTATUS WINAPI User32RenderSsynthesizedFormat( const struct render_synthesized_format_params *params, ULONG size ) { @@ -204,6 +208,16 @@ static BOOL WINAPI User32LoadDriver( const WCHAR *path, ULONG size ) return LoadLibraryW( path ) != NULL; } +static NTSTATUS WINAPI User32UnpackDDEMessage( const struct unpack_dde_message_params *params, ULONG size ) +{ + struct unpack_dde_message_result *result = params->result; + result->wparam = params->wparam; + result->lparam = params->lparam; + size -= FIELD_OFFSET( struct unpack_dde_message_params, data ); + return unpack_dde_message( params->hwnd, params->message, &result->wparam, &result->lparam, + params->data, size ); +} + static const void *kernel_callback_table[NtUserCallCount] = { User32CallEnumDisplayMonitor, @@ -220,8 +234,10 @@ static const void *kernel_callback_table[NtUserCallCount] = User32LoadDriver, User32LoadImage, User32LoadSysMenu, + User32PostDDEMessage, User32RegisterBuiltinClasses, User32RenderSsynthesizedFormat, + User32UnpackDDEMessage, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index e637bf01f5e..2e09605cc03 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -60,7 +60,7 @@ struct tagWND; extern BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, DWORD type ) DECLSPEC_HIDDEN; extern BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void **buffer, size_t size ) DECLSPEC_HIDDEN; + const void *buffer, size_t size ) DECLSPEC_HIDDEN; extern void free_cached_data( UINT format, HANDLE handle ) DECLSPEC_HIDDEN; extern HANDLE render_synthesized_format( UINT format, UINT from ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index b8ea7cdce9f..0045c8a54c0 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1827,9 +1827,26 @@ static int peek_message( MSG *msg, HWND hwnd, UINT first, UINT last, UINT flags, } if (info.msg.message >= WM_DDE_FIRST && info.msg.message <= WM_DDE_LAST) { - if (!user_callbacks->unpack_dde_message( info.msg.hwnd, info.msg.message, &info.msg.wParam, - &info.msg.lParam, &buffer, size )) - continue; /* ignore it */ + struct unpack_dde_message_result result; + struct unpack_dde_message_params *params; + void *ret_ptr; + ULONG len; + BOOL ret; + + len = FIELD_OFFSET( struct unpack_dde_message_params, data[size] ); + if (!(params = malloc( len ))) + continue; + params->result = &result; + params->hwnd = info.msg.hwnd; + params->message = info.msg.message; + params->wparam = info.msg.wParam; + params->lparam = info.msg.lParam; + if (size) memcpy( params->data, buffer, size ); + ret = KeUserModeCallback( NtUserUnpackDDEMessage, params, len, &ret_ptr, &len ); + free( params ); + if (!ret) continue; /* ignore it */ + info.msg.wParam = result.wparam; + info.msg.lParam = result.lparam; } *msg = info.msg; msg->pt = point_phys_to_win_dpi( info.msg.hwnd, info.msg.pt ); @@ -2185,8 +2202,17 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * } else if (info->type == MSG_POSTED && info->msg >= WM_DDE_FIRST && info->msg <= WM_DDE_LAST) { - return user_callbacks && user_callbacks->post_dde_message( info->hwnd, info->msg, - info->wparam, info->lparam, info->dest_tid, info->type ); + struct post_dde_message_params params; + void *ret_ptr; + ULONG ret_len; + + params.hwnd = info->hwnd; + params.msg = info->msg; + params.wparam = info->wparam; + params.lparam = info->lparam; + params.dest_tid = info->dest_tid; + params.type = info->type; + return KeUserModeCallback( NtUserPostDDEMessage, &params, sizeof(params), &ret_ptr, &ret_len ); } SERVER_START_REQ( send_message ) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 55f2a449be4..9c23799c6bb 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -33,10 +33,6 @@ struct hardware_msg_data; struct user_callbacks { NTSTATUS (WINAPI *pNtWaitForMultipleObjects)(ULONG,const HANDLE*,BOOLEAN,BOOLEAN,const LARGE_INTEGER*); - BOOL (CDECL *post_dde_message)( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, - DWORD type ); - BOOL (CDECL *unpack_dde_message)( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, - void **buffer, size_t size ); NTSTATUS (CDECL *try_finally)( NTSTATUS (CDECL *func)( void *), void *arg, void (CALLBACK *finally_func)( BOOL )); }; diff --git a/include/ntuser.h b/include/ntuser.h index d22799ebe01..8cd7833717f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -42,8 +42,10 @@ enum NtUserLoadDriver, NtUserLoadImage, NtUserLoadSysMenu, + NtUserPostDDEMessage, NtUserRegisterBuiltinClasses, NtUserRenderSynthesizedFormat, + NtUserUnpackDDEMessage, /* win16 hooks */ NtUserCallFreeIcon, NtUserThunkLock, @@ -218,6 +220,17 @@ struct load_sys_menu_params BOOL mdi; }; +/* NtUserPostDDEMessage params */ +struct post_dde_message_params +{ + HWND hwnd; + UINT msg; + WPARAM wparam; + LPARAM lparam; + DWORD dest_tid; + DWORD type; +}; + /* NtUserRenderSynthesizedFormat params */ struct render_synthesized_format_params { @@ -225,6 +238,23 @@ struct render_synthesized_format_params UINT from; }; +/* NtUserUnpackDDEMessage params */ +struct unpack_dde_message_result +{ + WPARAM wparam; + LPARAM lparam; +}; + +struct unpack_dde_message_params +{ + struct unpack_dde_message_result *result; /* FIXME: Use NtCallbackReturn instead */ + HWND hwnd; + UINT message; + WPARAM wparam; + LPARAM lparam; + char data[1]; +}; + /* process DPI awareness contexts */ #define NTUSER_DPI_UNAWARE 0x00006010 #define NTUSER_DPI_SYSTEM_AWARE 0x00006011

1 0

Zebediah Figura : ddraw/tests: Build ddraw1.c without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 92793a6e73daf1cbbe3386d0a8c1887073e9e50e URL: https://gitlab.winehq.org/wine/wine/-/commit/92793a6e73daf1cbbe3386d0a8c188… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 8 00:09:23 2022 -0500 ddraw/tests: Build ddraw1.c without -DWINE_NO_LONG_TYPES. --- dlls/ddraw/tests/ddraw1.c | 3930 ++++++++++++++++++++++----------------------- 1 file changed, 1948 insertions(+), 1982 deletions(-)

1 0

Zebediah Figura : ddraw/tests: Build ddraw2.c without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 0af510467b176daff66b9bc9ec07b51859ff656a URL: https://gitlab.winehq.org/wine/wine/-/commit/0af510467b176daff66b9bc9ec07b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 10 22:20:26 2022 -0500 ddraw/tests: Build ddraw2.c without -DWINE_NO_LONG_TYPES. --- dlls/ddraw/tests/ddraw2.c | 4507 ++++++++++++++++++++++----------------------- 1 file changed, 2239 insertions(+), 2268 deletions(-)

1 0

Rémi Bernon : mf/tests: Simplify topology loader tests.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 2db8a0a94efd3d45f2888c96f293670112414533 URL: https://gitlab.winehq.org/wine/wine/-/commit/2db8a0a94efd3d45f2888c96f29367… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 1 13:27:54 2022 +0200 mf/tests: Simplify topology loader tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 193 ++++++++++++++++------------------------------------- 1 file changed, 56 insertions(+), 137 deletions(-)

1 0

Rémi Bernon : mf/tests: Add more topology loader media types tests.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 142e6e78619975bd064a73110b8999fc9fe7ae84 URL: https://gitlab.winehq.org/wine/wine/-/commit/142e6e78619975bd064a73110b8999… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 1 13:27:54 2022 +0200 mf/tests: Add more topology loader media types tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 150 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 121 insertions(+), 29 deletions(-)

1 0

Rémi Bernon : mf/tests: Add more topology loader connect method tests.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: fb513fcc0742390338a30e0df13111bf21de0920 URL: https://gitlab.winehq.org/wine/wine/-/commit/fb513fcc0742390338a30e0df13111… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 4 17:42:54 2022 +0200 mf/tests: Add more topology loader connect method tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 70 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 24 deletions(-)

1 0

Rémi Bernon : mf: Move and rename topology_loader_get_node_type_handler.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 6c2b8fd3a4dadc0f6061c11e0bbc05326d504423 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c2b8fd3a4dadc0f6061c11e0bbc05… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 8 11:18:43 2022 +0200 mf: Move and rename topology_loader_get_node_type_handler. To topology_node_get_type_handler. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/topology.c | 74 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 34c20dbc735..29f34445bc5 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1820,6 +1820,41 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode return hr; } +static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, IMFMediaTypeHandler **handler) +{ + MF_TOPOLOGY_TYPE node_type; + IMFStreamSink *stream_sink; + IMFStreamDescriptor *sd; + HRESULT hr; + + if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) + return hr; + + switch (node_type) + { + case MF_TOPOLOGY_OUTPUT_NODE: + if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) + { + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, handler); + IMFStreamSink_Release(stream_sink); + } + break; + case MF_TOPOLOGY_SOURCESTREAM_NODE: + if (SUCCEEDED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, + &IID_IMFStreamDescriptor, (void **)&sd))) + { + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, handler); + IMFStreamDescriptor_Release(sd); + } + break; + default: + WARN("Unexpected node type %u.\n", node_type); + return MF_E_UNEXPECTED; + } + + return hr; +} + /*********************************************************************** * MFGetTopoNodeCurrentType (mf.@) */ @@ -2168,41 +2203,6 @@ static HRESULT connect_to_converter(struct transform_output_type *output_type, s typedef HRESULT (*p_topology_loader_connect_func)(struct topoloader_context *context, IMFTopologyNode *upstream_node, unsigned int output_index, IMFTopologyNode *downstream_node, unsigned int input_index); -static HRESULT topology_loader_get_node_type_handler(IMFTopologyNode *node, IMFMediaTypeHandler **handler) -{ - MF_TOPOLOGY_TYPE node_type; - IMFStreamSink *stream_sink; - IMFStreamDescriptor *sd; - HRESULT hr; - - if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) - return hr; - - switch (node_type) - { - case MF_TOPOLOGY_OUTPUT_NODE: - if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) - { - hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, handler); - IMFStreamSink_Release(stream_sink); - } - break; - case MF_TOPOLOGY_SOURCESTREAM_NODE: - if (SUCCEEDED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, - &IID_IMFStreamDescriptor, (void **)&sd))) - { - hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, handler); - IMFStreamDescriptor_Release(sd); - } - break; - default: - WARN("Unexpected node type %u.\n", node_type); - return MF_E_UNEXPECTED; - } - - return hr; -} - static HRESULT topology_loader_get_mft_categories(IMFMediaTypeHandler *handler, GUID *decode_cat, GUID *convert_cat) { GUID major; @@ -2291,10 +2291,10 @@ static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context TRACE("attempting to connect %p:%u to %p:%u\n", source, output_index, sink, input_index); - if (FAILED(hr = topology_loader_get_node_type_handler(source, &source_handler))) + if (FAILED(hr = topology_node_get_type_handler(source, &source_handler))) goto done; - if (FAILED(hr = topology_loader_get_node_type_handler(sink, &sink_handler))) + if (FAILED(hr = topology_node_get_type_handler(sink, &sink_handler))) goto done; if (FAILED(IMFTopologyNode_GetUINT32(source, &MF_TOPONODE_CONNECT_METHOD, &source_method)))

1 0

Zebediah Figura : wineusb.sys: Queue pending IRPs after submitting the URB.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: b3a47cf17e7e6f5176bab04e5034bf41700f592f URL: https://gitlab.winehq.org/wine/wine/-/commit/b3a47cf17e7e6f5176bab04e5034bf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 17:00:02 2022 -0500 wineusb.sys: Queue pending IRPs after submitting the URB. --- dlls/wineusb.sys/wineusb.c | 105 +++++++++++++++++++++++++++++---------------- 1 file changed, 67 insertions(+), 38 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 396591db451..9e8d78ccf05 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -829,15 +829,6 @@ static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) queue_event(&event); } -static void queue_irp(struct usb_device *device, IRP *irp, struct libusb_transfer *transfer) -{ - IoMarkIrpPending(irp); - irp->Tail.Overlay.DriverContext[0] = transfer; - EnterCriticalSection(&wineusb_cs); - InsertTailList(&device->irp_list, &irp->Tail.Overlay.ListEntry); - LeaveCriticalSection(&wineusb_cs); -} - struct pipe { unsigned char endpoint; @@ -869,10 +860,10 @@ static struct pipe get_pipe(HANDLE handle) return u.pipe; } -static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) +static NTSTATUS unix_submit_urb(struct unix_device *device, IRP *irp) { URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1; - libusb_device_handle *handle = device->unix_device->handle; + libusb_device_handle *handle = device->handle; struct libusb_transfer *transfer; int ret; @@ -880,30 +871,6 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) switch (urb->UrbHeader.Function) { - case URB_FUNCTION_ABORT_PIPE: - { - LIST_ENTRY *entry, *mark; - - /* The documentation states that URB_FUNCTION_ABORT_PIPE may - * complete before outstanding requests complete, so we don't need - * to wait for them. */ - EnterCriticalSection(&wineusb_cs); - mark = &device->irp_list; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) - { - IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); - struct usb_cancel_transfer_params params = - { - .transfer = queued_irp->Tail.Overlay.DriverContext[0], - }; - - __wine_unix_call(unix_handle, unix_usb_cancel_transfer, &params); - } - LeaveCriticalSection(&wineusb_cs); - - return STATUS_SUCCESS; - } - case URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL: { struct _URB_PIPE_REQUEST *req = &urb->UrbPipeRequest; @@ -925,6 +892,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) if (!(transfer = libusb_alloc_transfer(0))) return STATUS_NO_MEMORY; + irp->Tail.Overlay.DriverContext[0] = transfer; if (pipe.type == UsbdPipeTypeBulk) { @@ -943,7 +911,6 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) return USBD_STATUS_INVALID_PIPE_HANDLE; } - queue_irp(device, irp, transfer); transfer->flags = LIBUSB_TRANSFER_FREE_TRANSFER; ret = libusb_submit_transfer(transfer); if (ret < 0) @@ -962,6 +929,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) if (!(transfer = libusb_alloc_transfer(0))) return STATUS_NO_MEMORY; + irp->Tail.Overlay.DriverContext[0] = transfer; if (!(buffer = malloc(sizeof(struct libusb_control_setup) + req->TransferBufferLength))) { @@ -969,7 +937,6 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) return STATUS_NO_MEMORY; } - queue_irp(device, irp, transfer); libusb_fill_control_setup(buffer, LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE, LIBUSB_REQUEST_GET_DESCRIPTOR, (req->DescriptorType << 8) | req->Index, @@ -1019,6 +986,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) if (!(transfer = libusb_alloc_transfer(0))) return STATUS_NO_MEMORY; + irp->Tail.Overlay.DriverContext[0] = transfer; if (!(buffer = malloc(sizeof(struct libusb_control_setup) + req->TransferBufferLength))) { @@ -1026,7 +994,6 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) return STATUS_NO_MEMORY; } - queue_irp(device, irp, transfer); libusb_fill_control_setup(buffer, req_type, req->Request, req->Value, req->Index, req->TransferBufferLength); if (!(req->TransferFlags & USBD_TRANSFER_DIRECTION_IN)) @@ -1047,6 +1014,68 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) +{ + URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1; + NTSTATUS status; + + TRACE("type %#x.\n", urb->UrbHeader.Function); + + switch (urb->UrbHeader.Function) + { + case URB_FUNCTION_ABORT_PIPE: + { + LIST_ENTRY *entry, *mark; + + /* The documentation states that URB_FUNCTION_ABORT_PIPE may + * complete before outstanding requests complete, so we don't need + * to wait for them. */ + EnterCriticalSection(&wineusb_cs); + mark = &device->irp_list; + for (entry = mark->Flink; entry != mark; entry = entry->Flink) + { + IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + struct usb_cancel_transfer_params params = + { + .transfer = queued_irp->Tail.Overlay.DriverContext[0], + }; + + __wine_unix_call(unix_handle, unix_usb_cancel_transfer, &params); + } + LeaveCriticalSection(&wineusb_cs); + + return STATUS_SUCCESS; + } + + case URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL: + case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + case URB_FUNCTION_SELECT_CONFIGURATION: + case URB_FUNCTION_VENDOR_INTERFACE: + { + /* Hold the wineusb lock while submitting and queuing, and + * similarly hold it in complete_irp(). That way, if libusb reports + * completion between submitting and queuing, we won't try to + * dequeue the IRP until it's actually been queued. */ + EnterCriticalSection(&wineusb_cs); + status = unix_submit_urb(device->unix_device, irp); + if (status == STATUS_PENDING) + { + IoMarkIrpPending(irp); + InsertTailList(&device->irp_list, &irp->Tail.Overlay.ListEntry); + } + LeaveCriticalSection(&wineusb_cs); + + return status; + } + + default: + FIXME("Unhandled function %#x.\n", urb->UrbHeader.Function); + } + + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp);

1 0

Zebediah Figura : wineusb.sys: Move the event handling loop to the Unix library.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 92ae93d752a80c1d9dd28bbeac733ef5e4b49bfc URL: https://gitlab.winehq.org/wine/wine/-/commit/92ae93d752a80c1d9dd28bbeac733e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 5 23:20:26 2022 -0500 wineusb.sys: Move the event handling loop to the Unix library. --- dlls/wineusb.sys/unixlib.c | 29 +++++++++++++++++++++++++++++ dlls/wineusb.sys/unixlib.h | 2 ++ dlls/wineusb.sys/wineusb.c | 14 ++------------ 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index cdc84d98ede..ee8679e33a2 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -22,6 +22,7 @@ #pragma makedep unix #endif +#include <stdbool.h> #include <libusb.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -32,6 +33,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineusb); +static bool thread_shutdown; + +static NTSTATUS usb_main_loop(void *args) +{ + int ret; + + TRACE("Starting libusb event thread.\n"); + + while (!thread_shutdown) + { + if ((ret = libusb_handle_events(NULL))) + ERR("Error handling events: %s\n", libusb_strerror(ret)); + } + + TRACE("Shutting down libusb event thread.\n"); + return STATUS_SUCCESS; +} + +static NTSTATUS usb_exit(void *args) +{ + thread_shutdown = true; + libusb_interrupt_event_handler(NULL); + + return STATUS_SUCCESS; +} + static NTSTATUS usb_cancel_transfer(void *args) { const struct usb_cancel_transfer_params *params = args; @@ -46,5 +73,7 @@ static NTSTATUS usb_cancel_transfer(void *args) const unixlib_entry_t __wine_unix_call_funcs[] = { #define X(name) [unix_ ## name] = name + X(usb_main_loop), + X(usb_exit), X(usb_cancel_transfer), }; diff --git a/dlls/wineusb.sys/unixlib.h b/dlls/wineusb.sys/unixlib.h index d046062cd5f..6c037b20eef 100644 --- a/dlls/wineusb.sys/unixlib.h +++ b/dlls/wineusb.sys/unixlib.h @@ -32,6 +32,8 @@ struct usb_cancel_transfer_params enum unix_funcs { + unix_usb_main_loop, + unix_usb_exit, unix_usb_cancel_transfer, }; diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 9e8d78ccf05..66fe3778d64 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -376,7 +376,6 @@ static void remove_usb_device(libusb_device *libusb_device) } } -static BOOL thread_shutdown; static HANDLE libusb_event_thread, event_thread; static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device, @@ -393,19 +392,11 @@ static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device static DWORD CALLBACK libusb_event_thread_proc(void *arg) { static const struct usb_event shutdown_event = {.type = USB_EVENT_SHUTDOWN}; - int ret; - - TRACE("Starting libusb event thread.\n"); - while (!thread_shutdown) - { - if ((ret = libusb_handle_events(NULL))) - ERR("Error handling events: %s\n", libusb_strerror(ret)); - } + __wine_unix_call(unix_handle, unix_usb_main_loop, NULL); queue_event(&shutdown_event); - TRACE("Shutting down libusb event thread.\n"); return 0; } @@ -517,8 +508,7 @@ static NTSTATUS fdo_pnp(IRP *irp) struct usb_device *device, *cursor; libusb_hotplug_deregister_callback(NULL, hotplug_cb_handle); - thread_shutdown = TRUE; - libusb_interrupt_event_handler(NULL); + __wine_unix_call(unix_handle, unix_usb_exit, NULL); WaitForSingleObject(libusb_event_thread, INFINITE); CloseHandle(libusb_event_thread); WaitForSingleObject(event_thread, INFINITE);

1 0

Zebediah Figura : wineusb.sys: Move the event threads to IRP_MN_START_DEVICE.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 0427ccb141950bd73721d952536dab18730527ff URL: https://gitlab.winehq.org/wine/wine/-/commit/0427ccb141950bd73721d952536dab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 5 23:28:38 2022 -0500 wineusb.sys: Move the event threads to IRP_MN_START_DEVICE. To correspond with the shutdown in IRP_MN_REMOVE_DEVICE. --- dlls/wineusb.sys/wineusb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 66fe3778d64..c7363739bcf 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -487,6 +487,9 @@ static NTSTATUS fdo_pnp(IRP *irp) } case IRP_MN_START_DEVICE: + libusb_event_thread = CreateThread(NULL, 0, libusb_event_thread_proc, NULL, 0, NULL); + event_thread = CreateThread(NULL, 0, event_thread_proc, NULL, 0, NULL); + if ((ret = libusb_hotplug_register_callback(NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, LIBUSB_HOTPLUG_ENUMERATE, LIBUSB_HOTPLUG_MATCH_ANY, LIBUSB_HOTPLUG_MATCH_ANY, @@ -1154,9 +1157,6 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) return STATUS_UNSUCCESSFUL; } - libusb_event_thread = CreateThread(NULL, 0, libusb_event_thread_proc, NULL, 0, NULL); - event_thread = CreateThread(NULL, 0, event_thread_proc, NULL, 0, NULL); - driver->DriverExtension->AddDevice = driver_add_device; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp;

1 0