May 2023 - Wine-commits - list.winehq.org

Mohamad Al-Jaf : msmpeg2vdec: Add DllGetClassObject() stub.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 9c60c34c9458fdc581c0468a3b6a65484fb408c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c60c34c9458fdc581c0468a3b6a65… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Wed Apr 20 21:38:14 2022 -0400 msmpeg2vdec: Add DllGetClassObject() stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54955 --- dlls/msmpeg2vdec/Makefile.in | 3 +++ dlls/msmpeg2vdec/main.c | 27 +++++++++++++++++++++++++++ dlls/msmpeg2vdec/msmpeg2vdec.spec | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/msmpeg2vdec/Makefile.in b/dlls/msmpeg2vdec/Makefile.in index d2dbf5adda0..609c6a34f9a 100644 --- a/dlls/msmpeg2vdec/Makefile.in +++ b/dlls/msmpeg2vdec/Makefile.in @@ -1 +1,4 @@ MODULE = msmpeg2vdec.dll + +C_SRCS = \ + main.c diff --git a/dlls/msmpeg2vdec/main.c b/dlls/msmpeg2vdec/main.c new file mode 100644 index 00000000000..0ff52f5d1cb --- /dev/null +++ b/dlls/msmpeg2vdec/main.c @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msmpeg2vdec); + +HRESULT WINAPI DllGetClassObject( REFCLSID clsid, REFIID riid, void **out ) +{ + FIXME( "clsid %s, riid %s, out %p stub!\n", debugstr_guid(clsid), debugstr_guid(riid), out ); + return CLASS_E_CLASSNOTAVAILABLE; +} diff --git a/dlls/msmpeg2vdec/msmpeg2vdec.spec b/dlls/msmpeg2vdec/msmpeg2vdec.spec index 2ba3ab602f1..b81b77ce108 100644 --- a/dlls/msmpeg2vdec/msmpeg2vdec.spec +++ b/dlls/msmpeg2vdec/msmpeg2vdec.spec @@ -3,6 +3,6 @@ @ stub ?GetSurfaceSize(a)CVIDEOfilter@@QEAAJHPEAJ(a)Z @ stub ?LoadSurface(a)CVIDEOfilter@@QEAAJHPEAEK(a)Z @ stdcall -private DllCanUnloadNow() -@ stub DllGetClassObject +@ stdcall -private DllGetClassObject(ptr ptr ptr) @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer()

1 0

Zebediah Figura : qcap/audiorecord: Implement DecideBufferSize().
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 4925b34c90547848be4b1c250146d5ab5c90a9bd URL: https://gitlab.winehq.org/wine/wine/-/commit/4925b34c90547848be4b1c250146d5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 15:12:45 2023 -0500 qcap/audiorecord: Implement DecideBufferSize(). --- dlls/qcap/audiorecord.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index d97d7fef19a..01f0fed3288 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -132,8 +132,17 @@ static HRESULT audio_record_source_get_media_type(struct strmbase_pin *iface, static HRESULT WINAPI audio_record_source_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) { + struct audio_record *filter = impl_from_strmbase_filter(iface->pin.filter); + const WAVEFORMATEX *format = (void *)filter->source.pin.mt.pbFormat; ALLOCATOR_PROPERTIES ret_props; + props->cBuffers = 4; + /* This is the algorithm that native uses. The alignment to an even number + * doesn't make much sense, and may be a bug. */ + props->cbBuffer = (format->nAvgBytesPerSec / 2) & ~1; + props->cbAlign = 1; + props->cbPrefix = 0; + return IMemAllocator_SetProperties(allocator, props, &ret_props); }

1 0

Zebediah Figura : qcap/tests: Add tests for audio capture pin connection.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: c808b30b2cd302d3621e88abc67ed67f80793900 URL: https://gitlab.winehq.org/wine/wine/-/commit/c808b30b2cd302d3621e88abc67ed6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 15:03:07 2023 -0500 qcap/tests: Add tests for audio capture pin connection. --- dlls/qcap/tests/audiorecord.c | 245 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 245 insertions(+)

1 0

