September 2019 - Wine-commits

Jacek Caban : scrobj: Add scriptlet instance stub implementation.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 4d368c3dabf4d2003e632d393deb923eb679d8f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d368c3dabf4d2003e632d39… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:54:53 2019 +0200 scrobj: Add scriptlet instance stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 213 ++++++++++++++++++++++++++++++++++++++++++++- dlls/scrobj/tests/scrobj.c | 53 +++++++++-- 2 files changed, 259 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4d368c3dabf4d2003e63…

1 0

Jacek Caban : scrobj: Parse scripts in DllInstall.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 55e01ac01267ca90b99d26450938fe7d0985ea06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55e01ac01267ca90b99d2645… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:55:04 2019 +0200 scrobj: Parse scripts in DllInstall. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/scrobj/tests/scrobj.c | 2 -- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 32aedcd8f9..6b3b3ea6e8 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -117,6 +117,7 @@ struct script_host IActiveScript *active_script; IActiveScriptParse *parser; + SCRIPTSTATE state; BOOL cloned; }; @@ -204,6 +205,16 @@ static WCHAR *heap_strdupW(const WCHAR *str) return ret; } +static HRESULT set_script_state(struct script_host *host, SCRIPTSTATE state) +{ + HRESULT hres; + if (state == host->state) return S_OK; + hres = IActiveScript_SetScriptState(host->active_script, state); + if (FAILED(hres)) return hres; + host->state = state; + return S_OK; +} + static inline struct script_host *impl_from_IActiveScriptSite(IActiveScriptSite *iface) { return CONTAINING_RECORD(iface, struct script_host, IActiveScriptSite_iface); @@ -437,6 +448,46 @@ static struct script_host *find_script_host(struct list *hosts, const WCHAR *lan return NULL; } +static HRESULT parse_scripts(struct scriptlet_factory *factory, struct list *hosts, BOOL start) +{ + DWORD parse_flags = SCRIPTTEXT_ISVISIBLE; + struct scriptlet_script *script; + struct script_host *host; + HRESULT hres; + + if (!start) parse_flags |= SCRIPTITEM_ISPERSISTENT; + + LIST_FOR_EACH_ENTRY(script, &factory->scripts, struct scriptlet_script, entry) + { + host = find_script_host(hosts, script->language); + + if (start && host->state != SCRIPTSTATE_STARTED) + { + hres = set_script_state(host, SCRIPTSTATE_STARTED); + if (FAILED(hres)) return hres; + } + + if (host->cloned) continue; + + hres = IActiveScriptParse_ParseScriptText(host->parser, script->body, NULL, NULL, NULL, 0, 0 /* FIXME */, + parse_flags, NULL, NULL); + if (FAILED(hres)) + { + WARN("ParseScriptText failed: %08x\n", hres); + return hres; + } + } + if (!start) + { + LIST_FOR_EACH_ENTRY(host, hosts, struct script_host, entry) + { + if (host->state != SCRIPTSTATE_UNINITIALIZED) + set_script_state(host, SCRIPTSTATE_UNINITIALIZED); + } + } + return S_OK; +} + static HRESULT init_script_host(struct script_host *host, IActiveScript *clone) { HRESULT hres; @@ -509,6 +560,7 @@ static HRESULT create_script_host(const WCHAR *language, IActiveScript *origin_s host->IActiveScriptSiteWindow_iface.lpVtbl = &ActiveScriptSiteWindowVtbl; host->IServiceProvider_iface.lpVtbl = &ServiceProviderVtbl; host->ref = 1; + host->state = SCRIPTSTATE_CLOSED; if (!(host->language = heap_strdupW(language))) { @@ -533,6 +585,7 @@ static void detach_script_hosts(struct list *hosts) while (!list_empty(hosts)) { struct script_host *host = LIST_ENTRY(list_head(hosts), struct script_host, entry); + if (host->state != SCRIPTSTATE_UNINITIALIZED) set_script_state(host, SCRIPTSTATE_UNINITIALIZED); list_remove(&host->entry); if (host->parser) { @@ -1800,6 +1853,7 @@ HRESULT WINAPI DllInstall(BOOL install, const WCHAR *arg) { /* validate scripts */ hres = create_scriptlet_hosts(factory, &factory->hosts); + if (SUCCEEDED(hres)) hres = parse_scripts(factory, &factory->hosts, FALSE); } else { diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index 9afa11d419..f968fe21ce 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -720,9 +720,7 @@ static void register_script_object(BOOL do_register, const WCHAR *file_name) CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(InitNew); CHECK_CALLED(SetScriptSite); - todo_wine CHECK_CALLED(ParseScriptText); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); CHECK_CALLED(Close); ok(hres == S_OK, "DllInstall failed: %08x\n", hres);

1 0

Jacek Caban : scrobj: Create script hosts for scriptlet instance.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 03f89b60facaa59ad4532b902b304743140c0597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03f89b60facaa59ad4532b90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:55:13 2019 +0200 scrobj: Create script hosts for scriptlet instance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/scrobj/tests/scrobj.c | 20 -------------------- 2 files changed, 34 insertions(+), 22 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 6b3b3ea6e8..251507ecf5 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -102,6 +102,7 @@ struct scriptlet_instance { IDispatchEx IDispatchEx_iface; LONG ref; + struct list hosts; }; struct script_host @@ -674,7 +675,10 @@ static ULONG WINAPI scriptlet_Release(IDispatchEx *iface) TRACE("(%p) ref=%d\n", This, ref); if (!ref) + { + detach_script_hosts(&This->hosts); heap_free(This); + } return ref; } @@ -798,14 +802,29 @@ static IDispatchExVtbl DispatchExVtbl = { scriptlet_GetNameSpaceParent }; -static HRESULT create_scriptlet_instance(IDispatchEx **disp) +static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDispatchEx **disp) { + struct script_host *factory_host; struct scriptlet_instance *obj; + HRESULT hres; if (!(obj = heap_alloc(sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDispatchEx_iface.lpVtbl = &DispatchExVtbl; obj->ref = 1; + list_init(&obj->hosts); + + LIST_FOR_EACH_ENTRY(factory_host, &factory->hosts, struct script_host, entry) + { + hres = create_script_host(factory_host->language, factory_host->active_script, &obj->hosts); + if (FAILED(hres)) break; + } + + if (FAILED(hres)) + { + IDispatchEx_Release(&obj->IDispatchEx_iface); + return hres; + } *disp = &obj->IDispatchEx_iface; return S_OK; @@ -1295,7 +1314,20 @@ static HRESULT WINAPI scriptlet_factory_CreateInstance(IClassFactory *iface, IUn if (outer) FIXME("outer not supported\n"); - hres = create_scriptlet_instance(&disp); + if (list_empty(&This->hosts)) + { + hres = create_scriptlet_hosts(This, &This->hosts); + if (FAILED(hres)) return hres; + + hres = parse_scripts(This, &This->hosts, FALSE); + if (FAILED(hres)) + { + detach_script_hosts(&This->hosts); + return hres; + } + } + + hres = create_scriptlet_instance(This, &disp); if (FAILED(hres)) return hres; hres = IDispatchEx_QueryInterface(disp, riid, ppv); diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index f968fe21ce..ef80dfb7d4 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -778,15 +778,10 @@ static void test_create_object(void) SET_EXPECT(Clone); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); - todo_wine CHECK_CALLED(Clone); - todo_wine CHECK_CALLED(CreateInstance); - todo_wine CHECK_CALLED(QI_IActiveScriptParse); - todo_wine CHECK_CALLED(InitNew); - todo_wine CHECK_CALLED(SetScriptSite); todo_wine CHECK_CALLED(AddNamedItem_scriptlet); @@ -926,9 +921,7 @@ static void test_create_object(void) todo_wine SET_EXPECT(Close); IUnknown_Release(unk); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); - todo_wine CHECK_CALLED(Close); parse_flags = SCRIPTTEXT_ISVISIBLE; @@ -947,15 +940,10 @@ static void test_create_object(void) SET_EXPECT(ParseScriptText); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); - todo_wine CHECK_CALLED(Clone); - todo_wine CHECK_CALLED(CreateInstance); - todo_wine CHECK_CALLED(QI_IActiveScriptParse); - todo_wine CHECK_CALLED(InitNew); - todo_wine CHECK_CALLED(SetScriptSite); todo_wine CHECK_CALLED(AddNamedItem_scriptlet); @@ -975,9 +963,7 @@ static void test_create_object(void) SET_EXPECT(SetScriptState_UNINITIALIZED); SET_EXPECT(Close); IUnknown_Release(unk); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); - todo_wine CHECK_CALLED(Close); support_clone = TRUE; @@ -992,11 +978,8 @@ static void test_create_object(void) SET_EXPECT(SetScriptState_STARTED); hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "Could not create scriptlet instance: %08x\n", hres); - todo_wine CHECK_CALLED(Clone); - todo_wine CHECK_CALLED(QI_IActiveScriptParse); - todo_wine CHECK_CALLED(SetScriptSite); todo_wine CHECK_CALLED(AddNamedItem_scriptlet); @@ -1014,14 +997,11 @@ static void test_create_object(void) SET_EXPECT(SetScriptState_UNINITIALIZED); SET_EXPECT(Close); IUnknown_Release(unk); - todo_wine CHECK_CALLED(SetScriptState_UNINITIALIZED); - todo_wine CHECK_CALLED(Close); SET_EXPECT(Close); IClassFactory_Release(cf); - todo_wine CHECK_CALLED(Close); }

1 0

Jacek Caban : scrobj: Implement GetItemInfo.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: e50eae9dc8f982566b71154134a41861e1f10cbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e50eae9dc8f982566b711541… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:55:25 2019 +0200 scrobj: Implement GetItemInfo. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 228 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 221 insertions(+), 7 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e50eae9dc8f982566b71…

1 0

Jacek Caban : scrobj: Run scripts when creating a scriptlet instance.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 9d92ea3b5a5549770d588512634fe9bcb12887ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d92ea3b5a5549770d588512… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 23 17:55:40 2019 +0200 scrobj: Run scripts when creating a scriptlet instance. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrobj/scrobj.c | 8 ++++++++ dlls/scrobj/tests/scrobj.c | 11 ----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index a20a5a7580..9596c6b551 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -1032,8 +1032,16 @@ static HRESULT create_scriptlet_instance(struct scriptlet_factory *factory, IDis hres = create_script_host(factory_host->language, factory_host->active_script, &obj->hosts, &host); if (FAILED(hres)) break; host->object = obj; + + hres = IActiveScript_AddNamedItem(host->active_script, L"scriptlet", + SCRIPTITEM_ISVISIBLE | SCRIPTITEM_GLOBALMEMBERS); + if (FAILED(hres)) break; + + hres = IActiveScript_AddNamedItem(host->active_script, L"globals", SCRIPTITEM_ISVISIBLE); + if (FAILED(hres)) break; } + if (SUCCEEDED(hres)) hres = parse_scripts(factory, &obj->hosts, TRUE); if (FAILED(hres)) { IDispatchEx_Release(&obj->IDispatchEx_iface); diff --git a/dlls/scrobj/tests/scrobj.c b/dlls/scrobj/tests/scrobj.c index ef80dfb7d4..709f005080 100644 --- a/dlls/scrobj/tests/scrobj.c +++ b/dlls/scrobj/tests/scrobj.c @@ -783,9 +783,7 @@ static void test_create_object(void) CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(InitNew); CHECK_CALLED(SetScriptSite); - todo_wine CHECK_CALLED(AddNamedItem_scriptlet); - todo_wine CHECK_CALLED(AddNamedItem_globals); todo_wine CHECK_CALLED(GetScriptDispatch); @@ -793,9 +791,7 @@ static void test_create_object(void) CHECK_CALLED(GetDispID_vbAddOne); todo_wine CHECK_CALLED(GetDispID_wtTest); - todo_wine CHECK_CALLED(SetScriptState_STARTED); - todo_wine CHECK_CALLED(ParseScriptText); hres = IUnknown_QueryInterface(unk, &IID_IDispatch, (void**)&disp); @@ -945,9 +941,7 @@ static void test_create_object(void) CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(InitNew); CHECK_CALLED(SetScriptSite); - todo_wine CHECK_CALLED(AddNamedItem_scriptlet); - todo_wine CHECK_CALLED(AddNamedItem_globals); todo_wine CHECK_CALLED(GetScriptDispatch); @@ -955,9 +949,7 @@ static void test_create_object(void) CHECK_CALLED(GetDispID_vbAddOne); todo_wine CHECK_CALLED(GetDispID_wtTest); - todo_wine CHECK_CALLED(SetScriptState_STARTED); - todo_wine CHECK_CALLED(ParseScriptText); SET_EXPECT(SetScriptState_UNINITIALIZED); @@ -981,9 +973,7 @@ static void test_create_object(void) CHECK_CALLED(Clone); CHECK_CALLED(QI_IActiveScriptParse); CHECK_CALLED(SetScriptSite); - todo_wine CHECK_CALLED(AddNamedItem_scriptlet); - todo_wine CHECK_CALLED(AddNamedItem_globals); todo_wine CHECK_CALLED(GetScriptDispatch); @@ -991,7 +981,6 @@ static void test_create_object(void) CHECK_CALLED(GetDispID_vbAddOne); todo_wine CHECK_CALLED(GetDispID_wtTest); - todo_wine CHECK_CALLED(SetScriptState_STARTED); SET_EXPECT(SetScriptState_UNINITIALIZED);

1 0

Rémi Bernon : winex11.drv: Handle FocusIn/NotifyGrab and FocusOut/NotifyUngrab events.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: ae8f605ede0054c8e380e809c196f2621d9cf423 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae8f605ede0054c8e380e809… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Sep 23 09:58:17 2019 +0200 winex11.drv: Handle FocusIn/NotifyGrab and FocusOut/NotifyUngrab events. These events are received on mutter, when moving undecorated managed windows, although Wine never grabs the keyboard itself. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index f79f40c232..25730192d3 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -778,8 +778,9 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) switch (event->mode) { case NotifyGrab: - WARN( "unexpected FocusIn event with NotifyGrab mode\n" ); - break; + /* these are received when moving undecorated managed windows on mutter */ + keyboard_grabbed = TRUE; + return FALSE; case NotifyWhileGrabbed: keyboard_grabbed = TRUE; break; @@ -879,8 +880,9 @@ static BOOL X11DRV_FocusOut( HWND hwnd, XEvent *xev ) switch (event->mode) { case NotifyUngrab: - WARN( "unexpected FocusOut event with NotifyUngrab mode\n" ); - break; + /* these are received when moving undecorated managed windows on mutter */ + keyboard_grabbed = FALSE; + return FALSE; case NotifyNormal: keyboard_grabbed = FALSE; break;

1 0

Zebediah Figura : winegstreamer: Reimplement the MPEG splitter on top of the mpegaudioparse plugin.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: 40a4c782b7f77534535dfa7bb2a97049026fef47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a4c782b7f77534535dfa7b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 20 17:35:05 2019 -0500 winegstreamer: Reimplement the MPEG splitter on top of the mpegaudioparse plugin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 1 - dlls/quartz/main.c | 1 - dlls/quartz/mpegsplit.c | 890 --------------------------------------- dlls/quartz/quartz_private.h | 1 - dlls/quartz/quartz_strmif.idl | 7 - dlls/quartz/regsvr.c | 27 -- dlls/quartz/tests/mpegsplit.c | 14 +- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 292 ++++++++++++- dlls/winegstreamer/main.c | 66 +++ 10 files changed, 359 insertions(+), 941 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=40a4c782b7f77534535d…

1 0

Zebediah Figura : quartz: Get rid of the no longer used base parser.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: d44d83b684a8d6c2299d4501e349047d25f62b46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d44d83b684a8d6c2299d4501… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Sep 20 17:35:06 2019 -0500 quartz: Get rid of the no longer used base parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/Makefile.in | 2 - dlls/quartz/acmwrapper.c | 1 - dlls/quartz/avidec.c | 1 - dlls/quartz/dsoundrender.c | 1 - dlls/quartz/filesource.c | 1 - dlls/quartz/parser.c | 709 ------------------------------------- dlls/quartz/parser.h | 77 ---- dlls/quartz/pin.c | 818 ------------------------------------------- dlls/quartz/pin.h | 133 ------- dlls/quartz/quartz_private.h | 12 +- dlls/quartz/videorenderer.c | 1 - dlls/quartz/vmr9.c | 1 - 12 files changed, 1 insertion(+), 1756 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d44d83b684a8d6c2299d…

1 0

Akihiro Sagawa : dwrite: Prefer Windows platform names regardless of record order.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: ea07bc41907f8d75d6f0bcd44358c2dc777ae4fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea07bc41907f8d75d6f0bcd4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Sep 20 21:04:02 2019 +0900 dwrite: Prefer Windows platform names regardless of record order. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/opentype.c | 57 +++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index e8efa1d196..fced4b0411 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1935,10 +1935,9 @@ static BOOL opentype_decode_namerecord(const TT_NAME_V0 *header, BYTE *storage_a static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OPENTYPE_STRING_ID id, IDWriteLocalizedStrings **strings) { + int i, count, candidate_mac, candidate_unicode; const TT_NAME_V0 *header; BYTE *storage_area = 0; - USHORT count = 0; - int i, candidate; WORD format; BOOL exists; HRESULT hr; @@ -1964,7 +1963,7 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP count = GET_BE_WORD(header->count); exists = FALSE; - candidate = -1; + candidate_unicode = candidate_mac = -1; for (i = 0; i < count; i++) { const TT_NameRecord *record = &header->nameRecord[i]; USHORT platform; @@ -1972,34 +1971,40 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP if (GET_BE_WORD(record->nameID) != id) continue; - /* Right now only accept unicode and windows encoded fonts */ platform = GET_BE_WORD(record->platformID); - if (platform != OPENTYPE_PLATFORM_UNICODE && - platform != OPENTYPE_PLATFORM_MAC && - platform != OPENTYPE_PLATFORM_WIN) + switch (platform) { - FIXME("platform %i not supported\n", platform); - continue; - } - - /* Skip such entries for now, fonts tend to duplicate those strings as - WIN platform entries. If font does not have WIN or MAC entry for this id, we will - use this Unicode platform entry while assuming en-US locale. */ - if (platform == OPENTYPE_PLATFORM_UNICODE) { - candidate = i; - continue; + /* Skip Unicode or Mac entries for now, fonts tend to duplicate those + strings as WIN platform entries. If font does not have WIN entry for + this id, we will use Mac or Unicode platform entry while assuming + en-US locale. */ + case OPENTYPE_PLATFORM_UNICODE: + if (candidate_unicode == -1) + candidate_unicode = i; + break; + case OPENTYPE_PLATFORM_MAC: + if (candidate_mac == -1) + candidate_mac = i; + break; + case OPENTYPE_PLATFORM_WIN: + if (opentype_decode_namerecord(header, storage_area, i, *strings)) + exists = TRUE; + break; + default: + FIXME("platform %i not supported\n", platform); + break; } - - if (!opentype_decode_namerecord(header, storage_area, i, *strings)) - continue; - - exists = TRUE; } - if (!exists) { - if (candidate != -1) - exists = opentype_decode_namerecord(header, storage_area, candidate, *strings); - else { + if (!exists) + { + if (candidate_mac != -1) + exists = opentype_decode_namerecord(header, storage_area, candidate_mac, *strings); + if (!exists && candidate_unicode != -1) + exists = opentype_decode_namerecord(header, storage_area, candidate_unicode, *strings); + + if (!exists) + { IDWriteLocalizedStrings_Release(*strings); *strings = NULL; }

1 0

Nikolay Sivov : dwrite: Sort localized strings by locale name.
by Alexandre Julliard 23 Sep '19

23 Sep '19

Module: wine Branch: master Commit: c435eb5c5199e06660efc5e35add3fad848b1cb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c435eb5c5199e06660efc5e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 19 17:41:02 2019 +0300 dwrite: Sort localized strings by locale name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/main.c | 14 ++++++++++++++ dlls/dwrite/opentype.c | 3 +++ 3 files changed, 18 insertions(+) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 32ccd63c3e..d0fed98d6f 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -237,6 +237,7 @@ extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDE extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern void set_en_localizedstring(IDWriteLocalizedStrings*,const WCHAR*) DECLSPEC_HIDDEN; +extern void sort_localizedstrings(IDWriteLocalizedStrings*) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFactory5*,IDWriteFontCollection1**) DECLSPEC_HIDDEN; extern HRESULT get_eudc_fontcollection(IDWriteFactory5*,IDWriteFontCollection1**) DECLSPEC_HIDDEN; extern IDWriteTextAnalyzer *get_text_analyzer(void) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 3fe2b7eaa7..fc72013feb 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -520,6 +520,20 @@ void set_en_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *string) } } +static int localizedstrings_sorting_compare(const void *left, const void *right) +{ + const struct localizedpair *_l = left, *_r = right; + + return strcmpW(_l->locale, _r->locale); +}; + +void sort_localizedstrings(IDWriteLocalizedStrings *iface) +{ + struct localizedstrings *strings = impl_from_IDWriteLocalizedStrings(iface); + + qsort(strings->data, strings->count, sizeof(*strings->data), localizedstrings_sorting_compare); +} + struct collectionloader { struct list entry; diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index fced4b0411..efae402f91 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -2010,6 +2010,9 @@ static HRESULT opentype_get_font_strings_from_id(const void *table_data, enum OP } } + if (*strings) + sort_localizedstrings(*strings); + return exists ? S_OK : E_FAIL; }

1 0