November 2020 - Wine-commits

Piotr Caban : msvcrt: Use _exception definiotion from public header.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 595ee43c48dc75ebc03900b027d000ebd15dffd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=595ee43c48dc75ebc03900b0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:39 2020 +0100 msvcrt: Use _exception definiotion from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 6 +++--- dlls/msvcrt/msvcrt.h | 8 -------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0d42ca9a782..8efc6d3cdb2 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -57,7 +57,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #define _OVERFLOW 3 /* range overflow */ #define _UNDERFLOW 4 /* range underflow */ -typedef int (CDECL *MSVCRT_matherr_func)(struct MSVCRT__exception *); +typedef int (CDECL *MSVCRT_matherr_func)(struct _exception *); typedef double LDOUBLE; /* long double is just a double */ static MSVCRT_matherr_func MSVCRT_default_matherr_func = NULL; @@ -83,7 +83,7 @@ static inline float fp_barrierf(float x) /********************************************************************* * _matherr (CRTDLL.@) */ -int CDECL MSVCRT__matherr(struct MSVCRT__exception *e) +int CDECL MSVCRT__matherr(struct _exception *e) { return 0; } @@ -91,7 +91,7 @@ int CDECL MSVCRT__matherr(struct MSVCRT__exception *e) static double math_error(int type, const char *name, double arg1, double arg2, double retval) { - struct MSVCRT__exception exception = {type, (char *)name, arg1, arg2, retval}; + struct _exception exception = {type, (char *)name, arg1, arg2, retval}; TRACE("(%d, %s, %g, %g, %g)\n", type, debugstr_a(name), arg1, arg2, retval); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3d3a2d92dfe..4c1aaac2fb3 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -287,14 +287,6 @@ typedef struct _iobuf MSVCRT_FILE; extern MSVCRT_FILE MSVCRT__iob[]; -struct MSVCRT__exception { - int type; - char* name; - double arg1; - double arg2; - double retval; -}; - typedef struct _complex _Dcomplex; struct MSVCRT__heapinfo {

1 0

Piotr Caban : msvcrt: Use locale category definiotion from public header.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: e9a1ff11302bbcbb3db68fa4bbd827a7958067ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9a1ff11302bbcbb3db68fa4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:48 2020 +0100 msvcrt: Use locale category definiotion from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 7 +- dlls/msvcrt/locale.c | 226 +++++++++++++++++++++++++-------------------------- dlls/msvcrt/msvcrt.h | 9 -- dlls/msvcrt/string.c | 28 +++---- dlls/msvcrt/wcs.c | 30 +++---- 5 files changed, 146 insertions(+), 154 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9a1ff11302bbcbb3db6…

1 0

Francois Gouget : advapi32/tests: Don't check the display name if not in an English locale.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 58ff2a0a887feca82f5e8128968c10ab03d64b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58ff2a0a887feca82f5e8128… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 30 16:02:28 2020 +0100 advapi32/tests: Don't check the display name if not in an English locale. Service display names are often translated. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index d216e096207..cbe7fffbc7a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2678,6 +2678,26 @@ static void test_refcount(void) CloseServiceHandle(scm_handle); } +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static void test_EventLog(void) { SC_HANDLE scm_handle, svc_handle; @@ -2715,7 +2735,8 @@ todo_wine ok(!strcmp(config->lpServiceStartName, "LocalSystem") /* XP */ || !strcmp(config->lpServiceStartName, "NT AUTHORITY\\LocalService"), "got %s\n", config->lpServiceStartName); - ok(!strcmp(config->lpDisplayName, "Event Log") /* XP */ || + ok(!is_lang_english() || /* DisplayName is often translated */ + !strcmp(config->lpDisplayName, "Event Log") /* XP */ || !strcmp(config->lpDisplayName, "Windows Event Log") /* Vista+ */, "got %s\n", config->lpDisplayName); HeapFree(GetProcessHeap(), 0, config);

1 0

Francois Gouget : ntdll/tests: Don't check the load address in the WoW64 case.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: dcdd98f5c16a9be132a42bd4d6d0993451890c50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcdd98f5c16a9be132a42bd4… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Nov 30 16:19:10 2020 +0100 ntdll/tests: Don't check the load address in the WoW64 case. It could sometimes be NULL, such as win32k.sys on Win <= 7. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 5db7a800cbe..4379d8a84c6 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -490,7 +490,7 @@ static void test_query_module(void) const SYSTEM_MODULE *module = &info->Modules[i]; ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); - ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); + ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name); ok(module->ImageSize, "%u: got 0 size\n", i); ok(module->LoadCount, "%u: got 0 load count\n", i); } @@ -516,7 +516,7 @@ static void test_query_module(void) const SYSTEM_MODULE *module = &infoex->BaseInfo; ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); - ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i); + ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name); ok(module->ImageSize, "%u: got 0 size\n", i); ok(module->LoadCount, "%u: got 0 load count\n", i);

