wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Alexandre Julliard : ntdll/tests: Add a few more tests for registry path names.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: a4373db64e9c883c49cf41246d602855d962cb93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4373db64e9c883c49cf4124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 13:59:43 2022 +0200 ntdll/tests: Add a few more tests for registry path names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index a619241c8e5..a0d07c9fc21 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -412,6 +412,12 @@ static void test_NtOpenKey(void) ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\\\\\" ); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine + ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenKey failed: 0x%08lx\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine @@ -425,6 +431,13 @@ static void test_NtOpenKey(void) pNtClose( key ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\\\" ); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + pNtClose( key ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Foobar" ); status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine @@ -493,7 +506,7 @@ static void test_NtCreateKey(void) { /*Create WineTest*/ OBJECT_ATTRIBUTES attr; - HANDLE key, subkey; + HANDLE key, subkey, subkey2; ACCESS_MASK am = GENERIC_ALL; NTSTATUS status; UNICODE_STRING str; @@ -545,11 +558,20 @@ static void test_NtCreateKey(void) ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test\\\\subkey" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test\\subkey\\" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey\\" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey\\" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); @@ -557,6 +579,18 @@ static void test_NtCreateKey(void) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey2\\\\" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey2\\\\test\\\\" ); + status = pNtCreateKey( &subkey2, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlFreeUnicodeString( &str ); + pNtDeleteKey( subkey2 ); + pNtClose( subkey2 ); + pNtDeleteKey( subkey ); + pNtClose( subkey ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); @@ -594,6 +628,14 @@ static void test_NtCreateKey(void) if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\\\" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + todo_wine + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "NtCreateKey failed: 0x%08lx\n", status ); + if (!status) pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Foobar" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); todo_wine

1 0

Alexandre Julliard : ntdll/tests: Remove some workarounds for older Windows versions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: aca2cac6e21c8b368da7a02cf036f4c60da9167d URL: https://source.winehq.org/git/wine.git/?a=commit;h=aca2cac6e21c8b368da7a02c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 12:30:57 2022 +0200 ntdll/tests: Remove some workarounds for older Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 215 ++++++++++++++++++------------------------------- 1 file changed, 80 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aca2cac6e21c8b368da7…

1 0

Alexandre Julliard : advapi32/tests: Remove some workarounds for older Windows versions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: e76c07d4e7a5ae86200d123a287de20e041035fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e76c07d4e7a5ae86200d123a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 12:31:54 2022 +0200 advapi32/tests: Remove some workarounds for older Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 254 +++++++++++++++-------------------------- 1 file changed, 90 insertions(+), 164 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e76c07d4e7a5ae86200d…

1 0

Nikolay Sivov : mf/samplegrabber: Consistently check for shutdown flag within a lock.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: ec097bc1b0194c335dc5745cc5963c45d9682743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec097bc1b0194c335dc5745c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 4 22:05:37 2022 +0300 mf/samplegrabber: Consistently check for shutdown flag within a lock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index f711f6d8c44..2d9f8109aca 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -507,32 +507,29 @@ static HRESULT WINAPI sample_grabber_stream_Flush(IMFStreamSink *iface) { struct sample_grabber *grabber = impl_from_IMFStreamSink(iface); struct scheduled_item *item, *next_item; + HRESULT hr = S_OK; TRACE("%p.\n", iface); - if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; - EnterCriticalSection(&grabber->cs); - LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &grabber->items, struct scheduled_item, entry) + if (grabber->is_shut_down) + hr = MF_E_STREAMSINK_REMOVED; + else { - /* Samples are discarded, markers are processed immediately. */ - switch (item->type) + LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &grabber->items, struct scheduled_item, entry) { - case ITEM_TYPE_SAMPLE: - break; - case ITEM_TYPE_MARKER: + /* Samples are discarded, markers are processed immediately. */ + if (item->type == ITEM_TYPE_MARKER) sample_grabber_stream_report_marker(grabber, &item->u.marker.context, E_ABORT); - break; - } - stream_release_pending_item(item); + stream_release_pending_item(item); + } } LeaveCriticalSection(&grabber->cs); - return S_OK; + return hr; } static const IMFStreamSinkVtbl sample_grabber_stream_vtbl = @@ -924,9 +921,6 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkByIndex(IMFMediaSink *ifa TRACE("%p, %lu, %p.\n", iface, index, stream); - if (grabber->is_shut_down) - return MF_E_SHUTDOWN; - EnterCriticalSection(&grabber->cs); if (grabber->is_shut_down) @@ -1057,18 +1051,22 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) TRACE("%p.\n", iface); - if (grabber->is_shut_down) - return MF_E_SHUTDOWN; - EnterCriticalSection(&grabber->cs); - grabber->is_shut_down = TRUE; - sample_grabber_release_pending_items(grabber); - if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) + + if (grabber->is_shut_down) + hr = MF_E_SHUTDOWN; + else { - sample_grabber_set_presentation_clock(grabber, NULL); - IMFMediaEventQueue_Shutdown(grabber->stream_event_queue); - IMFMediaEventQueue_Shutdown(grabber->event_queue); + grabber->is_shut_down = TRUE; + sample_grabber_release_pending_items(grabber); + if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) + { + sample_grabber_set_presentation_clock(grabber, NULL); + IMFMediaEventQueue_Shutdown(grabber->stream_event_queue); + IMFMediaEventQueue_Shutdown(grabber->event_queue); + } } + LeaveCriticalSection(&grabber->cs); return hr;