Zebediah Figura : qcap/tests: Test audio capture allocator properties.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 348205b097e67867cd96504e7abff2c9e75eca9b URL: https://gitlab.winehq.org/wine/wine/-/commit/348205b097e67867cd96504e7abff2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 15:22:33 2023 -0500 qcap/tests: Test audio capture allocator properties. --- dlls/qcap/tests/audiorecord.c | 82 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index 9e7b2f944a7..ca41ffece66 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -547,6 +547,86 @@ static void testfilter_init(struct testfilter *filter) strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); } +static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, + IPin *source, struct testfilter *testsink) +{ + ALLOCATOR_PROPERTIES props, req_props = {2, 3200, 32, 0}; + IMemAllocator *allocator; + IMediaSample *sample; + WAVEFORMATEX format; + AM_MEDIA_TYPE mt; + HRESULT hr; + + init_pcm_mt(&mt, &format, 1, 32000, 16); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ok(!!testsink->sink.pAllocator, "Expected an allocator.\n"); + hr = IMemAllocator_GetProperties(testsink->sink.pAllocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(props.cBuffers == 4, "Got %ld buffers.\n", props.cBuffers); + ok(props.cbBuffer == 32000, "Got size %ld.\n", props.cbBuffer); + ok(props.cbAlign == 1, "Got alignment %ld.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); + + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#lx.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, AM_GBF_NOWAIT); + todo_wine ok(hr == VFW_E_TIMEOUT, "Got hr %#lx.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#lx.\n", hr); + + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); + + init_pcm_mt(&mt, &format, 1, 32000, 8); + format.nAvgBytesPerSec = 127; + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ok(!!testsink->sink.pAllocator, "Expected an allocator.\n"); + hr = IMemAllocator_GetProperties(testsink->sink.pAllocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(props.cBuffers == 4, "Got %ld buffers.\n", props.cBuffers); + ok(props.cbBuffer == 62, "Got size %ld.\n", props.cbBuffer); + ok(props.cbAlign == 1, "Got alignment %ld.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); + + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&allocator); + testsink->sink.pAllocator = allocator; + + hr = IMemAllocator_SetProperties(allocator, &req_props, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + init_pcm_mt(&mt, &format, 1, 32000, 16); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + todo_wine ok(testsink->sink.pAllocator && testsink->sink.pAllocator != allocator, + "Got unexpected allocator %p.\n", testsink->sink.pAllocator); + hr = IMemAllocator_GetProperties(testsink->sink.pAllocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(props.cBuffers == 4, "Got %ld buffers.\n", props.cBuffers); + ok(props.cbBuffer == 32000, "Got size %ld.\n", props.cbBuffer); + ok(props.cbAlign == 1, "Got alignment %ld.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); + + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); +} + static void test_connect_pin(IBaseFilter *filter) { AM_MEDIA_TYPE mt, req_mt, *source_mt; @@ -567,6 +647,8 @@ static void test_connect_pin(IBaseFilter *filter) IBaseFilter_FindPin(filter, L"Capture", &source); + test_source_allocator(graph, control, source, &testsink); + peer = (IPin *)0xdeadbeef; hr = IPin_ConnectedTo(source, &peer); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#lx.\n", hr);

1 0

