February 2020 - Wine-commits

Anton Baskanov : amstream: Reject incompatible media types in AMAudioStream::ReceiveConnection.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 5b94633aa30d29a60ff055e0cef85d1091937f73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b94633aa30d29a60ff055e0… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Feb 25 23:59:29 2020 -0600 amstream: Reject incompatible media types in AMAudioStream::ReceiveConnection. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiostream.c | 14 +++++ dlls/amstream/tests/amstream.c | 116 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index ca4e163566..1f9aed7338 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -734,6 +734,14 @@ static HRESULT WINAPI audio_sink_ReceiveConnection(IPin *iface, IPin *peer, cons TRACE("stream %p, peer %p, mt %p.\n", stream, peer, mt); + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio) + || !IsEqualGUID(&mt->formattype, &FORMAT_WaveFormatEx) + || mt->cbFormat < sizeof(WAVEFORMATEX)) + return VFW_E_TYPE_NOT_ACCEPTED; + + if (((const WAVEFORMATEX *)mt->pbFormat)->wFormatTag != WAVE_FORMAT_PCM) + return E_INVALIDARG; + EnterCriticalSection(&stream->cs); if (stream->peer) @@ -750,6 +758,12 @@ static HRESULT WINAPI audio_sink_ReceiveConnection(IPin *iface, IPin *peer, cons return VFW_E_INVALID_DIRECTION; } + if (stream->format.wFormatTag && memcmp(mt->pbFormat, &stream->format, sizeof(WAVEFORMATEX))) + { + LeaveCriticalSection(&stream->cs); + return E_INVALIDARG; + } + CopyMediaType(&stream->mt, mt); IPin_AddRef(stream->peer = peer); diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index b11a353b03..80fb138a90 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2617,6 +2617,121 @@ static void test_audiostream_set_format(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_audiostream_receive_connection(void) +{ + static const WAVEFORMATEX valid_format = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 2, + .nSamplesPerSec = 44100, + .wBitsPerSample = 16, + .nBlockAlign = 4, + .nAvgBytesPerSec = 4 * 44100, + }; + + const AM_MEDIA_TYPE valid_mt = + { + .majortype = MEDIATYPE_Audio, + .subtype = MEDIASUBTYPE_PCM, + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(WAVEFORMATEX), + .pbFormat = (BYTE *)&valid_format, + }; + + WAVEFORMATEXTENSIBLE extensible_format; + IAudioMediaStream *audio_stream; + IAMMultiMediaStream *mmstream; + struct testfilter source; + IGraphBuilder *graph; + IMediaStream *stream; + WAVEFORMATEX format; + AM_MEDIA_TYPE mt; + HRESULT hr; + ULONG ref; + IPin *pin; + + mmstream = create_ammultimediastream(); + 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 = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &valid_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + mt = valid_mt; + mt.majortype = GUID_NULL; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + mt = valid_mt; + mt.subtype = MEDIASUBTYPE_RGB24; + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + mt = valid_mt; + mt.formattype = GUID_NULL; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + mt = valid_mt; + mt.cbFormat = sizeof(WAVEFORMATEX) - 1; + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + + extensible_format.Format = valid_format; + extensible_format.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; + extensible_format.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); + extensible_format.Samples.wValidBitsPerSample = valid_format.wBitsPerSample; + extensible_format.dwChannelMask = KSAUDIO_SPEAKER_STEREO; + extensible_format.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + mt = valid_mt; + mt.cbFormat = sizeof(extensible_format); + mt.pbFormat = (BYTE *)&extensible_format; + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_SetFormat(audio_stream, &valid_format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format = valid_format; + format.nChannels = 1; + mt = valid_mt; + mt.pbFormat = (BYTE *)&format; + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &mt); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &valid_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IGraphBuilder_Disconnect(graph, pin); + IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + + 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); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(amstream) { HANDLE file; @@ -2652,6 +2767,7 @@ START_TEST(amstream) test_audiostream_get_format(); test_audiostream_set_format(); + test_audiostream_receive_connection(); CoUninitialize(); }

