November 2020 - Wine-Commits

Derek Lesho : mf/topoloader: Add partial topology resolution tests.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: de8930ff52509ac5b5ba1a6b5039efa140540999 URL: https://source.winehq.org/git/wine.git/?a=commit;h=de8930ff52509ac5b5ba1a6b… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 30 15:25:12 2020 +0300 mf/topoloader: Add partial topology resolution tests. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/Makefile.in | 2 - dlls/mf/tests/mf.c | 705 +++++++++++++++++++++++++++++++++++++++------- dlls/mf/tests/resource.rc | 22 -- dlls/mf/tests/test.wav | Bin 4488 -> 0 bytes 4 files changed, 597 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=de8930ff52509ac5b5ba…

1 0

Nikolay Sivov : dwrite/layout: Zero-initialize format structure.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 2903090ecc62514e4cd58bbd70fcbc26f2c5556c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2903090ecc62514e4cd58bbd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 30 15:12:42 2020 +0300 dwrite/layout: Zero-initialize format structure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 66 +++++++++++++++++++--------------------------------- 1 file changed, 24 insertions(+), 42 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 25d3bcb4ad0..ab442c453bf 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -5920,10 +5920,10 @@ static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextF CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat3_iface) : NULL; } -HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, - DWRITE_FONT_STRETCH stretch, FLOAT size, const WCHAR *locale, IDWriteTextFormat **format) +HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, + DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, FLOAT size, const WCHAR *locale, IDWriteTextFormat **format) { - struct dwrite_textformat *This; + struct dwrite_textformat *object; *format = NULL; @@ -5935,45 +5935,27 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle ((UINT32)style > DWRITE_FONT_STYLE_ITALIC)) return E_INVALIDARG; - This = heap_alloc(sizeof(struct dwrite_textformat)); - if (!This) return E_OUTOFMEMORY; - - This->IDWriteTextFormat3_iface.lpVtbl = &dwritetextformatvtbl; - This->refcount = 1; - This->format.family_name = heap_strdupW(family_name); - This->format.family_len = strlenW(family_name); - This->format.locale = heap_strdupW(locale); - This->format.locale_len = strlenW(locale); - /* force locale name to lower case, layout will inherit this modified value */ - strlwrW(This->format.locale); - This->format.weight = weight; - This->format.style = style; - This->format.fontsize = size; - This->format.tabstop = 4.0f * size; - This->format.stretch = stretch; - This->format.textalignment = DWRITE_TEXT_ALIGNMENT_LEADING; - This->format.optical_alignment = DWRITE_OPTICAL_ALIGNMENT_NONE; - This->format.paralign = DWRITE_PARAGRAPH_ALIGNMENT_NEAR; - This->format.wrapping = DWRITE_WORD_WRAPPING_WRAP; - This->format.last_line_wrapping = TRUE; - This->format.readingdir = DWRITE_READING_DIRECTION_LEFT_TO_RIGHT; - This->format.flow = DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM; - This->format.spacing.method = DWRITE_LINE_SPACING_METHOD_DEFAULT; - This->format.spacing.height = 0.0f; - This->format.spacing.baseline = 0.0f; - This->format.spacing.leadingBefore = 0.0f; - This->format.spacing.fontLineGapUsage = DWRITE_FONT_LINE_GAP_USAGE_DEFAULT; - This->format.vertical_orientation = DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; - This->format.trimming.granularity = DWRITE_TRIMMING_GRANULARITY_NONE; - This->format.trimming.delimiter = 0; - This->format.trimming.delimiterCount = 0; - This->format.trimmingsign = NULL; - This->format.collection = collection; - This->format.fallback = NULL; - This->format.automatic_axes = DWRITE_AUTOMATIC_FONT_AXES_NONE; - IDWriteFontCollection_AddRef(collection); - - *format = (IDWriteTextFormat *)&This->IDWriteTextFormat3_iface; + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->IDWriteTextFormat3_iface.lpVtbl = &dwritetextformatvtbl; + object->refcount = 1; + object->format.family_name = heap_strdupW(family_name); + object->format.family_len = strlenW(family_name); + object->format.locale = heap_strdupW(locale); + object->format.locale_len = strlenW(locale); + /* Force locale name to lower case, layout will inherit this modified value. */ + strlwrW(object->format.locale); + object->format.weight = weight; + object->format.style = style; + object->format.fontsize = size; + object->format.tabstop = 4.0f * size; + object->format.stretch = stretch; + object->format.last_line_wrapping = TRUE; + object->format.collection = collection; + IDWriteFontCollection_AddRef(object->format.collection); + + *format = (IDWriteTextFormat *)&object->IDWriteTextFormat3_iface; return S_OK; }

1 0