Zebediah Figura : qcap/audiorecord: Open a winmm device when connecting.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 5bac0fabb95ad21c5bc6f25d07a5d9e6562b2f41 URL: https://gitlab.winehq.org/wine/wine/-/commit/5bac0fabb95ad21c5bc6f25d07a5d9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 15:27:59 2023 -0500 qcap/audiorecord: Open a winmm device when connecting. --- dlls/qcap/Makefile.in | 2 +- dlls/qcap/audiorecord.c | 44 +++++++++++++++++++++++++++++++++----------- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index b61a4a05ab2..56482c23ced 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,6 +1,6 @@ MODULE = qcap.dll UNIXLIB = qcap.so -IMPORTS = strmbase strmiids uuid ole32 oleaut32 +IMPORTS = strmbase strmiids uuid ole32 oleaut32 winmm DELAYIMPORTS = msvfw32 C_SRCS = \ diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 01f0fed3288..52cbfbdb04f 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -30,6 +30,9 @@ struct audio_record struct strmbase_source source; IAMStreamConfig IAMStreamConfig_iface; + + unsigned int id; + HWAVEIN device; }; static struct audio_record *impl_from_strmbase_filter(struct strmbase_filter *filter) @@ -135,6 +138,8 @@ static HRESULT WINAPI audio_record_source_DecideBufferSize(struct strmbase_sourc struct audio_record *filter = impl_from_strmbase_filter(iface->pin.filter); const WAVEFORMATEX *format = (void *)filter->source.pin.mt.pbFormat; ALLOCATOR_PROPERTIES ret_props; + MMRESULT ret; + HRESULT hr; props->cBuffers = 4; /* This is the algorithm that native uses. The alignment to an even number @@ -143,7 +148,23 @@ static HRESULT WINAPI audio_record_source_DecideBufferSize(struct strmbase_sourc props->cbAlign = 1; props->cbPrefix = 0; - return IMemAllocator_SetProperties(allocator, props, &ret_props); + if (FAILED(hr = IMemAllocator_SetProperties(allocator, props, &ret_props))) + return hr; + + if ((ret = waveInOpen(&filter->device, filter->id, format, 0, 0, CALLBACK_NULL)) != MMSYSERR_NOERROR) + { + ERR("Failed to open device %u, error %u.\n", filter->id, ret); + return E_FAIL; + } + + return S_OK; +} + +static void audio_record_source_disconnect(struct strmbase_source *iface) +{ + struct audio_record *filter = impl_from_strmbase_filter(iface->pin.filter); + + waveInClose(filter->device); } static const struct strmbase_source_ops source_ops = @@ -154,6 +175,7 @@ static const struct strmbase_source_ops source_ops = .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnDecideBufferSize = audio_record_source_DecideBufferSize, + .source_disconnect = audio_record_source_disconnect, }; static struct audio_record *impl_from_IAMStreamConfig(IAMStreamConfig *iface) @@ -331,21 +353,21 @@ static HRESULT WINAPI PPB_InitNew(IPersistPropertyBag *iface) return E_NOTIMPL; } -static HRESULT WINAPI PPB_Load(IPersistPropertyBag *iface, IPropertyBag *pPropBag, - IErrorLog *pErrorLog) +static HRESULT WINAPI PPB_Load(IPersistPropertyBag *iface, IPropertyBag *bag, IErrorLog *error_log) { - struct audio_record *This = impl_from_IPersistPropertyBag(iface); - HRESULT hr; + struct audio_record *filter = impl_from_IPersistPropertyBag(iface); VARIANT var; + HRESULT hr; - TRACE("(%p/%p)->(%p, %p)\n", iface, This, pPropBag, pErrorLog); + TRACE("filter %p, bag %p, error_log %p.\n", filter, bag, error_log); V_VT(&var) = VT_I4; - hr = IPropertyBag_Read(pPropBag, L"WaveInID", &var, pErrorLog); - if (SUCCEEDED(hr)) - { - FIXME("FIXME: implement opening waveIn device %ld\n", V_I4(&var)); - } + if (FAILED(hr = IPropertyBag_Read(bag, L"WaveInID", &var, error_log))) + return hr; + + EnterCriticalSection(&filter->filter.filter_cs); + filter->id = V_I4(&var); + LeaveCriticalSection(&filter->filter.filter_cs); return hr; }

1 0

