- Wine-Devel - list.winehq.org

[PATCH 5/7] windowscodecs: Add more formats to get_bytes_per_block_from_format().
by Ziqing Hui July 21, 2020

July 21, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 101 ++++++++++++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 6 -- 2 files changed, 98 insertions(+), 9 deletions(-)

2 3

[PATCH 1/5] strmbase: Get rid of BaseRendererImpl_Receive().
by Zebediah Figura July 21, 2020

July 21, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/strmbase/renderer.c | 142 ++++++++++++++++++--------------------- include/wine/strmbase.h | 2 - 2 files changed, 66 insertions(+), 78 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1f0a747a2ce..bc2d0551fe3 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -169,7 +169,72 @@ static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void static HRESULT WINAPI BaseRenderer_Receive(struct strmbase_sink *pin, IMediaSample *sample) { struct strmbase_renderer *filter = impl_from_IPin(&pin->pin.IPin_iface); - return BaseRendererImpl_Receive(filter, sample); + REFERENCE_TIME start, stop; + AM_MEDIA_TYPE *mt; + HRESULT hr; + + if (filter->eos || filter->sink.flushing) + return S_FALSE; + + if (filter->filter.state == State_Stopped) + return VFW_E_WRONG_STATE; + + if (IMediaSample_GetMediaType(sample, &mt) == S_OK) + { + TRACE("Format change.\n"); + strmbase_dump_media_type(mt); + + if (FAILED(filter->pFuncsTable->pfnCheckMediaType(filter, mt))) + return VFW_E_TYPE_NOT_ACCEPTED; + DeleteMediaType(mt); + } + + EnterCriticalSection(&filter->csRenderLock); + if (filter->filter.state == State_Paused) + SetEvent(filter->state_event); + + if (filter->filter.clock && SUCCEEDED(IMediaSample_GetTime(sample, &start, &stop))) + { + REFERENCE_TIME now; + DWORD_PTR cookie; + + strmbase_passthrough_update_time(&filter->passthrough, start); + + IReferenceClock_GetTime(filter->filter.clock, &now); + + if (now - filter->stream_start - start <= -10000) + { + HANDLE handles[2] = {filter->advise_event, filter->flush_event}; + DWORD ret; + + IReferenceClock_AdviseTime(filter->filter.clock, filter->stream_start, + start, (HEVENT)filter->advise_event, &cookie); + + LeaveCriticalSection(&filter->csRenderLock); + + ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); + IReferenceClock_Unadvise(filter->filter.clock, cookie); + + if (ret == 1) + { + TRACE("Flush signaled; discarding current sample.\n"); + return S_OK; + } + + EnterCriticalSection(&filter->csRenderLock); + } + } + else + start = stop = -1; + + QualityControlRender_BeginRender(&filter->qc, start, stop); + hr = filter->pFuncsTable->pfnDoRenderSample(filter, sample); + QualityControlRender_EndRender(&filter->qc); + QualityControlRender_DoQOS(&filter->qc); + + LeaveCriticalSection(&filter->csRenderLock); + + return hr; } static HRESULT sink_connect(struct strmbase_sink *iface, IPin *peer, const AM_MEDIA_TYPE *mt) @@ -267,81 +332,6 @@ void strmbase_renderer_cleanup(struct strmbase_renderer *filter) strmbase_filter_cleanup(&filter->filter); } -HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *This, IMediaSample *pSample) -{ - REFERENCE_TIME start, stop; - AM_MEDIA_TYPE *pmt; - HRESULT hr; - - TRACE("(%p)->%p\n", This, pSample); - - if (This->eos || This->sink.flushing) - return S_FALSE; - - if (This->filter.state == State_Stopped) - return VFW_E_WRONG_STATE; - - if (IMediaSample_GetMediaType(pSample, &pmt) == S_OK) - { - TRACE("Format change.\n"); - strmbase_dump_media_type(pmt); - - if (FAILED(This->pFuncsTable->pfnCheckMediaType(This, pmt))) - { - return VFW_E_TYPE_NOT_ACCEPTED; - } - DeleteMediaType(pmt); - } - - EnterCriticalSection(&This->csRenderLock); - if (This->filter.state == State_Paused) - SetEvent(This->state_event); - - /* Wait for render Time */ - if (This->filter.clock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) - { - REFERENCE_TIME now; - DWORD_PTR cookie; - - strmbase_passthrough_update_time(&This->passthrough, start); - - IReferenceClock_GetTime(This->filter.clock, &now); - - if (now - This->stream_start - start <= -10000) - { - HANDLE handles[2] = {This->advise_event, This->flush_event}; - DWORD ret; - - IReferenceClock_AdviseTime(This->filter.clock, This->stream_start, - start, (HEVENT)This->advise_event, &cookie); - - LeaveCriticalSection(&This->csRenderLock); - - ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); - IReferenceClock_Unadvise(This->filter.clock, cookie); - - if (ret == 1) - { - TRACE("Flush signaled, discarding current sample.\n"); - return S_OK; - } - - EnterCriticalSection(&This->csRenderLock); - } - } - else - start = stop = -1; - - QualityControlRender_BeginRender(&This->qc, start, stop); - hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); - QualityControlRender_EndRender(&This->qc); - QualityControlRender_DoQOS(&This->qc); - - LeaveCriticalSection(&This->csRenderLock); - - return hr; -} - void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops) { diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9e0d4e7d479..24bb97702b5 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -334,8 +334,6 @@ struct strmbase_renderer_ops HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); }; -HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample); - void strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops); void strmbase_renderer_cleanup(struct strmbase_renderer *filter); -- 2.27.0