1 0

Nikolay Sivov : mf/sar: Consistently check for shutdown flag within a lock.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 568b4bc902857a4c1666fb5e83c85c1d4b2e1a71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=568b4bc902857a4c1666fb5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 4 22:00:46 2022 +0300 mf/sar: Consistently check for shutdown flag within a lock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/sar.c | 52 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 33040be3ed0..5504cc17472 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -451,21 +451,26 @@ static HRESULT WINAPI audio_renderer_sink_GetPresentationClock(IMFMediaSink *ifa static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); + HRESULT hr = S_OK; TRACE("%p.\n", iface); + EnterCriticalSection(&renderer->cs); + if (renderer->flags & SAR_SHUT_DOWN) - return MF_E_SHUTDOWN; + hr = MF_E_SHUTDOWN; + else + { + renderer->flags |= SAR_SHUT_DOWN; + IMFMediaEventQueue_Shutdown(renderer->event_queue); + IMFMediaEventQueue_Shutdown(renderer->stream_event_queue); + audio_renderer_set_presentation_clock(renderer, NULL); + audio_renderer_release_audio_client(renderer); + } - EnterCriticalSection(&renderer->cs); - renderer->flags |= SAR_SHUT_DOWN; - IMFMediaEventQueue_Shutdown(renderer->event_queue); - IMFMediaEventQueue_Shutdown(renderer->stream_event_queue); - audio_renderer_set_presentation_clock(renderer, NULL); - audio_renderer_release_audio_client(renderer); LeaveCriticalSection(&renderer->cs); - return S_OK; + return hr; } static const IMFMediaSinkVtbl audio_renderer_sink_vtbl = @@ -1364,19 +1369,22 @@ static HRESULT WINAPI audio_renderer_stream_ProcessSample(IMFStreamSink *iface, if (!sample) return E_POINTER; - if (renderer->flags & SAR_SHUT_DOWN) - return MF_E_STREAMSINK_REMOVED; - EnterCriticalSection(&renderer->cs); - if (renderer->state == STREAM_STATE_RUNNING) - hr = stream_queue_sample(renderer, sample); - renderer->flags &= ~SAR_SAMPLE_REQUESTED; - - if (renderer->queued_frames < renderer->max_frames && renderer->state == STREAM_STATE_RUNNING) + if (renderer->flags & SAR_SHUT_DOWN) + hr = MF_E_STREAMSINK_REMOVED; + else { - IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); - renderer->flags |= SAR_SAMPLE_REQUESTED; + if (renderer->state == STREAM_STATE_RUNNING) + hr = stream_queue_sample(renderer, sample); + renderer->flags &= ~SAR_SAMPLE_REQUESTED; + + if (renderer->queued_frames < renderer->max_frames && renderer->state == STREAM_STATE_RUNNING) + { + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, + &GUID_NULL, S_OK, NULL); + renderer->flags |= SAR_SAMPLE_REQUESTED; + } } LeaveCriticalSection(&renderer->cs); @@ -1414,11 +1422,13 @@ static HRESULT WINAPI audio_renderer_stream_PlaceMarker(IMFStreamSink *iface, MF TRACE("%p, %d, %p, %p.\n", iface, marker_type, marker_value, context_value); + EnterCriticalSection(&renderer->cs); + if (renderer->flags & SAR_SHUT_DOWN) - return MF_E_STREAMSINK_REMOVED; + hr = MF_E_STREAMSINK_REMOVED; + else + hr = stream_place_marker(renderer, marker_type, context_value); - EnterCriticalSection(&renderer->cs); - hr = stream_place_marker(renderer, marker_type, context_value); LeaveCriticalSection(&renderer->cs); return hr;

1 0

Nikolay Sivov : mf/evr: Consistently check for shutdown flag within a lock.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 5981f2ed735a2a130dcc743ef9bb6d2ab0b33197 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5981f2ed735a2a130dcc743e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 4 21:55:32 2022 +0300 mf/evr: Consistently check for shutdown flag within a lock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 115 +++++++++++++++++++++++++++++++++------------------------- 1 file changed, 66 insertions(+), 49 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index c9506af9143..db7053a1405 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1432,38 +1432,43 @@ static HRESULT WINAPI video_renderer_sink_GetPresentationClock(IMFMediaSink *ifa static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); + HRESULT hr = S_OK; size_t i; TRACE("%p.\n", iface); - if (renderer->flags & EVR_SHUT_DOWN) - return MF_E_SHUTDOWN; - EnterCriticalSection(&renderer->cs); - renderer->flags |= EVR_SHUT_DOWN; - /* Detach streams from the sink. */ - for (i = 0; i < renderer->stream_count; ++i) + + if (renderer->flags & EVR_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else { - struct video_stream *stream = renderer->streams[i]; + renderer->flags |= EVR_SHUT_DOWN; + /* Detach streams from the sink. */ + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; - EnterCriticalSection(&stream->cs); - stream->parent = NULL; - LeaveCriticalSection(&stream->cs); + EnterCriticalSection(&stream->cs); + stream->parent = NULL; + LeaveCriticalSection(&stream->cs); - IMFMediaEventQueue_Shutdown(stream->event_queue); - IMFStreamSink_Release(&stream->IMFStreamSink_iface); - IMFMediaSink_Release(iface); - renderer->streams[i] = NULL; + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFStreamSink_Release(&stream->IMFStreamSink_iface); + IMFMediaSink_Release(iface); + renderer->streams[i] = NULL; + } + free(renderer->streams); + renderer->stream_count = 0; + renderer->stream_size = 0; + IMFMediaEventQueue_Shutdown(renderer->event_queue); + video_renderer_set_presentation_clock(renderer, NULL); + video_renderer_release_services(renderer); } - free(renderer->streams); - renderer->stream_count = 0; - renderer->stream_size = 0; - IMFMediaEventQueue_Shutdown(renderer->event_queue); - video_renderer_set_presentation_clock(renderer, NULL); - video_renderer_release_services(renderer); + LeaveCriticalSection(&renderer->cs); - return S_OK; + return hr; } static const IMFMediaSinkVtbl video_renderer_sink_vtbl = @@ -1742,52 +1747,64 @@ static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTra return hr; } -static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, IMFTransform *mixer, - IMFVideoPresenter *presenter) +static HRESULT video_renderer_create_mixer_and_presenter(struct video_renderer *renderer, + IMFTransform **mixer, IMFVideoPresenter **presenter) { - struct video_renderer *renderer = impl_from_IMFVideoRenderer(iface); HRESULT hr; - TRACE("%p, %p, %p.\n", iface, mixer, presenter); - - EnterCriticalSection(&renderer->cs); - - if (renderer->flags & EVR_SHUT_DOWN) + if (*mixer) { - LeaveCriticalSection(&renderer->cs); - return MF_E_SHUTDOWN; + IMFTransform_AddRef(*mixer); } - - video_renderer_uninitialize(renderer); - - if (mixer) - IMFTransform_AddRef(mixer); - else if (FAILED(hr = video_renderer_create_mixer(NULL, &mixer))) + else if (FAILED(hr = video_renderer_create_mixer(NULL, mixer))) { WARN("Failed to create default mixer object, hr %#lx.\n", hr); - LeaveCriticalSection(&renderer->cs); return hr; } - if (presenter) - IMFVideoPresenter_AddRef(presenter); - else if (FAILED(hr = video_renderer_create_presenter(renderer, NULL, &presenter))) + if (*presenter) + { + IMFVideoPresenter_AddRef(*presenter); + } + else if (FAILED(hr = video_renderer_create_presenter(renderer, NULL, presenter))) { WARN("Failed to create default presenter, hr %#lx.\n", hr); - LeaveCriticalSection(&renderer->cs); - IMFTransform_Release(mixer); + IMFTransform_Release(*mixer); return hr; } - /* FIXME: check clock state */ - /* FIXME: check that streams are not initialized */ + return S_OK; +} - hr = video_renderer_initialize(renderer, mixer, presenter); +static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, IMFTransform *mixer, + IMFVideoPresenter *presenter) +{ + struct video_renderer *renderer = impl_from_IMFVideoRenderer(iface); + HRESULT hr; - LeaveCriticalSection(&renderer->cs); + TRACE("%p, %p, %p.\n", iface, mixer, presenter); - IMFTransform_Release(mixer); - IMFVideoPresenter_Release(presenter); + EnterCriticalSection(&renderer->cs); + + if (renderer->flags & EVR_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + video_renderer_uninitialize(renderer); + + if (SUCCEEDED(hr = video_renderer_create_mixer_and_presenter(renderer, &mixer, &presenter))) + { + /* FIXME: check clock state */ + /* FIXME: check that streams are not initialized */ + + hr = video_renderer_initialize(renderer, mixer, presenter); + + IMFTransform_Release(mixer); + IMFVideoPresenter_Release(presenter); + } + } + + LeaveCriticalSection(&renderer->cs); return hr; }