Zebediah Figura : qcap/audiorecord: Implement streaming.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: aece95c9d81d4aa01b642d05370db1be98346a7c URL: https://gitlab.winehq.org/wine/wine/-/commit/aece95c9d81d4aa01b642d05370db1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 15:30:49 2023 -0500 qcap/audiorecord: Implement streaming. --- dlls/qcap/audiorecord.c | 215 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/qcap/qcap_private.h | 1 + 2 files changed, 215 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 52cbfbdb04f..3a9339fcc2d 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -33,6 +33,15 @@ struct audio_record unsigned int id; HWAVEIN device; + HANDLE event; + HANDLE thread; + + /* FIXME: It would be nice to avoid duplicating this variable with strmbase. + * However, synchronization is tricky; we need access to be protected by a + * separate lock. */ + FILTER_STATE state; + CONDITION_VARIABLE state_cv; + CRITICAL_SECTION state_cs; }; static struct audio_record *impl_from_strmbase_filter(struct strmbase_filter *filter) @@ -151,7 +160,8 @@ static HRESULT WINAPI audio_record_source_DecideBufferSize(struct strmbase_sourc if (FAILED(hr = IMemAllocator_SetProperties(allocator, props, &ret_props))) return hr; - if ((ret = waveInOpen(&filter->device, filter->id, format, 0, 0, CALLBACK_NULL)) != MMSYSERR_NOERROR) + if ((ret = waveInOpen(&filter->device, filter->id, format, + (DWORD_PTR)filter->event, 0, CALLBACK_EVENT)) != MMSYSERR_NOERROR) { ERR("Failed to open device %u, error %u.\n", filter->id, ret); return E_FAIL; @@ -293,6 +303,9 @@ static void audio_record_destroy(struct strmbase_filter *iface) { struct audio_record *filter = impl_from_strmbase_filter(iface); + filter->state_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->state_cs); + CloseHandle(filter->event); strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); free(filter); @@ -311,11 +324,200 @@ static HRESULT audio_record_query_interface(struct strmbase_filter *iface, REFII return S_OK; } +static DWORD WINAPI stream_thread(void *arg) +{ + struct audio_record *filter = arg; + const WAVEFORMATEX *format = (void *)filter->source.pin.mt.pbFormat; + bool started = false; + MMRESULT ret; + + /* FIXME: We should probably queue several buffers instead of just one. */ + + EnterCriticalSection(&filter->state_cs); + + for (;;) + { + IMediaSample *sample; + WAVEHDR header = {0}; + HRESULT hr; + BYTE *data; + + while (filter->state == State_Paused) + SleepConditionVariableCS(&filter->state_cv, &filter->state_cs, INFINITE); + + if (filter->state == State_Stopped) + break; + + if (FAILED(hr = IMemAllocator_GetBuffer(filter->source.pAllocator, &sample, NULL, NULL, 0))) + { + ERR("Failed to get sample, hr %#lx.\n", hr); + break; + } + + IMediaSample_GetPointer(sample, &data); + + header.lpData = (void *)data; + header.dwBufferLength = IMediaSample_GetSize(sample); + if ((ret = waveInPrepareHeader(filter->device, &header, sizeof(header))) != MMSYSERR_NOERROR) + ERR("Failed to prepare header, error %u.\n", ret); + + if ((ret = waveInAddBuffer(filter->device, &header, sizeof(header))) != MMSYSERR_NOERROR) + ERR("Failed to add buffer, error %u.\n", ret); + + if (!started) + { + if ((ret = waveInStart(filter->device)) != MMSYSERR_NOERROR) + ERR("Failed to start, error %u.\n", ret); + started = true; + } + + while (!(header.dwFlags & WHDR_DONE) && filter->state == State_Running) + { + LeaveCriticalSection(&filter->state_cs); + + if ((ret = WaitForSingleObject(filter->event, INFINITE))) + ERR("Failed to wait, error %u.\n", ret); + + EnterCriticalSection(&filter->state_cs); + } + + if (filter->state != State_Running) + { + TRACE("State is %#x; resetting.\n", filter->state); + if ((ret = waveInReset(filter->device)) != MMSYSERR_NOERROR) + ERR("Failed to reset, error %u.\n", ret); + } + + if ((ret = waveInUnprepareHeader(filter->device, &header, sizeof(header))) != MMSYSERR_NOERROR) + ERR("Failed to unprepare header, error %u.\n", ret); + + IMediaSample_SetActualDataLength(sample, header.dwBytesRecorded); + + if (filter->state == State_Running) + { + REFERENCE_TIME start_pts, end_pts; + MMTIME time; + + time.wType = TIME_BYTES; + if ((ret = waveInGetPosition(filter->device, &time, sizeof(time))) != MMSYSERR_NOERROR) + ERR("Failed to get position, error %u.\n", ret); + if (time.wType != TIME_BYTES) + ERR("Got unexpected type %#x.\n", time.wType); + end_pts = MulDiv(time.u.cb, 10000000, format->nAvgBytesPerSec); + start_pts = MulDiv(time.u.cb - header.dwBytesRecorded, 10000000, format->nAvgBytesPerSec); + IMediaSample_SetTime(sample, &start_pts, &end_pts); + + TRACE("Sending buffer %p.\n", sample); + hr = IMemInputPin_Receive(filter->source.pMemInputPin, sample); + IMediaSample_Release(sample); + if (FAILED(hr)) + { + ERR("IMemInputPin::Receive() returned %#lx.\n", hr); + break; + } + } + } + + LeaveCriticalSection(&filter->state_cs); + + if (started && (ret = waveInStop(filter->device)) != MMSYSERR_NOERROR) + ERR("Failed to stop, error %u.\n", ret); + + return 0; +} + +static HRESULT audio_record_init_stream(struct strmbase_filter *iface) +{ + struct audio_record *filter = impl_from_strmbase_filter(iface); + HRESULT hr; + + if (!filter->source.pin.peer) + return S_OK; + + if (FAILED(hr = IMemAllocator_Commit(filter->source.pAllocator))) + ERR("Failed to commit allocator, hr %#lx.\n", hr); + + EnterCriticalSection(&filter->state_cs); + filter->state = State_Paused; + LeaveCriticalSection(&filter->state_cs); + + filter->thread = CreateThread(NULL, 0, stream_thread, filter, 0, NULL); + + return S_OK; +} + +static HRESULT audio_record_start_stream(struct strmbase_filter *iface, REFERENCE_TIME time) +{ + struct audio_record *filter = impl_from_strmbase_filter(iface); + + if (!filter->source.pin.peer) + return S_OK; + + EnterCriticalSection(&filter->state_cs); + filter->state = State_Running; + LeaveCriticalSection(&filter->state_cs); + WakeConditionVariable(&filter->state_cv); + return S_OK; +} + +static HRESULT audio_record_stop_stream(struct strmbase_filter *iface) +{ + struct audio_record *filter = impl_from_strmbase_filter(iface); + + if (!filter->source.pin.peer) + return S_OK; + + EnterCriticalSection(&filter->state_cs); + filter->state = State_Paused; + LeaveCriticalSection(&filter->state_cs); + SetEvent(filter->event); + return S_OK; +} + +static HRESULT audio_record_cleanup_stream(struct strmbase_filter *iface) +{ + struct audio_record *filter = impl_from_strmbase_filter(iface); + HRESULT hr; + + if (!filter->source.pin.peer) + return S_OK; + + EnterCriticalSection(&filter->state_cs); + filter->state = State_Stopped; + LeaveCriticalSection(&filter->state_cs); + WakeConditionVariable(&filter->state_cv); + SetEvent(filter->event); + + WaitForSingleObject(filter->thread, INFINITE); + CloseHandle(filter->thread); + filter->thread = NULL; + + hr = IMemAllocator_Decommit(filter->source.pAllocator); + if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) + ERR("Failed to decommit allocator, hr %#lx.\n", hr); + + return S_OK; +} + +static HRESULT audio_record_wait_state(struct strmbase_filter *iface, DWORD timeout) +{ + struct audio_record *filter = impl_from_strmbase_filter(iface); + + if (filter->filter.state == State_Paused) + return VFW_S_CANT_CUE; + return S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = audio_record_get_pin, .filter_destroy = audio_record_destroy, .filter_query_interface = audio_record_query_interface, + .filter_init_stream = audio_record_init_stream, + .filter_start_stream = audio_record_start_stream, + .filter_stop_stream = audio_record_stop_stream, + .filter_cleanup_stream = audio_record_cleanup_stream, + .filter_wait_state = audio_record_wait_state, }; static HRESULT WINAPI PPB_QueryInterface(IPersistPropertyBag *iface, REFIID riid, LPVOID *ppv) @@ -398,12 +600,23 @@ HRESULT audio_record_create(IUnknown *outer, IUnknown **out) if (!(object = calloc(1, sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->event = CreateEventW(NULL, FALSE, FALSE, NULL))) + { + free(object); + return E_OUTOFMEMORY; + } + object->IPersistPropertyBag_iface.lpVtbl = &PersistPropertyBagVtbl; strmbase_filter_init(&object->filter, outer, &CLSID_AudioRecord, &filter_ops); strmbase_source_init(&object->source, &object->filter, L"Capture", &source_ops); object->IAMStreamConfig_iface.lpVtbl = &stream_config_vtbl; + object->state = State_Stopped; + InitializeConditionVariable(&object->state_cv); + InitializeCriticalSection(&object->state_cs); + object->state_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": audio_record.state_cs"); + TRACE("Created audio recorder %p.\n", object); *out = &object->filter.IUnknown_inner; return S_OK; diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 140e56539b5..ae1571b0baf 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -24,6 +24,7 @@ #define COBJMACROS #define NONAMELESSSTRUCT #define NONAMELESSUNION +#include <stdbool.h> #include "dshow.h" #include "winternl.h" #include "wine/unixlib.h"

