September 2022 - Wine-commits

Rémi Bernon : mf/tests: Test that IMFTopoLoader_Load doesn't set output nodes media types.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: 065a34320762ff3cedbcef7a855af994def7a0d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/065a34320762ff3cedbcef7a855af9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 29 11:42:48 2022 +0200 mf/tests: Test that IMFTopoLoader_Load doesn't set output nodes media types. --- dlls/mf/tests/mf.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 349cb0f2825..34cab54a607 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1532,6 +1532,8 @@ static void test_sequencer_source(void) struct test_handler { IMFMediaTypeHandler IMFMediaTypeHandler_iface; + + ULONG set_current_count; IMFMediaType *current_type; IMFMediaType *invalid_type; @@ -1619,9 +1621,13 @@ static HRESULT WINAPI test_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *ifac static HRESULT WINAPI test_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *media_type) { - /* FIXME: Wine sets downstream media type when resolving topology, native doesn't */ - todo_wine - ok(0, "Unexpected call.\n"); + struct test_handler *impl = impl_from_IMFMediaTypeHandler(iface); + + if (impl->current_type) + IMFMediaType_Release(impl->current_type); + IMFMediaType_AddRef((impl->current_type = media_type)); + impl->set_current_count++; + return S_OK; } @@ -2871,10 +2877,11 @@ static void test_topology_loader(void) init_media_type(input_type, *test->input_type, -1); init_media_type(output_type, *test->output_type, -1); + handler.set_current_count = 0; if (test->flags & LOADER_NO_CURRENT_OUTPUT) handler.current_type = NULL; else - handler.current_type = output_type; + IMFMediaType_AddRef((handler.current_type = output_type)); if (test->flags & LOADER_SET_INVALID_INPUT) handler.invalid_type = input_type; @@ -3057,6 +3064,13 @@ todo_wine { else ok(!handler.enum_count, "got %lu GetMediaTypeByIndex\n", handler.enum_count); + todo_wine_if((test->flags & LOADER_NO_CURRENT_OUTPUT) && !(test->flags & LOADER_SET_MEDIA_TYPES)) + ok(!handler.set_current_count, "got %lu SetCurrentMediaType\n", handler.set_current_count); + + if (handler.current_type) + IMFMediaType_Release(handler.current_type); + handler.current_type = NULL; + hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_SOURCE, NULL); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFTopologyNode_SetUnknown(src_node, &MF_TOPONODE_STREAM_DESCRIPTOR, NULL);

1 0