1 0

Zebediah Figura : wineusb.sys: Complete IRPs through the event thread.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: d4bb82af35de5011110e0da93c3a0c0b1fbc3963 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4bb82af35de5011110e0da9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 16:15:01 2022 -0500 wineusb.sys: Complete IRPs through the event thread. --- dlls/wineusb.sys/wineusb.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 37434074b91..0b8af43a3dc 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -115,6 +115,7 @@ enum usb_event_type { USB_EVENT_ADD_DEVICE, USB_EVENT_REMOVE_DEVICE, + USB_EVENT_TRANSFER_COMPLETE, USB_EVENT_SHUTDOWN, }; @@ -126,6 +127,7 @@ struct usb_event { struct unix_device *added_device; struct unix_device *removed_device; + IRP *completed_irp; } u; }; @@ -407,6 +409,16 @@ static DWORD CALLBACK libusb_event_thread_proc(void *arg) return 0; } +static void complete_irp(IRP *irp) +{ + EnterCriticalSection(&wineusb_cs); + RemoveEntryList(&irp->Tail.Overlay.ListEntry); + LeaveCriticalSection(&wineusb_cs); + + irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static DWORD CALLBACK event_thread_proc(void *arg) { struct usb_event event; @@ -427,6 +439,10 @@ static DWORD CALLBACK event_thread_proc(void *arg) remove_unix_device(event.u.removed_device); break; + case USB_EVENT_TRANSFER_COMPLETE: + complete_irp(event.u.completed_irp); + break; + case USB_EVENT_SHUTDOWN: TRACE("Shutting down client event thread.\n"); return 0; @@ -772,6 +788,7 @@ static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) { IRP *irp = transfer->user_data; URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1; + struct usb_event event; TRACE("Completing IRP %p, status %#x.\n", irp, transfer->status); @@ -807,12 +824,9 @@ static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) } } - EnterCriticalSection(&wineusb_cs); - RemoveEntryList(&irp->Tail.Overlay.ListEntry); - LeaveCriticalSection(&wineusb_cs); - - irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(irp, IO_NO_INCREMENT); + event.type = USB_EVENT_TRANSFER_COMPLETE; + event.u.completed_irp = irp; + queue_event(&event); } static void queue_irp(struct usb_device *device, IRP *irp, struct libusb_transfer *transfer)

