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

Nikolay Sivov : mfmediaengine: Set media type flags on source resolution.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: c1a12f10b34c7f78e7f5f50a78a80f7db5a74ddd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1a12f10b34c7f78e7f5f50a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 20:08:38 2020 +0300 mfmediaengine: Set media type flags on source resolution. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 203 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 193 insertions(+), 10 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1a12f10b34c7f78e7f5…

1 0

Nikolay Sivov : mfmediaengine: Set presentation duration attribute.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 3e784ab4a63dbf7029bf16bb14a24672b8b66008 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e784ab4a63dbf7029bf16bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 20:08:39 2020 +0300 mfmediaengine: Set presentation duration attribute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 4136382566..e39009b30b 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -18,6 +18,7 @@ #define COBJMACROS +#include <math.h> #include <stdarg.h> #include "windef.h" @@ -82,6 +83,7 @@ struct media_engine double playback_rate; double default_playback_rate; double volume; + double duration; IMFMediaSession *session; IMFSourceResolver *resolver; CRITICAL_SECTION cs; @@ -208,6 +210,7 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi IMFStreamDescriptor *sd_audio = NULL, *sd_video = NULL; unsigned int stream_count = 0, i; IMFPresentationDescriptor *pd; + UINT64 duration; HRESULT hr; if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(source, &pd))) @@ -265,7 +268,20 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi if (sd_audio) engine->flags |= FLAGS_ENGINE_HAS_AUDIO; - /* TODO: set duration */ + /* Assume live source if duration was not provided. */ + if (SUCCEEDED(IMFPresentationDescriptor_GetUINT64(pd, &MF_PD_DURATION, &duration))) + { + /* Convert 100ns to seconds. */ + engine->duration = duration / 10000000; + } + else + engine->duration = INFINITY; + + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_DURATIONCHANGE, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADEDMETADATA, 0, 0); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_LOADEDDATA, 0, 0); + + /* TODO: set up topology nodes */ if (sd_video) IMFStreamDescriptor_Release(sd_video); @@ -513,9 +529,16 @@ static double WINAPI media_engine_GetStartTime(IMFMediaEngine *iface) static double WINAPI media_engine_GetDuration(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + double value; - return 0.0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + value = engine->duration; + LeaveCriticalSection(&engine->cs); + + return value; } static BOOL WINAPI media_engine_IsPaused(IMFMediaEngine *iface) @@ -962,6 +985,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct engine->default_playback_rate = 1.0; engine->playback_rate = 1.0; engine->volume = 1.0; + engine->duration = NAN; InitializeCriticalSection(&engine->cs); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify,

1 0

Nikolay Sivov : mfmediaengine/tests: Add some tests for error property.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 63d8cfa8f98181754c893655734cdbd69778ea5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=63d8cfa8f98181754c893655… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 20:08:40 2020 +0300 mfmediaengine/tests: Add some tests for error property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/tests/mfmediaengine.c | 55 ++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index a5b80ef25f..59154c8d4f 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -490,6 +490,60 @@ static void test_mute(void) IMFMediaEngine_Release(media_engine); } +static void test_error(void) +{ + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaEngine *media_engine; + IMFMediaError *eo, *eo2; + HRESULT hr; + + media_engine = create_media_engine(callback); + + eo = (void *)0xdeadbeef; + hr = IMFMediaEngine_GetError(media_engine, &eo); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!eo, "Unexpected instance.\n"); +} + hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_ENCRYPTED + 1); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_ABORTED); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + eo = NULL; + hr = IMFMediaEngine_GetError(media_engine, &eo); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!eo, "Unexpected instance.\n"); +} + eo2 = NULL; + hr = IMFMediaEngine_GetError(media_engine, &eo2); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(eo2 != eo, "Unexpected instance.\n"); +} + if (eo2) + IMFMediaError_Release(eo2); + if (eo) + IMFMediaError_Release(eo); + + hr = IMFMediaEngine_SetErrorCode(media_engine, MF_MEDIA_ENGINE_ERR_NOERROR); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + eo = (void *)0xdeadbeef; + hr = IMFMediaEngine_GetError(media_engine, &eo); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!eo, "Unexpected instance.\n"); +} + IMFMediaEngine_Release(media_engine); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -516,6 +570,7 @@ START_TEST(mfmediaengine) test_Play(); test_playback_rate(); test_mute(); + test_error(); IMFMediaEngineClassFactory_Release(factory);