1 0

Zebediah Figura : qcap/tests: Test audio capture streaming.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: b5958a78361423b373049a23ffc8f35afc1b2b70 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5958a78361423b373049a23ffc8f3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 4 15:31:51 2023 -0500 qcap/tests: Test audio capture streaming. --- dlls/qcap/tests/audiorecord.c | 162 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 160 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index ca41ffece66..b73cbba3548 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -303,7 +303,7 @@ static void test_unconnected_filter_state(IBaseFilter *filter) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); - todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#lx.\n", hr); + ok(hr == VFW_S_CANT_CUE, "Got hr %#lx.\n", hr); ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); @@ -317,7 +317,7 @@ static void test_unconnected_filter_state(IBaseFilter *filter) ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); - todo_wine ok(hr == VFW_S_CANT_CUE, "Got hr %#lx.\n", hr); + ok(hr == VFW_S_CANT_CUE, "Got hr %#lx.\n", hr); ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); @@ -472,6 +472,8 @@ struct testfilter struct strmbase_filter filter; struct strmbase_sink sink; const AM_MEDIA_TYPE *mt; + HANDLE sample_event, eos_event; + unsigned int sample_count, eos_count; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -492,12 +494,24 @@ static void testfilter_destroy(struct strmbase_filter *iface) struct testfilter *filter = impl_from_strmbase_filter(iface); strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); + CloseHandle(filter->eos_event); + CloseHandle(filter->sample_event); +} + +static HRESULT testfilter_init_stream(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + filter->eos_count = 0; + filter->sample_count = 0; + return S_OK; } static const struct strmbase_filter_ops testfilter_ops = { .filter_get_pin = testfilter_get_pin, .filter_destroy = testfilter_destroy, + .filter_init_stream = testfilter_init_stream, }; static HRESULT testsink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -532,11 +546,61 @@ static HRESULT testsink_connect(struct strmbase_sink *iface, IPin *peer, const A return S_OK; } +static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + REFERENCE_TIME start, end; + AM_MEDIA_TYPE *mt; + HRESULT hr; + + hr = IMediaSample_GetTime(sample, &start, &end); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + if (winetest_debug > 1) + trace("%04lx: Got sample with timestamps %I64d-%I64d.\n", GetCurrentThreadId(), start, end); + + mt = (void *)0xdeadbeef; + hr = IMediaSample_GetMediaType(sample, &mt); + ok(hr == S_FALSE, "Got hr %#lx.\n", hr); + ok(!mt, "Got unexpected media type %p.\n", mt); + + /* Usually the actual size of the sample is the same as its capacity. + * For unclear reasons, though, this isn't always the case. */ + + ok(!filter->eos_count, "Got a sample after EOS.\n"); + ++filter->sample_count; + SetEvent(filter->sample_event); + return S_OK; +} + +static HRESULT testsink_eos(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + + if (winetest_debug > 1) + trace("%04lx: Got EOS.\n", GetCurrentThreadId()); + + ok(!filter->eos_count, "Got %u EOS events.\n", filter->eos_count + 1); + ++filter->eos_count; + SetEvent(filter->eos_event); + return S_OK; +} + +static HRESULT testsink_new_segment(struct strmbase_sink *iface, + REFERENCE_TIME start, REFERENCE_TIME end, double rate) +{ + ok(0, "Unexpected new segment.\n"); + return S_OK; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, .base.pin_get_media_type = testsink_get_media_type, .sink_connect = testsink_connect, + .pfnReceive = testsink_Receive, + .sink_eos = testsink_eos, + .sink_new_segment = testsink_new_segment, }; static void testfilter_init(struct testfilter *filter) @@ -545,6 +609,8 @@ static void testfilter_init(struct testfilter *filter) memset(filter, 0, sizeof(*filter)); strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); + filter->sample_event = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->eos_event = CreateEventW(NULL, FALSE, FALSE, NULL); } static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, @@ -627,6 +693,97 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); } +static void test_filter_state(IFilterGraph2 *graph, IMediaControl *control, + IPin *source, struct testfilter *testsink) +{ + IMemAllocator *allocator; + IMediaSample *sample; + OAFilterState state; + WAVEFORMATEX format; + AM_MEDIA_TYPE mt; + HRESULT hr; + DWORD ret; + + init_pcm_mt(&mt, &format, 1, 32000, 16); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(state == State_Stopped, "Got state %lu.\n", state); + + allocator = testsink->sink.pAllocator; + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_CANT_CUE, "Got hr %#lx.\n", hr); + ok(state == State_Paused, "Got state %lu.\n", state); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + /* starting up the device can be a little slow */ + ret = WaitForSingleObject(testsink->sample_event, 5000); + ok(!ret, "Got %lu.\n", ret); + + ret = WaitForSingleObject(testsink->sample_event, 1000); + ok(!ret, "Got %lu.\n", ret); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(state == State_Running, "Got state %lu.\n", state); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_CANT_CUE, "Got hr %#lx.\n", hr); + ok(state == State_Paused, "Got state %lu.\n", state); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(state == State_Stopped, "Got state %lu.\n", state); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#lx.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(state == State_Running, "Got state %lu.\n", state); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(state == State_Stopped, "Got state %lu.\n", state); + + /* Test committing the allocator before the capture filter does. */ + + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemAllocator_Decommit(allocator); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); +} + static void test_connect_pin(IBaseFilter *filter) { AM_MEDIA_TYPE mt, req_mt, *source_mt; @@ -648,6 +805,7 @@ static void test_connect_pin(IBaseFilter *filter) IBaseFilter_FindPin(filter, L"Capture", &source); test_source_allocator(graph, control, source, &testsink); + test_filter_state(graph, control, source, &testsink); peer = (IPin *)0xdeadbeef; hr = IPin_ConnectedTo(source, &peer);

