- Wine-Commits - list.winehq.org

Ziqing Hui : winegstreamer: Use NTSTATUS value in wg_muxer_create.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 29b35f6bb7cc26d6ddfc5140dd0fba5889f650bd URL: https://gitlab.winehq.org/wine/wine/-/commit/29b35f6bb7cc26d6ddfc5140dd0fba… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Sep 15 16:05:22 2023 +0800 winegstreamer: Use NTSTATUS value in wg_muxer_create. --- dlls/winegstreamer/main.c | 8 ++++++-- dlls/winegstreamer/wg_muxer.c | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 853907e1825..beb48fa3731 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -466,13 +466,17 @@ HRESULT wg_muxer_create(const char *format, wg_muxer_t *muxer) TRACE("format %p, muxer %p.\n", format, muxer); - if (SUCCEEDED(status = WINE_UNIX_CALL(unix_wg_muxer_create, &params))) + if (!(status = WINE_UNIX_CALL(unix_wg_muxer_create, &params))) { *muxer = params.muxer; TRACE("Created wg_muxer %#I64x.\n", params.muxer); } + else + { + WARN("Failed to create muxer, status %#lx.\n", status); + } - return status; + return HRESULT_FROM_NT(status); } void wg_muxer_destroy(wg_muxer_t muxer) diff --git a/dlls/winegstreamer/wg_muxer.c b/dlls/winegstreamer/wg_muxer.c index 6887bc015ba..601c5f03d31 100644 --- a/dlls/winegstreamer/wg_muxer.c +++ b/dlls/winegstreamer/wg_muxer.c @@ -61,14 +61,14 @@ NTSTATUS wg_muxer_create(void *args) { struct wg_muxer_create_params *params = args; GstElement *first = NULL, *last = NULL; + NTSTATUS status = STATUS_UNSUCCESSFUL; GstPadTemplate *template = NULL; GstCaps *sink_caps = NULL; - NTSTATUS status = E_FAIL; struct wg_muxer *muxer; /* Create wg_muxer object. */ if (!(muxer = calloc(1, sizeof(*muxer)))) - return E_OUTOFMEMORY; + return STATUS_NO_MEMORY; if (!(muxer->container = gst_bin_new("wg_muxer"))) goto out; @@ -110,7 +110,7 @@ NTSTATUS wg_muxer_create(void *args) GST_INFO("Created winegstreamer muxer %p.", muxer); params->muxer = (wg_transform_t)(ULONG_PTR)muxer; - return S_OK; + return STATUS_SUCCESS; out: if (muxer->my_sink)

1 0

Nikolay Sivov : mf/samplegrabber: Release current media type on shutdown.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: c45ae2c680f0d6789d4fee495e17e7027be3c1b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/c45ae2c680f0d6789d4fee495e17e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 31 09:45:46 2023 +0100 mf/samplegrabber: Release current media type on shutdown. --- dlls/mf/samplegrabber.c | 33 ++++++++++++++++++++++++++------- dlls/mf/tests/mf.c | 5 ++--- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index deb1ce09a55..5e5b6ad6d0e 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -655,34 +655,50 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_GetCurrentMediaType(IMF IMFMediaType **media_type) { struct sample_grabber *grabber = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr = S_OK; TRACE("%p, %p.\n", iface, media_type); if (!media_type) return E_POINTER; + EnterCriticalSection(&grabber->cs); + if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; + { + hr = MF_E_STREAMSINK_REMOVED; + } + else + { + *media_type = grabber->current_media_type; + IMFMediaType_AddRef(*media_type); + } - *media_type = grabber->current_media_type; - IMFMediaType_AddRef(*media_type); + LeaveCriticalSection(&grabber->cs); - return S_OK; + return hr; } static HRESULT WINAPI sample_grabber_stream_type_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) { struct sample_grabber *grabber = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr; TRACE("%p, %p.\n", iface, type); if (!type) return E_POINTER; + EnterCriticalSection(&grabber->cs); + if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; + hr = MF_E_STREAMSINK_REMOVED; + else + hr = IMFMediaType_GetMajorType(grabber->current_media_type, type); - return IMFMediaType_GetMajorType(grabber->current_media_type, type); + LeaveCriticalSection(&grabber->cs); + + return hr; } static const IMFMediaTypeHandlerVtbl sample_grabber_stream_type_handler_vtbl = @@ -867,7 +883,8 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFSampleGrabberSinkCallback_Release(grabber->callback); if (grabber->callback2) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); - IMFMediaType_Release(grabber->current_media_type); + if (grabber->current_media_type) + IMFMediaType_Release(grabber->current_media_type); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) IMFMediaEventQueue_Release(grabber->event_queue); @@ -1091,6 +1108,8 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { sample_grabber_set_presentation_clock(grabber, NULL); + IMFMediaType_Release(grabber->current_media_type); + grabber->current_media_type = NULL; IMFMediaEventQueue_Shutdown(grabber->stream_event_queue); IMFMediaEventQueue_Shutdown(grabber->event_queue); } diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 18c97b93593..8ec379be991 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4697,10 +4697,9 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to get type count, hr %#lx.\n", hr); ref = IMFMediaType_Release(media_type2); - todo_wine - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); ref = IMFMediaType_Release(media_type); - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &media_type); ok(hr == MF_E_NO_MORE_TYPES, "Unexpected hr %#lx.\n", hr);

