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

Jacek Caban : ntoskrnl.exe: Open thread with THREAD_QUERY_INFORMATION access in KeGetCurrentThread.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: 2017db7d0af4421357ad58fee880f6eeb162e4f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2017db7d0af4421357ad58fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 12 15:20:28 2019 +0200 ntoskrnl.exe: Open thread with THREAD_QUERY_INFORMATION access in KeGetCurrentThread. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 861eb40..3789abd 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2510,7 +2510,8 @@ PRKTHREAD WINAPI KeGetCurrentThread(void) HANDLE handle = GetCurrentThread(); /* FIXME: we shouldn't need it, GetCurrentThread() should be client thread already */ - if (GetCurrentThreadId() == request_thread) handle = OpenThread( 0, FALSE, client_tid ); + if (GetCurrentThreadId() == request_thread) + handle = OpenThread( THREAD_QUERY_INFORMATION, FALSE, client_tid ); kernel_object_from_handle( handle, PsThreadType, (void**)&thread ); if (handle != GetCurrentThread()) NtClose( handle );

1 0

Zebediah Figura : qcap/tests: Remove some unnecessary workarounds.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: 5f71a3f125343c9e4f21ef192668eb4da455d20a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f71a3f125343c9e4f21ef19… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:51 2019 -0500 qcap/tests: Remove some unnecessary workarounds. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 42 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index f62a88f..0c79ea7 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -1,5 +1,5 @@ /* - * SmartTeeFilter tests + * Smart tee filter unit tests * * Copyright 2015 Damjan Jovanovic * @@ -18,18 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" #define COBJMACROS -#include <dshow.h> -#include <guiddef.h> -#include <devguid.h> -#include <stdio.h> - -#include "wine/strmbase.h" +#include "dshow.h" #include "wine/test.h" static HANDLE event; @@ -2022,25 +2012,19 @@ end: START_TEST(smartteefilter) { - if (SUCCEEDED(CoInitialize(NULL))) - { - event = CreateEventW(NULL, FALSE, FALSE, NULL); - if (event) { - test_smart_tee_filter_aggregation(); - test_smart_tee_filter(); + CoInitialize(NULL); - test_audio_smart_tee_filter_auto_insertion(test_audio_preview); - test_audio_smart_tee_filter_auto_insertion(test_audio_capture); + event = CreateEventW(NULL, FALSE, FALSE, NULL); - test_video_smart_tee_filter_auto_insertion(test_video_preview); - test_video_smart_tee_filter_auto_insertion(test_video_capture); + test_smart_tee_filter_aggregation(); + test_smart_tee_filter(); - CloseHandle(event); - } else - skip("CreateEvent failed, error=%u\n", GetLastError()); + test_audio_smart_tee_filter_auto_insertion(test_audio_preview); + test_audio_smart_tee_filter_auto_insertion(test_audio_capture); - CoUninitialize(); - } - else - skip("CoInitialize failed\n"); + test_video_smart_tee_filter_auto_insertion(test_video_preview); + test_video_smart_tee_filter_auto_insertion(test_video_capture); + + CloseHandle(event); + CoUninitialize(); }

1 0

Zebediah Figura : qcap/tests: Add some tests for smart tee filter interfaces.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: c6f95af31dc59eac1f1f5bcbe0b23d78ba825fe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6f95af31dc59eac1f1f5bcb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:52 2019 -0500 qcap/tests: Add some tests for smart tee filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 0c79ea7..5bcb82d 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -24,6 +24,57 @@ static HANDLE event; +static IBaseFilter *create_smart_tee(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_SmartTee, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + return filter; +} + +#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) +static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) +{ + IUnknown *iface = iface_ptr; + HRESULT hr, expected_hr; + IUnknown *unk; + + expected_hr = supported ? S_OK : E_NOINTERFACE; + + hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(unk); +} + +static void test_interfaces(void) +{ + IBaseFilter *filter = create_smart_tee(); + ULONG ref; + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IKsPropertySet, FALSE); + check_interface(filter, &IID_IMediaPosition, FALSE); + check_interface(filter, &IID_IMediaSeeking, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IQualityControl, FALSE); + check_interface(filter, &IID_IQualProp, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVideoWindow, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got unexpected refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -2016,6 +2067,8 @@ START_TEST(smartteefilter) event = CreateEventW(NULL, FALSE, FALSE, NULL); + test_interfaces(); + test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Zebediah Figura : qcap/tests: Add some more tests for IBaseFilter:: EnumPins() on the smart tee filter.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: ea1c56cb6672c13211fdbca39956c18bd873b3b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea1c56cb6672c13211fdbca3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:53 2019 -0500 qcap/tests: Add some more tests for IBaseFilter::EnumPins() on the smart tee filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 148 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 148 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 5bcb82d..cdd09f0 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -33,6 +33,13 @@ static IBaseFilter *create_smart_tee(void) return filter; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -75,6 +82,146 @@ static void test_interfaces(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_smart_tee(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[4]; + 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_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_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 == 1, "Got count %u.\n", count); + IPin_Release(pins[0]); + + hr = IEnumPins_Reset(enum1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Next(enum1, 4, pins, &count); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + IPin_Release(pins[0]); + IPin_Release(pins[1]); + IPin_Release(pins[2]); + + 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, 4); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 3); + 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); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -2068,6 +2215,7 @@ START_TEST(smartteefilter) event = CreateEventW(NULL, FALSE, FALSE, NULL); test_interfaces(); + test_enum_pins(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Zebediah Figura : qcap/tests: Add some tests for IBaseFilter::FindPin() on the smart tee filter.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: 4862f8404b13e9509b203da31a47c093eb38617d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4862f8404b13e9509b203da3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:54 2019 -0500 qcap/tests: Add some tests for IBaseFilter::FindPin() on the smart tee filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 45 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index cdd09f0..f931d0b 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -22,6 +22,10 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR sink_id[] = {'I','n','p','u','t',0}; +static const WCHAR capture_id[] = {'C','a','p','t','u','r','e',0}; +static const WCHAR preview_id[] = {'P','r','e','v','i','e','w',0}; + static HANDLE event; static IBaseFilter *create_smart_tee(void) @@ -222,6 +226,46 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + IBaseFilter *filter = create_smart_tee(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_EnumPins(filter, &enum_pins); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, capture_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, preview_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(pin2 == pin, "Expected pin %p, got %p.\n", pin, pin2); + IPin_Release(pin2); + IPin_Release(pin); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -2216,6 +2260,7 @@ START_TEST(smartteefilter) test_interfaces(); test_enum_pins(); + test_find_pin(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Zebediah Figura : qcap/tests: Add more tests for querying smart tee pin information.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: a770ebe3ad4a4d5ae0a12f06d5e4a96c126ef8f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a770ebe3ad4a4d5ae0a12f06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:55 2019 -0500 qcap/tests: Add more tests for querying smart tee pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 143 ++++++++++++++++++++++++++++----------- 1 file changed, 104 insertions(+), 39 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index f931d0b..79d296d 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -266,6 +266,109 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter = create_smart_tee(); + PIN_DIRECTION dir; + PIN_INFO info; + ULONG count; + HRESULT hr; + WCHAR *id; + ULONG ref; + IPin *pin; + + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + 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(pin); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_INPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, capture_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, capture_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, capture_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + hr = IBaseFilter_FindPin(filter, preview_id, &pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_QueryPinInfo(pin, &info); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); + ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); + ok(!lstrcmpW(info.achName, preview_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ref = get_refcount(filter); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + ok(ref == 3, "Got unexpected refcount %d.\n", ref); + IBaseFilter_Release(info.pFilter); + + hr = IPin_QueryDirection(pin, &dir); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(dir == PINDIR_OUTPUT, "Got direction %d.\n", dir); + + hr = IPin_QueryId(pin, &id); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!lstrcmpW(id, preview_id), "Got id %s.\n", wine_dbgstr_w(id)); + CoTaskMemFree(id); + + hr = IPin_QueryInternalConnections(pin, NULL, &count); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + typedef struct { IBaseFilter IBaseFilter_iface; LONG ref; @@ -1885,7 +1988,6 @@ static void test_smart_tee_filter(void) int pinNumber = 0; IMemInputPin *memInputPin = NULL; IEnumMediaTypes *enumMediaTypes = NULL; - ULONG nPin = 0; hr = CoCreateInstance(&CLSID_SmartTee, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&smartTeeFilter); @@ -1908,55 +2010,24 @@ static void test_smart_tee_filter(void) while (IEnumPins_Next(enumPins, 1, &pin, NULL) == S_OK) { - LPWSTR id = NULL; - PIN_INFO pinInfo; - memset(&pinInfo, 0, sizeof(pinInfo)); - hr = IPin_QueryPinInfo(pin, &pinInfo); - ok(SUCCEEDED(hr), "QueryPinInfo failed, hr=0x%08x\n", hr); - if (FAILED(hr)) - goto endwhile; - - ok(pinInfo.pFilter == smartTeeFilter, "pin's filter isn't the filter owning the pin\n"); if (pinNumber == 0) { - static const WCHAR wszInput[] = {'I','n','p','u','t',0}; - ok(pinInfo.dir == PINDIR_INPUT, "pin 0 isn't an input pin\n"); - ok(!lstrcmpW(pinInfo.achName, wszInput), "pin 0 is called %s, not 'Input'\n", wine_dbgstr_w(pinInfo.achName)); - hr = IPin_QueryId(pin, &id); - ok(SUCCEEDED(hr), "IPin_QueryId() failed with 0x%08x\n", hr); - ok(!lstrcmpW(id, wszInput), "pin 0's id is %s, not 'Input'\n", wine_dbgstr_w(id)); inputPin = pin; IPin_AddRef(inputPin); } else if (pinNumber == 1) { - static const WCHAR wszCapture[] = {'C','a','p','t','u','r','e',0}; - ok(pinInfo.dir == PINDIR_OUTPUT, "pin 1 isn't an output pin\n"); - ok(!lstrcmpW(pinInfo.achName, wszCapture), "pin 1 is called %s, not 'Capture'\n", wine_dbgstr_w(pinInfo.achName)); - hr = IPin_QueryId(pin, &id); - ok(SUCCEEDED(hr), "IPin_QueryId() failed with 0x%08x\n", hr); - ok(!lstrcmpW(id, wszCapture), "pin 1's id is %s, not 'Capture'\n", wine_dbgstr_w(id)); capturePin = pin; IPin_AddRef(capturePin); } else if (pinNumber == 2) { - static const WCHAR wszPreview[] = {'P','r','e','v','i','e','w',0}; - ok(pinInfo.dir == PINDIR_OUTPUT, "pin 2 isn't an output pin\n"); - ok(!lstrcmpW(pinInfo.achName, wszPreview), "pin 2 is called %s, not 'Preview'\n", wine_dbgstr_w(pinInfo.achName)); - hr = IPin_QueryId(pin, &id); - ok(SUCCEEDED(hr), "IPin_QueryId() failed with 0x%08x\n", hr); - ok(!lstrcmpW(id, wszPreview), "pin 2's id is %s, not 'Preview'\n", wine_dbgstr_w(id)); previewPin = pin; IPin_AddRef(previewPin); } else ok(0, "pin %d isn't supposed to exist\n", pinNumber); - endwhile: - if (pinInfo.pFilter) - IBaseFilter_Release(pinInfo.pFilter); - CoTaskMemFree(id); IPin_Release(pin); pinNumber++; } @@ -2010,13 +2081,6 @@ static void test_smart_tee_filter(void) hr = IPin_EnumMediaTypes(previewPin, &enumMediaTypes); ok(hr == VFW_E_NOT_CONNECTED, "IPin_EnumMediaTypes() failed, hr=0x%08x\n", hr); - hr = IPin_QueryInternalConnections(inputPin, NULL, &nPin); - ok(hr == E_NOTIMPL, "IPin_QueryInternalConnections() returned hr=0x%08x\n", hr); - hr = IPin_QueryInternalConnections(capturePin, NULL, &nPin); - ok(hr == E_NOTIMPL, "IPin_QueryInternalConnections() returned hr=0x%08x\n", hr); - hr = IPin_QueryInternalConnections(previewPin, NULL, &nPin); - ok(hr == E_NOTIMPL, "IPin_QueryInternalConnections() returned hr=0x%08x\n", hr); - test_smart_tee_filter_in_graph(smartTeeFilter, inputPin, capturePin, previewPin); end: @@ -2261,6 +2325,7 @@ START_TEST(smartteefilter) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); test_smart_tee_filter_aggregation(); test_smart_tee_filter();

1 0

Zebediah Figura : qcap/tests: Add more tests for smart tee pin interfaces.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: 7ca60b90ef0114149f240270f4c592503464087c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ca60b90ef0114149f240270… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 12 00:20:56 2019 -0500 qcap/tests: Add more tests for smart tee pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 88 ++++++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 39 deletions(-) diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index 79d296d..b3b0584 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -63,6 +63,7 @@ static void test_interfaces(void) { IBaseFilter *filter = create_smart_tee(); ULONG ref; + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -82,6 +83,54 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAMStreamConfig, FALSE); + check_interface(pin, &IID_IAMStreamControl, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IPropertyBag, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, capture_id, &pin); + + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAMStreamConfig, FALSE); + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IPropertyBag, FALSE); + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, preview_id, &pin); + + todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAMStreamConfig, FALSE); + check_interface(pin, &IID_IAsyncReader, FALSE); + check_interface(pin, &IID_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + check_interface(pin, &IID_IPropertyBag, FALSE); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); ok(!ref, "Got unexpected refcount %d.\n", ref); } @@ -1842,21 +1891,6 @@ static SourceFilter* create_audio_SourceFilter(void) return This; } -static BOOL has_interface(IUnknown *unknown, REFIID uuid) -{ - HRESULT hr; - IUnknown *iface = NULL; - - hr = IUnknown_QueryInterface(unknown, uuid, (void**)&iface); - if (SUCCEEDED(hr)) - { - IUnknown_Release(iface); - return TRUE; - } - else - return FALSE; -} - static void test_smart_tee_filter_in_graph(IBaseFilter *smartTeeFilter, IPin *inputPin, IPin *capturePin, IPin *previewPin) { @@ -2036,30 +2070,6 @@ static void test_smart_tee_filter(void) if (!(inputPin && capturePin && previewPin)) goto end; - ok(has_interface((IUnknown*)inputPin, &IID_IUnknown), "IUnknown should exist on the input pin\n"); - ok(has_interface((IUnknown*)inputPin, &IID_IMemInputPin), "IMemInputPin should exist the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IKsPropertySet), "IKsPropertySet shouldn't exist on the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IAMStreamConfig), "IAMStreamConfig shouldn't exist on the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IAMStreamControl), "IAMStreamControl shouldn't exist on the input pin\n"); - ok(!has_interface((IUnknown*)inputPin, &IID_IPropertyBag), "IPropertyBag shouldn't exist on the input pin\n"); - todo_wine ok(has_interface((IUnknown*)inputPin, &IID_IQualityControl), "IQualityControl should exist on the input pin\n"); - - ok(has_interface((IUnknown*)capturePin, &IID_IUnknown), "IUnknown should exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IAsyncReader), "IAsyncReader shouldn't exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IKsPropertySet), "IKsPropertySet shouldn't exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IAMStreamConfig), "IAMStreamConfig shouldn't exist on the capture pin\n"); - todo_wine ok(has_interface((IUnknown*)capturePin, &IID_IAMStreamControl), "IAMStreamControl should exist on the capture pin\n"); - ok(!has_interface((IUnknown*)capturePin, &IID_IPropertyBag), "IPropertyBag shouldn't exist on the capture pin\n"); - todo_wine ok(has_interface((IUnknown*)capturePin, &IID_IQualityControl), "IQualityControl should exist on the capture pin\n"); - - ok(has_interface((IUnknown*)previewPin, &IID_IUnknown), "IUnknown should exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IAsyncReader), "IAsyncReader shouldn't exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IKsPropertySet), "IKsPropertySet shouldn't exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IAMStreamConfig), "IAMStreamConfig shouldn't exist on the preview pin\n"); - todo_wine ok(has_interface((IUnknown*)capturePin, &IID_IAMStreamControl), "IAMStreamControl should exist on the preview pin\n"); - ok(!has_interface((IUnknown*)previewPin, &IID_IPropertyBag), "IPropertyBag shouldn't exist on the preview pin\n"); - todo_wine ok(has_interface((IUnknown*)previewPin, &IID_IQualityControl), "IQualityControl should exist on the preview pin\n"); - hr = IPin_QueryInterface(inputPin, &IID_IMemInputPin, (void**)&memInputPin); ok(SUCCEEDED(hr), "couldn't get mem input pin, hr=0x%08x\n", hr); if (FAILED(hr))

1 0

Paul Gofman : xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start().
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: a5b22c86b4d46fa8443cc2bee8b91d237eb8996b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5b22c86b4d46fa8443cc2be… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Apr 11 11:30:50 2019 +0300 xaudio2_7: Also preserve %ebx in call_on_voice_processing_pass_start(). It is tested that EBX register is not preserved by IXAudio2VoiceCallback_OnVoiceProcessingPassStart callback in League of Legends. It doesn't lead to crash in the present xaudio, while it might still be a potential issue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46870 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 18306a1..cbbedc4 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -41,7 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #if XAUDIO2_VER != 0 && defined(__i386__) -/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi. */ +/* EVE Online uses an OnVoiceProcessingPassStart callback which corrupts %esi; + * League of Legends uses a callback which corrupts %ebx. */ #define IXAudio2VoiceCallback_OnVoiceProcessingPassStart(a, b) call_on_voice_processing_pass_start(a, b) extern void call_on_voice_processing_pass_start(IXAudio2VoiceCallback *This, UINT32 BytesRequired); __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, @@ -54,13 +55,17 @@ __ASM_GLOBAL_FUNC( call_on_voice_processing_pass_start, __ASM_CFI(".cfi_rel_offset %esi,-4\n\t") "pushl %edi\n\t" __ASM_CFI(".cfi_rel_offset %edi,-8\n\t") - "subl $8,%esp\n\t" + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-12\n\t") + "subl $4,%esp\n\t" "pushl 12(%ebp)\n\t" /* BytesRequired */ "pushl 8(%ebp)\n\t" /* This */ "movl 8(%ebp),%eax\n\t" "movl 0(%eax),%eax\n\t" "call *0(%eax)\n\t" /* This->lpVtbl->OnVoiceProcessingPassStart */ - "leal -8(%ebp),%esp\n\t" + "leal -12(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") "popl %edi\n\t" __ASM_CFI(".cfi_same_value %edi\n\t") "popl %esi\n\t"