1 0

Piotr Caban : wineps: Move BANDINFOSTRUCT definition to unixlib.c.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: f848b9f8460494d502ed6357827c9a38ab7783fb URL: https://gitlab.winehq.org/wine/wine/-/commit/f848b9f8460494d502ed6357827c9a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 17 15:41:08 2023 +0200 wineps: Move BANDINFOSTRUCT definition to unixlib.c. --- dlls/wineps.drv/psdrv.h | 9 --------- dlls/wineps.drv/unixlib.c | 15 +++++++++++---- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 1d6ff1c69dc..d16e135aeda 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -143,15 +143,6 @@ typedef struct _tagPAGESIZE { WORD WinPage; /*eg DMPAPER_A4. Doesn't really belong here */ } PAGESIZE; - -/* For BANDINFO Escape */ -typedef struct _BANDINFOSTRUCT -{ - BOOL GraphicsFlag; - BOOL TextFlag; - RECT GraphicsRect; -} BANDINFOSTRUCT, *PBANDINFOSTRUCT; - typedef struct { struct list entry; diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 76e60ca1596..96b8df48f19 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -81,6 +81,13 @@ struct printer_info static struct list printer_info_list = LIST_INIT(printer_info_list); +struct band_info +{ + BOOL graphics_flag; + BOOL text_flag; + RECT graphics_rect; +}; + typedef struct { struct gdi_physdev dev; @@ -714,11 +721,11 @@ static int CDECL ext_escape(PHYSDEV dev, int escape, int input_size, const void } case BANDINFO: { - BANDINFOSTRUCT *ibi = (BANDINFOSTRUCT*)input; - BANDINFOSTRUCT *obi = (BANDINFOSTRUCT*)output; + struct band_info *ibi = (struct band_info *)input; + struct band_info *obi = (struct band_info *)output; - FIXME("BANDINFO(graphics %d, text %d, rect %s), stub!\n", ibi->GraphicsFlag, - ibi->TextFlag, wine_dbgstr_rect(&ibi->GraphicsRect)); + FIXME("BANDINFO(graphics %d, text %d, rect %s), stub!\n", ibi->graphics_flag, + ibi->text_flag, wine_dbgstr_rect(&ibi->graphics_rect)); *obi = *ibi; return 1; }