1 0

Zebediah Figura : qcap/tests: Add some tests for smart tee streaming using the strmbase infrastructure.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: c431868593a9e48d921fda3750641501214e7254 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c431868593a9e48d921fda37… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 29 23:05:28 2020 -0600 qcap/tests: Add some tests for smart tee streaming using the strmbase infrastructure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 268 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 264 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c431868593a9e48d921f…

1 0

Zebediah Figura : qcap/tests: Remove old tests for smart tee streaming.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 49971c0c19d2e5fad61a665b630bc13f2b34661d URL: https://source.winehq.org/git/wine.git/?a=commit;h=49971c0c19d2e5fad61a665b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 29 23:05:29 2020 -0600 qcap/tests: Remove old tests for smart tee streaming. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/smartteefilter.c | 1653 -------------------------------------- 1 file changed, 1653 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=49971c0c19d2e5fad61a…

1 0

Zebediah Figura : qedit/tests: Add some tests for sample grabber streaming.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 9ade87059db569fd3a204e394592cfdb11e968a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ade87059db569fd3a204e39… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 29 23:05:30 2020 -0600 qedit/tests: Add some tests for sample grabber streaming. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/samplegrabber.c | 114 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 110 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 3a1d1a16ce6..2eaaffb67b7 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -579,6 +579,7 @@ struct testfilter struct strmbase_sink sink; const AM_MEDIA_TYPE *sink_mt; AM_MEDIA_TYPE source_mt; + unsigned int got_sample; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -628,7 +629,7 @@ static HRESULT testsource_get_media_type(struct strmbase_pin *iface, unsigned in static void test_sink_allocator(IPin *pin) { - ALLOCATOR_PROPERTIES req_props = {1, 5000, 1, 0}, ret_props; + ALLOCATOR_PROPERTIES req_props = {1, 256, 1, 0}, ret_props; IMemAllocator *req_allocator, *ret_allocator; IMemInputPin *input; HRESULT hr; @@ -666,9 +667,6 @@ static void test_sink_allocator(IPin *pin) hr = IMemAllocator_SetProperties(req_allocator, &req_props, &ret_props); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IMemAllocator_Commit(req_allocator); - ok(hr == S_OK, "Got hr %#x.\n", hr); - IMemAllocator_Release(req_allocator); IMemInputPin_Release(input); } @@ -736,6 +734,42 @@ static HRESULT testsink_get_media_type(struct strmbase_pin *iface, unsigned int static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample *sample) { + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + REFERENCE_TIME start, stop; + BYTE *data, expect[200]; + LONG size, i; + HRESULT hr; + + size = IMediaSample_GetSize(sample); + ok(size == 256, "Got size %u.\n", size); + size = IMediaSample_GetActualDataLength(sample); + ok(size == 200, "Got valid size %u.\n", size); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < size; ++i) + expect[i] = i; + ok(!memcmp(data, expect, size), "Data didn't match.\n"); + + hr = IMediaSample_GetTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start == 30000, "Got start time %s.\n", wine_dbgstr_longlong(start)); + ok(stop == 40000, "Got stop time %s.\n", wine_dbgstr_longlong(stop)); + + hr = IMediaSample_GetMediaTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(start == 10000, "Got start time %s.\n", wine_dbgstr_longlong(start)); + ok(stop == 20000, "Got stop time %s.\n", wine_dbgstr_longlong(stop)); + + hr = IMediaSample_IsDiscontinuity(sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_IsPreroll(sample); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + hr = IMediaSample_IsSyncPoint(sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ++filter->got_sample; + return S_OK; } @@ -756,6 +790,73 @@ static void testfilter_init(struct testfilter *filter) strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); } +static void test_sample_processing(IMediaControl *control, IMemInputPin *input, struct testfilter *sink) +{ + REFERENCE_TIME start, stop; + IMemAllocator *allocator; + IMediaSample *sample; + LONG size, i; + HRESULT hr; + BYTE *data; + + hr = IMemInputPin_ReceiveCanBlock(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr != S_OK) + { + IMemAllocator_Commit(allocator); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + size = IMediaSample_GetSize(sample); + ok(size == 256, "Got size %d.\n", size); + for (i = 0; i < 200; ++i) + data[i] = i; + hr = IMediaSample_SetActualDataLength(sample, 200); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start = 10000; + stop = 20000; + hr = IMediaSample_SetMediaTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#x.\n", hr); + start = 30000; + stop = 40000; + hr = IMediaSample_SetTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetDiscontinuity(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetSyncPoint(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(sink->got_sample == 1, "Got %u calls to Receive().\n", sink->got_sample); + sink->got_sample = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_Receive(input, sample); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); +} + static void test_connect_pin(void) { AM_MEDIA_TYPE req_mt = @@ -772,6 +873,7 @@ static void test_connect_pin(void) IMediaControl *control; AM_MEDIA_TYPE mt, *pmt; IFilterGraph2 *graph; + IMemInputPin *input; HRESULT hr; ULONG ref; @@ -784,6 +886,7 @@ static void test_connect_pin(void) IFilterGraph2_AddFilter(graph, filter, L"sample grabber"); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); IBaseFilter_FindPin(filter, L"In", &sink); + IPin_QueryInterface(sink, &IID_IMemInputPin, (void **)&input); IBaseFilter_FindPin(filter, L"Out", &source); IBaseFilter_QueryInterface(filter, &IID_ISampleGrabber, (void **)&grabber); @@ -916,6 +1019,8 @@ static void test_connect_pin(void) ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); + test_sample_processing(control, input, &testsink); + hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, source); @@ -1053,6 +1158,7 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(sink, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + IMemInputPin_Release(input); IPin_Release(sink); IPin_Release(source); IMediaControl_Release(control);

1 0

Zebediah Figura : qedit/tests: Add some tests for sample grabber streaming events.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 1917988975e080d853fcf6f6b3c1c674d542aee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1917988975e080d853fcf6f6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Nov 29 23:05:31 2020 -0600 qedit/tests: Add some tests for sample grabber streaming events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/samplegrabber.c | 128 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 127 insertions(+), 1 deletion(-) diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 2eaaffb67b7..f82c375b76f 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -579,7 +579,7 @@ struct testfilter struct strmbase_sink sink; const AM_MEDIA_TYPE *sink_mt; AM_MEDIA_TYPE source_mt; - unsigned int got_sample; + unsigned int got_sample, got_new_segment, got_eos, got_begin_flush, got_end_flush; }; static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -773,12 +773,48 @@ static HRESULT WINAPI testsink_Receive(struct strmbase_sink *iface, IMediaSample return S_OK; } +static HRESULT testsink_new_segment(struct strmbase_sink *iface, + REFERENCE_TIME start, REFERENCE_TIME stop, double rate) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_new_segment; + ok(start == 10000, "Got start %s.\n", wine_dbgstr_longlong(start)); + ok(stop == 20000, "Got stop %s.\n", wine_dbgstr_longlong(stop)); + ok(rate == 1.0, "Got rate %.16e.\n", rate); + return S_OK; +} + +static HRESULT testsink_eos(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_eos; + return S_OK; +} + +static HRESULT testsink_begin_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_begin_flush; + return S_OK; +} + +static HRESULT testsink_end_flush(struct strmbase_sink *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->pin.filter); + ++filter->got_end_flush; + return S_OK; +} + static const struct strmbase_sink_ops testsink_ops = { .base.pin_query_interface = testsink_query_interface, .base.pin_query_accept = testsink_query_accept, .base.pin_get_media_type = testsink_get_media_type, .pfnReceive = testsink_Receive, + .sink_new_segment = testsink_new_segment, + .sink_eos = testsink_eos, + .sink_begin_flush = testsink_begin_flush, + .sink_end_flush = testsink_end_flush, }; static void testfilter_init(struct testfilter *filter) @@ -857,6 +893,95 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, IMemAllocator_Release(allocator); } +static void test_streaming_events(IMediaControl *control, IPin *sink, + IMemInputPin *input, struct testfilter *testsink) +{ + REFERENCE_TIME start, stop; + IMemAllocator *allocator; + IMediaSample *sample; + HRESULT hr; + BYTE *data; + LONG i; + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + for (i = 0; i < 200; ++i) + data[i] = i; + hr = IMediaSample_SetActualDataLength(sample, 200); + ok(hr == S_OK, "Got hr %#x.\n", hr); + start = 10000; + stop = 20000; + hr = IMediaSample_SetMediaTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#x.\n", hr); + start = 30000; + stop = 40000; + hr = IMediaSample_SetTime(sample, &start, &stop); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetDiscontinuity(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaSample_SetSyncPoint(sample, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(!testsink->got_new_segment, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + hr = IPin_NewSegment(sink, 10000, 20000, 1.0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_new_segment == 1, "Got %u calls to IPin::NewSegment().\n", testsink->got_new_segment); + + ok(!testsink->got_eos, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!testsink->got_sample, "Got %u calls to Receive().\n", testsink->got_sample); + ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + testsink->got_eos = 0; + + hr = IPin_EndOfStream(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + testsink->got_eos = 0; + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(testsink->got_sample == 1, "Got %u calls to Receive().\n", testsink->got_sample); + testsink->got_sample = 0; + + ok(!testsink->got_begin_flush, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + hr = IPin_BeginFlush(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_begin_flush == 1, "Got %u calls to IPin::BeginFlush().\n", testsink->got_begin_flush); + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_sample == 1, "Got %u calls to Receive().\n", testsink->got_sample); + testsink->got_sample = 0; + + hr = IPin_EndOfStream(sink); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(testsink->got_eos == 1, "Got %u calls to IPin::EndOfStream().\n", testsink->got_eos); + testsink->got_eos = 0; + + ok(!testsink->got_end_flush, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + hr = IPin_EndFlush(sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_end_flush == 1, "Got %u calls to IPin::EndFlush().\n", testsink->got_end_flush); + + hr = IMemInputPin_Receive(input, sample); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(testsink->got_sample == 1, "Got %u calls to Receive().\n", testsink->got_sample); + testsink->got_sample = 0; + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMediaSample_Release(sample); + IMemAllocator_Release(allocator); +} + static void test_connect_pin(void) { AM_MEDIA_TYPE req_mt = @@ -1020,6 +1145,7 @@ static void test_connect_pin(void) ok(compare_media_types(&testsource.source.pin.mt, &testsink.sink.pin.mt), "Media types didn't match.\n"); test_sample_processing(control, input, &testsink); + test_streaming_events(control, sink, input, &testsink); hr = IMediaControl_Pause(control); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Piotr Caban : msvcp120/tests: Use wide-char string literals.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 6c1eaf1997fc073215889a049065573b088a71ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c1eaf1997fc073215889a04… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 10:10:06 2020 +0100 msvcp120/tests: Use wide-char string literals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 62 ++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c1eaf1997fc07321588…

1 0

Piotr Caban : msvcp140/tests: Use wide-char string literals.
by Alexandre Julliard 30 Nov '20

30 Nov '20

Module: wine Branch: master Commit: 81b6613b3762a1f2e5f8258f55cc9004ce5cc239 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81b6613b3762a1f2e5f8258f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 10:10:10 2020 +0100 msvcp140/tests: Use wide-char string literals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 358 ++++++++++++++++------------------------- 1 file changed, 142 insertions(+), 216 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81b6613b3762a1f2e5f8…

1 0