1 0

Zebediah Figura : wineusb.sys: Report new devices through the event thread.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: f8e5e72a5978d011e7d9f91266a582cec81946be URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8e5e72a5978d011e7d9f912… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 24 18:46:22 2022 -0500 wineusb.sys: Report new devices through the event thread. --- dlls/wineusb.sys/wineusb.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index b8bcb816e95..37434074b91 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -113,6 +113,7 @@ static pthread_mutex_t event_mutex = PTHREAD_MUTEX_INITIALIZER; enum usb_event_type { + USB_EVENT_ADD_DEVICE, USB_EVENT_REMOVE_DEVICE, USB_EVENT_SHUTDOWN, }; @@ -123,6 +124,7 @@ struct usb_event union { + struct unix_device *added_device; struct unix_device *removed_device; } u; }; @@ -304,6 +306,7 @@ static void add_usb_device(libusb_device *libusb_device) { struct libusb_device_descriptor device_desc; struct unix_device *unix_device; + struct usb_event usb_event; int ret; libusb_get_device_descriptor(libusb_device, &device_desc); @@ -324,7 +327,9 @@ static void add_usb_device(libusb_device *libusb_device) list_add_tail(&unix_device_list, &unix_device->entry); pthread_mutex_unlock(&unix_device_mutex); - add_unix_device(unix_device); + usb_event.type = USB_EVENT_ADD_DEVICE; + usb_event.u.added_device = unix_device; + queue_event(&usb_event); } static void remove_unix_device(struct unix_device *unix_device) @@ -414,8 +419,11 @@ static DWORD CALLBACK event_thread_proc(void *arg) switch (event.type) { + case USB_EVENT_ADD_DEVICE: + add_unix_device(event.u.added_device); + break; + case USB_EVENT_REMOVE_DEVICE: - TRACE("Got remove event for device %p.\n", event.u.removed_device); remove_unix_device(event.u.removed_device); break;

1 0

Zebediah Figura : wineusb.sys: Remove devices through the event thread.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 4ed25028052a8e40a065cdf1aacf418083ccadeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed25028052a8e40a065cdf1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 24 18:39:08 2022 -0500 wineusb.sys: Remove devices through the event thread. --- dlls/wineusb.sys/wineusb.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index b3d14e91839..b8bcb816e95 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -113,12 +113,18 @@ static pthread_mutex_t event_mutex = PTHREAD_MUTEX_INITIALIZER; enum usb_event_type { + USB_EVENT_REMOVE_DEVICE, USB_EVENT_SHUTDOWN, }; struct usb_event { enum usb_event_type type; + + union + { + struct unix_device *removed_device; + } u; }; static struct usb_event *usb_events; @@ -348,13 +354,18 @@ static void remove_unix_device(struct unix_device *unix_device) static void remove_usb_device(libusb_device *libusb_device) { struct unix_device *unix_device; + struct usb_event usb_event; TRACE("Removing device %p.\n", libusb_device); LIST_FOR_EACH_ENTRY(unix_device, &unix_device_list, struct unix_device, entry) { if (libusb_get_device(unix_device->handle) == libusb_device) - remove_unix_device(unix_device); + { + usb_event.type = USB_EVENT_REMOVE_DEVICE; + usb_event.u.removed_device = unix_device; + queue_event(&usb_event); + } } } @@ -403,6 +414,11 @@ static DWORD CALLBACK event_thread_proc(void *arg) switch (event.type) { + case USB_EVENT_REMOVE_DEVICE: + TRACE("Got remove event for device %p.\n", event.u.removed_device); + remove_unix_device(event.u.removed_device); + break; + case USB_EVENT_SHUTDOWN: TRACE("Shutting down client event thread.\n"); return 0;

1 0

Zebediah Figura : wineusb.sys: Spawn a separate thread to consume Unix library events.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 443489709654cf19e3a34216db33bcf62cd9cd62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=443489709654cf19e3a34216… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 11 18:43:23 2022 -0500 wineusb.sys: Spawn a separate thread to consume Unix library events. --- dlls/wineusb.sys/wineusb.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index cfa88616a8f..b3d14e91839 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -20,6 +20,7 @@ #include <assert.h> #include <stdarg.h> +#include <stdbool.h> #include <stdlib.h> #include <pthread.h> #include <libusb.h> @@ -107,6 +108,71 @@ static DEVICE_OBJECT *bus_fdo, *bus_pdo; static libusb_hotplug_callback_handle hotplug_cb_handle; +static pthread_cond_t event_cond = PTHREAD_COND_INITIALIZER; +static pthread_mutex_t event_mutex = PTHREAD_MUTEX_INITIALIZER; + +enum usb_event_type +{ + USB_EVENT_SHUTDOWN, +}; + +struct usb_event +{ + enum usb_event_type type; +}; + +static struct usb_event *usb_events; +static size_t usb_event_count, usb_events_capacity; + +static bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + unsigned int new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return true; + + max_capacity = ~(size_t)0 / size; + if (count > max_capacity) + return false; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = realloc(*elements, new_capacity * size))) + return false; + + *elements = new_elements; + *capacity = new_capacity; + + return true; +} + +static void queue_event(const struct usb_event *event) +{ + pthread_mutex_lock(&event_mutex); + if (array_reserve((void **)&usb_events, &usb_events_capacity, usb_event_count + 1, sizeof(*usb_events))) + usb_events[usb_event_count++] = *event; + else + ERR("Failed to queue event.\n"); + pthread_mutex_unlock(&event_mutex); + pthread_cond_signal(&event_cond); +} + +static void get_event(struct usb_event *event) +{ + pthread_mutex_lock(&event_mutex); + while (!usb_event_count) + pthread_cond_wait(&event_cond, &event_mutex); + *event = usb_events[0]; + if (--usb_event_count) + memmove(usb_events, usb_events + 1, usb_event_count * sizeof(*usb_events)); + pthread_mutex_unlock(&event_mutex); +} + static void destroy_unix_device(struct unix_device *unix_device) { pthread_mutex_lock(&unix_device_mutex); @@ -293,7 +359,7 @@ static void remove_usb_device(libusb_device *libusb_device) } static BOOL thread_shutdown; -static HANDLE event_thread; +static HANDLE libusb_event_thread, event_thread; static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device, libusb_hotplug_event event, void *user_data) @@ -306,11 +372,12 @@ static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device return 0; } -static DWORD CALLBACK event_thread_proc(void *arg) +static DWORD CALLBACK libusb_event_thread_proc(void *arg) { + static const struct usb_event shutdown_event = {.type = USB_EVENT_SHUTDOWN}; int ret; - TRACE("Starting event thread.\n"); + TRACE("Starting libusb event thread.\n"); while (!thread_shutdown) { @@ -318,10 +385,31 @@ static DWORD CALLBACK event_thread_proc(void *arg) ERR("Error handling events: %s\n", libusb_strerror(ret)); } - TRACE("Shutting down event thread.\n"); + queue_event(&shutdown_event); + + TRACE("Shutting down libusb event thread.\n"); return 0; } +static DWORD CALLBACK event_thread_proc(void *arg) +{ + struct usb_event event; + + TRACE("Starting client event thread.\n"); + + for (;;) + { + get_event(&event); + + switch (event.type) + { + case USB_EVENT_SHUTDOWN: + TRACE("Shutting down client event thread.\n"); + return 0; + } + } +} + static NTSTATUS fdo_pnp(IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -391,6 +479,8 @@ static NTSTATUS fdo_pnp(IRP *irp) libusb_hotplug_deregister_callback(NULL, hotplug_cb_handle); thread_shutdown = TRUE; libusb_interrupt_event_handler(NULL); + WaitForSingleObject(libusb_event_thread, INFINITE); + CloseHandle(libusb_event_thread); WaitForSingleObject(event_thread, INFINITE); CloseHandle(event_thread); @@ -1007,6 +1097,7 @@ 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;

1 0

← Newer
1
...
52
53
54
55
56
57
58
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022