2 5

Interop with custom clipboard format
by Gabriel Kind July 21, 2020

July 21, 2020

Hello, I want to interop with a Windows Application that uses a custom clipboard format in SetClipboardData. Is it possible to access this custom format from X11? 01a4:trace:clipboard:SetClipboardData 024b 0x1a45fba I use "xclip -selection clipboard -o -t TARGETS" and it only lists me TARGETS MULTIPLE <- This one is empty TIMESTAMP <- this is 0 As a workaround I could create a small Windows application for IPC with my Linux program to Get/Set this format but maybe there is a simpler way? :) Bye Gabriel

1 0

[PATCH] winevulkan: Update to VK spec version 1.2.148.
by Liam Middlebrook July 20, 2020

July 20, 2020

Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Arthur Huillet <ahuillet(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 04b263e3e4..dd86016117 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.2.145" +VK_XML_VERSION = "1.2.148" WINE_VK_VERSION = (1, 2) # Filenames to create. -- 2.26.2

2 1

[PATCH] gdiplus: Fix crash if failed to create bitmap.
by Jiajin Cui July 20, 2020

July 20, 2020

2 1

[PATCH 1/6] amstream/tests: Fix AMMultiMediaStream::OpenFile test.
by Anton Baskanov July 20, 2020

July 20, 2020

Fixes the following issues: - OpenFile failes on native with VFW_E_CANNOT_CONNECT as there are no renderes in the graph. - IMediaSeeking checks are called with a wrong object. - IMediaSeeking checks fail as there are no streams. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/amstream/tests/amstream.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a81cdba3f3..e962d85e73 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -231,8 +231,10 @@ static void test_interfaces(void) static void test_openfile(void) { + IMediaStreamFilter *filter; IAMMultiMediaStream *pams; HRESULT hr; + LONG ref; IGraphBuilder* pgraph; if (!(pams = create_ammultimediastream())) @@ -245,13 +247,9 @@ static void test_openfile(void) if (pgraph) IGraphBuilder_Release(pgraph); - check_interface(pams, &IID_IMediaSeeking, FALSE); - - hr = IAMMultiMediaStream_OpenFile(pams, L"test.avi", 0); + hr = IAMMultiMediaStream_OpenFile(pams, L"test.avi", AMMSF_NORENDER); ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); - check_interface(pams, &IID_IMediaSeeking, TRUE); - hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); ok(hr==S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); ok(pgraph!=NULL, "Filtergraph should be created\n"); @@ -260,6 +258,24 @@ static void test_openfile(void) IGraphBuilder_Release(pgraph); IAMMultiMediaStream_Release(pams); + + pams = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(pams, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(pams, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, FALSE); + + hr = IAMMultiMediaStream_OpenFile(pams, L"test.avi", 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_interface(filter, &IID_IMediaSeeking, TRUE); + + ref = IAMMultiMediaStream_Release(pams); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static void test_renderfile(void) -- 2.17.1

2 9

[PATCH] qcap/tests: Avoid test failures in test_seeking().
by Gijs Vermeulen July 20, 2020

July 20, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/qcap/tests/avimux.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index 572314f8ab..d1a67a01a1 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -784,11 +784,13 @@ static void test_seeking(void) hr = IMediaSeeking_GetDuration(seeking, &time); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); + if (hr == S_OK) + ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); hr = IMediaSeeking_GetCurrentPosition(seeking, &time); todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); + if (hr == S_OK) + ok(!time, "Got duration %s.\n", wine_dbgstr_longlong(time)); hr = IMediaSeeking_GetStopPosition(seeking, &time); ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); -- 2.27.0

