March 2020 - Wine-commits - list.winehq.org

Zebediah Figura : strmbase: Get rid of the base transform.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 421e6b2b938b785755979b99a5cbcd0edb2eda0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=421e6b2b938b785755979b99… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 10 22:03:31 2020 -0500 strmbase: Get rid of the base transform. This is providing very little of value. The code in Receive() and in the state management methods should probably be moved to the base pin and filter respectively; the media type management is just wrong (and our two extant transforms should not handle it the same way anyway), and most of the rest just passes through to the transform's own callback table. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/Makefile.in | 1 - dlls/strmbase/transform.c | 437 ---------------------------------------------- include/wine/strmbase.h | 50 ------ 3 files changed, 488 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=421e6b2b938b78575597…

1 0

Nikolay Sivov : mf: Shutdown samplegrabber event queue on sink shutdown.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 97f949b9c6415936cc3c184c63a8803cfca1f9a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97f949b9c6415936cc3c184c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:39 2020 +0300 mf: Shutdown samplegrabber event queue on sink shutdown. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 6 +++--- dlls/mf/tests/mf.c | 20 +++++++++++++++++++- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index f44df9f32b..f4dbe4f283 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -849,10 +849,7 @@ static ULONG WINAPI sample_grabber_sink_Release(IMFMediaSink *iface) IMFSampleGrabberSinkCallback2_Release(grabber->callback2); IMFMediaType_Release(grabber->media_type); if (grabber->event_queue) - { - IMFMediaEventQueue_Shutdown(grabber->event_queue); IMFMediaEventQueue_Release(grabber->event_queue); - } if (grabber->clock) IMFPresentationClock_Release(grabber->clock); if (grabber->timer) @@ -1045,12 +1042,15 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) grabber->is_shut_down = TRUE; if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) { + /* Detach stream. */ IMFMediaSink_Release(&grabber->stream->sink->IMFMediaSink_iface); EnterCriticalSection(&grabber->stream->cs); grabber->stream->sink = NULL; LeaveCriticalSection(&grabber->stream->cs); IMFStreamSink_Release(&grabber->stream->IMFStreamSink_iface); grabber->stream = NULL; + + IMFMediaEventQueue_Shutdown(grabber->event_queue); } LeaveCriticalSection(&grabber->cs); diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index da533d05d3..ebab86aab6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1925,6 +1925,7 @@ static void test_sample_grabber(void) IMFMediaSink *sink, *sink2; DWORD flags, count, id; IMFActivate *activate; + IMFMediaEvent *event; ULONG refcount; IUnknown *unk; HRESULT hr; @@ -1995,9 +1996,12 @@ static void test_sample_grabber(void) ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); IMFClockStateSink_Release(clocksink); + /* Event generator. */ hr = IMFMediaSink_QueryInterface(sink, &IID_IMFMediaEventGenerator, (void **)&eg); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); - IMFMediaEventGenerator_Release(eg); + + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&unk); ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); @@ -2130,9 +2134,18 @@ todo_wine hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, NULL, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); + + hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_NO_EVENTS_AVAILABLE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_Shutdown(sink); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFMediaEventGenerator_GetEvent(eg, MF_EVENT_FLAG_NO_WAIT, &event); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFMediaSink_Shutdown(sink); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -2148,6 +2161,10 @@ todo_wine hr = IMFMediaSink_GetStreamSinkByIndex(sink, 0, &stream2); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); +todo_wine + ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); + hr = IMFStreamSink_GetMediaSink(stream, &sink2); ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); @@ -2195,6 +2212,7 @@ todo_wine hr = IMFStreamSink_GetMediaTypeHandler(stream, NULL); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + IMFMediaEventGenerator_Release(eg); IMFMediaSink_Release(sink); IMFStreamSink_Release(stream);

1 0

