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

Zebediah Figura : wordpad: Use GetSysColorBrush().
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: dcd9376ae711d56778032f146480e1d1aaf245ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd9376ae711d56778032f14… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 22:39:14 2019 -0500 wordpad: Use GetSysColorBrush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/print.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index d34fd66..acc583e 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -376,10 +376,9 @@ static void paint_ruler(HWND hWnd, LONG EditLeftmost, BOOL NewMetrics) HDC hdcPrint = make_dc(); RECT printRect = get_print_rect(hdcPrint); RECT drawRect; - HBRUSH hBrush = CreateSolidBrush(GetSysColor(COLOR_MENU)); GetClientRect(hWnd, &drawRect); - FillRect(hdc, &drawRect, hBrush); + FillRect(hdc, &drawRect, GetSysColorBrush(COLOR_MENU)); InflateRect(&drawRect, 0, -3); drawRect.left = EditLeftmost; @@ -399,7 +398,6 @@ static void paint_ruler(HWND hWnd, LONG EditLeftmost, BOOL NewMetrics) add_ruler_units(hdc, &drawRect, NewMetrics, EditLeftmost); SelectObject(hdc, GetStockObject(BLACK_BRUSH)); - DeleteObject(hBrush); DeleteDC(hdcPrint); EndPaint(hWnd, &ps); }

1 0