Nikolay Sivov : dwrite/layout: Keep automatic axes property.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 2a74ed80beeb81575a708616228ca16195e5cff5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a74ed80beeb81575a708616… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 30 15:12:41 2020 +0300 dwrite/layout: Keep automatic axes property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 53 +++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 129 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b9321157a91..25d3bcb4ad0 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -32,7 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); -struct dwrite_textformat_data { +struct dwrite_textformat_data +{ WCHAR *family_name; UINT32 family_len; WCHAR *locale; @@ -51,6 +52,7 @@ struct dwrite_textformat_data { DWRITE_VERTICAL_GLYPH_ORIENTATION vertical_orientation; DWRITE_OPTICAL_ALIGNMENT optical_alignment; DWRITE_LINE_SPACING spacing; + DWRITE_AUTOMATIC_FONT_AXES automatic_axes; FLOAT fontsize; FLOAT tabstop; @@ -4144,17 +4146,25 @@ static HRESULT WINAPI dwritetextlayout4_GetFontAxisValues(IDWriteTextLayout4 *if static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextlayout4_GetAutomaticFontAxes(IDWriteTextLayout4 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout4(iface); + + TRACE("%p.\n", iface); - return DWRITE_AUTOMATIC_FONT_AXES_NONE; + return layout->format.automatic_axes; } static HRESULT WINAPI dwritetextlayout4_SetAutomaticFontAxes(IDWriteTextLayout4 *iface, DWRITE_AUTOMATIC_FONT_AXES axes) { - FIXME("%p, %d.\n", iface, axes); + struct dwrite_textlayout *layout = impl_from_IDWriteTextLayout4(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, axes); + + if ((unsigned int)axes > DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE) + return E_INVALIDARG; + + layout->format.automatic_axes = axes; + return S_OK; } static const IDWriteTextLayout4Vtbl dwritetextlayoutvtbl = @@ -4702,17 +4712,15 @@ static HRESULT WINAPI dwritetextformat3_layout_GetFontAxisValues(IDWriteTextForm static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_layout_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); - - return DWRITE_AUTOMATIC_FONT_AXES_NONE; + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); + return IDWriteTextLayout4_GetAutomaticFontAxes(&layout->IDWriteTextLayout4_iface); } static HRESULT WINAPI dwritetextformat3_layout_SetAutomaticFontAxes(IDWriteTextFormat3 *iface, DWRITE_AUTOMATIC_FONT_AXES axes) { - FIXME("%p, %d.\n", iface, axes); - - return E_NOTIMPL; + struct dwrite_textlayout *layout = impl_layout_from_IDWriteTextFormat3(iface); + return IDWriteTextLayout4_SetAutomaticFontAxes(&layout->IDWriteTextLayout4_iface, axes); } static const IDWriteTextFormat3Vtbl dwritetextformat3_layout_vtbl = @@ -5036,6 +5044,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I { struct dwrite_textformat *textformat; IDWriteTextFormat1 *format1; + IDWriteTextFormat3 *format3; UINT32 len; HRESULT hr; @@ -5125,6 +5134,13 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I layout->format.optical_alignment = DWRITE_OPTICAL_ALIGNMENT_NONE; } + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat3, (void **)&format3); + if (hr == S_OK) + { + layout->format.automatic_axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + IDWriteTextFormat3_Release(format3); + } + return IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); } @@ -5833,16 +5849,22 @@ static HRESULT WINAPI dwritetextformat3_GetFontAxisValues(IDWriteTextFormat3 *if static DWRITE_AUTOMATIC_FONT_AXES WINAPI dwritetextformat3_GetAutomaticFontAxes(IDWriteTextFormat3 *iface) { - FIXME("%p.\n", iface); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return DWRITE_AUTOMATIC_FONT_AXES_NONE; + TRACE("%p.\n", iface); + + return format->format.automatic_axes; } static HRESULT WINAPI dwritetextformat3_SetAutomaticFontAxes(IDWriteTextFormat3 *iface, DWRITE_AUTOMATIC_FONT_AXES axes) { - FIXME("%p, %d.\n", iface, axes); + struct dwrite_textformat *format = impl_from_IDWriteTextFormat3(iface); - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, axes); + + format->format.automatic_axes = axes; + + return S_OK; } static const IDWriteTextFormat3Vtbl dwritetextformatvtbl = @@ -5948,6 +5970,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.trimmingsign = NULL; This->format.collection = collection; This->format.fallback = NULL; + This->format.automatic_axes = DWRITE_AUTOMATIC_FONT_AXES_NONE; IDWriteFontCollection_AddRef(collection); *format = (IDWriteTextFormat *)&This->IDWriteTextFormat3_iface; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 2e309f14b73..beb09f400f9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5732,6 +5732,96 @@ todo_wine { IDWriteFactory_Release(factory); } +static void test_automatic_font_axes(void) +{ + DWRITE_AUTOMATIC_FONT_AXES axes; + IDWriteTextLayout4 *layout4 = NULL; + IDWriteTextFormat3 *format3; + IDWriteTextLayout *layout; + IDWriteTextFormat *format; + IDWriteFactory *factory; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, L"Tahoma", NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 16.0f, L"en-us", &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %x.\n", hr); + + IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout4, (void **)&layout4); + + IDWriteTextLayout_Release(layout); + + if (!layout4) + { + win_skip("Text layout does not support variable fonts.\n"); + IDWriteFactory_Release(factory); + IDWriteTextFormat_Release(format); + return; + } + + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat3, (void **)&format3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_NONE, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextFormat3_SetAutomaticFontAxes(format3, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat3_SetAutomaticFontAxes(format3, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteTextFormat3_Release(format3); + + axes = IDWriteTextLayout4_GetAutomaticFontAxes(layout4); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_NONE, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextLayout4_SetAutomaticFontAxes(layout4, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextLayout4_SetAutomaticFontAxes(layout4, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteTextLayout4_Release(layout4); + + /* Out of range values allow for formats, but not for layouts. */ + hr = IDWriteFactory_CreateTextLayout(factory, L"a", 1, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %x.\n", hr); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout4, (void **)&layout4); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextLayout4_GetAutomaticFontAxes(layout4); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextLayout4_QueryInterface(layout4, &IID_IDWriteTextFormat3, (void **)&format3); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextLayout4_SetAutomaticFontAxes(layout4, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + axes = IDWriteTextFormat3_GetAutomaticFontAxes(format3); + ok(axes == DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE, "Unexpected automatic axes %u.\n", axes); + + hr = IDWriteTextFormat3_SetAutomaticFontAxes(format3, DWRITE_AUTOMATIC_FONT_AXES_OPTICAL_SIZE + 1); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + IDWriteTextFormat3_Release(format3); + + IDWriteTextLayout_Release(layout); + + IDWriteTextLayout4_Release(layout4); + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -5783,6 +5873,7 @@ START_TEST(layout) test_line_spacing(); test_GetOverhangMetrics(); test_tab_stops(); + test_automatic_font_axes(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : mfplat/mediatype: Store extra format data as MF_MT_USER_DATA when initializing from WAVEFORMATEX.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 3a9ecc58785e0795169af3810f241ccd1e18ce3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3a9ecc58785e0795169af381… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 30 15:00:51 2020 +0300 mfplat/mediatype: Store extra format data as MF_MT_USER_DATA when initializing from WAVEFORMATEX. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 13 ++++++++++--- dlls/mfplat/tests/mfplat.c | 28 +++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index f3895ca4d49..62d75e80146 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -2943,6 +2943,13 @@ static void mediatype_set_guid(IMFMediaType *mediatype, const GUID *attr, const *hr = IMFMediaType_SetGUID(mediatype, attr, value); } +static void mediatype_set_blob(IMFMediaType *mediatype, const GUID *attr, const UINT8 *data, + unsigned int size, HRESULT *hr) +{ + if (SUCCEEDED(*hr)) + *hr = IMFMediaType_SetBlob(mediatype, attr, data, size); +} + /*********************************************************************** * MFInitMediaTypeFromWaveFormatEx (mfplat.@) */ @@ -2957,9 +2964,6 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA if (!mediatype || !format) return E_POINTER; - if (format->cbSize && format->cbSize < sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX)) - return E_INVALIDARG; - if (format->cbSize + sizeof(*format) > size) return E_INVALIDARG; @@ -3007,6 +3011,9 @@ HRESULT WINAPI MFInitMediaTypeFromWaveFormatEx(IMFMediaType *mediatype, const WA mediatype_set_uint32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1, &hr); } + if (format->cbSize) + mediatype_set_blob(mediatype, &MF_MT_USER_DATA, (const UINT8 *)(format + 1), format->cbSize, &hr); + return hr; } diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 474d6281f5f..38e8acb966e 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5600,9 +5600,12 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void) { WAVE_FORMAT_WMAUDIO_LOSSLESS }, { WAVE_FORMAT_WMASPDIF }, }; + + UINT8 buff[MPEGLAYER3_WFX_EXTRA_BYTES]; WAVEFORMATEXTENSIBLE waveformatext; + MPEGLAYER3WAVEFORMAT mp3format; IMFMediaType *mediatype; - unsigned int i; + unsigned int i, size; HRESULT hr; hr = MFCreateMediaType(&mediatype); @@ -5628,6 +5631,29 @@ static void test_MFInitMediaTypeFromWaveFormatEx(void) validate_media_type(mediatype, &waveformatext.Format); } + /* MPEGLAYER3WAVEFORMAT */ + mp3format.wfx.wFormatTag = WAVE_FORMAT_MPEGLAYER3; + mp3format.wfx.nChannels = 2; + mp3format.wfx.nSamplesPerSec = 44100; + mp3format.wfx.nAvgBytesPerSec = 16000; + mp3format.wfx.nBlockAlign = 1; + mp3format.wfx.wBitsPerSample = 0; + mp3format.wfx.cbSize = MPEGLAYER3_WFX_EXTRA_BYTES; + mp3format.wID = MPEGLAYER3_ID_MPEG; + mp3format.fdwFlags = 0; + mp3format.nBlockSize = 417; + mp3format.nFramesPerBlock = 0; + mp3format.nCodecDelay = 0; + + hr = MFInitMediaTypeFromWaveFormatEx(mediatype, (WAVEFORMATEX *)&mp3format, sizeof(mp3format)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + validate_media_type(mediatype, &mp3format.wfx); + hr = IMFMediaType_GetBlob(mediatype, &MF_MT_USER_DATA, buff, sizeof(buff), &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size == mp3format.wfx.cbSize, "Unexpected size %u.\n", size); + ok(!memcmp(buff, (WAVEFORMATEX *)&mp3format + 1, size), "Unexpected user data.\n"); + IMFMediaType_Release(mediatype); }