Nikolay Sivov : mf: Block samplegrabber stream event calls after stream is removed.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 2062dd95d738a5e0e76b44fc679290d0248408c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2062dd95d738a5e0e76b44fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:40 2020 +0300 mf: Block samplegrabber stream event calls after stream is removed. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 13 +++++++++++++ dlls/mf/tests/mf.c | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index f4dbe4f283..82febf236d 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -235,6 +235,9 @@ static HRESULT WINAPI sample_grabber_stream_GetEvent(IMFStreamSink *iface, DWORD TRACE("%p, %#x, %p.\n", iface, flags, event); + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + return IMFMediaEventQueue_GetEvent(stream->event_queue, flags, event); } @@ -245,6 +248,9 @@ static HRESULT WINAPI sample_grabber_stream_BeginGetEvent(IMFStreamSink *iface, TRACE("%p, %p, %p.\n", iface, callback, state); + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + return IMFMediaEventQueue_BeginGetEvent(stream->event_queue, callback, state); } @@ -255,6 +261,9 @@ static HRESULT WINAPI sample_grabber_stream_EndGetEvent(IMFStreamSink *iface, IM TRACE("%p, %p, %p.\n", iface, result, event); + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + return IMFMediaEventQueue_EndGetEvent(stream->event_queue, result, event); } @@ -265,6 +274,9 @@ static HRESULT WINAPI sample_grabber_stream_QueueEvent(IMFStreamSink *iface, Med TRACE("%p, %u, %s, %#x, %p.\n", iface, event_type, debugstr_guid(ext_type), hr, value); + if (!stream->sink) + return MF_E_STREAMSINK_REMOVED; + return IMFMediaEventQueue_QueueEventParamVar(stream->event_queue, event_type, ext_type, hr, value); } @@ -1046,6 +1058,7 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) IMFMediaSink_Release(&grabber->stream->sink->IMFMediaSink_iface); EnterCriticalSection(&grabber->stream->cs); grabber->stream->sink = NULL; + IMFMediaEventQueue_Shutdown(grabber->stream->event_queue); LeaveCriticalSection(&grabber->stream->cs); IMFStreamSink_Release(&grabber->stream->IMFStreamSink_iface); grabber->stream = NULL; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index ebab86aab6..0593ed8868 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2162,7 +2162,6 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); hr = IMFStreamSink_GetEvent(stream, MF_EVENT_FLAG_NO_WAIT, &event); -todo_wine ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); hr = IMFStreamSink_GetMediaSink(stream, &sink2);

1 0