1 0

Nikolay Sivov : mf/samplegrabber: Use OnSetPresentationClock() on shutdown as well.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 729ed419ae4e8083a1a188b6dce08a20d13c5abd URL: https://gitlab.winehq.org/wine/wine/-/commit/729ed419ae4e8083a1a188b6dce08a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 31 13:04:01 2023 +0100 mf/samplegrabber: Use OnSetPresentationClock() on shutdown as well. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 66ac7808cc7..de599139736 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1019,8 +1019,13 @@ static void sample_grabber_cancel_timer(struct sample_grabber *grabber) } } -static void sample_grabber_set_presentation_clock(struct sample_grabber *grabber, IMFPresentationClock *clock) +static HRESULT sample_grabber_set_presentation_clock(struct sample_grabber *grabber, IMFPresentationClock *clock) { + HRESULT hr; + + if (FAILED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(sample_grabber_get_callback(grabber), clock))) + return hr; + if (grabber->clock) { sample_grabber_cancel_timer(grabber); @@ -1043,6 +1048,8 @@ static void sample_grabber_set_presentation_clock(struct sample_grabber *grabber grabber->timer = NULL; } } + + return hr; } static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) @@ -1058,10 +1065,9 @@ static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *ifa { hr = MF_E_SHUTDOWN; } - else if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(sample_grabber_get_callback(grabber), - clock))) + else { - sample_grabber_set_presentation_clock(grabber, clock); + hr = sample_grabber_set_presentation_clock(grabber, clock); } LeaveCriticalSection(&grabber->cs); @@ -1109,8 +1115,9 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) { grabber->is_shut_down = TRUE; sample_grabber_release_pending_items(grabber); - sample_grabber_set_presentation_clock(grabber, NULL); - if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) + if (SUCCEEDED(hr = sample_grabber_set_presentation_clock(grabber, NULL))) + hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)); + if (SUCCEEDED(hr)) { IMFMediaType_Release(grabber->current_media_type); grabber->current_media_type = NULL;

1 0

Nikolay Sivov : mf/samplegrabber: Reset the clock before OnShutdown().
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 09d949494b657402ba725448432d401dc44ad14d URL: https://gitlab.winehq.org/wine/wine/-/commit/09d949494b657402ba725448432d40… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 31 12:48:11 2023 +0100 mf/samplegrabber: Reset the clock before OnShutdown(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 332b1a6e71d..66ac7808cc7 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1109,9 +1109,9 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) { grabber->is_shut_down = TRUE; sample_grabber_release_pending_items(grabber); + sample_grabber_set_presentation_clock(grabber, NULL); if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { - sample_grabber_set_presentation_clock(grabber, NULL); IMFMediaType_Release(grabber->current_media_type); grabber->current_media_type = NULL; IMFMediaEventQueue_Shutdown(grabber->stream_event_queue);

1 0

Nikolay Sivov : mf/samplegrabber: Check shutdown state when setting the clock.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 882d822900bdb08fd750e754b76094f7b4f65548 URL: https://gitlab.winehq.org/wine/wine/-/commit/882d822900bdb08fd750e754b76094… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Oct 31 10:00:25 2023 +0100 mf/samplegrabber: Check shutdown state when setting the clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 6 +++++- dlls/mf/tests/mf.c | 13 ++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 5e5b6ad6d0e..332b1a6e71d 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -1054,7 +1054,11 @@ static HRESULT WINAPI sample_grabber_sink_SetPresentationClock(IMFMediaSink *ifa EnterCriticalSection(&grabber->cs); - if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(sample_grabber_get_callback(grabber), + if (grabber->is_shut_down) + { + hr = MF_E_SHUTDOWN; + } + else if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnSetPresentationClock(sample_grabber_get_callback(grabber), clock))) { sample_grabber_set_presentation_clock(grabber, clock); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 8ec379be991..84f5e69ac25 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4649,9 +4649,16 @@ static void test_sample_grabber(void) EXPECT_REF(clock, 3); hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#lx.\n", hr); + EXPECT_REF(clock, 1); + + hr = IMFMediaSink_SetPresentationClock(sink, NULL); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); + + hr = IMFMediaSink_SetPresentationClock(sink, clock); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); ref = IMFPresentationClock_Release(clock); - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#lx.\n", hr); @@ -4730,9 +4737,9 @@ static void test_sample_grabber(void) IMFStreamSink_Release(stream); ref = IMFActivate_Release(activate); - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); ref = IMFMediaSink_Release(sink); - ok(ref == 0, "Release returned %ld\n", ref); + ok(!ref, "Unexpected refcount %ld.\n", ref); /* Rateless mode with MF_SAMPLEGRABBERSINK_IGNORE_CLOCK. */ hr = MFCreateMediaType(&media_type);