1 0

Piotr Caban : wineps: Define PSDRV_DEVMODE in unixlib.h.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 36a9bc820a24a326565c496924ee7422533c5453 URL: https://gitlab.winehq.org/wine/wine/-/commit/36a9bc820a24a326565c496924ee74… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 17 15:41:36 2023 +0200 wineps: Define PSDRV_DEVMODE in unixlib.h. --- dlls/wineps.drv/builtin.c | 1 - dlls/wineps.drv/font.c | 1 - dlls/wineps.drv/init.c | 1 - dlls/wineps.drv/psdrv.h | 17 ++--------------- dlls/wineps.drv/unixlib.c | 1 - dlls/wineps.drv/unixlib.h | 18 ++++++++++++++++++ 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c index d62d4fc134f..02b452b0a8b 100644 --- a/dlls/wineps.drv/builtin.c +++ b/dlls/wineps.drv/builtin.c @@ -31,7 +31,6 @@ #include "winternl.h" #include "psdrv.h" -#include "unixlib.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/font.c b/dlls/wineps.drv/font.c index 869eb0ea9b6..74171c09530 100644 --- a/dlls/wineps.drv/font.c +++ b/dlls/wineps.drv/font.c @@ -30,7 +30,6 @@ #include "winternl.h" #include "psdrv.h" -#include "unixlib.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(psdrv); diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 78a72303708..9cbea031d48 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -31,7 +31,6 @@ #include "psdrv.h" #include "ddk/winddi.h" #include "ntf.h" -#include "unixlib.h" #include "winspool.h" #include "wine/debug.h" diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index d16e135aeda..981ef6868dd 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -28,6 +28,8 @@ #include "wingdi.h" #include "winspool.h" +#include "unixlib.h" + #include "wine/gdi_driver.h" #include "wine/list.h" @@ -210,19 +212,6 @@ typedef struct { DUPLEX *DefaultDuplex; } PPD; -typedef struct { - DEVMODEW dmPublic; - int default_resolution; - int landscape_orientation; - int duplex; - int input_slots; - int resolutions; - int page_sizes; - int font_subs; - int installed_fonts; - BYTE data[1]; -} PSDRV_DEVMODE; - typedef struct { struct list entry; @@ -554,7 +543,6 @@ extern void passthrough_leave(print_ctx *ctx) DECLSPEC_HIDDEN; setlocale(LC_NUMERIC,tmplocale); \ } while (0) -#ifndef WINE_UNIX_LIB static inline WCHAR *strdupW( const WCHAR *str ) { int size; @@ -566,6 +554,5 @@ static inline WCHAR *strdupW( const WCHAR *str ) if (ret) memcpy( ret, str, size ); return ret; } -#endif #endif diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 96b8df48f19..7baffdcd09f 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -32,7 +32,6 @@ #include "winbase.h" #include "ntf.h" -#include "psdrv.h" #include "unixlib.h" #include "ntgdi.h" #include "ddk/winddi.h" diff --git a/dlls/wineps.drv/unixlib.h b/dlls/wineps.drv/unixlib.h index e28a4416d09..235f48b5832 100644 --- a/dlls/wineps.drv/unixlib.h +++ b/dlls/wineps.drv/unixlib.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __PSDRV_UNIXLIB_H +#define __PSDRV_UNIXLIB_H + #include "ntuser.h" #include "wine/unixlib.h" @@ -71,6 +74,19 @@ struct installed_font char name[LF_FACESIZE]; }; +typedef struct { + DEVMODEW dmPublic; + int default_resolution; + int landscape_orientation; + int duplex; + int input_slots; + int resolutions; + int page_sizes; + int font_subs; + int installed_fonts; + BYTE data[1]; +} PSDRV_DEVMODE; + /* Unix calls */ enum wineps_funcs { @@ -94,3 +110,5 @@ struct open_dc_params PSDRV_DEVMODE *def_devmode; HDC hdc; }; + +#endif

