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

Gabriel Ivăncescu : comctl32/tests: Also test for split buttons when testing BCM_GETIDEALSIZE.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: e41cb8e9947f97ed5b286954c93c92872837fb36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e41cb8e9947f97ed5b286954… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Apr 3 20:06:33 2019 +0300 comctl32/tests: Also test for split buttons when testing BCM_GETIDEALSIZE. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/button.c | 223 +++++++++++++++++++++++++------------------ 1 file changed, 130 insertions(+), 93 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e41cb8e9947f97ed5b28…

1 0

Zebediah Figura : quartz/tests: Add tests for IVMRFilterConfig9 on the VMR9 filter.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 957111ef0a612508f65c70d1f91b928ac9969458 URL: https://source.winehq.org/git/wine.git/?a=commit;h=957111ef0a612508f65c70d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:48 2019 -0500 quartz/tests: Add tests for IVMRFilterConfig9 on the VMR9 filter. 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/vmr9.c | 146 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 147 insertions(+) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index ce59b73..1a12ffa 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ systemclock.c \ videorenderer.c \ vmr7.c \ + vmr9.c \ waveparser.c diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c new file mode 100644 index 0000000..2d642c6 --- /dev/null +++ b/dlls/quartz/tests/vmr9.c @@ -0,0 +1,146 @@ +/* + * Video Mixing Renderer 9 unit tests + * + * Copyright 2019 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 "d3d9.h" +#include "vmr9.h" +#include "wine/test.h" + +static void test_filter_config(void) +{ + IVMRFilterConfig9 *config; + DWORD count, mode; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMRMode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowed, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowed); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Renderless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Renderless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 3); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowed, "Got mode %#x.\n", mode); + + /* Despite MSDN, you can still change the rendering mode after setting the + * stream count. */ + hr = IVMRFilterConfig9_SetRenderingMode(config, VMR9Mode_Windowless); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetRenderingMode(config, &mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(mode == VMR9Mode_Windowless, "Got mode %#x.\n", mode); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &count); + todo_wine { + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 3, "Got count %u.\n", count); + } + + ref = IVMRFilterConfig9_Release(config); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + +START_TEST(vmr9) +{ + IBaseFilter *filter; + HRESULT hr; + + CoInitialize(NULL); + + if (FAILED(hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, + CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter))) + { + skip("Failed to create VMR9, hr %#x.\n", hr); + return; + } + IBaseFilter_Release(filter); + + test_filter_config(); + + CoUninitialize(); +}

1 0