Zebediah Figura : regedit: Use the default implementation of WM_ERASEBKGND.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: cf274c6f0c4cff6fedd6042bded3089154cf7835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf274c6f0c4cff6fedd6042b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 22:39:15 2019 -0500 regedit: Use the default implementation of WM_ERASEBKGND. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/hexedit.c | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/programs/regedit/hexedit.c b/programs/regedit/hexedit.c index db48c80..951779b 100644 --- a/programs/regedit/hexedit.c +++ b/programs/regedit/hexedit.c @@ -340,34 +340,6 @@ HexEdit_Destroy (HEXEDIT_INFO *infoPtr) return 0; } - -static inline LRESULT -HexEdit_EraseBackground (HEXEDIT_INFO *infoPtr, HDC hdc) -{ - HBRUSH hBrush, hSolidBrush = NULL; - RECT rc; - - if (GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE) & WS_DISABLED) - hBrush = hSolidBrush = CreateSolidBrush(GetSysColor(COLOR_BTNFACE)); - else - { - hBrush = (HBRUSH)SendMessageW(GetParent(infoPtr->hwndSelf), WM_CTLCOLOREDIT, - (WPARAM)hdc, (LPARAM)infoPtr->hwndSelf); - if (!hBrush) - hBrush = hSolidBrush = CreateSolidBrush(GetSysColor(COLOR_WINDOW)); - } - - GetClientRect (infoPtr->hwndSelf, &rc); - - FillRect (hdc, &rc, hBrush); - - if (hSolidBrush) - DeleteObject(hSolidBrush); - - return -1; -} - - static inline LRESULT HexEdit_GetFont (HEXEDIT_INFO *infoPtr) { @@ -625,9 +597,6 @@ HexEdit_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_DESTROY: return HexEdit_Destroy (infoPtr); - case WM_ERASEBKGND: - return HexEdit_EraseBackground (infoPtr, (HDC)wParam); - case WM_GETDLGCODE: return DLGC_WANTCHARS | DLGC_WANTARROWS; @@ -675,7 +644,7 @@ void HexEdit_Register(void) wndClass.cbClsExtra = 0; wndClass.cbWndExtra = sizeof(HEXEDIT_INFO *); wndClass.hCursor = NULL; - wndClass.hbrBackground = NULL; + wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndClass.lpszClassName = szHexEditClass; RegisterClassW(&wndClass);

1 0

Zebediah Figura : qedit/tests: Abort on missing qedit.dll.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 66dc93570c711b19c676d818fc837cf3d72db7fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=66dc93570c711b19c676d818… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:22 2019 -0500 qedit/tests: Abort on missing qedit.dll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/mediadet.c | 12 ++++++++++++ dlls/qedit/tests/samplegrabber.c | 12 ++++++++++++ dlls/qedit/tests/timeline.c | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 34c43fd..311d77b 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -647,6 +647,9 @@ static void test_COM_sg_enumpins(void) START_TEST(mediadet) { + IMediaDet *detector; + HRESULT hr; + if (!init_tests()) { skip("Couldn't initialize tests!\n"); @@ -655,6 +658,15 @@ START_TEST(mediadet) CoInitialize(NULL); + if (FAILED(hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaDet, (void **)&detector))) + { + /* qedit.dll does not exist on 2003. */ + win_skip("Failed to create media detector object, hr %#x.\n", hr); + return; + } + IMediaDet_Release(detector); + test_aggregation(); test_mediadet(); test_samplegrabber(); diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 22f6ddb..8bc44b9 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -451,8 +451,20 @@ static void test_aggregation(void) START_TEST(samplegrabber) { + IBaseFilter *filter; + HRESULT hr; + CoInitialize(NULL); + if (FAILED(hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter))) + { + /* qedit.dll does not exist on 2003. */ + win_skip("Failed to create sample grabber filter, hr %#x.\n", hr); + return; + } + IBaseFilter_Release(filter); + test_interfaces(); test_enum_pins(); test_find_pin(); diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index 9e24062..0d01d51 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -246,8 +246,20 @@ static void test_timelineobj_interfaces(void) START_TEST(timeline) { + IAMTimeline *timeline; + HRESULT hr; + CoInitialize(NULL); + if (FAILED(hr = CoCreateInstance(&CLSID_AMTimeline, NULL, CLSCTX_INPROC_SERVER, + &IID_IAMTimeline, (void **)&timeline))) + { + /* qedit.dll does not exist on 2003. */ + win_skip("Failed to create timeline object, hr %#x.\n", hr); + return; + } + IAMTimeline_Release(timeline); + test_aggregation(); test_timeline(); test_timelineobj_interfaces();

1 0

Zebediah Figura : qedit/tests: Add some tests for null renderer filter interfaces.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 1904ac4e3b37eb66fb8fb903437e9400e5654a3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1904ac4e3b37eb66fb8fb903… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:23 2019 -0500 qedit/tests: Add some tests for null renderer filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/Makefile.in | 1 + dlls/qedit/tests/nullrenderer.c | 95 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/dlls/qedit/tests/Makefile.in b/dlls/qedit/tests/Makefile.in index 052336d..53d95d7 100644 --- a/dlls/qedit/tests/Makefile.in +++ b/dlls/qedit/tests/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = oleaut32 ole32 C_SRCS = \ mediadet.c \ + nullrenderer.c \ samplegrabber.c \ timeline.c diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c new file mode 100644 index 0000000..025a258 --- /dev/null +++ b/dlls/qedit/tests/nullrenderer.c @@ -0,0 +1,95 @@ +/* + * Null renderer filter unit tests + * + * Copyright 2018 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#include "dshow.h" +#include "wine/test.h" + +static IBaseFilter *create_null_renderer(void) +{ + IBaseFilter *filter = NULL; + HRESULT hr = CoCreateInstance(&CLSID_NullRenderer, 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_null_renderer(); + ULONG ref; + + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IMediaFilter, TRUE); + check_interface(filter, &IID_IMediaPosition, TRUE); + check_interface(filter, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IPersist, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + + todo_wine 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_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + todo_wine 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); +} + +START_TEST(nullrenderer) +{ + IBaseFilter *filter; + HRESULT hr; + + CoInitialize(NULL); + + if (FAILED(hr = CoCreateInstance(&CLSID_NullRenderer, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter))) + { + /* qedit.dll does not exist on 2003. */ + win_skip("Failed to create null renderer filter, hr %#x.\n", hr); + return; + } + IBaseFilter_Release(filter); + + test_interfaces(); + + CoUninitialize(); +}

1 0

Zebediah Figura : qedit/tests: Add some tests for IBaseFilter::EnumPins() on the null renderer.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: bdf5e8f5e02e160099efdbadee125da32e69a860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdf5e8f5e02e160099efdbad… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:24 2019 -0500 qedit/tests: Add some tests for IBaseFilter::EnumPins() on the null renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 98 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 025a258..5bdfc18 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -31,6 +31,13 @@ static IBaseFilter *create_null_renderer(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) { @@ -73,6 +80,96 @@ static void test_interfaces(void) ok(!ref, "Got unexpected refcount %d.\n", ref); } +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_null_renderer(); + IEnumPins *enum1, *enum2; + ULONG count, ref; + IPin *pins[2]; + 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); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pins[0]); + todo_wine 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_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_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_Clone(enum1, &enum2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 2); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IEnumPins_Skip(enum1, 1); + 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); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -90,6 +187,7 @@ START_TEST(nullrenderer) IBaseFilter_Release(filter); test_interfaces(); + test_enum_pins(); CoUninitialize(); }

1 0

Zebediah Figura : qedit/tests: Add some tests for IBaseFilter::FindPin() on the null renderer.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: e407dae3c7d0041f3643ac47f88bab268fc0ead8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e407dae3c7d0041f3643ac47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:25 2019 -0500 qedit/tests: Add some tests for IBaseFilter::FindPin() on the null renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 5bdfc18..f709d2a 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -22,6 +22,8 @@ #include "dshow.h" #include "wine/test.h" +static const WCHAR sink_id[] = {'I','n',0}; + static IBaseFilter *create_null_renderer(void) { IBaseFilter *filter = NULL; @@ -170,6 +172,34 @@ static void test_enum_pins(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_find_pin(void) +{ + static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; + IBaseFilter *filter = create_null_renderer(); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + 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); + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -188,6 +218,7 @@ START_TEST(nullrenderer) test_interfaces(); test_enum_pins(); + test_find_pin(); CoUninitialize(); }

