June 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : mfmediaengine: Send "volumechange" event on muted state change.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: daa119581a5a7f739242764c158944bfabc680ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=daa119581a5a7f739242764c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:41:05 2020 +0300 mfmediaengine: Send "volumechange" event on muted state change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 29 +++++++++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index b9bf3c7027..731bccb581 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -63,6 +63,7 @@ enum media_engine_flags FLAGS_ENGINE_LOOP = 0x80, FLAGS_ENGINE_PAUSED = 0x100, FLAGS_ENGINE_WAITING = 0x200, + FLAGS_ENGINE_MUTED = 0x400, }; struct media_engine @@ -542,16 +543,36 @@ static HRESULT WINAPI media_engine_Pause(IMFMediaEngine *iface) static BOOL WINAPI media_engine_GetMuted(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + BOOL ret; - return FALSE; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + ret = !!(engine->flags & FLAGS_ENGINE_MUTED); + LeaveCriticalSection(&engine->cs); + + return ret; } static HRESULT WINAPI media_engine_SetMuted(IMFMediaEngine *iface, BOOL muted) { - FIXME("(%p, %d): stub.\n", iface, muted); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %d.\n", iface, muted); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!!(engine->flags & FLAGS_ENGINE_MUTED) ^ !!muted) + { + media_engine_set_flag(engine, FLAGS_ENGINE_MUTED, muted); + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_VOLUMECHANGE, 0, 0); + } + LeaveCriticalSection(&engine->cs); + + return hr; } static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 4079e9aa70..0839d1d445 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -361,14 +361,13 @@ todo_wine ok(!state, "Unexpected state.\n"); hr = IMFMediaEngine_SetMuted(media_engine, TRUE); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); val = IMFMediaEngine_GetVolume(media_engine); todo_wine ok(val == 1.0, "Unexpected value %f.\n", val); - val = IMFMediaEngine_SetVolume(media_engine, 2.0); + hr = IMFMediaEngine_SetVolume(media_engine, 2.0); todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); @@ -465,6 +464,34 @@ static void test_playback_rate(void) IMFMediaEngine_Release(media_engine); } +static void test_mute(void) +{ + struct media_engine_notify notify_impl = {{&media_engine_notify_vtbl}, 1}; + IMFMediaEngineNotify *callback = &notify_impl.IMFMediaEngineNotify_iface; + IMFMediaEngine *media_engine; + HRESULT hr; + BOOL ret; + + media_engine = create_media_engine(callback); + + ret = IMFMediaEngine_GetMuted(media_engine); + ok(!ret, "Unexpected state.\n"); + + hr = IMFMediaEngine_SetMuted(media_engine, TRUE); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_GetMuted(media_engine); + ok(ret, "Unexpected state.\n"); + + hr = IMFMediaEngine_Shutdown(media_engine); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + ret = IMFMediaEngine_GetMuted(media_engine); + ok(ret, "Unexpected state.\n"); + + IMFMediaEngine_Release(media_engine); +} + START_TEST(mfmediaengine) { HRESULT hr; @@ -490,6 +517,7 @@ START_TEST(mfmediaengine) test_Shutdown(); test_Play(); test_playback_rate(); + test_mute(); IMFMediaEngineClassFactory_Release(factory);

1 0

Nikolay Sivov : mfmediaengine: Send "volumechange" event on volume change.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: e9cc1d58b4e5aa6c19a5d15f2da1675b635f95a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9cc1d58b4e5aa6c19a5d15f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:41:06 2020 +0300 mfmediaengine: Send "volumechange" event on volume change. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 30 ++++++++++++++++++++++++++---- dlls/mfmediaengine/tests/mfmediaengine.c | 2 -- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 731bccb581..59006e64ca 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -79,6 +79,7 @@ struct media_engine unsigned int flags; double playback_rate; double default_playback_rate; + double volume; IMFMediaSession *session; CRITICAL_SECTION cs; }; @@ -577,16 +578,36 @@ static HRESULT WINAPI media_engine_SetMuted(IMFMediaEngine *iface, BOOL muted) static double WINAPI media_engine_GetVolume(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + double volume; - return 0.0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + volume = engine->volume; + LeaveCriticalSection(&engine->cs); + + return volume; } static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngine *iface, double volume) { - FIXME("(%p, %f): stub.\n", iface, volume); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %f.\n", iface, volume); + + EnterCriticalSection(&engine->cs); + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (volume != engine->volume) + { + engine->volume = volume; + IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_VOLUMECHANGE, 0, 0); + } + LeaveCriticalSection(&engine->cs); + + return hr; } static BOOL WINAPI media_engine_HasVideo(IMFMediaEngine *iface) @@ -737,6 +758,7 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct engine->flags = (flags & MF_MEDIA_ENGINE_CREATEFLAGS_MASK) | FLAGS_ENGINE_PAUSED; engine->default_playback_rate = 1.0; engine->playback_rate = 1.0; + engine->volume = 1.0; InitializeCriticalSection(&engine->cs); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index 0839d1d445..a5b80ef25f 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -364,11 +364,9 @@ todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); val = IMFMediaEngine_GetVolume(media_engine); -todo_wine ok(val == 1.0, "Unexpected value %f.\n", val); hr = IMFMediaEngine_SetVolume(media_engine, 2.0); -todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); state = IMFMediaEngine_HasVideo(media_engine);

1 0

Nikolay Sivov : mfmediaengine: Propagate error out on missing callback attribute.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 13aafb43a3fcdb00b74eb8bbd0cb7722aa5cba99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13aafb43a3fcdb00b74eb8bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:41:07 2020 +0300 mfmediaengine: Propagate error out on missing callback attribute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 59006e64ca..5ec179614d 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -762,9 +762,9 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct InitializeCriticalSection(&engine->cs); hr = IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_CALLBACK, &IID_IMFMediaEngineNotify, - (void **)&engine->callback); + (void **)&engine->callback); if (FAILED(hr)) - return MF_E_ATTRIBUTENOTFOUND; + return hr; if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) return hr;