1 0

Alexandre Julliard : configure: Set wine_makedep variable outside of the cache check.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: c19da578f59b8dda5274f6bf3e982cf4a7c2b181 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c19da578f59b8dda5274f6bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 12 16:22:15 2019 +0200 configure: Set wine_makedep variable outside of the cache check. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 33 +++++++++++++++++---------------- configure.ac | 29 ++++++++++++++--------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/configure b/configure index 5733ea7..529c2df 100755 --- a/configure +++ b/configure @@ -5711,25 +5711,26 @@ else wine_cv_toolsdir="$with_wine64" fi fi - if test -z "$wine_cv_toolsdir"; then - wine_makedep=tools/makedep - wine_cv_toolsdir="\$(top_builddir)" - elif test -d "$wine_cv_toolsdir/tools/winebuild"; then - wine_makedep=$wine_cv_toolsdir/tools/makedep - case "$wine_cv_toolsdir" in - /*) ;; - *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; - esac - enable_tools=${enable_tools:-no} - test -f "$wine_makedep" || as_fn_error $? "the Wine tools have not yet been built in $wine_cv_toolsdir" "$LINENO" 5 - else - as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 - fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_toolsdir" >&5 $as_echo "$wine_cv_toolsdir" >&6; } -TOOLSDIR=$wine_cv_toolsdir - +if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep + TOOLSDIR="\$(top_builddir)" + +elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep + case "$wine_cv_toolsdir" in + /*) TOOLSDIR=$wine_cv_toolsdir + ;; + *) TOOLSDIR="\$(top_builddir)/$wine_cv_toolsdir" + ;; + esac + enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || as_fn_error $? "the Wine tools have not yet been built in $wine_cv_toolsdir" "$LINENO" 5 +else + as_fn_error $? "could not find Wine tools in $wine_cv_toolsdir" "$LINENO" 5 +fi if test -n "$host_alias" -a "$host_alias" != "$build_alias" then TARGETFLAGS="-b $host_alias $TARGETFLAGS" diff --git a/configure.ac b/configure.ac index 4dbb7f4..02e7e9e 100644 --- a/configure.ac +++ b/configure.ac @@ -243,22 +243,21 @@ AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir, elif test -n "$with_wine64"; then wine_cv_toolsdir="$with_wine64" fi - fi - if test -z "$wine_cv_toolsdir"; then - wine_makedep=tools/makedep - wine_cv_toolsdir="\$(top_builddir)" - elif test -d "$wine_cv_toolsdir/tools/winebuild"; then - wine_makedep=$wine_cv_toolsdir/tools/makedep - case "$wine_cv_toolsdir" in - /*) ;; - *) wine_cv_toolsdir="\$(top_builddir)/$wine_cv_toolsdir" ;; - esac - enable_tools=${enable_tools:-no} - test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir]) - else - AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) fi]) -AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) +if test -z "$wine_cv_toolsdir"; then + wine_makedep=tools/makedep + AC_SUBST(TOOLSDIR,"\$(top_builddir)") +elif test -d "$wine_cv_toolsdir/tools/winebuild"; then + wine_makedep=$wine_cv_toolsdir/tools/makedep + case "$wine_cv_toolsdir" in + /*) AC_SUBST(TOOLSDIR,$wine_cv_toolsdir) ;; + *) AC_SUBST(TOOLSDIR,"\$(top_builddir)/$wine_cv_toolsdir") ;; + esac + enable_tools=${enable_tools:-no} + test -f "$wine_makedep" || AC_MSG_ERROR([the Wine tools have not yet been built in $wine_cv_toolsdir]) +else + AC_MSG_ERROR([could not find Wine tools in $wine_cv_toolsdir]) +fi if test -n "$host_alias" -a "$host_alias" != "$build_alias" then AC_SUBST(TARGETFLAGS,"-b $host_alias $TARGETFLAGS")

1 0

Nikolay Sivov : dbgeng: Update stub to IDebugSymbols3.
by Alexandre Julliard 12 Apr '19

12 Apr '19

Module: wine Branch: master Commit: cb32c035d900b0f7641c54a9c0577a8ff1893abb URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb32c035d900b0f7641c54a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 12 18:01:29 2019 +0300 dbgeng: Update stub to IDebugSymbols3. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbgeng/dbgeng.c | 795 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 733 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb32c035d900b0f7641c…

1 0