1 0

Zebediah Figura : qedit/tests: Add some tests for querying null renderer pin information.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: e9c4d26638ec4d67be01c0b4ee9d9359f4c6188e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9c4d26638ec4d67be01c0b4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:26 2019 -0500 qedit/tests: Add some tests for querying null renderer pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 46 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index f709d2a..9793860 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -200,6 +200,51 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + IBaseFilter *filter = create_null_renderer(); + PIN_DIRECTION dir; + PIN_INFO info; + 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); + todo_wine 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); + todo_wine ok(ref == 3, "Got unexpected refcount %d.\n", ref); + ref = get_refcount(pin); + todo_wine 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, NULL); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -219,6 +264,7 @@ START_TEST(nullrenderer) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Zebediah Figura : qedit/tests: Add some tests for null renderer pin interfaces.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: c9c28a638767501193da21c9c4552dd3a47a043e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9c28a638767501193da21c9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:27 2019 -0500 qedit/tests: Add some tests for null renderer pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index 9793860..be38e5f 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -59,6 +59,7 @@ static void test_interfaces(void) { IBaseFilter *filter = create_null_renderer(); ULONG ref; + IPin *pin; check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); @@ -78,6 +79,18 @@ 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_IKsPropertySet, FALSE); + check_interface(pin, &IID_IMediaPosition, FALSE); + todo_wine check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); ref = IBaseFilter_Release(filter); ok(!ref, "Got unexpected refcount %d.\n", ref); }

1 0

Zebediah Figura : qedit/tests: Add a test for aggregation on the null renderer.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 50395b03374e8f2f0a17706037cbff3097ef7a1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=50395b03374e8f2f0a177060… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:28 2019 -0500 qedit/tests: Add a test for aggregation on the null renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/nullrenderer.c | 95 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index be38e5f..0ae17b1 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -258,6 +258,100 @@ static void test_pin_info(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static const GUID test_iid = {0x33333333}; +static LONG outer_ref = 1; + +static HRESULT WINAPI outer_QueryInterface(IUnknown *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_IUnknown) + || IsEqualGUID(iid, &IID_IBaseFilter) + || IsEqualGUID(iid, &test_iid)) + { + *out = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI outer_AddRef(IUnknown *iface) +{ + return InterlockedIncrement(&outer_ref); +} + +static ULONG WINAPI outer_Release(IUnknown *iface) +{ + return InterlockedDecrement(&outer_ref); +} + +static const IUnknownVtbl outer_vtbl = +{ + outer_QueryInterface, + outer_AddRef, + outer_Release, +}; + +static IUnknown test_outer = {&outer_vtbl}; + +static void test_aggregation(void) +{ + IBaseFilter *filter, *filter2; + IUnknown *unk, *unk2; + HRESULT hr; + ULONG ref; + + filter = (IBaseFilter *)0xdeadbeef; + hr = CoCreateInstance(&CLSID_NullRenderer, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!filter, "Got interface %p.\n", filter); + + hr = CoCreateInstance(&CLSID_NullRenderer, &test_outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); + ref = get_refcount(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + + ref = IUnknown_AddRef(unk); + ok(ref == 2, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + ref = IUnknown_Release(unk); + ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + + hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); + IUnknown_Release(unk2); + + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2); + + hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(!unk2, "Got unexpected IUnknown %p.\n", unk2); + + hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2); + + IBaseFilter_Release(filter); + ref = IUnknown_Release(unk); + ok(!ref, "Got unexpected refcount %d.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); +} + START_TEST(nullrenderer) { IBaseFilter *filter; @@ -278,6 +372,7 @@ START_TEST(nullrenderer) test_enum_pins(); test_find_pin(); test_pin_info(); + test_aggregation(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Clean up and expand tests for aggregation.
by Alexandre Julliard 19 Apr '19

19 Apr '19

Module: wine Branch: master Commit: 6ed1e5c242e70c5a32016dd9a05b8bdecf386c03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ed1e5c242e70c5a32016dd9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 18 23:01:29 2019 -0500 quartz/tests: Clean up and expand tests for aggregation. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 1 - dlls/quartz/tests/filtergraph.c | 139 ++++++++++++----------- dlls/quartz/tests/filtermapper.c | 159 ++++++++++++++------------ dlls/quartz/tests/misc.c | 233 -------------------------------------- dlls/quartz/tests/videorenderer.c | 94 +++++++++++++++ dlls/quartz/tests/vmr7.c | 95 ++++++++++++++++ dlls/quartz/tests/vmr9.c | 95 ++++++++++++++++ 7 files changed, 442 insertions(+), 374 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6ed1e5c242e70c5a3201…

1 0