Rémi Bernon : mf/tests: Test that IMFTopoLoader_Load sets transform nodes media types.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: af62da3160206035769152b7b1cd76882b9ad3dd URL: https://gitlab.winehq.org/wine/wine/-/commit/af62da3160206035769152b7b1cd76… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 3 17:29:10 2022 +0200 mf/tests: Test that IMFTopoLoader_Load sets transform nodes media types. --- dlls/mf/tests/mf.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 34cab54a607..7937351eb4a 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2478,10 +2478,21 @@ enum loader_test_flags LOADER_NO_CURRENT_OUTPUT = 0x20, LOADER_SET_INVALID_INPUT = 0x40, LOADER_SET_MEDIA_TYPES = 0x80, + LOADER_ADD_RESAMPLER_MFT = 0x100, }; static void test_topology_loader(void) { + static const media_type_desc audio_float_44100 = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_Float), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 1), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 4), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 4 * 44100), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 4 * 8), + }; static const media_type_desc audio_pcm_44100 = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), @@ -2502,6 +2513,18 @@ static void test_topology_loader(void) ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 1), ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 8), }; + static const media_type_desc audio_pcm_48000_resampler = + { + ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), + ATTR_GUID(MF_MT_SUBTYPE, MFAudioFormat_PCM), + ATTR_UINT32(MF_MT_AUDIO_BITS_PER_SAMPLE, 16), + ATTR_UINT32(MF_MT_AUDIO_NUM_CHANNELS, 2), + ATTR_UINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, 48000), + ATTR_UINT32(MF_MT_AUDIO_AVG_BYTES_PER_SECOND, 192000), + ATTR_UINT32(MF_MT_AUDIO_BLOCK_ALIGNMENT, 4), + ATTR_UINT32(MF_MT_ALL_SAMPLES_INDEPENDENT, 1), + ATTR_UINT32(MF_MT_AUDIO_PREFER_WAVEFORMATEX, 1), + }; static const media_type_desc audio_float_48000 = { ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Audio), @@ -2659,6 +2682,19 @@ static void test_topology_loader(void) .expected_result = MF_E_INVALIDMEDIATYPE, }, + { + /* Float -> PCM, refuse input type, add converter */ + .input_type = &audio_float_44100, .output_type = &audio_pcm_48000, .sink_method = MF_CONNECT_DIRECT, .source_method = -1, + .expected_result = MF_E_NO_MORE_TYPES, + .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + }, + { + /* Float -> PCM, refuse input type, add converter, allow resampler output type */ + .input_type = &audio_float_44100, .output_type = &audio_pcm_48000_resampler, .sink_method = MF_CONNECT_DIRECT, .source_method = -1, + .expected_result = S_OK, + .flags = LOADER_SET_INVALID_INPUT | LOADER_ADD_RESAMPLER_MFT | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + }, + { /* MP3 -> PCM */ .input_type = &audio_mp3_44100, .output_type = &audio_pcm_44100, .sink_method = MF_CONNECT_DIRECT, .source_method = -1, @@ -2900,6 +2936,46 @@ static void test_topology_loader(void) handler.media_types = NULL; } + if (test->flags & LOADER_ADD_RESAMPLER_MFT) + { + hr = IMFTopology_Clear(topology); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTopology_AddNode(topology, src_node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTopology_AddNode(topology, sink_node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &mft_node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = CoCreateInstance(&CLSID_CResamplerMediaObject, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTopologyNode_SetGUID(mft_node, &MF_TOPONODE_TRANSFORM_OBJECTID, &CLSID_CResamplerMediaObject); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTopologyNode_SetObject(mft_node, (IUnknown *)transform); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IMFTransform_Release(transform); + + hr = IMFTopology_AddNode(topology, mft_node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTopologyNode_ConnectOutput(src_node, 0, mft_node, 0); + ok(hr == S_OK, "Failed to connect nodes, hr %#lx.\n", hr); + hr = IMFTopologyNode_ConnectOutput(mft_node, 0, sink_node, 0); + ok(hr == S_OK, "Failed to connect nodes, hr %#lx.\n", hr); + IMFTopologyNode_Release(mft_node); + } + else + { + hr = IMFTopology_Clear(topology); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTopology_AddNode(topology, src_node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTopology_AddNode(topology, sink_node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + hr = IMFTopologyNode_ConnectOutput(src_node, 0, sink_node, 0); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + } + create_descriptors(1, &input_type, test->current_input, &pd, &sd); source = create_test_source(pd); @@ -3028,13 +3104,22 @@ todo_wine { hr = IMFTransform_GetOutputCurrentType(transform, 0, &media_type); ok(hr == S_OK, "Failed to get transform output type, hr %#lx.\n", hr); - hr = IMFMediaType_Compare(output_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret); ok(hr == S_OK, "Failed to compare media types, hr %#lx.\n", hr); ok(ret, "Output type of last transform doesn't match sink node type.\n"); + IMFMediaType_Release(media_type); - IMFTopologyNode_Release(mft_node); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); + ok(hr == S_OK, "Failed to get transform input type, hr %#lx.\n", hr); + if ((test->flags & (LOADER_EXPECTED_CONVERTER | LOADER_EXPECTED_DECODER)) != (LOADER_EXPECTED_CONVERTER | LOADER_EXPECTED_DECODER)) + { + hr = IMFMediaType_Compare(input_type, (IMFAttributes *)media_type, MF_ATTRIBUTES_MATCH_OUR_ITEMS, &ret); + ok(hr == S_OK, "Failed to compare media types, hr %#lx.\n", hr); + ok(ret, "Input type of transform doesn't match source node type.\n"); + } IMFMediaType_Release(media_type); + + IMFTopologyNode_Release(mft_node); IMFTransform_Release(transform); }