Zebediah Figura : quartz/tests: Add tests for VMR9 filter interfaces.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 8233e1166faa540199ac06ecb77579ff63a961a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8233e1166faa540199ac06ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:49 2019 -0500 quartz/tests: Add tests for VMR9 filter interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 2d642c6..7ecf852 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -24,6 +24,24 @@ #include "vmr9.h" #include "wine/test.h" +static IBaseFilter *create_vmr9(DWORD mode) +{ + IBaseFilter *filter = NULL; + IVMRFilterConfig9 *config; + HRESULT hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + if (mode) + { + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IVMRFilterConfig9_SetRenderingMode(config, mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IVMRFilterConfig9_Release(config); + } + return filter; +} + static void test_filter_config(void) { IVMRFilterConfig9 *config; @@ -125,6 +143,98 @@ static void test_filter_config(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +#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_vmr9(0); + ULONG ref; + + check_interface(filter, &IID_IAMCertifiedOutputProtection, TRUE); + check_interface(filter, &IID_IAMFilterMiscFlags, TRUE); + check_interface(filter, &IID_IBaseFilter, TRUE); + check_interface(filter, &IID_IBasicVideo, TRUE); + todo_wine check_interface(filter, &IID_IBasicVideo2, TRUE); + todo_wine check_interface(filter, &IID_IKsPropertySet, 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_IQualityControl, TRUE); + todo_wine check_interface(filter, &IID_IQualProp, TRUE); + check_interface(filter, &IID_IUnknown, TRUE); + check_interface(filter, &IID_IVideoWindow, TRUE); + todo_wine check_interface(filter, &IID_IVMRAspectRatioControl9, TRUE); + todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); + check_interface(filter, &IID_IVMRFilterConfig9, TRUE); + todo_wine check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); + check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + + check_interface(filter, &IID_IBasicAudio, FALSE); + check_interface(filter, &IID_IDirectDrawVideo, FALSE); + check_interface(filter, &IID_IPersistPropertyBag, FALSE); + check_interface(filter, &IID_IPin, FALSE); + check_interface(filter, &IID_IReferenceClock, FALSE); + check_interface(filter, &IID_IVMRAspectRatioControl, FALSE); + check_interface(filter, &IID_IVMRDeinterlaceControl, FALSE); + todo_wine check_interface(filter, &IID_IVMRFilterConfig, FALSE); + check_interface(filter, &IID_IVMRMixerBitmap, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRMixerControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + IBaseFilter_Release(filter); + filter = create_vmr9(VMR9Mode_Windowless); + + check_interface(filter, &IID_IVMRMonitorConfig9, TRUE); + check_interface(filter, &IID_IVMRWindowlessControl9, TRUE); + + todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IBasicVideo2, FALSE); + todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + check_interface(filter, &IID_IVMRMixerControl9, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + todo_wine check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + + IBaseFilter_Release(filter); + filter = create_vmr9(VMR9Mode_Renderless); + + check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, TRUE); + + todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); + check_interface(filter, &IID_IBasicVideo2, FALSE); + todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); + check_interface(filter, &IID_IVMRMixerControl, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE); + todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + todo_wine check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl, FALSE); + check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -141,6 +251,7 @@ START_TEST(vmr9) IBaseFilter_Release(filter); test_filter_config(); + test_interfaces(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add tests for IBaseFilter::EnumPins() on the VMR9 filter.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: b6b78db30d65f46e9201f884702349e2f8e5b16b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6b78db30d65f46e9201f884… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:50 2019 -0500 quartz/tests: Add tests for IBaseFilter::EnumPins() on the VMR9 filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 152 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 7ecf852..cbaf081 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -42,6 +42,13 @@ static IBaseFilter *create_vmr9(DWORD mode) return filter; } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + static void test_filter_config(void) { IVMRFilterConfig9 *config; @@ -235,6 +242,150 @@ static void test_interfaces(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static HRESULT set_mixing_mode(IBaseFilter *filter) +{ + IVMRFilterConfig9 *config; + HRESULT hr; + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + IVMRFilterConfig9_Release(config); + return hr; +} + +static void test_enum_pins(void) +{ + IBaseFilter *filter = create_vmr9(0); + IEnumPins *enum1, *enum2; + ULONG count, ref; + 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); + 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); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + 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, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + hr = IEnumPins_Next(enum1, 1, pins, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IPin_Release(pins[0]); + + 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, 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_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]); + } + + IEnumPins_Release(enum1); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -252,6 +403,7 @@ START_TEST(vmr9) test_filter_config(); test_interfaces(); + test_enum_pins(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add tests for IBaseFilter::FindPin() on the VMR9 filter.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 57df3a452c26c26ae9312631dbad051d86f6fcfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=57df3a452c26c26ae9312631… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:51 2019 -0500 quartz/tests: Add tests for IBaseFilter::FindPin() on the VMR9 filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index cbaf081..6df3470 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -386,6 +386,70 @@ 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}; + static const WCHAR inW[] = {'I','n',0}; + + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr9(0); + IEnumPins *enum_pins; + IPin *pin, *pin2; + HRESULT hr; + ULONG ref; + + IBaseFilter_EnumPins(filter, &enum_pins); + + hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + hr = IBaseFilter_FindPin(filter, inW, &pin); + ok(hr == VFW_E_NOT_FOUND, "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(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '1'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + IEnumPins_Reset(enum_pins); + + sink_id[9] = '0'; + 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(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '1'; + 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(pin == pin2, "Pins did not match.\n"); + IPin_Release(pin); + IPin_Release(pin2); + + sink_id[9] = '2'; + hr = IBaseFilter_FindPin(filter, sink_id, &pin); + ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); + } + + IEnumPins_Release(enum_pins); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -404,6 +468,7 @@ START_TEST(vmr9) test_filter_config(); test_interfaces(); test_enum_pins(); + test_find_pin(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add tests for querying VMR9 pin information.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 43f549fdcdfadab50425d05d08347f741a1c50c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43f549fdcdfadab50425d05d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 3 22:13:52 2019 -0500 quartz/tests: Add tests for querying VMR9 pin information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 6df3470..f8e6f21 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -450,6 +450,68 @@ static void test_find_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_pin_info(void) +{ + WCHAR sink_id[] = {'V','M','R',' ','I','n','p','u','t','0',0}; + IBaseFilter *filter = create_vmr9(0); + PIN_DIRECTION dir; + ULONG count, ref; + PIN_INFO info; + HRESULT hr; + WCHAR *id; + IPin *pin; + + IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IPin_QueryPinInfo(pin, &info); + 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)); + 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); + + if (SUCCEEDED(set_mixing_mode(filter))) + { + sink_id[9] = '1'; + + IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IPin_QueryPinInfo(pin, &info); + 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)); + 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); + } + + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -469,6 +531,7 @@ START_TEST(vmr9) test_interfaces(); test_enum_pins(); test_find_pin(); + test_pin_info(); CoUninitialize(); }