1 0

Ziqing Hui : winegstreamer: Introduce link_src_to_sink.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 0c84f713f1f7c3ac1d31765d049d3c7c5da1255c URL: https://gitlab.winehq.org/wine/wine/-/commit/0c84f713f1f7c3ac1d31765d049d3c… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Fri Sep 22 11:14:56 2023 +0800 winegstreamer: Introduce link_src_to_sink. --- dlls/winegstreamer/unix_private.h | 1 + dlls/winegstreamer/unixlib.c | 34 ++++++++++++++++++---------------- dlls/winegstreamer/wg_parser.c | 7 ++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/winegstreamer/unix_private.h b/dlls/winegstreamer/unix_private.h index 305d69c12a8..eefd3cdb259 100644 --- a/dlls/winegstreamer/unix_private.h +++ b/dlls/winegstreamer/unix_private.h @@ -37,6 +37,7 @@ extern GstStreamType stream_type_from_caps(GstCaps *caps) DECLSPEC_HIDDEN; extern GstElement *create_element(const char *name, const char *plugin_set) DECLSPEC_HIDDEN; extern GstElement *find_element(GstElementFactoryListType type, GstCaps *src_caps, GstCaps *sink_caps) DECLSPEC_HIDDEN; extern bool append_element(GstElement *container, GstElement *element, GstElement **first, GstElement **last) DECLSPEC_HIDDEN; +extern bool link_src_to_sink(GstPad *src_pad, GstPad *sink_pad) DECLSPEC_HIDDEN; extern bool link_src_to_element(GstPad *src_pad, GstElement *element) DECLSPEC_HIDDEN; extern bool link_element_to_sink(GstElement *element, GstPad *sink_pad) DECLSPEC_HIDDEN; extern bool push_event(GstPad *pad, GstEvent *event) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/unixlib.c b/dlls/winegstreamer/unixlib.c index 513ece95a90..4a204478ade 100644 --- a/dlls/winegstreamer/unixlib.c +++ b/dlls/winegstreamer/unixlib.c @@ -162,6 +162,20 @@ bool append_element(GstElement *container, GstElement *element, GstElement **fir return success; } +bool link_src_to_sink(GstPad *src_pad, GstPad *sink_pad) +{ + GstPadLinkReturn ret; + + if ((ret = gst_pad_link(src_pad, sink_pad)) != GST_PAD_LINK_OK) + { + GST_ERROR("Failed to link src pad %"GST_PTR_FORMAT" to sink pad %"GST_PTR_FORMAT", reason: %s", + src_pad, sink_pad, gst_pad_link_get_name(ret)); + return false; + } + + return true; +} + bool link_src_to_element(GstPad *src_pad, GstElement *element) { GstPadLinkReturn ret; @@ -174,15 +188,9 @@ bool link_src_to_element(GstPad *src_pad, GstElement *element) g_free(name); return false; } - if ((ret = gst_pad_link(src_pad, sink_pad))) - { - gchar *src_name = gst_pad_get_name(src_pad), *sink_name = gst_pad_get_name(sink_pad); - GST_ERROR("Failed to link element pad %s with pad %s", src_name, sink_name); - g_free(sink_name); - g_free(src_name); - } + ret = link_src_to_sink(src_pad, sink_pad); gst_object_unref(sink_pad); - return !ret; + return ret; } bool link_element_to_sink(GstElement *element, GstPad *sink_pad) @@ -197,15 +205,9 @@ bool link_element_to_sink(GstElement *element, GstPad *sink_pad) g_free(name); return false; } - if ((ret = gst_pad_link(src_pad, sink_pad))) - { - gchar *src_name = gst_pad_get_name(src_pad), *sink_name = gst_pad_get_name(sink_pad); - GST_ERROR("Failed to link pad %s with element pad %s", src_name, sink_name); - g_free(sink_name); - g_free(src_name); - } + ret = link_src_to_sink(src_pad, sink_pad); gst_object_unref(src_pad); - return !ret; + return ret; } bool push_event(GstPad *pad, GstEvent *event) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 299eea09c90..ebdefb6a7f9 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -849,7 +849,6 @@ static bool stream_create_post_processing_elements(GstPad *pad, struct wg_parser struct wg_parser *parser = stream->parser; const char *name; GstCaps *caps; - int ret; caps = gst_pad_query_caps(pad, NULL); name = gst_structure_get_name(gst_caps_get_structure(caps, 0)); @@ -898,11 +897,9 @@ static bool stream_create_post_processing_elements(GstPad *pad, struct wg_parser if (!link_src_to_element(pad, first) || !link_element_to_sink(last, stream->my_sink)) return false; } - else if ((ret = gst_pad_link(pad, stream->my_sink)) < 0) + else { - GST_ERROR("Failed to link decodebin source pad to our sink pad, error %s.", - gst_pad_link_get_name(ret)); - return false; + return link_src_to_sink(pad, stream->my_sink); } return true;