1 0

Rémi Bernon : mf/tests: Test that IMFMediaSession_SetTopology sets output nodes media types.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: de48020325b80f3c420e51de8a350dbadaabf9b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/de48020325b80f3c420e51de8a350d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 25 15:50:51 2022 +0200 mf/tests: Test that IMFMediaSession_SetTopology sets output nodes media types. --- dlls/mf/tests/mf.c | 357 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 349 insertions(+), 8 deletions(-)

1 0

Eric Pouech : include: Enable ANSI support in console for WINETEST_COLOR.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: f20b892ed9e8a9d8f9459caa55e76ed6142260f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f20b892ed9e8a9d8f9459caa55e76e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 1 11:18:00 2022 +0200 include: Enable ANSI support in console for WINETEST_COLOR. This lets WINETEST_COLOR works under Windows console (at least, on recent versions where ANSI support is available). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/test.h | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 1690c5613d8..3782c6eeeb6 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -678,7 +678,20 @@ int main( int argc, char **argv ) winetest_platform = "wine"; if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) - winetest_color = !strcasecmp(p, "auto") ? isatty(fileno(stdout)) : atoi(p); + { + BOOL automode = !strcasecmp(p, "auto"); + winetest_color = automode ? isatty( fileno( stdout ) ) : atoi(p); + /* enable ANSI support for Windows console */ + if (winetest_color) + { + HANDLE hOutput = (HANDLE)_get_osfhandle( fileno( stdout ) ); + DWORD mode; + if (GetConsoleMode( hOutput, &mode ) && + !SetConsoleMode( hOutput, mode | ENABLE_PROCESSED_OUTPUT | ENABLE_VIRTUAL_TERMINAL_PROCESSING ) && + automode) + winetest_color = 0; + } + } if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p);

1 0

Francois Gouget : winex11.drv: Use #ifdef to check config.h macros.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: 57d1bad10615b3c283d50a30775de8b7a8e92af2 URL: https://gitlab.winehq.org/wine/wine/-/commit/57d1bad10615b3c283d50a30775de8… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Aug 25 12:11:27 2022 +0200 winex11.drv: Use #ifdef to check config.h macros. They are undefined when the feature is missing. --- dlls/winex11.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d0cc185d96c..96be81df6e3 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -371,7 +371,7 @@ static void disable_xinput2(void) */ static BOOL grab_clipping_window( const RECT *clip ) { -#if HAVE_X11_EXTENSIONS_XINPUT2_H +#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); UNICODE_STRING class_name;

1 0