Nikolay Sivov : mf: Improve ShutdownObject() behavior for sample grabber activation object.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 15657f68a4cce9e3f15e9048d9bd32935d51db4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=15657f68a4cce9e3f15e9048… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:41 2020 +0300 mf: Improve ShutdownObject() behavior for sample grabber activation object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/main.c | 23 +++++++-- dlls/mf/mf_private.h | 1 + dlls/mf/samplegrabber.c | 11 +++++ dlls/mf/sar.c | 6 +++ dlls/mf/tests/mf.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++- 5 files changed, 158 insertions(+), 5 deletions(-) diff --git a/dlls/mf/main.c b/dlls/mf/main.c index f16e3e8aba..ecf7de23b6 100644 --- a/dlls/mf/main.c +++ b/dlls/mf/main.c @@ -402,14 +402,23 @@ static HRESULT WINAPI activate_object_ActivateObject(IMFActivate *iface, REFIID static HRESULT WINAPI activate_object_ShutdownObject(IMFActivate *iface) { - FIXME("%p.\n", iface); + struct activate_object *activate = impl_from_IMFActivate(iface); + IUnknown *object; - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if ((object = InterlockedCompareExchangePointer((void **)&activate->object, NULL, activate->object))) + { + activate->funcs->shutdown_object(activate->context, object); + IUnknown_Release(object); + } + + return S_OK; } static HRESULT WINAPI activate_object_DetachObject(IMFActivate *iface) { - FIXME("%p.\n", iface); + TRACE("%p.\n", iface); return E_NOTIMPL; } @@ -1265,6 +1274,10 @@ static HRESULT evr_create_object(IMFAttributes *attributes, void *user_context, return E_NOTIMPL; } +static void evr_shutdown_object(void *user_context, IUnknown *obj) +{ +} + static void evr_free_private(void *user_context) { } @@ -1272,6 +1285,7 @@ static void evr_free_private(void *user_context) static const struct activate_funcs evr_activate_funcs = { evr_create_object, + evr_shutdown_object, evr_free_private, }; @@ -1279,6 +1293,9 @@ HRESULT WINAPI MFCreateVideoRendererActivate(HWND hwnd, IMFActivate **activate) { TRACE("%p, %p.\n", hwnd, activate); + if (!activate) + return E_POINTER; + return create_activation_object(hwnd, &evr_activate_funcs, activate); } diff --git a/dlls/mf/mf_private.h b/dlls/mf/mf_private.h index 0b7d1c65fa..f68c7d8d4c 100644 --- a/dlls/mf/mf_private.h +++ b/dlls/mf/mf_private.h @@ -50,6 +50,7 @@ static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t co struct activate_funcs { HRESULT (*create_object)(IMFAttributes *attributes, void *context, IUnknown **object); + void (*shutdown_object)(void *context, IUnknown *object); void (*free_private)(void *context); }; diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 82febf236d..ea0d596f7e 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -101,6 +101,7 @@ struct sample_grabber_activate_context { IMFMediaType *media_type; IMFSampleGrabberSinkCallback *callback; + BOOL shut_down; }; static void sample_grabber_free_private(void *user_context) @@ -1320,6 +1321,9 @@ static HRESULT sample_grabber_create_object(IMFAttributes *attributes, void *use TRACE("%p, %p, %p.\n", attributes, user_context, obj); + if (context->shut_down) + return MF_E_SHUTDOWN; + /* At least major type is required. */ if (FAILED(IMFMediaType_GetMajorType(context->media_type, &guid))) return MF_E_INVALIDMEDIATYPE; @@ -1363,9 +1367,16 @@ failed: return hr; } +static void sample_grabber_shutdown_object(void *user_context, IUnknown *obj) +{ + struct sample_grabber_activate_context *context = user_context; + context->shut_down = TRUE; +} + static const struct activate_funcs sample_grabber_activate_funcs = { sample_grabber_create_object, + sample_grabber_shutdown_object, sample_grabber_free_private, }; diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index c0c1803df1..4f20472748 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -33,6 +33,11 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, return E_NOTIMPL; } +static void sar_shutdown_object(void *user_context, IUnknown *obj) +{ + /* FIXME: shut down sink */ +} + static void sar_free_private(void *user_context) { } @@ -40,6 +45,7 @@ static void sar_free_private(void *user_context) static const struct activate_funcs sar_activate_funcs = { sar_create_object, + sar_shutdown_object, sar_free_private, }; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 0593ed8868..5742da1620 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2044,10 +2044,15 @@ static void test_sample_grabber(void) IMFPresentationClock_Release(clock); + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); + hr = IMFActivate_ShutdownObject(activate); -todo_wine ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); + hr = IMFStreamSink_GetMediaTypeHandler(stream, &handler); ok(hr == S_OK, "Failed to get type handler, hr %#x.\n", hr); @@ -2240,8 +2245,36 @@ todo_wine ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); ok(flags & MEDIASINK_RATELESS, "Unexpected flags %#x.\n", flags); + hr = IMFActivate_ShutdownObject(activate); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = IMFMediaSink_Shutdown(sink); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + IMFMediaSink_Release(sink); + + /* Detaching */ + hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); + ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); + IMFMediaSink_Release(sink); + + hr = IMFActivate_ShutdownObject(activate); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFActivate_GetCount(activate, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFActivate_DetachObject(activate); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMFActivate_Release(activate); + IMFMediaType_Release(media_type); hr = MFShutdown(); @@ -2608,8 +2641,9 @@ static void test_sar(void) { IMFPresentationTimeSource *time_source; IMFClockStateSink *state_sink; + IMFMediaSink *sink, *sink2; + IMFActivate *activate; MFCLOCK_STATE state; - IMFMediaSink *sink; IMFClock *clock; DWORD flags; HRESULT hr; @@ -2656,19 +2690,103 @@ if (SUCCEEDED(hr)) IMFMediaSink_Release(sink); } + /* Activation */ + hr = MFCreateAudioRendererActivate(&activate); + ok(hr == S_OK, "Failed to create activation object, hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); +todo_wine + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + +if (hr == S_OK) +{ + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink2); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + ok(sink == sink2, "Unexpected instance.\n"); + IMFMediaSink_Release(sink2); + + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); + + hr = IMFActivate_ShutdownObject(activate); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + IMFMediaSink_Release(sink); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + IMFMediaSink_Release(sink); + + hr = IMFActivate_DetachObject(activate); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); +} + IMFActivate_Release(activate); CoUninitialize(); } static void test_evr(void) { + IMFMediaSink *sink, *sink2; IMFActivate *activate; + DWORD flags; HRESULT hr; + hr = CoInitialize(NULL); + ok(hr == S_OK, "Failed to initialize, hr %#x.\n", hr); + + hr = MFCreateVideoRendererActivate(NULL, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = MFCreateVideoRendererActivate(NULL, &activate); ok(hr == S_OK, "Failed to create activate object, hr %#x.\n", hr); + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); +todo_wine + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + +if (hr == S_OK) +{ + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFActivate_ShutdownObject(activate); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + /* Activate again. */ + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink2); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + ok(sink == sink2, "Unexpected instance.\n"); + IMFMediaSink_Release(sink2); + + hr = IMFActivate_DetachObject(activate); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_GetCharacteristics(sink, &flags); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink2); + ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); + + hr = IMFActivate_ShutdownObject(activate); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + IMFMediaSink_Release(sink2); + IMFMediaSink_Release(sink); +} IMFActivate_Release(activate); + + CoUninitialize(); } static void test_MFCreateSimpleTypeHandler(void)

1 0

Nikolay Sivov : mf: Set shutdown state flag for presentation clock.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 5009e5da07b3c2e974dc9446b3bd483b814e415c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5009e5da07b3c2e974dc9446… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 11 14:19:42 2020 +0300 mf: Set shutdown state flag for presentation clock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 28 ++++++++++++++++++++++++---- dlls/mf/tests/mf.c | 31 +++++++++++++++++++++++++++---- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 29f366a34e..91fcce57ca 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -239,6 +239,7 @@ struct presentation_clock float rate; LONGLONG frequency; CRITICAL_SECTION cs; + BOOL is_shut_down; }; struct quality_manager @@ -3332,16 +3333,35 @@ static ULONG WINAPI present_clock_shutdown_Release(IMFShutdown *iface) static HRESULT WINAPI present_clock_shutdown_Shutdown(IMFShutdown *iface) { - FIXME("%p.\n", iface); + struct presentation_clock *clock = impl_from_IMFShutdown(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + EnterCriticalSection(&clock->cs); + clock->is_shut_down = TRUE; + LeaveCriticalSection(&clock->cs); + + return S_OK; } static HRESULT WINAPI present_clock_shutdown_GetShutdownStatus(IMFShutdown *iface, MFSHUTDOWN_STATUS *status) { - FIXME("%p, %p.\n", iface, status); + struct presentation_clock *clock = impl_from_IMFShutdown(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, status); + + if (!status) + return E_INVALIDARG; + + EnterCriticalSection(&clock->cs); + if (clock->is_shut_down) + *status = MFSHUTDOWN_COMPLETED; + else + hr = MF_E_INVALIDREQUEST; + LeaveCriticalSection(&clock->cs); + + return hr; } static const IMFShutdownVtbl presentclockshutdownvtbl = diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 5742da1620..a86a8ecdbb 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1776,6 +1776,10 @@ static void test_presentation_clock(void) ok(rate == 1.0f, "Unexpected rate.\n"); ok(!thin, "Unexpected thinning.\n"); + hr = IMFPresentationClock_GetState(clock, 0, &state); + ok(hr == S_OK, "Failed to get clock state, hr %#x.\n", hr); + ok(state == MFCLOCK_STATE_PAUSED, "Unexpected state %d.\n", state); + hr = IMFPresentationClock_Start(clock, 0); ok(hr == S_OK, "Failed to stop, hr %#x.\n", hr); @@ -1809,18 +1813,37 @@ static void test_presentation_clock(void) /* Shutdown behavior. */ hr = IMFShutdown_GetShutdownStatus(shutdown, NULL); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + hr = IMFShutdown_Shutdown(shutdown); -todo_wine ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + time_source = NULL; + hr = IMFPresentationClock_GetTimeSource(clock, &time_source); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!time_source, "Unexpected instance %p.\n", time_source); + IMFPresentationTimeSource_Release(time_source); + + hr = IMFPresentationClock_GetTime(clock, &time); + ok(hr == S_OK, "Failed to get time, hr %#x.\n", hr); + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); -todo_wine { ok(hr == S_OK, "Failed to get status, hr %#x.\n", hr); ok(status == MFSHUTDOWN_COMPLETED, "Unexpected status.\n"); -} + + hr = IMFPresentationClock_Start(clock, 0); + ok(hr == S_OK, "Failed to start the clock, hr %#x.\n", hr); + + hr = IMFShutdown_GetShutdownStatus(shutdown, &status); + ok(hr == S_OK, "Failed to get status, hr %#x.\n", hr); + ok(status == MFSHUTDOWN_COMPLETED, "Unexpected status.\n"); + + hr = IMFShutdown_Shutdown(shutdown); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFShutdown_Release(shutdown); IMFPresentationClock_Release(clock);

