February 2020 - Wine-commits

Zebediah Figura : d3d8: Retrieve the viewport from the primary stateblock.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 3fa7bd141af550a25469f24b30d5492d3849ddc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fa7bd141af550a25469f24b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 25 17:35:04 2020 -0600 d3d8: Retrieve the viewport from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e7c79d54a0..7853aa9b55 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1705,7 +1705,7 @@ static HRESULT WINAPI d3d8_device_GetViewport(IDirect3DDevice8 *iface, D3DVIEWPO TRACE("iface %p, viewport %p.\n", iface, viewport); wined3d_mutex_lock(); - wined3d_device_get_viewports(device->wined3d_device, NULL, &wined3d_viewport); + wined3d_viewport = wined3d_stateblock_get_state(device->state)->viewport; wined3d_mutex_unlock(); viewport->X = wined3d_viewport.x;

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetViewport().
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 7e0e1859d13a323d4f9f0c6e6ea54a3fa583b248 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7e0e1859d13a323d4f9f0c6e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 25 17:35:05 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetViewport(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 7853aa9b55..79d41afebf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1690,8 +1690,6 @@ static HRESULT WINAPI d3d8_device_SetViewport(IDirect3DDevice8 *iface, const D3D vp.max_z = viewport->MaxZ; wined3d_stateblock_set_viewport(device->update_state, &vp); - if (!device->recording) - wined3d_device_set_viewports(device->wined3d_device, 1, &vp); wined3d_mutex_unlock(); return D3D_OK;

1 0

Zebediah Figura : d3d8: Retrieve light state from the primary stateblock.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: f7d744e9c581c62321bc70ae0a279ddc07ce7ab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7d744e9c581c62321bc70ae… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 25 17:35:06 2020 -0600 d3d8: Retrieve light state from the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 79d41afebf..81361a90eb 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1764,13 +1764,14 @@ static HRESULT WINAPI d3d8_device_SetLight(IDirect3DDevice8 *iface, DWORD index, static HRESULT WINAPI d3d8_device_GetLight(IDirect3DDevice8 *iface, DWORD index, D3DLIGHT8 *light) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + BOOL enabled; HRESULT hr; TRACE("iface %p, index %u, light %p.\n", iface, index, light); /* Note: D3DLIGHT8 is compatible with struct wined3d_light. */ wined3d_mutex_lock(); - hr = wined3d_device_get_light(device->wined3d_device, index, (struct wined3d_light *)light); + hr = wined3d_stateblock_get_light(device->state, index, (struct wined3d_light *)light, &enabled); wined3d_mutex_unlock(); return hr; @@ -1792,15 +1793,16 @@ static HRESULT WINAPI d3d8_device_LightEnable(IDirect3DDevice8 *iface, DWORD ind return hr; } -static HRESULT WINAPI d3d8_device_GetLightEnable(IDirect3DDevice8 *iface, DWORD index, BOOL *enable) +static HRESULT WINAPI d3d8_device_GetLightEnable(IDirect3DDevice8 *iface, DWORD index, BOOL *enabled) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + struct wined3d_light light; HRESULT hr; - TRACE("iface %p, index %u, enable %p.\n", iface, index, enable); + TRACE("iface %p, index %u, enabled %p.\n", iface, index, enabled); wined3d_mutex_lock(); - hr = wined3d_device_get_light_enable(device->wined3d_device, index, enable); + hr = wined3d_stateblock_get_light(device->state, index, &light, enabled); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : d3d8: Stop setting the device state in d3d8_device_SetLight() and d3d8_device_LightEnable().
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 6384f4c4e74e47d2aab3ab9f5758142acca278c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6384f4c4e74e47d2aab3ab9f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 25 17:35:07 2020 -0600 d3d8: Stop setting the device state in d3d8_device_SetLight() and d3d8_device_LightEnable(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 81361a90eb..869a6a2dd0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1754,8 +1754,6 @@ static HRESULT WINAPI d3d8_device_SetLight(IDirect3DDevice8 *iface, DWORD index, /* Note: D3DLIGHT8 is compatible with struct wined3d_light. */ wined3d_mutex_lock(); hr = wined3d_stateblock_set_light(device->update_state, index, (const struct wined3d_light *)light); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light(device->wined3d_device, index, (const struct wined3d_light *)light); wined3d_mutex_unlock(); return hr; @@ -1786,8 +1784,6 @@ static HRESULT WINAPI d3d8_device_LightEnable(IDirect3DDevice8 *iface, DWORD ind wined3d_mutex_lock(); hr = wined3d_stateblock_set_light_enable(device->update_state, index, enable); - if (SUCCEEDED(hr) && !device->recording) - hr = wined3d_device_set_light_enable(device->wined3d_device, index, enable); wined3d_mutex_unlock(); return hr;

1 0

Zebediah Figura : ddraw: Avoid leaking the primary stateblock.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 2d22647506c99300954f54d2c902355d7a39a899 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d22647506c99300954f54d2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 25 17:35:08 2020 -0600 ddraw: Avoid leaking the primary stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 03b03f4584..7fd78e6234 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -245,6 +245,7 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) wined3d_device_set_rendertarget_view(This->wined3d_device, 0, NULL, FALSE); + wined3d_stateblock_decref(This->state); if (This->recording) wined3d_stateblock_decref(This->recording);

1 0

Nikolay Sivov : mf/tests: Add some tests for SAR time source.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: f2465d92b80c07b9452a97e8bdbddb1d36514af6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2465d92b80c07b9452a97e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 26 18:05:39 2020 +0300 mf/tests: Add some tests for SAR time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a1a7d2b05a..8f3a80360f 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2555,7 +2555,11 @@ static void test_quality_manager(void) static void test_sar(void) { IMFPresentationTimeSource *time_source; + IMFClockStateSink *state_sink; + MFCLOCK_STATE state; IMFMediaSink *sink; + IMFClock *clock; + DWORD flags; HRESULT hr; hr = CoInitialize(NULL); @@ -2576,6 +2580,26 @@ if (SUCCEEDED(hr)) { hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&time_source); ok(hr == S_OK, "Failed to get time source interface, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetUnderlyingClock(time_source, &clock); + ok(hr == MF_E_NO_CLOCK, "Unexpected hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetClockCharacteristics(time_source, &flags); + ok(hr == S_OK, "Failed to get flags, hr %#x.\n", hr); + ok(flags == MFCLOCK_CHARACTERISTICS_FLAG_FREQUENCY_10MHZ, "Unexpected flags %#x.\n", flags); + + hr = IMFPresentationTimeSource_GetState(time_source, 0, &state); + ok(hr == S_OK, "Failed to get clock state, hr %#x.\n", hr); + ok(state == MFCLOCK_STATE_INVALID, "Unexpected state %d.\n", state); + + hr = IMFPresentationTimeSource_QueryInterface(time_source, &IID_IMFClockStateSink, (void **)&state_sink); + ok(hr == S_OK, "Failed to get state sink, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockStart(state_sink, 0, 0); + ok(hr == MF_E_NOT_INITIALIZED, "Unexpected hr %#x.\n", hr); + + IMFClockStateSink_Release(state_sink); + IMFPresentationTimeSource_Release(time_source); IMFMediaSink_Release(sink);

1 0

Nikolay Sivov : gdi32/tests: Reduce some tracing noise in font tests.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 0f51b732e4eae54b13232e025d00f277d75f564b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f51b732e4eae54b13232e02… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 26 18:45:23 2020 +0300 gdi32/tests: Reduce some tracing noise in font tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 101 +++++++++--------------------------------------- 1 file changed, 18 insertions(+), 83 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f51b732e4eae54b1323…

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: cd722817170244a7c406aee6c48d958cdb973ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd722817170244a7c406aee6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Feb 26 10:04:00 2020 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/lt.po b/po/lt.po index 6b8141e5e1..d152f56e7d 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-02-21 09:23+0200\n" +"PO-Revision-Date: 2020-02-26 10:03+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10275,16 +10275,12 @@ msgid "New Zealand Daylight Time" msgstr "Naujosios Zelandijos vasaros laikas" #: tzres.rc:34 -#, fuzzy -#| msgid "Argentina Standard Time" msgid "Aleutian Standard Time" -msgstr "Argentinos juostinis laikas" +msgstr "Aleutų juostinis laikas" #: tzres.rc:35 -#, fuzzy -#| msgid "Argentina Daylight Time" msgid "Aleutian Daylight Time" -msgstr "Argentinos vasaros laikas" +msgstr "Aleutų vasaros laikas" #: tzres.rc:72 msgid "Central Brazilian Standard Time"

1 0

Anton Baskanov : amstream: Implement AMAudioStream::GetFormat.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: 1ae8e519f4d8f28962f9ff1a3b7310d94e0ec908 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ae8e519f4d8f28962f9ff1a… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Feb 25 23:59:27 2020 -0600 amstream: Implement AMAudioStream::GetFormat. 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 | 21 ++++-- dlls/amstream/tests/Makefile.in | 2 +- dlls/amstream/tests/amstream.c | 155 ++++++++++++++++++++++++++++++++++++++-- 3 files changed, 166 insertions(+), 12 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 2875e1f59b..544f70a75c 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -495,17 +495,28 @@ static HRESULT WINAPI audio_IAudioMediaStream_SendEndOfStream(IAudioMediaStream } /*** IAudioMediaStream methods ***/ -static HRESULT WINAPI audio_IAudioMediaStream_GetFormat(IAudioMediaStream *iface, WAVEFORMATEX *wave_format_current) +static HRESULT WINAPI audio_IAudioMediaStream_GetFormat(IAudioMediaStream *iface, WAVEFORMATEX *format) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format_current); + TRACE("stream %p, format %p.\n", stream, format); - if (!wave_format_current) + if (!format) return E_POINTER; - return MS_E_NOSTREAM; + EnterCriticalSection(&stream->cs); + if (!stream->peer) + { + LeaveCriticalSection(&stream->cs); + return MS_E_NOSTREAM; + } + + *format = *(WAVEFORMATEX *)stream->mt.pbFormat; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI audio_IAudioMediaStream_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *wave_format) diff --git a/dlls/amstream/tests/Makefile.in b/dlls/amstream/tests/Makefile.in index 3a1a269fea..81eaed3c15 100644 --- a/dlls/amstream/tests/Makefile.in +++ b/dlls/amstream/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = amstream.dll -IMPORTS = strmiids uuid ddraw ole32 user32 +IMPORTS = strmbase strmiids uuid ddraw ole32 user32 C_SRCS = \ amstream.c diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 6497dde91c..743dbb99cc 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -27,6 +27,7 @@ #include "ks.h" #include "initguid.h" #include "ksmedia.h" +#include "wine/strmbase.h" static const WCHAR primary_video_sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; static const WCHAR primary_audio_sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; @@ -987,16 +988,10 @@ static void test_media_streams(void) if (SUCCEEDED(hr)) { IAudioData* audio_data = NULL; - WAVEFORMATEX format; hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); - hr = IAudioMediaStream_GetFormat(audio_media_stream, NULL); - ok(hr == E_POINTER, "IAudioMediaStream_GetFormat returned: %x\n", hr); - hr = IAudioMediaStream_GetFormat(audio_media_stream, &format); - ok(hr == MS_E_NOSTREAM, "IAudioMediaStream_GetFormat returned: %x\n", hr); - hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr); hr = IAudioMediaStream_CreateSample(audio_media_stream, audio_data, 0, &audio_sample); @@ -2293,6 +2288,152 @@ out_unknown: IUnknown_Release(unknown); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +static inline struct testfilter *impl_from_BaseFilter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + if (!index) + return &filter->source.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_BaseFilter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + return S_OK; +} + +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + return S_OK; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .base.pin_query_accept = testsource_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); +} + +static void test_audiostream_get_format(void) +{ + static const WAVEFORMATEX pin_format = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 2, + .nSamplesPerSec = 44100, + .wBitsPerSample = 16, + .nBlockAlign = 4, + .nAvgBytesPerSec = 4 * 44100, + }; + AM_MEDIA_TYPE mt = + { + .majortype = MEDIATYPE_Audio, + .subtype = MEDIASUBTYPE_PCM, + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(WAVEFORMATEX), + .pbFormat = (BYTE *)&pin_format, + }; + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAudioMediaStream *audio_stream; + struct testfilter source; + IGraphBuilder *graph; + IMediaStream *stream; + WAVEFORMATEX format; + 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, "Expected non-NULL graph.\n"); + + testfilter_init(&source); + + hr = IGraphBuilder_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, &format); + ok(hr == MS_E_NOSTREAM, "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); + + memset(&format, 0xcc, sizeof(format)); + hr = IAudioMediaStream_GetFormat(audio_stream, &format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(format.wFormatTag == WAVE_FORMAT_PCM, "Got tag %#x.\n", format.wFormatTag); + ok(format.nChannels == 2, "Got %u channels.\n", format.nChannels); + ok(format.nSamplesPerSec == 44100, "Got sample rate %u.\n", format.nSamplesPerSec); + ok(format.nAvgBytesPerSec == 176400, "Got %u bytes/sec.\n", format.nAvgBytesPerSec); + ok(format.nBlockAlign == 4, "Got alignment %u.\n", format.nBlockAlign); + ok(format.wBitsPerSample == 16, "Got %u bits/sample.\n", format.wBitsPerSample); + ok(!format.cbSize, "Got extra size %u.\n", format.cbSize); + + hr = IGraphBuilder_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, &format); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + 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; @@ -2326,5 +2467,7 @@ START_TEST(amstream) test_audiodata_get_format(); test_audiodata_set_format(); + test_audiostream_get_format(); + CoUninitialize(); }

1 0

Anton Baskanov : amstream: Implement AMAudioStream::SetFormat.
by Alexandre Julliard 26 Feb '20

26 Feb '20

Module: wine Branch: master Commit: bbf0a93e4ee8aea8e933dc8dcd6c4a933d625a1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf0a93e4ee8aea8e933dc8d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Feb 25 23:59:28 2020 -0600 amstream: Implement AMAudioStream::SetFormat. 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 | 28 ++++++- dlls/amstream/tests/amstream.c | 184 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 208 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 544f70a75c..ca4e163566 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -183,6 +183,7 @@ struct audio_stream IPin *peer; IMemAllocator *allocator; AM_MEDIA_TYPE mt; + WAVEFORMATEX format; }; static inline struct audio_stream *impl_from_IAMMediaStream(IAMMediaStream *iface) @@ -519,13 +520,32 @@ static HRESULT WINAPI audio_IAudioMediaStream_GetFormat(IAudioMediaStream *iface return S_OK; } -static HRESULT WINAPI audio_IAudioMediaStream_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *wave_format) +static HRESULT WINAPI audio_IAudioMediaStream_SetFormat(IAudioMediaStream *iface, const WAVEFORMATEX *format) { - struct audio_stream *This = impl_from_IAudioMediaStream(iface); + struct audio_stream *stream = impl_from_IAudioMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", iface, This, wave_format); + TRACE("stream %p, format %p.\n", stream, format); - return E_NOTIMPL; + if (!format) + return E_POINTER; + + if (format->wFormatTag != WAVE_FORMAT_PCM) + return E_INVALIDARG; + + EnterCriticalSection(&stream->cs); + + if ((stream->peer && memcmp(format, stream->mt.pbFormat, sizeof(WAVEFORMATEX))) + || (stream->format.wFormatTag && memcmp(format, &stream->format, sizeof(WAVEFORMATEX)))) + { + LeaveCriticalSection(&stream->cs); + return E_INVALIDARG; + } + + stream->format = *format; + + LeaveCriticalSection(&stream->cs); + + return S_OK; } static HRESULT WINAPI audio_IAudioMediaStream_CreateSample(IAudioMediaStream *iface, IAudioData *audio_data, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 743dbb99cc..b11a353b03 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -2434,6 +2434,189 @@ static void test_audiostream_get_format(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static HRESULT set_audiostream_format(const WAVEFORMATEX *format) +{ + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IAudioMediaStream *audio_stream; + IMediaStream *stream; + HRESULT hr; + ULONG ref; + + 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 = IAudioMediaStream_SetFormat(audio_stream, format); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IAudioMediaStream_Release(audio_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + return hr; +} + +static void test_audiostream_set_format(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 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; + HRESULT hr; + ULONG ref; + IPin *pin; + + hr = set_audiostream_format(&valid_format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = set_audiostream_format(NULL); + ok(hr == E_POINTER, "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; + hr = set_audiostream_format(&extensible_format.Format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + format = valid_format; + format.nBlockAlign = 1; + hr = set_audiostream_format(&format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format = valid_format; + format.nAvgBytesPerSec = 1234; + hr = set_audiostream_format(&format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mmstream = create_ammultimediastream(); + + 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 = IAudioMediaStream_SetFormat(audio_stream, &valid_format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IAudioMediaStream_GetFormat(audio_stream, &format); + ok(hr == MS_E_NOSTREAM, "Got hr %#x.\n", hr); + + format = valid_format; + format.nChannels = 1; + hr = IAudioMediaStream_SetFormat(audio_stream, &format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + format = valid_format; + format.nSamplesPerSec = 11025; + hr = IAudioMediaStream_SetFormat(audio_stream, &format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + format = valid_format; + format.nAvgBytesPerSec = 1234; + hr = IAudioMediaStream_SetFormat(audio_stream, &format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + format = valid_format; + format.nBlockAlign = 1; + hr = IAudioMediaStream_SetFormat(audio_stream, &format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + format = valid_format; + format.wBitsPerSample = 8; + hr = IAudioMediaStream_SetFormat(audio_stream, &format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + format = valid_format; + format.cbSize = 1; + hr = IAudioMediaStream_SetFormat(audio_stream, &format); + 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); + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IAudioMediaStream_Release(audio_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + 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, "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, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format = valid_format; + format.nChannels = 1; + hr = IAudioMediaStream_SetFormat(audio_stream, &format); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IGraphBuilder_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IGraphBuilder_Disconnect(graph, &source.source.pin.IPin_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + format = valid_format; + format.nChannels = 1; + hr = IAudioMediaStream_SetFormat(audio_stream, &format); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + 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; @@ -2468,6 +2651,7 @@ START_TEST(amstream) test_audiodata_set_format(); test_audiostream_get_format(); + test_audiostream_set_format(); CoUninitialize(); }

1 0