1 0

Zebediah Figura : mp3dmod/tests: Test IMediaBuffer reference counting.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: fb94eae9777126c3ce459ef76bdba6fb5dedd742 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb94eae9777126c3ce459ef7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 00:19:21 2020 -0600 mp3dmod/tests: Test IMediaBuffer reference counting. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/tests/mp3dmod.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 99d52e6fd7..1d404248cc 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -40,8 +40,10 @@ static REFERENCE_TIME samplelen(DWORD samples, int rate) return (REFERENCE_TIME) 10000000 * samples / rate; } -struct test_buffer { +struct test_buffer +{ IMediaBuffer IMediaBuffer_iface; + LONG refcount; BYTE data[5000]; DWORD len; DWORD maxlen; @@ -65,12 +67,14 @@ static HRESULT WINAPI Buffer_QueryInterface(IMediaBuffer *iface, REFIID iid, voi static ULONG WINAPI Buffer_AddRef(IMediaBuffer *iface) { - return 2; + struct test_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedIncrement(&buffer->refcount); } static ULONG WINAPI Buffer_Release(IMediaBuffer *iface) { - return 1; + struct test_buffer *buffer = impl_from_IMediaBuffer(iface); + return InterlockedDecrement(&buffer->refcount); } static HRESULT WINAPI Buffer_SetLength(IMediaBuffer *iface, DWORD len) @@ -107,8 +111,8 @@ static IMediaBufferVtbl Buffer_vtbl = { static void test_convert(void) { static const BYTE mp3hdr[] = {0xff,0xfb,0x14,0xc4}; - struct test_buffer outbuf = {{&Buffer_vtbl}}; - struct test_buffer inbuf = {{&Buffer_vtbl}}; + struct test_buffer outbuf = {.IMediaBuffer_iface = {&Buffer_vtbl}, .refcount = 1}; + struct test_buffer inbuf = {.IMediaBuffer_iface = {&Buffer_vtbl}, .refcount = 1}; DMO_MEDIA_TYPE in = {{0}}, out = {{0}}; MPEGLAYER3WAVEFORMAT mp3fmt = {{0}}; DMO_OUTPUT_DATA_BUFFER output; @@ -169,6 +173,7 @@ static void test_convert(void) inbuf.len = 96 * 5; hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == S_OK, "got %#x\n", hr); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); @@ -194,6 +199,8 @@ static void test_convert(void) ok(output.rtTimestamp == 0, "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(written, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); @@ -205,6 +212,8 @@ static void test_convert(void) hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == DMO_E_NOTACCEPTING, "got %#x\n", hr); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); /* write the rest */ outbuf.len = 0; @@ -219,6 +228,8 @@ static void test_convert(void) "got %s\n", wine_dbgstr_longlong(output.rtTimestamp)); ok(output.rtTimelength == samplelen(outbuf.len, 48000), "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); @@ -228,6 +239,8 @@ static void test_convert(void) ok(hr == S_OK, "got %#x\n", hr); IMediaObject_Release(dmo); + todo_wine ok(inbuf.refcount == 1, "Got outstanding refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got outstanding refcount %d.\n", outbuf.refcount); } static const GUID IID_test_outer = {0xdeadbeef,0,0,{0,0,0,0,0,0,0,0x66}};

1 0

Zebediah Figura : mp3dmod: Release a held buffer on destruction.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 88357e92f12f34fb40819b2c6319e2679175cc83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88357e92f12f34fb40819b2c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 00:19:22 2020 -0600 mp3dmod: Release a held buffer on destruction. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 2 ++ dlls/mp3dmod/tests/mp3dmod.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 592ee5482a..65b48de711 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -103,6 +103,8 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) if (!refcount) { + if (This->buffer) + IMediaBuffer_Release(This->buffer); if (This->intype_set) MoFreeMediaType(&This->intype); MoFreeMediaType(&This->outtype); diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 1d404248cc..e66ad3ace0 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -239,7 +239,7 @@ static void test_convert(void) ok(hr == S_OK, "got %#x\n", hr); IMediaObject_Release(dmo); - todo_wine ok(inbuf.refcount == 1, "Got outstanding refcount %d.\n", inbuf.refcount); + ok(inbuf.refcount == 1, "Got outstanding refcount %d.\n", inbuf.refcount); ok(outbuf.refcount == 1, "Got outstanding refcount %d.\n", outbuf.refcount); }

1 0

Zebediah Figura : mp3dmod: Handle a NULL buffer passed to IMediaObject::ProcessOutput().
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 1673af4ce01985664153623b6618ae8b6b25df18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1673af4ce01985664153623b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 00:19:23 2020 -0600 mp3dmod: Handle a NULL buffer passed to IMediaObject::ProcessOutput(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 14 ++++++++++++++ dlls/mp3dmod/tests/mp3dmod.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 65b48de711..05d56eff72 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -456,6 +456,20 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags buffers[0].dwStatus = 0; + if (!buffers[0].pBuffer) + { + while ((err = mpg123_read(This->mh, NULL, 0, &written)) == MPG123_NEW_FORMAT); + if (err == MPG123_NEED_MORE) + return S_OK; + else if (err == MPG123_ERR) + ERR("mpg123_read() failed: %s\n", mpg123_strerror(This->mh)); + else if (err != MPG123_OK) + ERR("mpg123_read() returned %d\n", err); + + buffers[0].dwStatus = DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE; + return S_OK; + } + if (!This->buffer) return S_FALSE; diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index e66ad3ace0..9e845f5915 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -235,9 +235,50 @@ static void test_convert(void) ok(hr == S_FALSE, "got %#x\n", hr); ok(output.dwStatus == 0, "got %#x\n", output.dwStatus); + output.pBuffer = NULL; + output.dwStatus = 0xdeadbeef; + output.rtTimestamp = 0xdeadbeef; + output.rtTimelength = 0xdeadbeef; + hr = IMediaObject_ProcessOutput(dmo, DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER, 1, &output, &status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!output.pBuffer, "Got buffer %p.\n", output.pBuffer); + ok(!output.dwStatus, "Got status %#x.\n", output.dwStatus); + ok(output.rtTimestamp == 0xdeadbeef, "Got timestamp %s.\n", wine_dbgstr_longlong(output.rtTimestamp)); + ok(output.rtTimelength == 0xdeadbeef, "Got length %s.\n", wine_dbgstr_longlong(output.rtTimelength)); + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); ok(hr == S_OK, "got %#x\n", hr); + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == DMO_E_NOTACCEPTING, "Got hr %#x.\n", hr); + + output.pBuffer = NULL; + output.dwStatus = 0xdeadbeef; + output.rtTimestamp = 0xdeadbeef; + output.rtTimelength = 0xdeadbeef; + hr = IMediaObject_ProcessOutput(dmo, DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER, 1, &output, &status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!output.pBuffer, "Got buffer %p.\n", output.pBuffer); + ok(output.dwStatus == O_INCOMPLETE, "Got status %#x.\n", output.dwStatus); + ok(output.rtTimestamp == 0xdeadbeef, "Got timestamp %s.\n", wine_dbgstr_longlong(output.rtTimestamp)); + ok(output.rtTimelength == 0xdeadbeef, "Got length %s.\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!output.pBuffer, "Got buffer %p.\n", output.pBuffer); + ok(output.dwStatus == O_INCOMPLETE, "Got status %#x.\n", output.dwStatus); + ok(output.rtTimestamp == 0xdeadbeef, "Got timestamp %s.\n", wine_dbgstr_longlong(output.rtTimestamp)); + ok(output.rtTimelength == 0xdeadbeef, "Got length %s.\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + + output.pBuffer = &outbuf.IMediaBuffer_iface; + outbuf.len = 0; + outbuf.maxlen = 5000; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outbuf.len > 1152 && outbuf.len <= 5000, "got %u\n", written); + IMediaObject_Release(dmo); ok(inbuf.refcount == 1, "Got outstanding refcount %d.\n", inbuf.refcount); ok(outbuf.refcount == 1, "Got outstanding refcount %d.\n", outbuf.refcount);

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::Flush().
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: c46b927730fbefb651582aa9d3f3431b1d96e821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c46b927730fbefb651582aa9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 00:19:24 2020 -0600 mp3dmod: Implement IMediaObject::Flush(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 15 +++++++++++++-- dlls/mp3dmod/tests/mp3dmod.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 05d56eff72..3dce02fa14 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -358,9 +358,20 @@ static HRESULT WINAPI MediaObject_SetInputMaxLatency(IMediaObject *iface, DWORD static HRESULT WINAPI MediaObject_Flush(IMediaObject *iface) { - FIXME("(%p)->() stub!\n", iface); + struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - return E_NOTIMPL; + TRACE("iface %p.\n", iface); + + if (dmo->buffer) + IMediaBuffer_Release(dmo->buffer); + dmo->buffer = NULL; + dmo->timestamp = 0; + + /* mpg123 doesn't give us a way to flush, so just close and reopen the feed. */ + mpg123_close(dmo->mh); + mpg123_open_feed(dmo->mh); + + return S_OK; } static HRESULT WINAPI MediaObject_Discontinuity(IMediaObject *iface, DWORD index) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 9e845f5915..61002d5966 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -230,6 +230,7 @@ static void test_convert(void) "got %s\n", wine_dbgstr_longlong(output.rtTimelength)); ok(inbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + written += outbuf.len; hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_FALSE, "got %#x\n", hr); @@ -277,7 +278,41 @@ static void test_convert(void) outbuf.maxlen = 5000; hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(outbuf.len > 1152 && outbuf.len <= 5000, "got %u\n", written); + ok(outbuf.len > 1152 && outbuf.len <= 5000, "Got length %u.\n", outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH | O_INCOMPLETE), + "Got status %#x.\n", output.dwStatus); + ok(output.rtTimestamp == samplelen(written, 48000), "Got timestamp %s.\n", + wine_dbgstr_longlong(output.rtTimestamp)); + ok(output.rtTimelength == samplelen(outbuf.len, 48000), + "Got length %s.\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + + hr = IMediaObject_Flush(dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(inbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); + + outbuf.len = 0; + outbuf.maxlen = 5000; + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaObject_Flush(dmo); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaObject_ProcessInput(dmo, 0, &inbuf.IMediaBuffer_iface, 0, 0, 0); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IMediaObject_ProcessOutput(dmo, 0, 1, &output, &status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outbuf.len > 1152 && outbuf.len <= 5000, "Got length %u.\n", outbuf.len); + ok(output.dwStatus == (O_SYNCPOINT | O_TIME | O_TIMELENGTH | O_INCOMPLETE), + "Got status %#x.\n", output.dwStatus); + ok(!output.rtTimestamp, "Got timestamp %s.\n", wine_dbgstr_longlong(output.rtTimestamp)); + ok(output.rtTimelength == samplelen(outbuf.len, 48000), + "Got length %s.\n", wine_dbgstr_longlong(output.rtTimelength)); + ok(inbuf.refcount == 2, "Got refcount %d.\n", inbuf.refcount); + ok(outbuf.refcount == 1, "Got refcount %d.\n", inbuf.refcount); IMediaObject_Release(dmo); ok(inbuf.refcount == 1, "Got outstanding refcount %d.\n", inbuf.refcount);

1 0

Zebediah Figura : mp3dmod: Implement IMediaObject::Discontinuity().
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 655017af7b39e26e6c7322904db9e72913cfa801 URL: https://source.winehq.org/git/wine.git/?a=commit;h=655017af7b39e26e6c732290… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 26 00:19:25 2020 -0600 mp3dmod: Implement IMediaObject::Discontinuity(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 3dce02fa14..3ad3b785d2 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -376,9 +376,9 @@ static HRESULT WINAPI MediaObject_Flush(IMediaObject *iface) static HRESULT WINAPI MediaObject_Discontinuity(IMediaObject *iface, DWORD index) { - FIXME("(%p)->(%d) stub!\n", iface, index); + TRACE("iface %p.\n", iface); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI MediaObject_AllocateStreamingResources(IMediaObject *iface)

1 0

Jacek Caban : include: Make time.h compatible with ucrt.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 61526f8050c406f05d0a6372bdc58ea60447b2fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=61526f8050c406f05d0a6372… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 26 15:16:22 2020 +0100 include: Make time.h compatible with ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/time.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/time.h b/include/msvcrt/time.h index 61df364d21..058dd67014 100644 --- a/include/msvcrt/time.h +++ b/include/msvcrt/time.h @@ -54,7 +54,7 @@ extern __msvcrt_long _timezone; extern char *_tzname; #endif -#ifdef _USE_32BIT_TIME_T +#if !defined(_UCRT) && defined(_USE_32BIT_TIME_T) #define _ctime32 ctime #define _difftime32 difftime #define _gmtime32 gmtime @@ -96,6 +96,13 @@ static inline struct tm* gmtime(const time_t *t) { return _gmtime64(t); } static inline struct tm* localtime(const time_t *t) { return _localtime64(t); } static inline time_t mktime(struct tm *tm) { return _mktime64(tm); } static inline time_t time(time_t *t) { return _time64(t); } +#elif defined(_UCRT) +static inline char* ctime(const time_t *t) { return _ctime32(t); } +static inline double difftime(time_t t1, time_t t2) { return _difftime32(t1, t2); } +static inline struct tm* gmtime(const time_t *t) { return _gmtime32(t); } +static inline struct tm* localtime(const time_t *t) { return _localtime32(t); } +static inline time_t mktime(struct tm *tm) { return _mktime32(tm); } +static inline time_t time(time_t *t) { return _time32(t); } #endif #ifdef __cplusplus

1 0

Jacek Caban : include: Make corecrt_wtime.h compatible with ucrt.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 7b2517df2f403f5b7ebaa05d5bece20131299b24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b2517df2f403f5b7ebaa05d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 26 15:16:29 2020 +0100 include: Make corecrt_wtime.h compatible with ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wtime.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/msvcrt/corecrt_wtime.h b/include/msvcrt/corecrt_wtime.h index 3422b2d349..3e0547b0ae 100644 --- a/include/msvcrt/corecrt_wtime.h +++ b/include/msvcrt/corecrt_wtime.h @@ -20,7 +20,7 @@ struct tm { int tm_isdst; }; -#ifdef _USE_32BIT_TIME_T +#if defined(_USE_32BIT_TIME_T) && !defined(_UCRT) #define _wctime32 _wctime #endif @@ -39,6 +39,8 @@ errno_t __cdecl _wstrtime_s(wchar_t*,size_t); #ifndef _USE_32BIT_TIME_T static inline wchar_t* _wctime(const time_t *t) { return _wctime64(t); } +#elif defined(_UCRT) +static inline wchar_t* _wctime(const time_t *t) { return _wctime32(t); } #endif #ifdef __cplusplus

1 0

Jacek Caban : include: Make corecrt_wio.h compatible with ucrt.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: b4c82b263ff97a6ff07bce44d615a0e00a32dcb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4c82b263ff97a6ff07bce44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 26 15:16:41 2020 +0100 include: Make corecrt_wio.h compatible with ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/corecrt_wio.h | 92 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 74 insertions(+), 18 deletions(-) diff --git a/include/msvcrt/corecrt_wio.h b/include/msvcrt/corecrt_wio.h index 6d4b73c915..8a4e0636a0 100644 --- a/include/msvcrt/corecrt_wio.h +++ b/include/msvcrt/corecrt_wio.h @@ -12,24 +12,76 @@ typedef __msvcrt_ulong _fsize_t; -struct _wfinddata_t { - unsigned attrib; - time_t time_create; - time_t time_access; - time_t time_write; - _fsize_t size; - wchar_t name[260]; +#if defined(_USE_32BIT_TIME_T) +# define _wfinddata_t _wfinddata32_t +# define _wfinddatai64_t _wfinddata32i64_t +#else +# define _wfinddata_t _wfinddata64i32_t +# define _wfinddatai64_t _wfinddata64_t +#endif + +struct _wfinddata32_t { + unsigned attrib; + __time32_t time_create; + __time32_t time_access; + __time32_t time_write; + _fsize_t size; + wchar_t name[260]; +}; + +struct _wfinddata32i64_t { + unsigned attrib; + __time32_t time_create; + __time32_t time_access; + __time32_t time_write; + __int64 DECLSPEC_ALIGN(8) size; + wchar_t name[260]; }; -struct _wfinddatai64_t { - unsigned attrib; - time_t time_create; - time_t time_access; - time_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - wchar_t name[260]; +struct _wfinddata64i32_t { + unsigned attrib; + __time64_t time_create; + __time64_t time_access; + __time64_t time_write; + _fsize_t size; + wchar_t name[260]; }; +struct _wfinddata64_t { + unsigned attrib; + __time64_t time_create; + __time64_t time_access; + __time64_t time_write; + __int64 DECLSPEC_ALIGN(8) size; + wchar_t name[260]; +}; + +#ifdef _UCRT +# ifdef _USE_32BIT_TIME_T +# define _wfindfirst _wfindfirst32 +# define _wfindfirsti64 _wfindfirst32i64 +# define _wfindnext _wfindnext32 +# define _wfindnexti64 _wfindnext32i64 +# else +# define _wfindfirst _wfindfirst64i32 +# define _wfindfirsti64 _wfindfirst64 +# define _wfindnext _wfindnext64i32 +# define _wfindnexti64 _wfindnext64 +# endif +#else /* _UCRT */ +# ifdef _USE_32BIT_TIME_T +# define _wfindfirst32 _wfindfirst +# define _wfindfirst32i64 _wfindfirsti64 +# define _wfindnext32 _wfindnext +# define _wfindnext32i64 _wfindnexti64 +# else +# define _wfindfirst64i32 _wfindfirst +# define _wfindfirst64 _wfindfirsti64 +# define _wfindnext64i32 _wfindnext +# define _wfindnext64 _wfindnexti64 +# endif +#endif + #ifdef __cplusplus extern "C" { #endif @@ -37,10 +89,14 @@ extern "C" { int __cdecl _waccess(const wchar_t*,int); int __cdecl _wchmod(const wchar_t*,int); int __cdecl _wcreat(const wchar_t*,int); -intptr_t __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*); -intptr_t __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*); -int __cdecl _wfindnext(intptr_t,struct _wfinddata_t*); -int __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*); +intptr_t __cdecl _wfindfirst32(const wchar_t*,struct _wfinddata32_t*); +intptr_t __cdecl _wfindfirst32i64(const wchar_t*, struct _wfinddata32i64_t*); +intptr_t __cdecl _wfindfirst64(const wchar_t*,struct _wfinddata64_t*); +intptr_t __cdecl _wfindfirst64i32(const wchar_t*, struct _wfinddata64i32_t*); +int __cdecl _wfindnext32(intptr_t,struct _wfinddata32_t*); +int __cdecl _wfindnext32i64(intptr_t,struct _wfinddata32i64_t*); +int __cdecl _wfindnext64(intptr_t,struct _wfinddata64_t*); +int __cdecl _wfindnext64i32(intptr_t,struct _wfinddata64i32_t*); wchar_t* __cdecl _wmktemp(wchar_t*); int WINAPIV _wopen(const wchar_t*,int,...); int __cdecl _wrename(const wchar_t*,const wchar_t*);

1 0

Jacek Caban : include: Make sys/stat.h compatible with ucrt.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: e2a0a99e14d7514c5f1d5ffd52731d9a9cba7b47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2a0a99e14d7514c5f1d5ffd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 26 15:16:51 2020 +0100 include: Make sys/stat.h compatible with ucrt. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/sys/stat.h | 56 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/include/msvcrt/sys/stat.h b/include/msvcrt/sys/stat.h index 15cf823739..5a2fa9b1fc 100644 --- a/include/msvcrt/sys/stat.h +++ b/include/msvcrt/sys/stat.h @@ -106,9 +106,9 @@ struct _stat32i64 { short st_gid; _dev_t st_rdev; __int64 DECLSPEC_ALIGN(8) st_size; - time_t st_atime; - time_t st_mtime; - time_t st_ctime; + __time32_t st_atime; + __time32_t st_mtime; + __time32_t st_ctime; }; struct _stat64i32 { @@ -158,19 +158,53 @@ struct _stat64 { extern "C" { #endif -int __cdecl _fstat(int,struct _stat*); -int __cdecl _stat(const char*,struct _stat*); +#ifdef _UCRT +# ifdef _USE_32BIT_TIME_T +# define _fstat _fstat32 +# define _fstati64 _fstat32i64 +# define _stat _stat32 +# define _stati64 _stat32i64 +# define _wstat _wstat32 +# define _wstati64 _wstat32i64 +# else +# define _fstat _fstat64i32 +# define _fstati64 _fstat64 +# define _stat _stat64i32 +# define _stati64 _stat64 +# define _wstat _wstat64i32 +# define _wstati64 _wstat64 +# endif +#else /* _UCRT */ +# ifdef _USE_32BIT_TIME_T +# define _fstat32 _fstat +# define _fstat32i64 _fstati64 +# define _stat32i64 _stati64 +# define _stat32 _stat +# define _wstat32 _wstat +# define _wstat32i64 _wstati64 +# else +# define _fstat64i32 _fstat +# define _fstat64 _fstati64 +# define _stat64 _stati64 +# define _stat64i32 _stat +# define _wstat64i32 _wstat +# define _wstat64 _wstati64 +# endif +#endif + int __cdecl _fstat32(int, struct _stat32*); -int __cdecl _stat32(const char*, struct _stat32*); -int __cdecl _fstati64(int,struct _stati64*); -int __cdecl _stati64(const char*,struct _stati64*); +int __cdecl _fstat32i64(int, struct _stat32i64*); int __cdecl _fstat64(int,struct _stat64*); +int __cdecl _fstat64i32(int,struct _stat64i32*); +int __cdecl _stat32(const char*, struct _stat32*); +int __cdecl _stat32i64(const char*, struct _stat32i64*); int __cdecl _stat64(const char*,struct _stat64*); +int __cdecl _stat64i32(const char*,struct _stat64i32*); int __cdecl _umask(int); -int __cdecl _wstat(const wchar_t*,struct _stat*); -int __cdecl _wstat32(const wchar_t*, struct _stat32*); -int __cdecl _wstati64(const wchar_t*,struct _stati64*); +int __cdecl _wstat32(const wchar_t*,struct _stat32*); +int __cdecl _wstat32i64(const wchar_t*, struct _stat32i64*); int __cdecl _wstat64(const wchar_t*,struct _stat64*); +int __cdecl _wstat64i32(const wchar_t*,struct _stat64i32*); #ifdef __cplusplus }

1 0