Nikolay Sivov : evr/filter: Notify mixer and presenter on state changes.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: 50cd67d06968029e7c4c2c7ac79f1535154f9c03 URL: https://gitlab.winehq.org/wine/wine/-/commit/50cd67d06968029e7c4c2c7ac79f15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 5 12:25:20 2022 +0300 evr/filter: Notify mixer and presenter on state changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/evr/evr.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 1b2930c500a..67b13cbd5af 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -312,6 +312,38 @@ static HRESULT evr_query_accept(struct strmbase_renderer *iface, const AM_MEDIA_ return hr; } +/* FIXME: errors should be propagated from init/start/stop handlers. */ +static void evr_init_stream(struct strmbase_renderer *iface) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + + if (!filter->mixer) return; + + if (SUCCEEDED(IMFTransform_ProcessMessage(filter->mixer, MFT_MESSAGE_NOTIFY_BEGIN_STREAMING, 0))) + IMFVideoPresenter_ProcessMessage(filter->presenter, MFVP_MESSAGE_BEGINSTREAMING, 0); +} + +static void evr_start_stream(struct strmbase_renderer *iface) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + + if (filter->mixer) + IMFTransform_ProcessMessage(filter->mixer, MFT_MESSAGE_NOTIFY_START_OF_STREAM, 0); +} + +static void evr_stop_stream(struct strmbase_renderer *iface) +{ + struct evr *filter = impl_from_strmbase_renderer(iface); + + if (!filter->mixer) return; + + if (SUCCEEDED(IMFTransform_ProcessMessage(filter->mixer, MFT_MESSAGE_NOTIFY_END_OF_STREAM, 0))) + { + if (SUCCEEDED(IMFVideoPresenter_ProcessMessage(filter->presenter, MFVP_MESSAGE_ENDSTREAMING, 0))) + IMFTransform_ProcessMessage(filter->mixer, MFT_MESSAGE_NOTIFY_END_STREAMING, 0); + } +} + static const struct strmbase_renderer_ops renderer_ops = { .renderer_query_accept = evr_query_accept, @@ -320,6 +352,9 @@ static const struct strmbase_renderer_ops renderer_ops = .renderer_connect = evr_connect, .renderer_disconnect = evr_disconnect, .renderer_destroy = evr_destroy, + .renderer_init_stream = evr_init_stream, + .renderer_start_stream = evr_start_stream, + .renderer_stop_stream = evr_stop_stream, }; static struct evr *impl_from_IEVRFilterConfig(IEVRFilterConfig *iface)

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: ecbfb5e134661a62e4f899e88cb7125c686c7e06 URL: https://gitlab.winehq.org/wine/wine/-/commit/ecbfb5e134661a62e4f899e88cb712… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Sep 5 10:50:48 2022 +0200 po: Update German translation. --- po/de.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/de.po b/po/de.po index 3a9f13e2425..059917dfd5d 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-06-28 13:20+0200\n" +"PO-Revision-Date: 2022-09-05 10:50+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -1334,10 +1334,8 @@ msgid "Options" msgstr "Einstellungen" #: dlls/compstui/compstui.rc:31 -#, fuzzy -#| msgid "Defaults" msgid "Default" -msgstr "Standards" +msgstr "Standard" #: dlls/credui/credui.rc:45 msgid "&User name:"

1 0

Matteo Bruni : windowscodecs/tests: Clean up after running test expected to fail.
by Alexandre Julliard 05 Sep '22

05 Sep '22

Module: wine Branch: master Commit: 03acb453d93c3b70a6132dc114316e4c9b0b2aab URL: https://gitlab.winehq.org/wine/wine/-/commit/03acb453d93c3b70a6132dc114316e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Aug 30 13:51:45 2022 +0200 windowscodecs/tests: Clean up after running test expected to fail. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/windowscodecs/tests/ddsformat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index fc07fd7222c..a9965095d62 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -878,7 +878,7 @@ static void test_dds_decoder_image_parameters(void) hr = IWICDdsDecoder_GetParameters(dds_decoder, NULL); ok(hr == E_INVALIDARG, "GetParameters got unexpected hr %#lx\n", hr); - if (test_data[i].init_hr != S_OK && !test_data[i].wine_init) continue; + if (test_data[i].init_hr != S_OK && !test_data[i].wine_init) goto next; hr = init_decoder(decoder, stream, test_data[i].init_hr, test_data[i].wine_init); if (hr != S_OK) {

1 0

Rémi Bernon : win32u: Move display placement logic out of graphics drivers.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: 12d0792f7479688a7b300a2fe40913dc14d25b91 URL: https://gitlab.winehq.org/wine/wine/-/commit/12d0792f7479688a7b300a2fe40913… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 16 09:13:24 2022 +0200 win32u: Move display placement logic out of graphics drivers. --- dlls/win32u/driver.c | 14 +- dlls/win32u/sysparams.c | 262 +++++++++++++++++++++++++++++++++-- dlls/wineandroid.drv/init.c | 9 +- dlls/winemac.drv/display.c | 97 ++++++------- dlls/winemac.drv/gdi.c | 2 +- dlls/winemac.drv/macdrv.h | 3 +- dlls/winex11.drv/display.c | 325 ++++---------------------------------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 3 +- include/wine/gdi_driver.h | 2 +- 10 files changed, 337 insertions(+), 382 deletions(-)