1 0

Nikolay Sivov : mfmediaengine: Duplicate configuration attributes.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 4bbb7b664934fff53add6141753d69c937bc2ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4bbb7b664934fff53add6141… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 12:35:13 2020 +0300 mfmediaengine: Duplicate configuration attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/Makefile.in | 2 +- dlls/mfmediaengine/main.c | 25 +++++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/mfmediaengine/Makefile.in b/dlls/mfmediaengine/Makefile.in index 2278e87a64..cb593cb7ed 100644 --- a/dlls/mfmediaengine/Makefile.in +++ b/dlls/mfmediaengine/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfmediaengine.dll IMPORTLIB = mfmediaengine -IMPORTS = mf mfuuid uuid +IMPORTS = mfplat mf mfuuid uuid EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 5ec179614d..d698b53c38 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -23,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "mfapi.h" #include "mfmediaengine.h" #include "mferror.h" #include "dxgi.h" @@ -72,9 +73,7 @@ struct media_engine IMFAsyncCallback session_events; LONG refcount; IMFMediaEngineNotify *callback; - UINT64 playback_hwnd; - DXGI_FORMAT output_format; - IMFDXGIDeviceManager *dxgi_manager; + IMFAttributes *attributes; enum media_engine_mode mode; unsigned int flags; double playback_rate; @@ -192,10 +191,10 @@ static void free_media_engine(struct media_engine *engine) { if (engine->callback) IMFMediaEngineNotify_Release(engine->callback); - if (engine->dxgi_manager) - IMFDXGIDeviceManager_Release(engine->dxgi_manager); if (engine->session) IMFMediaSession_Release(engine->session); + if (engine->attributes) + IMFAttributes_Release(engine->attributes); DeleteCriticalSection(&engine->cs); heap_free(engine); } @@ -750,6 +749,8 @@ static ULONG WINAPI media_engine_factory_Release(IMFMediaEngineClassFactory *ifa static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct media_engine *engine) { + DXGI_FORMAT output_format; + UINT64 playback_hwnd; HRESULT hr; engine->IMFMediaEngine_iface.lpVtbl = &media_engine_vtbl; @@ -772,11 +773,15 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, &engine->session_events, NULL))) return hr; - IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, &engine->playback_hwnd); - IMFAttributes_GetUnknown(attributes, &MF_MEDIA_ENGINE_DXGI_MANAGER, &IID_IMFDXGIDeviceManager, - (void **)&engine->dxgi_manager); - hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &engine->output_format); - if (engine->playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ + if (FAILED(hr = MFCreateAttributes(&engine->attributes, 0))) + return hr; + + if (FAILED(hr = IMFAttributes_CopyAllItems(attributes, engine->attributes))) + return hr; + + IMFAttributes_GetUINT64(attributes, &MF_MEDIA_ENGINE_PLAYBACK_HWND, &playback_hwnd); + hr = IMFAttributes_GetUINT32(attributes, &MF_MEDIA_ENGINE_VIDEO_OUTPUT_FORMAT, &output_format); + if (playback_hwnd) /* FIXME: handle MF_MEDIA_ENGINE_PLAYBACK_VISUAL */ engine->mode = MEDIA_ENGINE_RENDERING_MODE; else {