1 0

Nikolay Sivov : mfmediaengine: Implement error object.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 48c3a30650354f2ee5079533353a297850b6ec58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48c3a30650354f2ee5079533… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 3 20:08:41 2020 +0300 mfmediaengine: Implement error object. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 124 ++++++++++++++++++++++++++++++- dlls/mfmediaengine/tests/mfmediaengine.c | 28 +++++++ 2 files changed, 150 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index e39009b30b..d77b1e4afe 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -89,6 +89,126 @@ struct media_engine CRITICAL_SECTION cs; }; +struct media_error +{ + IMFMediaError IMFMediaError_iface; + LONG refcount; + unsigned int code; + HRESULT extended_code; +}; + +static struct media_error *impl_from_IMFMediaError(IMFMediaError *iface) +{ + return CONTAINING_RECORD(iface, struct media_error, IMFMediaError_iface); +} + +static HRESULT WINAPI media_error_QueryInterface(IMFMediaError *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaError) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaError_AddRef(iface); + return S_OK; + } + + WARN("Unsupported interface %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI media_error_AddRef(IMFMediaError *iface) +{ + struct media_error *me = impl_from_IMFMediaError(iface); + ULONG refcount = InterlockedIncrement(&me->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + return refcount; +} + +static ULONG WINAPI media_error_Release(IMFMediaError *iface) +{ + struct media_error *me = impl_from_IMFMediaError(iface); + ULONG refcount = InterlockedDecrement(&me->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + heap_free(me); + + return refcount; +} + +static USHORT WINAPI media_error_GetErrorCode(IMFMediaError *iface) +{ + struct media_error *me = impl_from_IMFMediaError(iface); + TRACE("%p.\n", iface); + return me->code; +} + +static HRESULT WINAPI media_error_GetExtendedErrorCode(IMFMediaError *iface) +{ + struct media_error *me = impl_from_IMFMediaError(iface); + TRACE("%p.\n", iface); + return me->extended_code; +} + +static HRESULT WINAPI media_error_SetErrorCode(IMFMediaError *iface, MF_MEDIA_ENGINE_ERR code) +{ + struct media_error *me = impl_from_IMFMediaError(iface); + + TRACE("%p, %u.\n", iface, code); + + if ((unsigned int)code > MF_MEDIA_ENGINE_ERR_ENCRYPTED) + return E_INVALIDARG; + + me->code = code; + + return S_OK; +} + +static HRESULT WINAPI media_error_SetExtendedErrorCode(IMFMediaError *iface, HRESULT code) +{ + struct media_error *me = impl_from_IMFMediaError(iface); + + TRACE("%p, %#x.\n", iface, code); + + me->extended_code = code; + + return S_OK; +} + +static const IMFMediaErrorVtbl media_error_vtbl = +{ + media_error_QueryInterface, + media_error_AddRef, + media_error_Release, + media_error_GetErrorCode, + media_error_GetExtendedErrorCode, + media_error_SetErrorCode, + media_error_SetExtendedErrorCode, +}; + +static HRESULT create_media_error(IMFMediaError **ret) +{ + struct media_error *object; + + *ret = NULL; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IMFMediaError_iface.lpVtbl = &media_error_vtbl; + object->refcount = 1; + + *ret = &object->IMFMediaError_iface; + + return S_OK; +} + static void media_engine_set_flag(struct media_engine *engine, unsigned int mask, BOOL value) { if (value) @@ -1060,9 +1180,9 @@ static HRESULT WINAPI media_engine_factory_CreateTimeRange(IMFMediaEngineClassFa static HRESULT WINAPI media_engine_factory_CreateError(IMFMediaEngineClassFactory *iface, IMFMediaError **error) { - FIXME("(%p, %p): stub.\n", iface, error); + TRACE("%p, %p.\n", iface, error); - return E_NOTIMPL; + return create_media_error(error); } static const IMFMediaEngineClassFactoryVtbl media_engine_factory_vtbl = diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 59154c8d4f..2f114db7e9 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -496,6 +496,7 @@ static void test_error(void) IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; IMFMediaEngine *media_engine; IMFMediaError *eo, *eo2; + unsigned int code; HRESULT hr; media_engine = create_media_engine(callback); @@ -542,6 +543,33 @@ todo_wine { ok(!eo, "Unexpected instance.\n"); } IMFMediaEngine_Release(media_engine); + + /* Error object. */ + hr = IMFMediaEngineClassFactory_CreateError(factory, &eo); + ok(hr == S_OK, "Failed to create error object, hr %#x.\n", hr); + + code = IMFMediaError_GetErrorCode(eo); + ok(code == MF_MEDIA_ENGINE_ERR_NOERROR, "Unexpected code %u.\n", code); + + hr = IMFMediaError_GetExtendedErrorCode(eo); + ok(hr == S_OK, "Unexpected code %#x.\n", hr); + + hr = IMFMediaError_SetErrorCode(eo, MF_MEDIA_ENGINE_ERR_ENCRYPTED + 1); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaError_SetErrorCode(eo, MF_MEDIA_ENGINE_ERR_ABORTED); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + code = IMFMediaError_GetErrorCode(eo); + ok(code == MF_MEDIA_ENGINE_ERR_ABORTED, "Unexpected code %u.\n", code); + + hr = IMFMediaError_SetExtendedErrorCode(eo, E_FAIL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaError_GetExtendedErrorCode(eo); + ok(hr == E_FAIL, "Unexpected code %#x.\n", hr); + + IMFMediaError_Release(eo); } START_TEST(mfmediaengine)

1 0

Anton Baskanov : amstream: Leave critical section on error in MediaStreamFilter::EnumPins().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: d1197ffaeb983abf226c27ad1a557a47644ea829 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1197ffaeb983abf226c27ad… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Jun 3 14:28:12 2020 -0500 amstream: Leave critical section on error in MediaStreamFilter::EnumPins(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/filter.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index fb9b1d9aee..f89fe13e62 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -361,14 +361,14 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu TRACE("iface %p, enum_pins %p.\n", iface, enum_pins); - EnterCriticalSection(&filter->cs); - if (!enum_pins) return E_POINTER; if (!(object = heap_alloc(sizeof(*object)))) return E_OUTOFMEMORY; + EnterCriticalSection(&filter->cs); + object->IEnumPins_iface.lpVtbl = &enum_pins_vtbl; object->refcount = 1; object->count = filter->nb_streams; @@ -376,6 +376,7 @@ static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enu if (!(object->pins = heap_alloc(filter->nb_streams * sizeof(*object->pins)))) { heap_free(object); + LeaveCriticalSection(&filter->cs); return E_OUTOFMEMORY; } for (i = 0; i < filter->nb_streams; ++i)

1 0

Anton Baskanov : amstream: Implement AMAudioStream::BeginFlush() and ::EndFlush().
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: ae1ca7029a4aea3e2b466dd6bc1958af38f15274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae1ca7029a4aea3e2b466dd6… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Jun 3 14:28:13 2020 -0500 amstream: Implement AMAudioStream::BeginFlush() and ::EndFlush(). Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 36 ++++++++++-- dlls/amstream/tests/amstream.c | 124 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 155 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index f9470fa5f9..8fba877719 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -56,6 +56,7 @@ struct audio_stream WAVEFORMATEX format; FILTER_STATE state; BOOL eos; + BOOL flushing; struct list receive_queue; struct list update_queue; }; @@ -1084,7 +1085,7 @@ static HRESULT WINAPI audio_sink_EndOfStream(IPin *iface) EnterCriticalSection(&stream->cs); - if (stream->eos) + if (stream->eos || stream->flushing) { LeaveCriticalSection(&stream->cs); return E_FAIL; @@ -1101,14 +1102,34 @@ static HRESULT WINAPI audio_sink_EndOfStream(IPin *iface) static HRESULT WINAPI audio_sink_BeginFlush(IPin *iface) { - FIXME("iface %p, stub!\n", iface); - return E_NOTIMPL; + struct audio_stream *stream = impl_from_IPin(iface); + + TRACE("stream %p.\n", stream); + + EnterCriticalSection(&stream->cs); + + stream->flushing = TRUE; + stream->eos = FALSE; + flush_receive_queue(stream); + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI audio_sink_EndFlush(IPin *iface) { - FIXME("iface %p, stub!\n", iface); - return E_NOTIMPL; + struct audio_stream *stream = impl_from_IPin(iface); + + TRACE("stream %p.\n", stream); + + EnterCriticalSection(&stream->cs); + + stream->flushing = FALSE; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI audio_sink_NewSegment(IPin *iface, REFERENCE_TIME start, REFERENCE_TIME stop, double rate) @@ -1219,6 +1240,11 @@ static HRESULT WINAPI audio_meminput_Receive(IMemInputPin *iface, IMediaSample * LeaveCriticalSection(&stream->cs); return VFW_E_WRONG_STATE; } + if (stream->flushing) + { + LeaveCriticalSection(&stream->cs); + return S_FALSE; + } hr = IMediaSample_GetPointer(sample, &pointer); if (FAILED(hr)) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index d5b90d9257..2c97a0aa90 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -3084,6 +3084,129 @@ static void test_audiostream_initialize(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_audiostream_begin_flush_end_flush(void) +{ + static const WAVEFORMATEX format = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .wBitsPerSample = 16, + .nBlockAlign = 2, + .nAvgBytesPerSec = 2 * 11025, + }; + + const AM_MEDIA_TYPE mt = + { + .majortype = MEDIATYPE_Audio, + .subtype = MEDIASUBTYPE_PCM, + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(WAVEFORMATEX), + .pbFormat = (BYTE *)&format, + }; + + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAudioStreamSample *stream_sample; + IAudioMediaStream *audio_stream; + IMediaSample *media_sample; + struct testfilter source; + IAudioData *audio_data; + IGraphBuilder *graph; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = IAMMultiMediaStream_Initialize(mmstream, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IAudioMediaStream, (void **)&audio_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(graph != NULL, "Expected non-NULL graph.\n"); + testfilter_init(&source); + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAudioData_SetBuffer(audio_data, 16, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAudioMediaStream_CreateSample(audio_stream, audio_data, 0, &stream_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_RUN); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(media_sample); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + ref = IMediaSample_Release(media_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = IAudioStreamSample_Update(stream_sample, SSUPDATE_ASYNC, NULL, NULL, 0); + ok(hr == MS_S_PENDING, "Got hr %#x.\n", hr); + + hr = IPin_EndOfStream(pin); + ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = BaseOutputPinImpl_GetDeliveryBuffer(&source.source, &media_sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemInputPin_Receive(source.source.pMemInputPin, media_sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = IMediaSample_Release(media_sample); + ok(ref == 1, "Got outstanding refcount %d.\n", ref); + + hr = IPin_EndOfStream(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAMMultiMediaStream_SetState(mmstream, STREAMSTATE_STOP); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + ref = IAudioStreamSample_Release(stream_sample); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAudioData_Release(audio_data); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IGraphBuilder_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IAudioMediaStream_Release(audio_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void CALLBACK apc_func(ULONG_PTR param) { } @@ -3820,6 +3943,7 @@ START_TEST(amstream) test_audiostream_end_of_stream(); test_audiostream_receive(); test_audiostream_initialize(); + test_audiostream_begin_flush_end_flush(); test_audiostreamsample_update(); test_audiostreamsample_completion_status();

1 0

Jacek Caban : jscript: Throw proper exception in RegExp.prototype.toString when called on non-RegExp object.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 6de0a658f1768a72ce1b07b418985991a482d19e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6de0a658f1768a72ce1b07b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 3 16:04:15 2020 +0200 jscript: Throw proper exception in RegExp.prototype.toString when called on non-RegExp object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/error.c | 1 + dlls/jscript/jscript.h | 3 ++- dlls/jscript/jscript.rc | 2 ++ dlls/jscript/jsregexp.c | 4 ++-- dlls/jscript/resource.h | 3 ++- dlls/jscript/tests/api.js | 2 ++ po/ar.po | 40 ++++++++++++++++++++++++++-------------- po/ast.po | 36 ++++++++++++++++++++++-------------- po/bg.po | 36 ++++++++++++++++++++++-------------- po/ca.po | 40 ++++++++++++++++++++++++++-------------- po/cs.po | 40 ++++++++++++++++++++++++++-------------- po/da.po | 40 ++++++++++++++++++++++++++-------------- po/de.po | 40 ++++++++++++++++++++++++++-------------- po/el.po | 36 ++++++++++++++++++++++-------------- po/en.po | 36 ++++++++++++++++++++++-------------- po/en_US.po | 36 ++++++++++++++++++++++-------------- po/eo.po | 36 ++++++++++++++++++++++-------------- po/es.po | 40 ++++++++++++++++++++++++++-------------- po/fa.po | 36 ++++++++++++++++++++++-------------- po/fi.po | 40 ++++++++++++++++++++++++++-------------- po/fr.po | 40 ++++++++++++++++++++++++++-------------- po/he.po | 36 ++++++++++++++++++++++-------------- po/hi.po | 36 ++++++++++++++++++++++-------------- po/hr.po | 40 ++++++++++++++++++++++++++-------------- po/hu.po | 40 ++++++++++++++++++++++++++-------------- po/it.po | 40 ++++++++++++++++++++++++++-------------- po/ja.po | 40 ++++++++++++++++++++++++++-------------- po/ko.po | 40 ++++++++++++++++++++++++++-------------- po/lt.po | 40 ++++++++++++++++++++++++++-------------- po/ml.po | 36 ++++++++++++++++++++++-------------- po/nb_NO.po | 40 ++++++++++++++++++++++++++-------------- po/nl.po | 40 ++++++++++++++++++++++++++-------------- po/or.po | 36 ++++++++++++++++++++++-------------- po/pa.po | 36 ++++++++++++++++++++++-------------- po/pl.po | 40 ++++++++++++++++++++++++++-------------- po/pt_BR.po | 40 ++++++++++++++++++++++++++-------------- po/pt_PT.po | 40 ++++++++++++++++++++++++++-------------- po/rm.po | 36 ++++++++++++++++++++++-------------- po/ro.po | 40 ++++++++++++++++++++++++++-------------- po/ru.po | 40 ++++++++++++++++++++++++++-------------- po/si.po | 40 ++++++++++++++++++++++++++-------------- po/sk.po | 38 ++++++++++++++++++++++++-------------- po/sl.po | 40 ++++++++++++++++++++++++++-------------- po/sr_RS(a)cyrillic.po | 40 ++++++++++++++++++++++++++-------------- po/sr_RS(a)latin.po | 40 ++++++++++++++++++++++++++-------------- po/sv.po | 40 ++++++++++++++++++++++++++-------------- po/ta.po | 36 ++++++++++++++++++++++-------------- po/te.po | 36 ++++++++++++++++++++++-------------- po/th.po | 36 ++++++++++++++++++++++-------------- po/tr.po | 40 ++++++++++++++++++++++++++-------------- po/uk.po | 40 ++++++++++++++++++++++++++-------------- po/wa.po | 36 ++++++++++++++++++++++-------------- po/wine.pot | 36 ++++++++++++++++++++++-------------- po/zh_CN.po | 40 ++++++++++++++++++++++++++-------------- po/zh_TW.po | 40 ++++++++++++++++++++++++++-------------- 55 files changed, 1211 insertions(+), 690 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6de0a658f1768a72ce1b…

1 0

Jacek Caban : mshtml/tests: Introduce sync_test helper.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 0c9f9efda0b947d51efff74a8b277f5633ac52b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c9f9efda0b947d51efff74a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 3 16:04:28 2020 +0200 mshtml/tests: Introduce sync_test helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/es5.js | 132 ++++++++++++------------------------------ dlls/mshtml/tests/winetest.js | 18 +++++- 2 files changed, 54 insertions(+), 96 deletions(-) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 2a8549ba1d..dca5821c0c 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -21,18 +21,18 @@ var JS_E_INVALID_WRITABLE_PROP_DESC = 0x800a13ac; var JS_E_NONCONFIGURABLE_REDEFINED = 0x800a13d6; var JS_E_NONWRITABLE_MODIFIED = 0x800a13d7; -function test_date_now() { +var tests = []; + +sync_test("date_now", function() { var now = Date.now(); var time = (new Date()).getTime(); ok(time >= now && time-now < 50, "unexpected Date.now() result " + now + " expected " + time); Date.now(1, 2, 3); +}); - next_test(); -} - -function test_toISOString() { +sync_test("toISOString", function() { function expect(date, expected) { var s = date.toISOString(); ok(s === expected, "toISOString returned " + s + " expected " + expected); @@ -58,11 +58,9 @@ function test_toISOString() { expect_exception(function() { new Date(NaN).toISOString(); }); expect_exception(function() { new Date(31494784780800001).toISOString(); }); +}); - next_test(); -} - -function test_indexOf() { +sync_test("indexOf", function() { function expect(array, args, exr) { var r = Array.prototype.indexOf.apply(array, args); ok(r == exr, "indexOf returned " + r + " expected " + exr); @@ -86,11 +84,9 @@ function test_indexOf() { expect({"4": 4, length: 3}, [4], -1); expect({"test": true}, [true], -1); expect([1,2,3], [2, 1.9], 1); +}); - next_test(); -} - -function test_array_forEach() { +sync_test("forEach", function() { ok(Array.prototype.forEach.length === 1, "forEach.length = " + Array.prototype.forEach.length); function test(array, expect) { @@ -121,11 +117,9 @@ function test_array_forEach() { ok(array === a, "array != a"); ok(this === o, "this != o"); }, o); +}); - next_test(); -} - -function test_isArray() { +sync_test("isArray", function() { function expect_array(a, exr) { var r = Array.isArray(a); ok(r === exr, "isArray returned " + r + " expected " + exr); @@ -139,11 +133,9 @@ function test_isArray() { function C() {} C.prototype = Array.prototype; expect_array(new C(), false); +}); - next_test(); -} - -function test_array_map() { +sync_test("array_map", function() { var calls, m, arr, ctx; /* basic map call with context */ @@ -190,11 +182,9 @@ function test_array_map() { [1,2].map(function() { ok(this === window, "this != window"); }, undefined); +}); - next_test(); -} - -function test_array_sort() { +sync_test("array_sort", function() { var r; r = [3,1,2].sort(function(x,y) { return y-x; }, 1, 2, 3, true, undefined ).join(); @@ -209,11 +199,9 @@ function test_array_sort() { }catch(e) { ok(e.name === "TypeError", "got exception " + e.name); } +}); - next_test(); -} - -function test_identifier_keywords() { +sync_test("identifier_keywords", function() { var o = { if: 1, default: 2, @@ -249,9 +237,7 @@ function test_identifier_keywords() { ok(o.if === 1, "o.if = " + o.if); ok(ro().default === 2, "ro().default = " + ro().default); ok(o.false === true, "o.false = " + o.false); - - next_test(); -} +}); function test_own_data_prop_desc(obj, prop, expected_writable, expected_enumerable, expected_configurable) { @@ -266,7 +252,7 @@ function test_own_data_prop_desc(obj, prop, expected_writable, expected_enumerab + " expected " + expected_configurable); } -function test_getOwnPropertyDescriptor() { +sync_test("getOwnPropertyDescriptor", function() { var obj; obj = { test: 1 }; @@ -304,11 +290,9 @@ function test_getOwnPropertyDescriptor() { test_own_data_prop_desc(function(){}, "prototype", true, false, false); test_own_data_prop_desc(Function, "prototype", false, false, false); test_own_data_prop_desc(String.prototype, "constructor", true, false, true); +}); - next_test(); -} - -function test_defineProperty() { +sync_test("defineProperty", function() { function test_accessor_prop_desc(obj, prop, orig_desc) { var expected_enumerable = "enumerable" in orig_desc && !!orig_desc.enumerable; var expected_configurable = "configurable" in orig_desc && !!orig_desc.configurable; @@ -529,11 +513,9 @@ function test_defineProperty() { test_accessor_prop_desc(obj, "no_setter", desc); obj.no_setter = false; ok(obj.no_setter === true, "no_setter = " + obj.no_setter); +}); - next_test(); -} - -function test_defineProperties() { +sync_test("defineProperties", function() { var o, defined, descs; descs = { @@ -571,11 +553,9 @@ function test_defineProperties() { descs = Object.create(desc_proto); o = Object.create(null, descs); ok(!("proto_prop" in o), "proto_prop is in o"); +}); - next_test(); -} - -function test_property_definitions() { +sync_test("property_definitions", function() { var obj, val, i, arr; function test_accessor_prop_desc(obj, prop, have_getter, have_setter) { @@ -636,11 +616,9 @@ function test_property_definitions() { ok(obj.prop === 6, "obj.prop = " + obj.prop); test_accessor_prop_desc(obj, "0", true, false); ok(obj[0] === 7, "obj.prop = " + obj[0]); +}); - next_test(); -} - -function test_string_trim() { +sync_test("string_trim", function() { function test_trim(value, expected) { var r = String.prototype.trim.call(value); ok(r === expected, "trim(" + value + ") = " + r); @@ -652,11 +630,9 @@ function test_string_trim() { test_trim({ toString: function() { return " test "; } }, "test"); test_trim("", ""); test_trim(" \t\n", ""); +}); - next_test(); -} - -function test_global_properties() { +sync_test("global_properties", function() { var o; /* Make sure that global properties are not writable. */ @@ -669,17 +645,14 @@ function test_global_properties() { o = Infinity; Infinity = 1; ok(Infinity === o, "Infinity = " + NaN); +}); - next_test(); -} - -function test_string_split() { +sync_test("string_split", function() { var r; /* IE9 got this wrong*/ if("1undefined2".split(undefined).length != 1) { win_skip("detected broken String.prototype.split implementation"); - next_test(); return; } @@ -749,11 +722,9 @@ function test_string_split() { ok(typeof(r) === "object", "typeof(r) = " + typeof(r)); ok(r.length === 1, "r.length = " + r.length); ok(r[0] === "", "r[0] = " + r[0]); +}); - next_test(); -} - -function test_getPrototypeOf() { +sync_test("getPrototypeOf", function() { ok(Object.create.length === 2, "Object.create.length = " + Object.create.length); ok(Object.getPrototypeOf.length === 1, "Object.getPrototypeOf.length = " + Object.getPrototypeOf.length); @@ -788,11 +759,9 @@ function test_getPrototypeOf() { obj = Object.create(null); ok(!("toString" in obj), "toString is in obj"); ok(Object.getPrototypeOf(obj) === null, "Object.getPrototypeOf(obj) = " + Object.getPrototypeOf(obj)); +}); - next_test(); -} - -function test_toString() { +sync_test("toString", function() { var tmp, obj; (function () { tmp = Object.prototype.toString.call(arguments); })(); @@ -817,11 +786,9 @@ function test_toString() { obj = Object.create(Number.prototype); tmp = Object.prototype.toString.call(obj); ok(tmp === "[object Object]", "toString.call(Object.create(Number.prototype)) = " + tmp); +}); - next_test(); -} - -function test_bind() { +sync_test("bind", function() { var f, r; var o = new Object(), o2 = new Object(); @@ -897,27 +864,4 @@ function test_bind() { ok(t != a, "t == a"); ok(Function.prototype.bind.length === 1, "Function.prototype.bind.length = " + Function.prototype.bind.length); - - next_test(); -} - -var tests = [ - test_date_now, - test_toISOString, - test_indexOf, - test_array_forEach, - test_isArray, - test_array_map, - test_array_sort, - test_identifier_keywords, - test_getOwnPropertyDescriptor, - test_defineProperty, - test_defineProperties, - test_property_definitions, - test_string_trim, - test_global_properties, - test_string_split, - test_getPrototypeOf, - test_toString, - test_bind -]; +}); diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 2af1b33414..7e8cbfc9b2 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -70,8 +70,22 @@ function todo_wine_if(expr) { var file_prefix = document.location.pathname; if(document.location.search) file_prefix += document.location.search; -file_prefix += ": "; +file_prefix += ":"; + +var test_name; function format_message(msg) { - return file_prefix + msg; + var p = file_prefix; + if(test_name) p += test_name + ":"; + return p + " " + msg; +} + +function sync_test(name, f) +{ + tests.push(function() { + test_name = name; + f(); + test_name = undefined; + next_test(); + }); }

1 0

Jacek Caban : winmm/tests: Introduce compare_uint helper.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 72a36736a95787376675656a8d940ab3ce984a3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=72a36736a95787376675656a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:44 2020 +0200 winmm/tests: Introduce compare_uint helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/mixer.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index f03a71e1f3..b9e35aa519 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -36,6 +36,12 @@ #include "winmm_test.h" +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + return diff <= max_diff; +} + static const char * line_flags(DWORD fdwLine) { static char flags[100]; @@ -253,11 +259,11 @@ static void mixer_test_controlA(HMIXEROBJ mix, MIXERCONTROLA *control) mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { /* result may not match exactly because of rounding */ - ok(abs(ret_value.dwValue-new_value.dwValue)<=1, + ok(compare_uint(ret_value.dwValue, new_value.dwValue, 1), "Couldn't change value from %d to %d, returned %d\n", value.dwValue,new_value.dwValue,ret_value.dwValue); - if (abs(ret_value.dwValue-new_value.dwValue)<=1) { + if (compare_uint(ret_value.dwValue, new_value.dwValue, 1)) { details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1; @@ -632,11 +638,11 @@ static void mixer_test_controlW(HMIXEROBJ mix, MIXERCONTROLW *control) mmsys_error(rc)); if (rc==MMSYSERR_NOERROR) { /* result may not match exactly because of rounding */ - ok(abs(ret_value.dwValue-new_value.dwValue)<=1, + ok(compare_uint(ret_value.dwValue, new_value.dwValue, 1), "Couldn't change value from %d to %d, returned %d\n", value.dwValue,new_value.dwValue,ret_value.dwValue); - if (abs(ret_value.dwValue-new_value.dwValue)<=1) { + if (compare_uint(ret_value.dwValue, new_value.dwValue, 1)) { details.cbStruct = sizeof(MIXERCONTROLDETAILS); details.dwControlID = control->dwControlID; details.cChannels = 1;

1 0

Jacek Caban : winmm: Introduce compare_uint helper.
by Alexandre Julliard 03 Jun '20

03 Jun '20

Module: wine Branch: master Commit: 12f6e8086b7dcf7738953d4d2eeb63d310654447 URL: https://source.winehq.org/git/wine.git/?a=commit;h=12f6e8086b7dcf7738953d4d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:50 2020 +0200 winmm: Introduce compare_uint helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/joystick.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index e844be1837..2b1811d377 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -55,6 +55,12 @@ typedef struct tagWINE_JOYSTICK { static WINE_JOYSTICK JOY_Sticks[MAXJOYSTICK]; +static BOOL compare_uint(unsigned int x, unsigned int y, unsigned int max_diff) +{ + unsigned int diff = x > y ? x - y : y - x; + return diff <= max_diff; +} + /************************************************************************** * JOY_LoadDriver [internal] */ @@ -106,14 +112,14 @@ static void CALLBACK JOY_Timer(HWND hWnd, UINT wMsg, UINT_PTR wTimer, DWORD dwTi pos = MAKELONG(ji.wXpos, ji.wYpos); if (!joy->bChanged || - abs(joy->ji.wXpos - ji.wXpos) > joy->threshold || - abs(joy->ji.wYpos - ji.wYpos) > joy->threshold) { + !compare_uint(joy->ji.wXpos, ji.wXpos, joy->threshold) || + !compare_uint(joy->ji.wYpos, ji.wYpos, joy->threshold)) { SendMessageA(joy->hCapture, MM_JOY1MOVE + i, ji.wButtons, pos); joy->ji.wXpos = ji.wXpos; joy->ji.wYpos = ji.wYpos; } if (!joy->bChanged || - abs(joy->ji.wZpos - ji.wZpos) > joy->threshold) { + !compare_uint(joy->ji.wZpos, ji.wZpos, joy->threshold)) { SendMessageA(joy->hCapture, MM_JOY1ZMOVE + i, ji.wButtons, pos); joy->ji.wZpos = ji.wZpos; }

1 0