1 0

Nikolay Sivov : dwrite: Fix spans length reported by AnalyzeScript() for characters above BMP.
by Alexandre Julliard 02 Sep '22

02 Sep '22

Module: wine Branch: master Commit: eddf252aff1232be304693b494b0ef17e96a72a6 URL: https://gitlab.winehq.org/wine/wine/-/commit/eddf252aff1232be304693b494b0ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 2 19:56:31 2022 +0300 dwrite: Fix spans length reported by AnalyzeScript() for characters above BMP. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 30 +++++++++++++++--------------- dlls/dwrite/tests/analyzer.c | 9 +++++++++ 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 7e1da2e58ce..85cbfab74d5 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -375,6 +375,11 @@ struct text_source_context UINT32 ch; }; +static inline unsigned int text_source_get_char_length(const struct text_source_context *context) +{ + return context->ch > 0xffff ? 2 : 1; +} + static void text_source_read_more(struct text_source_context *context) { if ((context->chunk_length - context->cursor) > 1) return; @@ -674,14 +679,15 @@ static DWRITE_SCRIPT_ANALYSIS get_char_sa(UINT32 c) static HRESULT analyze_script(struct text_source_context *context, IDWriteTextAnalysisSink *sink) { DWRITE_SCRIPT_ANALYSIS sa; - UINT32 pos, seq_length; + UINT32 pos, length; + HRESULT hr; text_source_get_next_u32_char(context); sa = get_char_sa(context->ch); pos = context->position; - seq_length = 1; + length = text_source_get_char_length(context); while (!text_source_get_next_u32_char(context)) { @@ -705,20 +711,19 @@ static HRESULT analyze_script(struct text_source_context *context, IDWriteTextAn /* this is a length of a sequence to be reported next */ if (sa.script == cur_sa.script && sa.shapes == cur_sa.shapes) - seq_length++; - else { - HRESULT hr; - - hr = IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, seq_length, &sa); + length += text_source_get_char_length(context); + else + { + hr = IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); if (FAILED(hr)) return hr; - pos += seq_length; - seq_length = 1; + pos += length; + length = text_source_get_char_length(context); sa = cur_sa; } } /* one char length case or normal completion call */ - return IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, seq_length, &sa); + return IDWriteTextAnalysisSink_SetScriptAnalysis(sink, pos, length, &sa); } struct linebreaking_state { @@ -2379,11 +2384,6 @@ static inline BOOL fallback_is_uvs(const struct text_source_context *context) return FALSE; } -static inline unsigned int text_source_get_char_length(const struct text_source_context *context) -{ - return context->ch > 0xffff ? 2 : 1; -} - static UINT32 fallback_font_get_supported_length(IDWriteFont3 *font, IDWriteTextAnalysisSource *source, UINT32 position, UINT32 length) { diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 04ab52b42c0..aac0fcc0e01 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1021,6 +1021,11 @@ static struct sa_test sa_tests[] = { {0x25cc,0x300,'a',0}, 1, { { 0, 3, DWRITE_SCRIPT_SHAPES_DEFAULT } } }, + { + /* TAKRI LETTER A U+11680 */ + {0xd805,0xde80,0}, 1, + { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT } } + }, /* keep this as end test data marker */ { {0} } }; @@ -1080,12 +1085,16 @@ static void test_AnalyzeScript(void) { init_textsource(&analysissource, ptr->string, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); + winetest_push_context("Test %s", debugstr_w(ptr->string)); + init_expected_sa(expected_seq, ptr); hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, lstrlenW(ptr->string), &analysissink); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok_sequence(sequences, ANALYZER_ID, expected_seq[0]->sequence, wine_dbgstr_w(ptr->string), FALSE); ptr++; + + winetest_pop_context(); } IDWriteTextAnalyzer_Release(analyzer);

1 0