1 0

Alexandre Julliard : kernelbase: Don't use towlower() on the full Unicode character range.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 1a9ddc37590664b8710c19d487f92f86ded34dfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a9ddc37590664b8710c19d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 15:14:44 2020 +0100 kernelbase: Don't use towlower() on the full Unicode character range. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/path.c | 17 +++++++---------- dlls/kernelbase/string.c | 8 +++++--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 93446815f2..0e0c3f3dbd 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1652,7 +1652,7 @@ int WINAPI PathCommonPrefixW(const WCHAR *file1, const WCHAR *file2, WCHAR *path if ((!*iter1 || *iter1 == '\\') && (!*iter2 || *iter2 == '\\')) len = iter1 - file1; /* Common to this point */ - if (!*iter1 || (towlower(*iter1) != towlower(*iter2))) + if (!*iter1 || (towupper(*iter1) != towupper(*iter2))) break; /* Strings differ at this point */ iter1++; @@ -1813,8 +1813,6 @@ int WINAPI PathGetDriveNumberA(const char *path) int WINAPI PathGetDriveNumberW(const WCHAR *path) { - WCHAR drive; - TRACE("%s\n", wine_dbgstr_w(path)); if (!path) @@ -1822,11 +1820,10 @@ int WINAPI PathGetDriveNumberW(const WCHAR *path) if (!wcsncmp(path, L"\\\\?\\", 4)) path += 4; - drive = towlower(path[0]); - if (drive < 'a' || drive > 'z' || path[1] != ':') - return -1; - - return drive - 'a'; + if (!path[0] || path[1] != ':') return -1; + if (path[0] >= 'A' && path[0] <= 'Z') return path[0] - 'A'; + if (path[0] >= 'a' && path[0] <= 'z') return path[0] - 'a'; + return -1; } BOOL WINAPI PathIsFileSpecA(const char *path) @@ -4733,7 +4730,7 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co work = (LPWSTR)base.pszProtocol; for (i = 0; i < base.cchProtocol; ++i) - work[i] = towlower(work[i]); + work[i] = RtlDowncaseUnicodeChar(work[i]); /* mk is a special case */ if (base.nScheme == URL_SCHEME_MK) @@ -4871,7 +4868,7 @@ HRESULT WINAPI UrlCombineW(const WCHAR *baseW, const WCHAR *relativeW, WCHAR *co { work = (LPWSTR)relative.pszProtocol; for (i = 0; i < relative.cchProtocol; ++i) - work[i] = towlower(work[i]); + work[i] = RtlDowncaseUnicodeChar(work[i]); } /* Handle cases where relative has scheme. */ diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 7c484e2858..75ee5b0512 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -924,7 +924,7 @@ BOOL WINAPI StrToInt64ExW(const WCHAR *str, DWORD flags, LONGLONG *ret) else if (*str == '+') str++; - if (flags & STIF_SUPPORT_HEX && *str == '0' && towlower(str[1]) == 'x') + if (flags & STIF_SUPPORT_HEX && *str == '0' && (str[1] == 'x' || str[1] == 'X')) { /* Read hex number */ str += 2; @@ -935,10 +935,12 @@ BOOL WINAPI StrToInt64ExW(const WCHAR *str, DWORD flags, LONGLONG *ret) while (iswxdigit(*str)) { value *= 16; - if (iswdigit(*str)) + if (*str >= '0' && *str <= '9') value += (*str - '0'); + else if (*str >= 'A' && *str <= 'Z') + value += 10 + (*str - 'A'); else - value += 10 + (towlower(*str) - 'a'); + value += 10 + (*str - 'a'); str++; }

1 0

Alexandre Julliard : kernelbase: Don't use wcsicmp/wcsnicmp() on the full Unicode character range.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: ef95e4a8b9a4e772937514fb2538c145a07aa6c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef95e4a8b9a4e772937514fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 9 20:03:14 2020 +0100 kernelbase: Don't use wcsicmp/wcsnicmp() on the full Unicode character range. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 5 ++++- dlls/kernelbase/path.c | 3 ++- dlls/kernelbase/registry.c | 2 +- dlls/kernelbase/string.c | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 6591a11073..79e62716be 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "winternl.h" #include "winioctl.h" #include "wincon.h" @@ -183,7 +184,9 @@ static NTSTATUS find_actctx_dllpath( const WCHAR *name, WCHAR **path ) DWORD dirlen = info->ulAssemblyDirectoryNameLength / sizeof(WCHAR); p++; - if (!dirlen || wcsnicmp( p, info->lpAssemblyDirectoryName, dirlen ) || wcsicmp( p + dirlen, L".manifest" )) + if (!dirlen || + CompareStringOrdinal( p, dirlen, info->lpAssemblyDirectoryName, dirlen, TRUE ) != CSTR_EQUAL || + wcsicmp( p + dirlen, L".manifest" )) { /* manifest name does not match directory name, so it's not a global * windows/winsxs manifest; use the manifest directory name instead */ diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 0e0c3f3dbd..57102755c6 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2713,7 +2713,8 @@ BOOL WINAPI PathUnExpandEnvStringsW(const WCHAR *path, WCHAR *buffer, UINT buf_l while (cur->var) { /* path can't contain expanded value or value wasn't retrieved */ - if (cur->len == 0 || cur->len > pathlen || wcsnicmp(cur->path, path, cur->len)) + if (cur->len == 0 || cur->len > pathlen || + CompareStringOrdinal( cur->path, cur->len, path, cur->len, TRUE ) != CSTR_EQUAL) { cur++; continue; diff --git a/dlls/kernelbase/registry.c b/dlls/kernelbase/registry.c index 4f2234b1ef..e6f3722f70 100644 --- a/dlls/kernelbase/registry.c +++ b/dlls/kernelbase/registry.c @@ -2551,7 +2551,7 @@ static int reg_mui_cache_get(const WCHAR *file_name, UINT index, WCHAR **buffer) LIST_FOR_EACH_ENTRY(ent, &reg_mui_cache, struct mui_cache_entry, entry) { if (ent->index == index && ent->locale == GetThreadLocale() && - !wcsicmp(ent->file_name, file_name)) + !lstrcmpiW(ent->file_name, file_name)) goto found; } return 0; diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 75ee5b0512..bd6ff03643 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -416,7 +416,7 @@ WCHAR * WINAPI StrStrNIW(const WCHAR *str, const WCHAR *search, UINT max_len) for (i = max_len; *str && (i > 0); i--, str++) { - if (!wcsnicmp(str, search, len)) + if (!StrCmpNIW(str, search, len)) return (WCHAR *)str; }

1 0

Alexandre Julliard : kernelbase: Don't allow the full Unicode character range in StrToInt* functions.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 0eec0eb7e094eb3a50d20b230f732625a704483e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0eec0eb7e094eb3a50d20b23… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 12:22:14 2020 +0100 kernelbase: Don't allow the full Unicode character range in StrToInt* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/string.c | 30 +++++++--------- dlls/shlwapi/tests/string.c | 84 +++++++++++++++++++++++++++++++++------------ 2 files changed, 76 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0eec0eb7e094eb3a50d2…

1 0

Alexandre Julliard : kernelbase: Don't allow the full Unicode character range in path functions.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 5933c2a6901218bc6ef7b6e808b0571fa96b542e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5933c2a6901218bc6ef7b6e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 10 12:45:06 2020 +0100 kernelbase: Don't allow the full Unicode character range in path functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 2 +- dlls/kernelbase/path.c | 134 ++++++++++++++++++++++--------------------------- 2 files changed, 62 insertions(+), 74 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5933c2a6901218bc6ef7…

1 0

Jeff Smith : msvcrt: Stop forwarding iswctype functions to ntdll.
by Alexandre Julliard 11 Mar '20

11 Mar '20

Module: wine Branch: master Commit: 89ca556ac54606879b788880e522f9da65196f63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ca556ac54606879b788880… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Mar 10 20:59:24 2020 +0100 msvcrt: Stop forwarding iswctype functions to ntdll. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 6 +++--- dlls/msvcr100/msvcr100.spec | 6 +++--- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 6 +++--- dlls/msvcr71/msvcr71.spec | 6 +++--- dlls/msvcr80/msvcr80.spec | 6 +++--- dlls/msvcr90/msvcr90.spec | 6 +++--- dlls/msvcrt/msvcrt.spec | 6 +++--- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/msvcrtd/msvcrtd.spec | 6 +++--- dlls/ucrtbase/ucrtbase.spec | 6 +++--- 12 files changed, 41 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=89ca556ac54606879b78…

1 0