July 2020 - Wine-devel - list.winehq.org

[PATCH] gdiplus: Fix crash if failed to create bitmap.
by Jiajin Cui 20 Jul '20

20 Jul '20

2 1

[PATCH 1/6] amstream/tests: Fix AMMultiMediaStream::OpenFile test.
by Anton Baskanov 20 Jul '20

20 Jul '20

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 20 Jul '20

20 Jul '20

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 20 Jul '20

20 Jul '20

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 20 Jul '20

20 Jul '20

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 20 Jul '20

20 Jul '20

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

[PATCH 1/4] quartz/videorenderer: Render preroll samples.
by Zebediah Figura 20 Jul '20

20 Jul '20

The documentation specifies that preroll samples shouldn't be rendered, but the video renderer renders them anyway. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/videorenderer.c | 10 ---------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 4ae320e0225..ac2cadc4b17 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -797,6 +797,9 @@ static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, uns hr = IMediaSample_SetTime(sample, &start_time, &end_time); ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetPreroll(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + params->sink = sink; params->sample = sample; thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index f635d9eaac0..eb6accf2d34 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -82,15 +82,6 @@ static void VideoRenderer_AutoShowWindow(struct video_renderer *This) ShowWindow(This->window.hwnd, SW_SHOW); } -static HRESULT WINAPI VideoRenderer_ShouldDrawSampleNow(struct strmbase_renderer *filter, - IMediaSample *pSample, REFERENCE_TIME *start, REFERENCE_TIME *end) -{ - /* Preroll means the sample isn't shown, this is used for key frames and things like that */ - if (IMediaSample_IsPreroll(pSample) == S_OK) - return E_FAIL; - return S_FALSE; -} - static HRESULT WINAPI VideoRenderer_DoRenderSample(struct strmbase_renderer *iface, IMediaSample *pSample) { struct video_renderer *filter = impl_from_strmbase_renderer(iface); @@ -253,7 +244,6 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_init_stream = video_renderer_init_stream, .renderer_start_stream = video_renderer_start_stream, .renderer_stop_stream = video_renderer_stop_stream, - .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .renderer_destroy = video_renderer_destroy, .renderer_query_interface = video_renderer_query_interface, .renderer_pin_query_interface = video_renderer_pin_query_interface, -- 2.27.0

1 3

[PATCH 4/4] kernelbase: Reimplement GetVolumeInformation on top of GetVolumeInformationByHandle.
by Erich E. Hoover 20 Jul '20

20 Jul '20

This patch removes the volume querying information duplication in kernelbase by re-implementing GetVolumeInformation using GetVolumeInformationByHandle (itself implemented with NtQueryVolumeInformationFile). Best, Erich

1 0

[PATCH 3/4] ntdll: Allow NtQueryVolumeInformationFile to query volume information from the mountmgr.
by Erich E. Hoover 20 Jul '20

20 Jul '20

This patch allows NtQueryVolumeInformationFile to pass FileFsVolumeInformation and FileFsAttributeInformation requests to the mountmgr. These requests currently do not work for NT device paths, which results in a bunch of duplication in kernelbase. Best, Erich

1 0

[PATCH v2 2/4] mountmgr: Add support for IRP_MJ_QUERY_VOLUME_INFORMATION.
by Erich E. Hoover 20 Jul '20

20 Jul '20

This patch allows the mountmgr to handle the volume information request IRP, allowing volume information to be queried from the mountmgr. v2: Per Zeb's request, now storing the volume with the disk_device so that the lookup doesn't require a search. Best, Erich

1 0