1 0

Paul Gofman : mfplat/sample: Optimize copying to 2d buffer.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: bf58285a90eb4833fd6013e067353c566b460cd4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bf58285a90eb4833fd6013e067353c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 9 12:24:46 2023 -0600 mfplat/sample: Optimize copying to 2d buffer. --- dlls/mfplat/sample.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 3099f903779..a50f81c93d4 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -796,8 +796,9 @@ static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buff struct sample *sample = impl_from_IMFSample(iface); DWORD total_length, dst_length, dst_current_length, src_max_length, current_length; BYTE *src_ptr, *dst_ptr; - BOOL locked; - HRESULT hr; + IMF2DBuffer *buffer2d; + BOOL locked = FALSE; + HRESULT hr = E_FAIL; size_t i; TRACE("%p, %p.\n", iface, buffer); @@ -807,6 +808,25 @@ static HRESULT WINAPI sample_CopyToBuffer(IMFSample *iface, IMFMediaBuffer *buff total_length = sample_get_total_length(sample); dst_current_length = 0; + if (sample->buffer_count == 1 + && SUCCEEDED(IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&buffer2d))) + { + if (SUCCEEDED(IMFMediaBuffer_GetCurrentLength(sample->buffers[0], &current_length)) + && SUCCEEDED(IMF2DBuffer_GetContiguousLength(buffer2d, &dst_length)) + && current_length == dst_length + && SUCCEEDED(IMFMediaBuffer_Lock(sample->buffers[0], &src_ptr, &src_max_length, &current_length))) + { + hr = IMF2DBuffer_ContiguousCopyFrom(buffer2d, src_ptr, current_length); + IMFMediaBuffer_Unlock(sample->buffers[0]); + } + IMF2DBuffer_Release(buffer2d); + if (SUCCEEDED(hr)) + { + dst_current_length = current_length; + goto done; + } + } + dst_ptr = NULL; dst_length = current_length = 0; locked = SUCCEEDED(hr = IMFMediaBuffer_Lock(buffer, &dst_ptr, &dst_length, &current_length));

1 0

Zebediah Figura : ws2_32/tests: Add a regression test for interaction of sock_reselect() with event select.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 99dd3c5cba1debf39bb386790ebee923a50f1b0f URL: https://gitlab.winehq.org/wine/wine/-/commit/99dd3c5cba1debf39bb386790ebee9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 31 12:16:51 2023 -0500 ws2_32/tests: Add a regression test for interaction of sock_reselect() with event select. --- dlls/ws2_32/tests/sock.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9f6cd487777..5e22496e6ef 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -14002,6 +14002,36 @@ static void test_tcp_sendto_recvfrom(void) closesocket(server); } +/* Regression test for an internal bug affecting wget.exe. */ +static void test_select_after_WSAEventSelect(void) +{ + SOCKET client, server; + HANDLE event; + int ret; + + tcp_socketpair(&client, &server); + event = CreateEventA(NULL, FALSE, FALSE, NULL); + + ret = WSAEventSelect(client, event, FD_READ); + ok(!ret, "got error %u\n", WSAGetLastError()); + + ret = send(server, "data", 4, 0); + ok(ret == 4, "got %d\n", ret); + + ret = WaitForSingleObject(event, 1000); + ok(!ret, "got %d\n", ret); + + /* Poll. This must not trigger any events to be signalled again. */ + check_poll(client, POLLRDNORM | POLLWRNORM); + + ret = WaitForSingleObject(event, 0); + todo_wine ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + + CloseHandle(event); + closesocket(server); + closesocket(client); +} + START_TEST( sock ) { int i; @@ -14061,6 +14091,7 @@ START_TEST( sock ) test_write_watch(); test_events(); + test_select_after_WSAEventSelect(); test_ipv6only(); test_TransmitFile();