1 0

Nikolay Sivov : mferror: Consistently format error messages.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: a3fa08de6161e294f4161b70d6673b876fd2a215 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3fa08de6161e294f4161b70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 4 10:53:44 2019 +0300 mferror: Consistently format error messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mferror/mferror.mc | 24 ++++++++++++------------ po/ar.po | 32 ++++++++++++++++++-------------- po/bg.po | 36 ++++++++++++++++++++---------------- po/ca.po | 32 ++++++++++++++++++-------------- po/cs.po | 32 ++++++++++++++++++-------------- po/da.po | 32 ++++++++++++++++++-------------- po/de.po | 32 ++++++++++++++++++-------------- po/el.po | 36 ++++++++++++++++++++---------------- po/en.po | 48 ++++++++++++++++++++++++------------------------ po/en_US.po | 48 ++++++++++++++++++++++++------------------------ po/eo.po | 40 ++++++++++++++++++++++++---------------- po/es.po | 32 ++++++++++++++++++-------------- po/fa.po | 27 ++++++++++++++------------- po/fi.po | 32 ++++++++++++++++++-------------- po/fr.po | 32 ++++++++++++++++++-------------- po/he.po | 33 ++++++++++++++++++--------------- po/hi.po | 24 ++++++++++++------------ po/hr.po | 32 ++++++++++++++++++-------------- po/hu.po | 32 ++++++++++++++++++-------------- po/it.po | 32 ++++++++++++++++++-------------- po/ja.po | 32 ++++++++++++++++++-------------- po/ko.po | 32 ++++++++++++++++++-------------- po/lt.po | 48 ++++++++++++++++++++++++++++++++++++------------ po/ml.po | 28 +++++++++++++++------------- po/nb_NO.po | 32 ++++++++++++++++++-------------- po/nl.po | 32 ++++++++++++++++++-------------- po/or.po | 24 ++++++++++++------------ po/pa.po | 24 ++++++++++++------------ po/pl.po | 32 ++++++++++++++++++-------------- po/pt_BR.po | 32 ++++++++++++++++++-------------- po/pt_PT.po | 32 ++++++++++++++++++-------------- po/rm.po | 30 ++++++++++++++++-------------- po/ro.po | 32 ++++++++++++++++++-------------- po/ru.po | 32 ++++++++++++++++++-------------- po/si.po | 46 ++++++++++++++++++++++++++++++++-------------- po/sk.po | 32 ++++++++++++++++++-------------- po/sl.po | 32 ++++++++++++++++++-------------- po/sr_RS(a)cyrillic.po | 37 +++++++++++++++++++++---------------- po/sr_RS(a)latin.po | 37 +++++++++++++++++++++---------------- po/sv.po | 32 ++++++++++++++++++-------------- po/ta.po | 24 ++++++++++++------------ po/te.po | 24 ++++++++++++------------ po/th.po | 33 ++++++++++++++++++--------------- po/tr.po | 32 ++++++++++++++++++-------------- po/uk.po | 32 ++++++++++++++++++-------------- po/wa.po | 27 ++++++++++++++------------- po/wine.pot | 24 ++++++++++++------------ po/zh_CN.po | 32 ++++++++++++++++++-------------- po/zh_TW.po | 32 ++++++++++++++++++-------------- 49 files changed, 887 insertions(+), 699 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a3fa08de6161e294f416…