1 0

Piotr Caban : msvcr120/tests: Use wide-char string literals.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 4bf140d799c2596145722af90c742d994ebefd1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bf140d799c2596145722af9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 10:10:25 2020 +0100 msvcr120/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/msvcr120/tests/msvcr120.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index a462c898c93..5976a86963a 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -584,9 +584,6 @@ static void test__strtof(void) const char float3[] = "-3.402823466e+38"; const char float4[] = "1.7976931348623158e+308"; /* DBL_MAX */ - const WCHAR twelve[] = {'1','2','.','0',0}; - const WCHAR arabic23[] = { 0x662, 0x663, 0}; - char *end; float f; @@ -621,10 +618,10 @@ static void test__strtof(void) f = p_strtof("0x12", NULL); ok(f == 0, "f = %lf\n", f); - f = p_wcstof(twelve, NULL); + f = p_wcstof(L"12.0", NULL); ok(f == 12.0, "f = %lf\n", f); - f = p_wcstof(arabic23, NULL); + f = p_wcstof(L"\x0662\x0663", NULL); ok(f == 0, "f = %lf\n", f); if(!p_setlocale(LC_ALL, "Arabic")) { @@ -632,10 +629,10 @@ static void test__strtof(void) return; } - f = p_wcstof(twelve, NULL); + f = p_wcstof(L"12.0", NULL); ok(f == 12.0, "f = %lf\n", f); - f = p_wcstof(arabic23, NULL); + f = p_wcstof(L"\x0662\x0663", NULL); ok(f == 0, "f = %lf\n", f); p_setlocale(LC_ALL, "C"); @@ -807,22 +804,19 @@ static void test_feenv(void) static void test__wcreate_locale(void) { - static const wchar_t c_locale[] = {'C',0}; - static const wchar_t bogus[] = {'b','o','g','u','s',0}; - static const wchar_t empty[] = {0}; _locale_t lcl; errno_t e; /* simple success */ errno = -1; - lcl = p_wcreate_locale(LC_ALL, c_locale); + lcl = p_wcreate_locale(LC_ALL, L"C"); e = errno; ok(!!lcl, "expected success, but got NULL\n"); ok(errno == -1, "expected errno -1, but got %i\n", e); p_free_locale(lcl); errno = -1; - lcl = p_wcreate_locale(LC_ALL, empty); + lcl = p_wcreate_locale(LC_ALL, L""); e = errno; ok(!!lcl, "expected success, but got NULL\n"); ok(errno == -1, "expected errno -1, but got %i\n", e); @@ -830,14 +824,14 @@ static void test__wcreate_locale(void) /* bogus category */ errno = -1; - lcl = p_wcreate_locale(-1, c_locale); + lcl = p_wcreate_locale(-1, L"C"); e = errno; ok(!lcl, "expected failure, but got %p\n", lcl); ok(errno == -1, "expected errno -1, but got %i\n", e); /* bogus names */ errno = -1; - lcl = p_wcreate_locale(LC_ALL, bogus); + lcl = p_wcreate_locale(LC_ALL, L"bogus"); e = errno; ok(!lcl, "expected failure, but got %p\n", lcl); ok(errno == -1, "expected errno -1, but got %i\n", e);

1 0

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

Nov. 30, 2020

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

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

Nov. 30, 2020

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

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

Nov. 30, 2020

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

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

Nov. 30, 2020

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 : qcap/tests: Remove old tests for smart tee streaming.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

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