2 1

[PATCH] mountmgr.sys: Use SystemBuffer output for IOCTL_STORAGE_QUERY_PROPERTY.
by Derek Lesho July 20, 2020

July 20, 2020

In METHOD_BUFFERED ioctls, SystemBuffer must be used as both the input and output buffer. Using UserBuffer directly, without any checks is dangerous and non-functional, as it will be overwritten by the contents of SystemBuffer in a correct implementation. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/mountmgr.sys/device.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index f7a1f1e9b55..97208da4819 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1771,12 +1771,11 @@ static void query_property( struct disk_device *device, IRP *irp ) if (device->serial) len += strlen( device->serial ) + 1; - if (!irp->UserBuffer - || irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER)) + if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < sizeof(STORAGE_DESCRIPTOR_HEADER)) irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; else if (irpsp->Parameters.DeviceIoControl.OutputBufferLength < len) { - descriptor = irp->UserBuffer; + descriptor = irp->AssociatedIrp.SystemBuffer; descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR); descriptor->Size = len; irp->IoStatus.Information = sizeof(STORAGE_DESCRIPTOR_HEADER); @@ -1786,8 +1785,8 @@ static void query_property( struct disk_device *device, IRP *irp ) { FIXME( "Faking StorageDeviceProperty data\n" ); - memset( irp->UserBuffer, 0, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); - descriptor = irp->UserBuffer; + memset( irp->AssociatedIrp.SystemBuffer, 0, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); + descriptor = irp->AssociatedIrp.SystemBuffer; descriptor->Version = sizeof(STORAGE_DEVICE_DESCRIPTOR); descriptor->Size = len; descriptor->DeviceType = FILE_DEVICE_DISK; -- 2.27.0

1 0

[PATCH] qcap/tests: Initialize time to 1 in test_seeking() to avoid test failures.
by Gijs Vermeulen July 20, 2020

July 20, 2020

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/qcap/tests/avimux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index 572314f8ab..9f0f593afc 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -667,7 +667,7 @@ static void test_enum_media_types(void) static void test_seeking(void) { IBaseFilter *filter = create_avi_mux(); - LONGLONG time, current, stop; + LONGLONG current, stop, time = 1; IMediaSeeking *seeking; unsigned int i; GUID format; -- 2.27.0

2 1

[PATCH 3/3] msvcrt: Don't use get_char_typeW in _iswctype_l.
by Piotr Caban July 20, 2020

July 20, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/wcs.c | 14 ++++++++++++-- dlls/ucrtbase/tests/misc.c | 10 ++++------ 3 files changed, 17 insertions(+), 8 deletions(-)

2 1