1 0

Piotr Caban : wined3d: Don't use strcasecmp.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: dcd3c95dbd3748d5dc246ad7529f18c35252534e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcd3c95dbd3748d5dc246ad7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 4 16:00:57 2019 +0200 wined3d: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8fae8e2..7ebfd4d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3727,7 +3727,7 @@ static struct wined3d_shader_signature_element *shader_find_signature_element(co for (i = 0; i < s->element_count; ++i) { if (e[i].stream_idx == stream_idx - && !strcasecmp(e[i].semantic_name, semantic_name) + && !_strnicmp(e[i].semantic_name, semantic_name, -1) && e[i].semantic_idx == semantic_idx) return &e[i]; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 0a0121d..180e2d2 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -240,17 +240,17 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) } if (!get_config_key(hkey, appkey, "shader_backend", buffer, size)) { - if (!strcasecmp(buffer, "glsl")) + if (!_strnicmp(buffer, "glsl", -1)) { ERR_(winediag)("Using the GLSL shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_GLSL; } - else if (!strcasecmp(buffer, "arb")) + else if (!_strnicmp(buffer, "arb", -1)) { ERR_(winediag)("Using the ARB shader backend.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_ARB; } - else if (!strcasecmp(buffer, "none")) + else if (!_strnicmp(buffer, "none", -1)) { ERR_(winediag)("Disabling shader backends.\n"); wined3d_settings.shader_backend = WINED3D_SHADER_BACKEND_NONE;

1 0

Alexandre Julliard : winedump: Avoid using mmap().
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 82c44208b42583e0d1b3a34742da3d2d4c35b175 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c44208b42583e0d1b3a347… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:49:04 2019 +0200 winedump: Avoid using mmap(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/dump.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index f608075..85bc681 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -34,9 +34,6 @@ #ifdef HAVE_SYS_STAT_H # include <sys/stat.h> #endif -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif #include <fcntl.h> #include "windef.h" @@ -260,13 +257,8 @@ BOOL dump_analysis(const char *name, file_dumper fn, enum FileSig wanted_sig) if (fstat(fd, &s) < 0) fatal("Can't get size"); dump_total_len = s.st_size; -#ifdef HAVE_MMAP - if ((dump_base = mmap(NULL, dump_total_len, PROT_READ, MAP_PRIVATE, fd, 0)) == (void *)-1) -#endif - { - if (!(dump_base = malloc( dump_total_len ))) fatal( "Out of memory" ); - if ((unsigned long)read( fd, dump_base, dump_total_len ) != dump_total_len) fatal( "Cannot read file" ); - } + if (!(dump_base = malloc( dump_total_len ))) fatal( "Out of memory" ); + if ((unsigned long)read( fd, dump_base, dump_total_len ) != dump_total_len) fatal( "Cannot read file" ); printf("Contents of %s: %ld bytes\n\n", name, dump_total_len); @@ -286,12 +278,7 @@ BOOL dump_analysis(const char *name, file_dumper fn, enum FileSig wanted_sig) } if (ret) printf("Done dumping %s\n", name); -#ifdef HAVE_MMAP - if (munmap(dump_base, dump_total_len) == -1) -#endif - { - free( dump_base ); - } + free( dump_base ); close(fd); return ret;

1 0

Alexandre Julliard : configure: Remove some obsolete checks.
by Alexandre Julliard 04 Apr '19

04 Apr '19

Module: wine Branch: master Commit: 8d20ad28c327fbfa60b7353d0c6808fa30c5759b URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d20ad28c327fbfa60b7353d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 3 15:50:48 2019 +0200 configure: Remove some obsolete checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 90 +++-------------------------------------------------- configure.ac | 39 ++--------------------- include/config.h.in | 48 ---------------------------- 3 files changed, 7 insertions(+), 170 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d20ad28c327fbfa60b7…

1 0