April 2019 - Wine-Commits - list.winehq.org

Nikolay Sivov : mfplat/tests: Add some return value checks (Coverity).
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 622a84c637835f8ac73aa460c69e121e4899bbc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=622a84c637835f8ac73aa460… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 6 22:02:41 2019 +0300 mfplat/tests: Add some return value checks (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f081d97..176f339 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -308,7 +308,8 @@ static void test_source_resolver(void) IMFSourceResolver_Release(resolver); - MFShutdown(); + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); DeleteFileW(filename); } @@ -1787,7 +1788,7 @@ static void test_allocate_queue(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = MFShutdown(); - ok(hr == S_OK, "Failed to shutdown, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); } static void test_MFCopyImage(void) @@ -2074,7 +2075,8 @@ static void test_periodic_callback(void) if (!pMFAddPeriodicCallback) { win_skip("Periodic callbacks are not supported.\n"); - MFShutdown(); + hr = MFShutdown(); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); return; }

1 0

Zebediah Figura : qcap/tests: Add some tests for IBaseFilter::EnumPins() on the AVI compressor.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 9e6ca7cdb62d1561d5eace7805618109598779dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e6ca7cdb62d1561d5eace78… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 21:14:55 2019 -0500 qcap/tests: Add some tests for IBaseFilter::EnumPins() on the AVI compressor. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 53856d6..5b01e14 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -40,6 +40,13 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static void test_interfaces(IBaseFilter *filter) { check_interface(filter, &IID_IBaseFilter, TRUE); @@ -61,6 +68,124 @@ static void test_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IVideoWindow, FALSE); } +static void test_enum_pins(IBaseFilter *filter) +{ + IEnumPins *enum1, *enum2; + ULONG ref, count; + IPin *pins[3]; + HRESULT hr; + + ref = get_refcount(filter); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IBaseFilter_EnumPins(filter, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IBaseFilter_EnumPins(filter, &enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, NULL, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(enum1); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + IPin_Release(pins[0]); + ref = get_refcount(filter); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, NULL); + ok(hr == E_INVALIDARG, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Next(enum1, 2, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(!count, "Got count %u.\n", count); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 3, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 2, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 3); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum2, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + IEnumPins_Release(enum2); + IEnumPins_Release(enum1); +} + static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LPARAM lparam1, LPARAM lparam2) { @@ -127,6 +252,7 @@ START_TEST(avico) ok(hr == S_OK, "Got hr %#x.\n", hr); test_interfaces(filter); + test_enum_pins(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Zebediah Figura : quartz/systemclock: Avoid a use-after-free (Coverity).
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 5811cac5c2825804f78336cf24ac46c4b28d439d URL: https://source.winehq.org/git/wine.git/?a=commit;h=5811cac5c2825804f78336cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 14:25:51 2019 -0500 quartz/systemclock: Avoid a use-after-free (Coverity). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 15f8ea0..6bb1f47 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -85,6 +85,7 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) SetEvent(sink->handle); list_remove(&sink->entry); heap_free(sink); + continue; } }

1 0

Nikolay Sivov : mfplat: Fix early return from GetString() (Coverity).
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 53f0a25e6db64ced30551bf41631893f24eed4f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53f0a25e6db64ced30551bf4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 6 22:02:39 2019 +0300 mfplat: Fix early return from GetString() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 8303bf2..13c48cf 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -1260,9 +1260,9 @@ HRESULT attributes_GetString(struct attributes *attributes, REFGUID key, WCHAR * *length = len; if (size <= len) - return STRSAFE_E_INSUFFICIENT_BUFFER; - - memcpy(value, attribute->value.u.pwszVal, (len + 1) * sizeof(WCHAR)); + hr = STRSAFE_E_INSUFFICIENT_BUFFER; + else + memcpy(value, attribute->value.u.pwszVal, (len + 1) * sizeof(WCHAR)); } else hr = MF_E_INVALIDTYPE;

1 0

André Hentschel : kernel32: Add forward for RtlInstallFunctionTableCallback on ARM/ARM64.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 63352b5cce74eff0b7e9e5ed8e10f49bb126d755 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63352b5cce74eff0b7e9e5ed… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Apr 6 14:36:03 2019 +0200 kernel32: Add forward for RtlInstallFunctionTableCallback on ARM/ARM64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c8d52ce..1085879 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1292,7 +1292,7 @@ @ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory -@ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback +@ cdecl -arch=arm,arm64,x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback @ stdcall -arch=arm,x86_64 RtlLookupFunctionEntry(long ptr ptr) ntdll.RtlLookupFunctionEntry @ stdcall RtlMoveMemory(ptr ptr long) ntdll.RtlMoveMemory @ stdcall -arch=x86_64,arm,arm64 RtlPcToFileHeader(ptr ptr) ntdll.RtlPcToFileHeader

1 0

Nikolay Sivov : mfplat: Output warning for unexpected result object passed for periodic callback (Coverity).
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 88924d6a41ca92799441060da7078354615ec3ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=88924d6a41ca92799441060d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 6 22:02:40 2019 +0300 mfplat: Output warning for unexpected result object passed for periodic callback (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/queue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index c2cc623..36c5056 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -1066,7 +1066,8 @@ static HRESULT WINAPI periodic_callback_Invoke(IMFAsyncCallback *iface, IMFAsync struct periodic_callback *callback = impl_from_IMFAsyncCallback(iface); IUnknown *context = NULL; - IMFAsyncResult_GetObject(result, &context); + if (FAILED(IMFAsyncResult_GetObject(result, &context))) + WARN("Expected object to be set for result object.\n"); callback->callback(context);

1 0

Nikolay Sivov : mfreadwrite/tests: Remove some null checks.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: ea76c97ccd8bc62101c10b7a7d9a3437862761cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea76c97ccd8bc62101c10b7a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 6 22:02:43 2019 +0300 mfreadwrite/tests: Remove some null checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/mfplat.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 490b84d..c031ddc 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -79,10 +79,8 @@ static void test_MFCreateSourceReaderFromByteStream(void) todo_wine ok(hr == S_OK || hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); - if(stream) - IStream_Release(stream); - if(bytestream) - IMFByteStream_Release(bytestream); + IStream_Release(stream); + IMFByteStream_Release(bytestream); IMFAttributes_Release(attributes); if(source) IMFSourceReader_Release(source);

1 0

Zebediah Figura : ntdll: Avoid crashing while tracing parameters to NtCreateNamedPipeFile().
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 7dc459f3d131fd6343d4137df9fa5be1eb79e8b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dc459f3d131fd6343d4137d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 6 15:54:31 2019 -0500 ntdll: Avoid crashing while tracing parameters to NtCreateNamedPipeFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index e8775a3..3dafdcf 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3481,13 +3481,13 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access, data_size_t len; struct object_attributes *objattr; + if (!attr) return STATUS_INVALID_PARAMETER; + TRACE("(%p %x %s %p %x %d %x %d %d %d %d %d %d %p)\n", - handle, access, debugstr_w(attr->ObjectName->Buffer), iosb, sharing, dispo, + handle, access, debugstr_us(attr->ObjectName), iosb, sharing, dispo, options, pipe_type, read_mode, completion_mode, max_inst, inbound_quota, outbound_quota, timeout); - if (!attr) return STATUS_INVALID_PARAMETER; - /* assume we only get relative timeout */ if (timeout->QuadPart > 0) FIXME("Wrong time %s\n", wine_dbgstr_longlong(timeout->QuadPart));

1 0

Huw Davies : configure: Use a separate cache variable for the cross-compiler flags.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 56a30ff60ee126cf3e68070c7aabd3a037778f18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56a30ff60ee126cf3e68070c… Author: Huw Davies <huw(a)codeweavers.com> Date: Sat Apr 6 10:41:07 2019 +0100 configure: Use a separate cache variable for the cross-compiler flags. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 2 +- configure | 240 ++++++++++++++++++++++++++++++------------------------------- 2 files changed, 121 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56a30ff60ee126cf3e68…

1 0

Alexandre Julliard : wine.inf: Remove invalid comma.
by Alexandre Julliard April 8, 2019

April 8, 2019

Module: wine Branch: master Commit: 1bb1940061b845ff32b6d79f9ca432c5030f4a89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb1940061b845ff32b6d79f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Apr 6 20:59:51 2019 +0200 wine.inf: Remove invalid comma. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46968 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 48a9f4b..4d28a93 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2603,7 +2603,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,fltmgr.sys -12,,ksecdd.sys, +12,,ksecdd.sys 12,,mountmgr.sys 12,,ndis.sys 12,,tdi.sys

1 0