1 0

Nikolay Sivov : mfmediaengine: Forward buffering events to user callback.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: f151550e56df5e1b93b42844d66073f99c58b0d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f151550e56df5e1b93b42844… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:41:09 2020 +0300 mfmediaengine: Forward buffering events to user callback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index d698b53c38..b9a5fb46d6 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -137,10 +137,32 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface { struct media_engine *engine = impl_from_session_events_IMFAsyncCallback(iface); IMFMediaEvent *event = NULL; + MediaEventType event_type; HRESULT hr; if (FAILED(hr = IMFMediaSession_EndGetEvent(engine->session, result, &event))) + { WARN("Failed to get session event, hr %#x.\n", hr); + goto failed; + } + + if (FAILED(hr = IMFMediaEvent_GetType(event, &event_type))) + { + WARN("Failed to get event type, hr %#x.\n", hr); + goto failed; + } + + switch (event_type) + { + case MEBufferingStarted: + case MEBufferingStopped: + + IMFMediaEngineNotify_EventNotify(engine->callback, event_type == MEBufferingStarted ? + MF_MEDIA_ENGINE_EVENT_BUFFERINGSTARTED : MF_MEDIA_ENGINE_EVENT_BUFFERINGENDED, 0, 0); + break; + } + +failed: if (event) IMFMediaEvent_Release(event);

1 0

Nikolay Sivov : mf/session: Handle source buffering events.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 68b5a0574c8ad6d1df27b3641f6be7ecbb6d4f4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=68b5a0574c8ad6d1df27b364… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:43:42 2020 +0300 mf/session: Handle source buffering events. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index ba30733fe5..39b5e1a537 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2867,6 +2867,23 @@ static HRESULT WINAPI session_events_callback_Invoke(IMFAsyncCallback *iface, IM LeaveCriticalSection(&session->cs); break; + + case MEBufferingStarted: + case MEBufferingStopped: + + EnterCriticalSection(&session->cs); + if (session_get_media_source(session, (IMFMediaSource *)event_source)) + { + if (event_type == MEBufferingStarted) + IMFPresentationClock_Pause(session->clock); + else + IMFPresentationClock_Start(session->clock, PRESENTATION_CURRENT_POSITION); + + IMFMediaEventQueue_QueueEvent(session->event_queue, event); + } + LeaveCriticalSection(&session->cs); + break; + case MENewStream: stream = (IMFMediaStream *)value.punkVal;

1 0

Nikolay Sivov : dwrite: Implement reverse chain contextual substitution (GSUB lookup 8).
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: f2db3b58d6748c81dcbd24f96715b4efe2524dd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2db3b58d6748c81dcbd24f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:49 2020 +0300 dwrite: Implement reverse chain contextual substitution (GSUB lookup 8). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 58e1a3941c..fe25c6b692 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4661,7 +4661,6 @@ static void opentype_layout_replace_glyph(struct scriptshaping_context *context, context->u.subst.glyphs[context->cur] = glyph; opentype_set_subst_glyph_props(context, context->cur); } - context->cur++; } static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_context *context, const struct lookup *lookup, @@ -4707,6 +4706,7 @@ static BOOL opentype_layout_apply_gsub_single_substitution(struct scriptshaping_ } opentype_layout_replace_glyph(context, glyph); + context->cur++; return TRUE; } @@ -4801,6 +4801,7 @@ static BOOL opentype_layout_apply_gsub_mult_substitution(struct scriptshaping_co { /* Equivalent of single substitution. */ opentype_layout_replace_glyph(context, GET_BE_WORD(glyphs[0])); + context->cur++; } else if (glyph_count == 0) { @@ -4915,6 +4916,7 @@ static BOOL opentype_layout_apply_gsub_alt_substitution(struct scriptshaping_con } opentype_layout_replace_glyph(context, glyph); + context->cur++; return TRUE; } @@ -4937,6 +4939,7 @@ static BOOL opentype_layout_apply_ligature(struct scriptshaping_context *context if (comp_count == 1) { opentype_layout_replace_glyph(context, GET_BE_WORD(lig->lig_glyph)); + context->cur++; return TRUE; } @@ -5476,6 +5479,68 @@ static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scripts return ret; } +static BOOL opentype_layout_apply_gsub_reverse_chain_context_substitution(struct scriptshaping_context *context, + const struct lookup *lookup, unsigned int subtable_offset) +{ + const struct dwrite_fonttable *table = &context->table->table; + unsigned int offset = subtable_offset; + UINT16 glyph, format; + + glyph = context->u.subst.glyphs[context->cur]; + + format = table_read_be_word(table, offset); + offset += 2; + + if (format == 1) + { + struct match_context mc = { .context = context, .mask = lookup->mask }; + unsigned int start_index = 0, end_index = 0, backtrack_count, lookahead_count; + unsigned int coverage, coverage_index; + const UINT16 *backtrack, *lookahead; + + coverage = table_read_be_word(table, offset); + offset += 2; + + coverage_index = opentype_layout_is_glyph_covered(table, subtable_offset + coverage, glyph); + if (coverage_index == GLYPH_NOT_COVERED) + return FALSE; + + backtrack_count = table_read_be_word(table, offset); + offset += 2; + + backtrack = table_read_ensure(table, offset, sizeof(*backtrack) * backtrack_count); + offset += sizeof(*backtrack) * backtrack_count; + + lookahead_count = table_read_be_word(table, offset); + offset += 2; + + lookahead = table_read_ensure(table, offset, sizeof(*lookahead) * lookahead_count); + offset += sizeof(*lookahead) * lookahead_count; + + mc.match_func = opentype_match_coverage_func; + mc.backtrack_offset = subtable_offset; + mc.lookahead_offset = subtable_offset; + + if (opentype_layout_context_match_backtrack(&mc, backtrack_count, backtrack, &start_index) && + opentype_layout_context_match_lookahead(&mc, lookahead_count, lookahead, 1, &end_index)) + { + unsigned int glyph_count = table_read_be_word(table, offset); + if (coverage_index >= glyph_count) + return FALSE; + offset += 2; + + glyph = table_read_be_word(table, offset + coverage_index * sizeof(glyph)); + opentype_layout_replace_glyph(context, glyph); + + return TRUE; + } + } + else + WARN("Unknown reverse chaining contextual substitution format %u.\n", format); + + return FALSE; +} + static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *context, const struct lookup *lookup) { unsigned int i, lookup_type; @@ -5515,7 +5580,7 @@ static BOOL opentype_layout_apply_gsub_lookup(struct scriptshaping_context *cont ret = opentype_layout_apply_gsub_chain_context_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_REVERSE_CHAINING_CONTEXTUAL_SUBST: - WARN("Unimplemented lookup %d.\n", lookup->type); + ret = opentype_layout_apply_gsub_reverse_chain_context_substitution(context, lookup, subtable_offset); break; case GSUB_LOOKUP_EXTENSION_SUBST: WARN("Invalid lookup type for extension substitution %#x.\n", lookup_type);

1 0

Nikolay Sivov : dwrite: Use lookup fitering for context matching.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: aa222d7df87967b865a80c808b3714d6100ea542 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa222d7df87967b865a80c80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:50 2020 +0300 dwrite: Use lookup fitering for context matching. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fe25c6b692..fd59f40dcb 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -3496,7 +3496,7 @@ struct match_context unsigned int input_offset; unsigned int lookahead_offset; p_match_func match_func; - unsigned int mask; + const struct lookup *lookup; }; struct glyph_iterator @@ -5015,8 +5015,8 @@ static BOOL opentype_layout_context_match_input(const struct match_context *mc, match_positions[0] = context->cur; - glyph_iterator_init(context, 0, context->cur, count - 1, &iter); - iter.mask = mc->mask; + glyph_iterator_init(context, mc->lookup->flags, context->cur, count - 1, &iter); + iter.mask = mc->lookup->mask; iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = input; @@ -5042,7 +5042,7 @@ static BOOL opentype_layout_context_match_backtrack(const struct match_context * struct glyph_iterator iter; unsigned int i; - glyph_iterator_init(context, 0, context->cur, count, &iter); + glyph_iterator_init(context, mc->lookup->flags, context->cur, count, &iter); iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = backtrack; @@ -5066,7 +5066,7 @@ static BOOL opentype_layout_context_match_lookahead(const struct match_context * struct glyph_iterator iter; unsigned int i; - glyph_iterator_init(context, 0, context->cur + offset - 1, count, &iter); + glyph_iterator_init(context, mc->lookup->flags, context->cur + offset - 1, count, &iter); iter.match_func = mc->match_func; iter.match_data = &match_data; iter.glyph_data = lookahead; @@ -5262,7 +5262,7 @@ static BOOL opentype_layout_apply_rule_set(const struct match_context *mc, unsig static BOOL opentype_layout_apply_gsub_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - struct match_context mc = { .context = context, .mask = lookup->mask }; + struct match_context mc = { .context = context, .lookup = lookup }; const struct dwrite_fonttable *table = &context->table->table; unsigned int coverage_index = GLYPH_NOT_COVERED, count, offset; UINT16 glyph, format, coverage; @@ -5364,7 +5364,7 @@ static BOOL opentype_layout_apply_gsub_context_substitution(struct scriptshaping static BOOL opentype_layout_apply_gsub_chain_context_substitution(struct scriptshaping_context *context, const struct lookup *lookup, unsigned int subtable_offset) { - struct match_context mc = { .context = context, .mask = lookup->mask }; + struct match_context mc = { .context = context, .lookup = lookup }; const struct dwrite_fonttable *table = &context->table->table; unsigned int coverage_index = GLYPH_NOT_COVERED, count, offset; UINT16 glyph, format, coverage; @@ -5493,7 +5493,7 @@ static BOOL opentype_layout_apply_gsub_reverse_chain_context_substitution(struct if (format == 1) { - struct match_context mc = { .context = context, .mask = lookup->mask }; + struct match_context mc = { .context = context, .lookup = lookup }; unsigned int start_index = 0, end_index = 0, backtrack_count, lookahead_count; unsigned int coverage, coverage_index; const UINT16 *backtrack, *lookahead;

1 0

Nikolay Sivov : dwrite: Include required feature when collecting lookups.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 15baea930a3563bf66c688612e08b7f8925eda3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=15baea930a3563bf66c68861… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:51 2020 +0300 dwrite: Include required feature when collecting lookups. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fd59f40dcb..629bc7f407 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4405,6 +4405,7 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex { unsigned int last_num_lookups = 0, stage, script_feature_count = 0; UINT16 total_feature_count, total_lookup_count; + struct shaping_feature required_feature = { 0 }; const struct ot_feature_list *feature_list; const struct ot_langsys *langsys = NULL; struct shaping_feature *feature; @@ -4455,6 +4456,12 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex if (!feature_list) return; + /* Required feature. */ + required_feature.index = langsys ? GET_BE_WORD(langsys->required_feature_index) : 0xffff; + if (required_feature.index < total_feature_count) + required_feature.tag = feature_list->features[required_feature.index].tag; + required_feature.mask = global_bit_mask; + context->global_mask = global_bit_mask; next_bit = global_bit_shift + 1; for (i = 0; i < features->count; ++i) @@ -4474,6 +4481,9 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex if (!feature->max_value || next_bit + bits_needed > 8 * sizeof (feature->mask)) continue; + if (required_feature.tag == feature->tag) + required_feature.stage = feature->stage; + for (j = 0; j < script_feature_count; ++j) { feature_index = GET_BE_WORD(langsys->feature_index[j]); @@ -4517,6 +4527,9 @@ static void opentype_layout_collect_lookups(struct scriptshaping_context *contex for (stage = 0; stage <= features->stage; ++stage) { + if (required_feature.index != 0xffff && required_feature.stage == stage) + opentype_layout_add_lookups(feature_list, total_lookup_count, table, &required_feature, lookups); + for (i = 0; i < features->count; ++i) { if (features->features[i].stage == stage)

1 0

Nikolay Sivov : dwrite: Enable lookups from non-global features too.
by Alexandre Julliard 02 Jun '20

02 Jun '20

Module: wine Branch: master Commit: 4f7f3b7b8b007dd3e73b52b085109b223cbd5bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f7f3b7b8b007dd3e73b52b0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 2 11:48:52 2020 +0300 dwrite: Enable lookups from non-global features too. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 629bc7f407..64fba56202 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -4369,10 +4369,6 @@ static void opentype_layout_add_lookups(const struct ot_feature_list *feature_li if (feature->index == 0xffff) return; - /* FIXME: skip non-global ones for now. */ - if (!(feature->flags & FEATURE_GLOBAL)) - return; - feature_offset = GET_BE_WORD(feature_list->features[feature->index].offset); lookup_count = table_read_be_word(&table->table, table->feature_list + feature_offset +

1 0