1 0

Nikolay Sivov : shell32: Fix string size condition check (Coverity).
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: eb8cac0f08312b83cf7607925ca0e5996e35499b URL: https://gitlab.winehq.org/wine/wine/-/commit/eb8cac0f08312b83cf7607925ca0e5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 30 17:30:43 2023 +0100 shell32: Fix string size condition check (Coverity). The issue was introduced by 68fd74e7f9bdd2310aebeb59bc86754271cdc063. --- dlls/shell32/shlexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c index e0a768012e6..eb9ca4a06df 100644 --- a/dlls/shell32/shlexec.c +++ b/dlls/shell32/shlexec.c @@ -164,8 +164,8 @@ static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lp case 'l': case 'L': if (lpFile) { - if ((size = SearchPathW(NULL, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL) - && size <= ARRAY_SIZE(xlpFile))) + size = SearchPathW(NULL, lpFile, L".exe", ARRAY_SIZE(xlpFile), xlpFile, NULL); + if (size && size <= ARRAY_SIZE(xlpFile)) cmd = xlpFile; else cmd = lpFile;

1 0

Zebediah Figura : server: Only set sock->event when the event is first noticed.
by Alexandre Julliard Oct. 31, 2023

Oct. 31, 2023

Module: wine Branch: master Commit: 25f8698fcdb1907010bb34169c0d3ecf46b3bf51 URL: https://gitlab.winehq.org/wine/wine/-/commit/25f8698fcdb1907010bb34169c0d3e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Oct 31 12:22:31 2023 -0500 server: Only set sock->event when the event is first noticed. Do not set it every time another event is polled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55838 --- dlls/ws2_32/tests/sock.c | 2 +- server/sock.c | 36 ++++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5e22496e6ef..f9cc1482c41 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -14025,7 +14025,7 @@ static void test_select_after_WSAEventSelect(void) check_poll(client, POLLRDNORM | POLLWRNORM); ret = WaitForSingleObject(event, 0); - todo_wine ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); CloseHandle(event); closesocket(server); diff --git a/server/sock.c b/server/sock.c index 45a4955d603..f774cded733 100644 --- a/server/sock.c +++ b/server/sock.c @@ -787,18 +787,11 @@ static unsigned int afd_poll_flag_to_win32( unsigned int flags ) return ret; } -/* wake anybody waiting on the socket event or send the associated message */ -static void sock_wake_up( struct sock *sock ) +static void post_sock_messages( struct sock *sock ) { unsigned int events = sock->pending_events & sock->mask; int i; - if (sock->event) - { - if (debug_level) fprintf(stderr, "signalling events %x ptr %p\n", events, sock->event ); - if (events) - set_event( sock->event ); - } if (sock->window) { if (debug_level) fprintf(stderr, "signalling events %x win %08x\n", events, sock->window ); @@ -1285,6 +1278,9 @@ static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit ) { sock->pending_events |= event; sock->reported_events |= event; + + if ((sock->mask & event) && sock->event) + set_event( sock->event ); } } @@ -1329,7 +1325,7 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs break; } - sock_wake_up( sock ); + post_sock_messages( sock ); } static void sock_poll_event( struct fd *fd, int event ) @@ -2858,11 +2854,23 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->nonblocking = 1; sock_reselect( sock ); - /* Explicitly wake the socket up if the mask causes it to become - * signaled. Note that reselecting isn't enough, since we might already - * have had events recorded in sock->reported_events and we don't want - * to select for them again. */ - sock_wake_up( sock ); + + /* Explicitly wake the socket up if the mask matches pending_events. + * + * The logic here is a bit surprising. We always set the event if the + * socket has events that haven't been consumed by + * WSAEnumNetworkEvents() yet, including if WSAEventSelect() is called + * multiple times without consuming the events. + * However, once the events are consumed by WSAEnumNetworkEvents(), we + * don't set the event again (even though e.g. data is still available) + * until a "reset" call (i.e. that clears reported_events). */ + + if (event && (sock->pending_events & mask)) + { + if (debug_level) fprintf( stderr, "signalling pending events %#x due to event select\n", + sock->pending_events & mask ); + set_event( event ); + } return; }

1 0