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

[PATCH] kernel32/tests: Fix a race condition in test_WaitForJobObject().
by Francois Gouget March 11, 2020

March 11, 2020

Synchronize with the child process to ensure it does not exit before being added to the test job. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48642 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index b5ed99062e9..7cd8e3140e8 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -2759,7 +2759,8 @@ static void test_KillOnJobClose(void) static void test_WaitForJobObject(void) { - HANDLE job; + HANDLE job, sem; + char buffer[50]; PROCESS_INFORMATION pi; BOOL ret; DWORD dwret; @@ -2826,10 +2827,13 @@ static void test_WaitForJobObject(void) dwret = WaitForSingleObject(job, 100); ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); - create_process("exit", &pi); + sprintf(buffer, "sync kernel32-process-%x", GetCurrentProcessId()); + sem = CreateSemaphoreA(NULL, 0, 1, buffer); + create_process(buffer, &pi); ret = pAssignProcessToJobObject(job, pi.hProcess); ok(ret, "AssignProcessToJobObject error %u\n", GetLastError()); + ReleaseSemaphore(sem, 1, NULL); dwret = WaitForSingleObject(job, 100); ok(dwret == WAIT_TIMEOUT, "WaitForSingleObject returned %u\n", dwret); @@ -4047,6 +4051,13 @@ START_TEST(process) ok(0, "Child process not killed\n"); return; } + else if (!strcmp(myARGV[2], "sync") && myARGC >= 4) + { + HANDLE sem = CreateSemaphoreA(NULL, 0, 1, myARGV[3]); + ok(sem, "Could not get the %s semaphore: le=%u\n", myARGV[3], GetLastError()); + if (sem) WaitForSingleObject(sem, 30000); + return; + } else if (!strcmp(myARGV[2], "exit")) { Sleep(100); -- 2.20.1

1 0

[PATCH v2 1/5] wineqtdecoder: Fix compilation.
by Zebediah Figura March 10, 2020

March 10, 2020

Fixes: dd3d68e5d9e54b204168216da2da6bf6d1d8d296 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Thanks to Alistair Leslie-Hughes. dlls/wineqtdecoder/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/main.c b/dlls/wineqtdecoder/main.c index 6e0dd8c46b5..435951ba933 100644 --- a/dlls/wineqtdecoder/main.c +++ b/dlls/wineqtdecoder/main.c @@ -146,7 +146,6 @@ static struct class_factory video_decoder_cf = {{&class_factory_vtbl}, video_dec HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, void **out) { struct class_factory *factory; - HRESULT hr; TRACE("clsid %s, iid %s, out %p.\n", debugstr_guid(clsid), debugstr_guid(iid), out); @@ -193,7 +192,7 @@ static const REGFILTER2 reg_qt_splitter = .u.s2.rgPins2 = reg_qt_splitter_pins, }; -static const REGFILTERPINS2 reg_qt_splitter_pins[2] = +static const REGFILTERPINS2 reg_video_decoder_pins[2] = { { .nMediaTypes = 1, -- 2.25.1

1 4

[PATCH v2 1/4] quartz/acmwrapper: Reimplement the ACM wrapper directly on top of strmbase_filter.
by Zebediah Figura March 10, 2020

March 10, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/quartz/acmwrapper.c | 318 ++++++++++++++++++++++++++++----- dlls/quartz/tests/acmwrapper.c | 20 +-- 2 files changed, 288 insertions(+), 50 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index aa34f3ae263..bbeb9f034e7 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -37,8 +37,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct ACMWrapperImpl { - TransformFilter tf; + struct strmbase_filter filter; + CRITICAL_SECTION stream_cs; + struct strmbase_source source; + IQualityControl source_IQualityControl_iface; + IQualityControl *source_qc_sink; + IUnknown *seeking; + + struct strmbase_sink sink; + + AM_MEDIA_TYPE mt; HACMSTREAM has; LPWAVEFORMATEX pWfOut; @@ -46,14 +55,32 @@ typedef struct ACMWrapperImpl LONGLONG lasttime_sent; } ACMWrapperImpl; -static inline ACMWrapperImpl *impl_from_TransformFilter( TransformFilter *iface ) +static inline ACMWrapperImpl *impl_from_strmbase_filter(struct strmbase_filter *iface) { - return CONTAINING_RECORD(iface, ACMWrapperImpl, tf); + return CONTAINING_RECORD(iface, ACMWrapperImpl, filter); +} + +static HRESULT acm_wrapper_sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static HRESULT acm_wrapper_sink_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) +{ + return S_OK; } -static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSample) +static HRESULT WINAPI acm_wrapper_sink_Receive(struct strmbase_sink *iface, IMediaSample *pSample) { - ACMWrapperImpl* This = impl_from_TransformFilter(tf); + ACMWrapperImpl *This = impl_from_strmbase_filter(iface->pin.filter); IMediaSample* pOutSample = NULL; DWORD cbDstStream, cbSrcStream; LPBYTE pbDstStream; @@ -65,10 +92,29 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam LONGLONG tStart = -1, tStop = -1, tMed; LONGLONG mtStart = -1, mtStop = -1, mtMed; + /* We do not expect pin connection state to change while the filter is + * running. This guarantee is necessary, since otherwise we would have to + * take the filter lock, and we can't take the filter lock from a streaming + * thread. */ + if (!This->source.pMemInputPin) + { + WARN("Source is not connected, returning VFW_E_NOT_CONNECTED.\n"); + return VFW_E_NOT_CONNECTED; + } + + if (This->filter.state == State_Stopped) + return VFW_E_WRONG_STATE; + + if (This->sink.flushing) + return S_FALSE; + + EnterCriticalSection(&This->stream_cs); + hr = IMediaSample_GetPointer(pSample, &pbSrcStream); if (FAILED(hr)) { ERR("Cannot get pointer to sample data (%x)\n", hr); + LeaveCriticalSection(&This->stream_cs); return hr; } @@ -100,10 +146,11 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam while(hr == S_OK && ash.cbSrcLength) { - hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->tf.source, &pOutSample, NULL, NULL, 0); + hr = BaseOutputPinImpl_GetDeliveryBuffer(&This->source, &pOutSample, NULL, NULL, 0); if (FAILED(hr)) { ERR("Unable to get delivery buffer (%x)\n", hr); + LeaveCriticalSection(&This->stream_cs); return hr; } IMediaSample_SetPreroll(pOutSample, preroll); @@ -198,7 +245,7 @@ static HRESULT WINAPI ACMWrapper_Receive(TransformFilter *tf, IMediaSample *pSam TRACE("Sample stop time: %s\n", debugstr_time(tStart)); - hr = IMemInputPin_Receive(This->tf.source.pMemInputPin, pOutSample); + hr = IMemInputPin_Receive(This->source.pMemInputPin, pOutSample); if (hr != S_OK && hr != VFW_E_NOT_CONNECTED) { if (FAILED(hr)) ERR("Error sending sample (%x)\n", hr); @@ -220,6 +267,7 @@ error: This->lasttime_real = tStop; This->lasttime_sent = tMed; + LeaveCriticalSection(&This->stream_cs); return hr; } @@ -228,9 +276,9 @@ static BOOL is_audio_subtype(const GUID *guid) return !memcmp(&guid->Data2, &MEDIATYPE_Audio.Data2, sizeof(GUID) - sizeof(int)); } -static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_TYPE *mt) +static HRESULT acm_wrapper_sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl *filter = impl_from_TransformFilter(iface); + ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); const WAVEFORMATEX *wfx = (WAVEFORMATEX *)mt->pbFormat; HACMSTREAM drv; MMRESULT res; @@ -240,9 +288,9 @@ static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_T || wfx->wFormatTag == WAVE_FORMAT_PCM || wfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE) return VFW_E_TYPE_NOT_ACCEPTED; - CopyMediaType(&filter->tf.pmt, mt); - filter->tf.pmt.subtype.Data1 = WAVE_FORMAT_PCM; - filter->pWfOut = (WAVEFORMATEX *)filter->tf.pmt.pbFormat; + CopyMediaType(&filter->mt, mt); + filter->mt.subtype.Data1 = WAVE_FORMAT_PCM; + filter->pWfOut = (WAVEFORMATEX *)filter->mt.pbFormat; filter->pWfOut->wFormatTag = WAVE_FORMAT_PCM; filter->pWfOut->wBitsPerSample = 16; filter->pWfOut->nBlockAlign = filter->pWfOut->wBitsPerSample * filter->pWfOut->nChannels / 8; @@ -253,7 +301,7 @@ static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_T if ((res = acmStreamOpen(&drv, NULL, (WAVEFORMATEX *)wfx, filter->pWfOut, NULL, 0, 0, 0))) { ERR("Failed to open stream, error %u.\n", res); - FreeMediaType(&filter->tf.pmt); + FreeMediaType(&filter->mt); return VFW_E_TYPE_NOT_ACCEPTED; } @@ -262,34 +310,74 @@ static HRESULT acm_wrapper_connect_sink(TransformFilter *iface, const AM_MEDIA_T return S_OK; } -static HRESULT WINAPI ACMWrapper_BreakConnect(TransformFilter *tf, PIN_DIRECTION dir) +static void acm_wrapper_sink_disconnect(struct strmbase_sink *iface) { - ACMWrapperImpl *This = impl_from_TransformFilter(tf); + ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); - TRACE("(%p)->(%i)\n", This,dir); + if (filter->has) + acmStreamClose(filter->has, 0); + filter->has = 0; + filter->lasttime_real = filter->lasttime_sent = -1; +} - if (dir == PINDIR_INPUT) - { - if (This->has) - acmStreamClose(This->has, 0); +static const struct strmbase_sink_ops sink_ops = +{ + .base.pin_query_interface = acm_wrapper_sink_query_interface, + .base.pin_query_accept = acm_wrapper_sink_query_accept, + .base.pin_get_media_type = strmbase_pin_get_media_type, + .pfnReceive = acm_wrapper_sink_Receive, + .sink_connect = acm_wrapper_sink_connect, + .sink_disconnect = acm_wrapper_sink_disconnect, +}; - This->has = 0; - This->lasttime_real = This->lasttime_sent = -1; - } +static HRESULT acm_wrapper_source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &filter->source_IQualityControl_iface; + else if (IsEqualGUID(iid, &IID_IMediaSeeking)) + return IUnknown_QueryInterface(filter->seeking, iid, out); + else + return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); return S_OK; } -static HRESULT WINAPI ACMWrapper_DecideBufferSize(TransformFilter *tf, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +static HRESULT acm_wrapper_source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *mt) { - ACMWrapperImpl *pACM = impl_from_TransformFilter(tf); + ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(&mt->majortype, &filter->mt.majortype) + && (IsEqualGUID(&mt->subtype, &filter->mt.subtype) + || IsEqualGUID(&filter->mt.subtype, &GUID_NULL))) + return S_OK; + return S_FALSE; +} + +static HRESULT acm_wrapper_source_get_media_type(struct strmbase_pin *iface, + unsigned int index, AM_MEDIA_TYPE *mt) +{ + ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->filter); + + if (index) + return VFW_S_NO_MORE_ITEMS; + CopyMediaType(mt, &filter->mt); + return S_OK; +} + +static HRESULT WINAPI acm_wrapper_source_DecideBufferSize(struct strmbase_source *iface, + IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest) +{ + ACMWrapperImpl *filter = impl_from_strmbase_filter(iface->pin.filter); ALLOCATOR_PROPERTIES actual; if (!ppropInputRequest->cbAlign) ppropInputRequest->cbAlign = 1; - if (ppropInputRequest->cbBuffer < pACM->pWfOut->nAvgBytesPerSec / 2) - ppropInputRequest->cbBuffer = pACM->pWfOut->nAvgBytesPerSec / 2; + if (ppropInputRequest->cbBuffer < filter->pWfOut->nAvgBytesPerSec / 2) + ppropInputRequest->cbBuffer = filter->pWfOut->nAvgBytesPerSec / 2; if (!ppropInputRequest->cBuffers) ppropInputRequest->cBuffers = 1; @@ -297,28 +385,178 @@ static HRESULT WINAPI ACMWrapper_DecideBufferSize(TransformFilter *tf, IMemAlloc return IMemAllocator_SetProperties(pAlloc, ppropInputRequest, &actual); } -static const TransformFilterFuncTable ACMWrapper_FuncsTable = { - .pfnDecideBufferSize = ACMWrapper_DecideBufferSize, - .pfnReceive = ACMWrapper_Receive, - .transform_connect_sink = acm_wrapper_connect_sink, - .pfnBreakConnect = ACMWrapper_BreakConnect, +static const struct strmbase_source_ops source_ops = +{ + .base.pin_query_interface = acm_wrapper_source_query_interface, + .base.pin_query_accept = acm_wrapper_source_query_accept, + .base.pin_get_media_type = acm_wrapper_source_get_media_type, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, + .pfnDecideBufferSize = acm_wrapper_source_DecideBufferSize, +}; + +static ACMWrapperImpl *impl_from_source_IQualityControl(IQualityControl *iface) +{ + return CONTAINING_RECORD(iface, ACMWrapperImpl, source_IQualityControl_iface); +} + +static HRESULT WINAPI acm_wrapper_source_qc_QueryInterface(IQualityControl *iface, + REFIID iid, void **out) +{ + ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + return IPin_QueryInterface(&filter->source.pin.IPin_iface, iid, out); +} + +static ULONG WINAPI acm_wrapper_source_qc_AddRef(IQualityControl *iface) +{ + ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + return IPin_AddRef(&filter->source.pin.IPin_iface); +} + +static ULONG WINAPI acm_wrapper_source_qc_Release(IQualityControl *iface) +{ + ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + return IPin_Release(&filter->source.pin.IPin_iface); +} + +static HRESULT WINAPI acm_wrapper_source_qc_Notify(IQualityControl *iface, + IBaseFilter *sender, Quality q) +{ + ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + IQualityControl *peer; + HRESULT hr; + + TRACE("filter %p, sender %p, type %#x, proportion %u, late %s, timestamp %s.\n", + filter, sender, q.Type, q.Proportion, debugstr_time(q.Late), debugstr_time(q.TimeStamp)); + + if (filter->source_qc_sink) + return IQualityControl_Notify(filter->source_qc_sink, &filter->filter.IBaseFilter_iface, q); + + if (filter->sink.pin.peer + && SUCCEEDED(IPin_QueryInterface(filter->sink.pin.peer, &IID_IQualityControl, (void **)&peer))) + { + hr = IQualityControl_Notify(peer, &filter->filter.IBaseFilter_iface, q); + IQualityControl_Release(peer); + } + return hr; +} + +static HRESULT WINAPI acm_wrapper_source_qc_SetSink(IQualityControl *iface, IQualityControl *sink) +{ + ACMWrapperImpl *filter = impl_from_source_IQualityControl(iface); + + TRACE("filter %p, sink %p.\n", filter, sink); + + filter->source_qc_sink = sink; + + return S_OK; +} + +static const IQualityControlVtbl source_qc_vtbl = +{ + acm_wrapper_source_qc_QueryInterface, + acm_wrapper_source_qc_AddRef, + acm_wrapper_source_qc_Release, + acm_wrapper_source_qc_Notify, + acm_wrapper_source_qc_SetSink, +}; + +static struct strmbase_pin *acm_wrapper_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + + if (index == 0) + return &filter->sink.pin; + else if (index == 1) + return &filter->source.pin; + return NULL; +} + +static void acm_wrapper_destroy(struct strmbase_filter *iface) +{ + ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + + if (filter->sink.pin.peer) + IPin_Disconnect(filter->sink.pin.peer); + IPin_Disconnect(&filter->sink.pin.IPin_iface); + + if (filter->source.pin.peer) + IPin_Disconnect(filter->source.pin.peer); + IPin_Disconnect(&filter->source.pin.IPin_iface); + + strmbase_sink_cleanup(&filter->sink); + strmbase_source_cleanup(&filter->source); + + filter->stream_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&filter->stream_cs); + FreeMediaType(&filter->mt); + IUnknown_Release(filter->seeking); + strmbase_filter_cleanup(&filter->filter); + free(filter); +} + +static HRESULT acm_wrapper_init_stream(struct strmbase_filter *iface) +{ + ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + + BaseOutputPinImpl_Active(&filter->source); + return S_OK; +} + +static HRESULT acm_wrapper_cleanup_stream(struct strmbase_filter *iface) +{ + ACMWrapperImpl *filter = impl_from_strmbase_filter(iface); + + BaseOutputPinImpl_Inactive(&filter->source); + return S_OK; +} + +static const struct strmbase_filter_ops filter_ops = +{ + .filter_get_pin = acm_wrapper_get_pin, + .filter_destroy = acm_wrapper_destroy, + .filter_init_stream = acm_wrapper_init_stream, + .filter_cleanup_stream = acm_wrapper_cleanup_stream, }; HRESULT ACMWrapper_create(IUnknown *outer, void **out) { + ISeekingPassThru *passthrough; + ACMWrapperImpl *object; HRESULT hr; - ACMWrapperImpl* This; - *out = NULL; + if (!(object = calloc(1, sizeof(*object)))) + return E_OUTOFMEMORY; - hr = strmbase_transform_create(sizeof(ACMWrapperImpl), outer, &CLSID_ACMWrapper, - &ACMWrapper_FuncsTable, (IBaseFilter **)&This); + strmbase_filter_init(&object->filter, outer, &CLSID_ACMWrapper, &filter_ops); - if (FAILED(hr)) + InitializeCriticalSection(&object->stream_cs); + object->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": acm_wrapper.stream_cs"); + + strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + + strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + object->source_IQualityControl_iface.lpVtbl = &source_qc_vtbl; + + if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, + (IUnknown *)&object->source.pin.IPin_iface, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&object->seeking))) + { + strmbase_sink_cleanup(&object->sink); + strmbase_source_cleanup(&object->source); + strmbase_filter_cleanup(&object->filter); + free(object); return hr; + } - *out = &This->tf.filter.IUnknown_inner; - This->lasttime_real = This->lasttime_sent = -1; + IUnknown_QueryInterface(object->seeking, &IID_ISeekingPassThru, (void **)&passthrough); + ISeekingPassThru_Init(passthrough, FALSE, &object->sink.pin.IPin_iface); + ISeekingPassThru_Release(passthrough); - return hr; + object->lasttime_real = object->lasttime_sent = -1; + + TRACE("Created ACM wrapper %p.\n", object); + *out = &object->filter.IUnknown_inner; + + return S_OK; } diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c index 9c4fe4d0667..31b32b53ac9 100644 --- a/dlls/quartz/tests/acmwrapper.c +++ b/dlls/quartz/tests/acmwrapper.c @@ -446,42 +446,42 @@ static void test_unconnected_filter_state(void) ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Pause(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Paused, "Got state %u.\n", state); + ok(state == State_Paused, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(state == State_Stopped, "Got state %u.\n", state); hr = IBaseFilter_Run(filter, 0); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(state == State_Running, "Got state %u.\n", state); + ok(state == State_Running, "Got state %u.\n", state); hr = IBaseFilter_Stop(filter); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IBaseFilter_GetState(filter, 0, &state); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.25.1

4 6

[PATCH v2 1/4] ntdll: Check for an existing file on the server side.
by Zebediah Figura March 10, 2020

March 10, 2020

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ntdll/file.c | 16 ++-------------- server/fd.c | 10 ++++++++-- server/protocol.def | 1 + 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 5ecf293820e..f59e737baa5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2778,18 +2778,12 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, if (io->u.Status != STATUS_SUCCESS && io->u.Status != STATUS_NO_SUCH_FILE) break; - if (!info->ReplaceIfExists && io->u.Status == STATUS_SUCCESS) - { - RtlFreeAnsiString( &unix_name ); - io->u.Status = STATUS_OBJECT_NAME_COLLISION; - break; - } - SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->link = FALSE; + req->replace = info->ReplaceIfExists; wine_server_add_data( req, unix_name.Buffer, unix_name.Length ); io->u.Status = wine_server_call( req ); } @@ -2821,18 +2815,12 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, if (io->u.Status != STATUS_SUCCESS && io->u.Status != STATUS_NO_SUCH_FILE) break; - if (!info->ReplaceIfExists && io->u.Status == STATUS_SUCCESS) - { - RtlFreeAnsiString( &unix_name ); - io->u.Status = STATUS_OBJECT_NAME_COLLISION; - break; - } - SERVER_START_REQ( set_fd_name_info ) { req->handle = wine_server_obj_handle( handle ); req->rootdir = wine_server_obj_handle( attr.RootDirectory ); req->link = TRUE; + req->replace = info->ReplaceIfExists; wine_server_add_data( req, unix_name.Buffer, unix_name.Length ); io->u.Status = wine_server_call( req ); } diff --git a/server/fd.c b/server/fd.c index 5d80e218b97..c2cb3c96ac6 100644 --- a/server/fd.c +++ b/server/fd.c @@ -2325,7 +2325,7 @@ static void set_fd_disposition( struct fd *fd, int unlink ) /* set new name for the fd */ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, - data_size_t len, int create_link ) + data_size_t len, int create_link, int replace ) { struct inode *inode; struct stat st; @@ -2367,6 +2367,12 @@ static void set_fd_name( struct fd *fd, struct fd *root, const char *nameptr, if (!stat( name, &st )) { + if (!replace) + { + set_error( STATUS_OBJECT_NAME_COLLISION ); + goto failed; + } + /* can't replace directories or special files */ if (!S_ISREG( st.st_mode )) { @@ -2695,7 +2701,7 @@ DECL_HANDLER(set_fd_name_info) if ((fd = get_handle_fd_obj( current->process, req->handle, 0 ))) { - set_fd_name( fd, root_fd, get_req_data(), get_req_data_size(), req->link ); + set_fd_name( fd, root_fd, get_req_data(), get_req_data_size(), req->link, req->replace ); release_object( fd ); } if (root_fd) release_object( root_fd ); diff --git a/server/protocol.def b/server/protocol.def index 6c44b2b43f5..722993e59c7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3809,6 +3809,7 @@ struct handle_info obj_handle_t handle; /* handle to a file or directory */ obj_handle_t rootdir; /* root directory */ int link; /* link instead of renaming */ + int replace; /* replace an existing file? */ VARARG(filename,string); /* new file name */ @END -- 2.25.1

2 4

[PATCH] winegstreamer: Read into an existing buffer if requested.
by Zebediah Figura March 10, 2020

March 10, 2020

From: Zebediah Figura <zfigura(a)codeweavers.com> oggdemux needs this. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/winegstreamer/gstdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a51354b13c..e9548e80e4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -896,9 +896,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 HRESULT hr; GstMapInfo info; - TRACE("%p %s %i %p\n", pad, wine_dbgstr_longlong(ofs), len, buf); + TRACE("pad %p, offset %s, length %u, buffer %p.\n", pad, wine_dbgstr_longlong(ofs), len, *buf); - *buf = NULL; if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->nextpullofs; if (ofs >= This->filesize) { @@ -909,7 +908,8 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 len = This->filesize - ofs; This->nextpullofs = ofs + len; - *buf = gst_buffer_new_and_alloc(len); + if (!*buf) + *buf = gst_buffer_new_and_alloc(len); gst_buffer_map(*buf, &info, GST_MAP_WRITE); hr = IAsyncReader_SyncRead(This->reader, ofs, len, info.data); gst_buffer_unmap(*buf, &info); -- 2.25.1

1 0

[PATCH] xaudio2/tests: Add some refcount tests
by Andrew Eikum March 10, 2020

March 10, 2020

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- These tests will fail without Alistair's patches. I can resend after those patches are merged so the testbot runs with them applied. dlls/xaudio2_7/tests/xaudio2.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index f2bffdf29f2..502b513fb6b 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -948,6 +948,7 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) HRESULT hr; IUnknown *fx_unk; unsigned int i; + ULONG rc; HRESULT (CDECL *pCreateFX)(REFCLSID,IUnknown**) = NULL; @@ -1009,7 +1010,8 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "XAPO via CreateFX should have been released, got refcount: %u\n", rc); } hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, @@ -1027,7 +1029,8 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "AudioVolumeMeter via CreateFX should have been released, got refcount: %u\n", rc); } hr = pCreateFX(ar_clsids[version - 20], &fx_unk); @@ -1038,7 +1041,8 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "AudioReverb via CreateFX should have been released, got refcount: %u\n", rc); } FreeLibrary(xapofxdll); @@ -1050,6 +1054,7 @@ static void test_xapo_creation_modern(const char *module) HRESULT hr; IUnknown *fx_unk; unsigned int i; + ULONG rc; HRESULT (CDECL *pCreateFX)(REFCLSID,IUnknown**,void*,UINT32) = NULL; HRESULT (WINAPI *pCAVM)(IUnknown**) = NULL; @@ -1090,7 +1095,8 @@ static void test_xapo_creation_modern(const char *module) ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "XAPO via CreateFX should have been released, got refcount: %u\n", rc); } hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, @@ -1109,7 +1115,8 @@ static void test_xapo_creation_modern(const char *module) ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "XAPO via legacy CreateFX should have been released, got refcount: %u\n", rc); } pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter"); @@ -1123,7 +1130,8 @@ static void test_xapo_creation_modern(const char *module) ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "XAPO via CreateAudioVolumeMeter should have been released, got refcount: %u\n", rc); } pCAR = (void*)GetProcAddress(xaudio2dll, "CreateAudioReverb"); @@ -1137,7 +1145,8 @@ static void test_xapo_creation_modern(const char *module) ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); if(SUCCEEDED(hr)) IXAPO_Release(xapo); - IUnknown_Release(fx_unk); + rc = IUnknown_Release(fx_unk); + ok(rc == 0, "XAPO via CreateAudioReverb should have been released, got refcount: %u\n", rc); } FreeLibrary(xaudio2dll); @@ -1245,6 +1254,7 @@ START_TEST(xaudio2) IXAudio2 *xa = NULL; HANDLE xa28dll; UINT32 has_devices; + ULONG rc; CoInitialize(NULL); @@ -1279,7 +1289,8 @@ START_TEST(xaudio2) }else skip("No audio devices available\n"); - IXAudio27_Release(xa27); + rc = IXAudio27_Release(xa27); + ok(rc == 0, "IXAudio2.7 object should have been released, got refcount %u\n", rc); }else win_skip("XAudio 2.7 not available\n"); @@ -1304,7 +1315,8 @@ START_TEST(xaudio2) }else skip("No audio devices available\n"); - IXAudio2_Release(xa); + rc = IXAudio2_Release(xa); + ok(rc == 0, "IXAudio2 object should have been released, got refcount %u\n", rc); }else win_skip("XAudio 2.8 not available\n"); -- 2.25.1

2 1

[PATCH v7 1/4] jscript: Lookup and ref the named item's dispatch first, during interpretion.
by Gabriel Ivăncescu March 10, 2020

March 10, 2020

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/engine.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 5b96895..044e32c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -669,6 +669,15 @@ static HRESULT identifier_eval(script_ctx_t *ctx, BSTR identifier, exprval_t *re return S_OK; } } + + if(ctx->call_ctx->bytecode->named_item) { + jsdisp_t *script_obj = ctx->call_ctx->bytecode->named_item->script_obj; + hres = jsdisp_get_id(script_obj, identifier, 0, &id); + if(SUCCEEDED(hres)) { + exprval_set_disp_ref(ret, to_disp(script_obj), id); + return S_OK; + } + } } hres = jsdisp_get_id(ctx->global, identifier, 0, &id); @@ -1254,13 +1263,17 @@ static HRESULT interp_identifier_ref(script_ctx_t *ctx, BSTR identifier, unsigne return hres; if(exprval.type == EXPRVAL_INVALID && (flags & fdexNameEnsure)) { + jsdisp_t *script_obj = ctx->global; DISPID id; - hres = jsdisp_get_id(ctx->global, identifier, fdexNameEnsure, &id); + if(ctx->call_ctx->bytecode->named_item) + script_obj = ctx->call_ctx->bytecode->named_item->script_obj; + + hres = jsdisp_get_id(script_obj, identifier, fdexNameEnsure, &id); if(FAILED(hres)) return hres; - exprval_set_disp_ref(&exprval, to_disp(ctx->global), id); + exprval_set_disp_ref(&exprval, to_disp(script_obj), id); } if(exprval.type == EXPRVAL_JSVAL || exprval.type == EXPRVAL_INVALID) { @@ -2995,6 +3008,8 @@ HRESULT exec_source(script_ctx_t *ctx, DWORD flags, bytecode_t *bytecode, functi hres = create_named_item_script_obj(ctx, bytecode->named_item); if(FAILED(hres)) return hres; } + if(variable_obj == ctx->global) + variable_obj = bytecode->named_item->script_obj; } if(!ctx->ei->enter_notified) { -- 2.21.0

2 8

[PATCH] jscript: Don't lookup global members for bytecodes with a named item.
by Jacek Caban March 10, 2020

March 10, 2020

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/engine.c | 4 +++- dlls/jscript/tests/jscript.c | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH] xaudio2_7: Correct reference count on newly created IXAPO object
by Alistair Leslie-Hughes March 10, 2020

March 10, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xaudio2_7/xapo.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/xaudio2_7/xapo.c b/dlls/xaudio2_7/xapo.c index 9788cb38e8..e64523ea19 100644 --- a/dlls/xaudio2_7/xapo.c +++ b/dlls/xaudio2_7/xapo.c @@ -367,12 +367,9 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut } hr = IXAPO_QueryInterface(&object->IXAPO_iface, riid, ppobj); - if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, object); - return hr; - } + IXAPO_Release(&object->IXAPO_iface); - return S_OK; + return hr; } static HRESULT WINAPI xapocf_LockServer(IClassFactory *iface, BOOL dolock) -- 2.25.1

2 1

[PATCH v2] xaudio2_7: Correct reference count on newly created XAudio2 object
by Alistair Leslie-Hughes March 10, 2020

March 10, 2020

FAudioCOMConstructWithCustomAllocatorEXT initialize the reference count to 1, then QueryInterface increase the count to 2. Thus the finial release wont be called if a balanced AddRef/Release is used. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/xaudio2_7/xaudio_dll.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index a87e0124d3..fa0361182c 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1955,10 +1955,8 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p FAudio_RegisterForCallbacks(object->faudio, &object->FAudioEngineCallback_vtbl); hr = IXAudio2_QueryInterface(&object->IXAudio2_iface, riid, ppobj); + IXAudio2_Release(&object->IXAudio2_iface); if(FAILED(hr)){ - object->lock.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&object->lock); - HeapFree(GetProcessHeap(), 0, object); return hr; } -- 2.25.1

2 1