1 0

Piotr Caban : wineps: Remove unix_ prefix from find_pagesize and find_slot functions.
by Alexandre Julliard 19 May '23

19 May '23

Module: wine Branch: master Commit: 97cde730c07faed60d8eb721500d3ba201f7ad60 URL: https://gitlab.winehq.org/wine/wine/-/commit/97cde730c07faed60d8eb721500d3b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 17 16:00:11 2023 +0200 wineps: Remove unix_ prefix from find_pagesize and find_slot functions. --- dlls/wineps.drv/unixlib.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c index 7baffdcd09f..d3d3d2ee68f 100644 --- a/dlls/wineps.drv/unixlib.c +++ b/dlls/wineps.drv/unixlib.c @@ -307,7 +307,7 @@ static inline int paper_size_from_points(float size) return size * 254 / 72; } -static const struct input_slot *unix_find_slot(const struct printer_info *pi, +static const struct input_slot *find_slot(const struct printer_info *pi, const DEVMODEW *dm) { const struct input_slot *slot = (const struct input_slot *)pi->devmode->data; @@ -321,7 +321,7 @@ static const struct input_slot *unix_find_slot(const struct printer_info *pi, return NULL; } -static const struct page_size *unix_find_pagesize(const struct printer_info *pi, +static const struct page_size *find_pagesize(const struct printer_info *pi, const DEVMODEW *dm) { const struct page_size *page; @@ -357,7 +357,7 @@ static void merge_devmodes(PSDRV_DEVMODE *dm1, const DEVMODEW *dm2, /* NB PaperWidth is always < PaperLength */ if (dm2->dmFields & DM_PAPERSIZE) { - const struct page_size *page = unix_find_pagesize(pi, dm2); + const struct page_size *page = find_pagesize(pi, dm2); if (page) { @@ -414,7 +414,7 @@ static void merge_devmodes(PSDRV_DEVMODE *dm1, const DEVMODEW *dm2, if (dm2->dmFields & DM_DEFAULTSOURCE) { - const struct input_slot *slot = unix_find_slot(pi, dm2); + const struct input_slot *slot = find_slot(pi, dm2); if (slot) dm1->dmPublic.dmDefaultSource = dm2->dmDefaultSource; @@ -513,7 +513,7 @@ static void update_dev_caps(PSDRV_PDEVICE *pdev) } if (pdev->devmode->dmPublic.dmFields & DM_PAPERSIZE) { - page = unix_find_pagesize(pdev->pi, &pdev->devmode->dmPublic); + page = find_pagesize(pdev->pi, &pdev->devmode->dmPublic); if (!page) {

1 0