March 2021 - Wine-commits - list.winehq.org

Nikolay Sivov : dwrite: Enable 'meta' table properties for the font set.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 8010ede25738611471ef494aa81b40d95ce160d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8010ede25738611471ef494a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 15:07:00 2021 +0300 dwrite: Enable 'meta' table properties for the font set. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 1a54d2300b1..cd90a9c051c 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7157,6 +7157,10 @@ static IDWriteLocalizedStrings * fontset_entry_get_property(struct dwrite_fontse opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_FULL_NAME, &value); else if (property == DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME) opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME, &value); + else if (property == DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG) + opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG, &value); + else if (property == DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG) + opentype_get_font_info_strings(&stream_desc, DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG, &value); else WARN("Unsupported property %u.\n", property); @@ -7296,6 +7300,8 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE { case DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME: case DWRITE_FONT_PROPERTY_ID_FULL_NAME: + case DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG: + case DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG: if (!(value = fontset_entry_get_property(entry, props[i].propertyId))) return FALSE; @@ -7307,8 +7313,6 @@ static BOOL fontset_entry_is_matching(struct dwrite_fontset_entry *entry, DWRITE case DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME: case DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME: case DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME: - case DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG: - case DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG: case DWRITE_FONT_PROPERTY_ID_SEMANTIC_TAG: case DWRITE_FONT_PROPERTY_ID_WEIGHT: case DWRITE_FONT_PROPERTY_ID_STRETCH:

1 0

Nikolay Sivov : dwrite: Add a helper to return font list item.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 2bc442aa1beb24a48ea4f3be44c01374dc439d41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bc442aa1beb24a48ea4f3be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 15:07:01 2021 +0300 dwrite: Add a helper to return font list item. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index cd90a9c051c..14be1b9fc1b 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -2336,12 +2336,9 @@ static DWRITE_LOCALITY WINAPI dwritefontlist1_GetFontLocality(IDWriteFontList2 * return DWRITE_LOCALITY_LOCAL; } -static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList2 *iface, UINT32 index, IDWriteFont3 **font) +static HRESULT fontlist_get_font(const struct dwrite_fontlist *fontlist, unsigned int index, + IDWriteFont3 **font) { - struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface); - - TRACE("%p, %u, %p.\n", iface, index, font); - *font = NULL; if (fontlist->font_count == 0) @@ -2353,9 +2350,19 @@ static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList2 *iface, UINT32 in return create_font(fontlist->family, index, font); } +static HRESULT WINAPI dwritefontlist1_GetFont(IDWriteFontList2 *iface, UINT32 index, IDWriteFont3 **font) +{ + struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface); + + TRACE("%p, %u, %p.\n", iface, index, font); + + return fontlist_get_font(fontlist, index, font); +} + static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList2 *iface, UINT32 index, IDWriteFontFaceReference **reference) { + struct dwrite_fontlist *fontlist = impl_from_IDWriteFontList2(iface); IDWriteFont3 *font; HRESULT hr; @@ -2363,12 +2370,11 @@ static HRESULT WINAPI dwritefontlist1_GetFontFaceReference(IDWriteFontList2 *ifa *reference = NULL; - hr = IDWriteFontList2_GetFont(iface, index, &font); - if (FAILED(hr)) - return hr; - - hr = IDWriteFont3_GetFontFaceReference(font, reference); - IDWriteFont3_Release(font); + if (SUCCEEDED(hr = fontlist_get_font(fontlist, index, &font))) + { + hr = IDWriteFont3_GetFontFaceReference(font, reference); + IDWriteFont3_Release(font); + } return hr; }

1 0

Nikolay Sivov : dwrite/tests: Test font set properties that should be always available.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: fc1f50c5154e27bceb570c925c88763609f57c08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1f50c5154e27bceb570c92… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 15:07:02 2021 +0300 dwrite/tests: Test font set properties that should be always available. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e995f9441bd..c14c557c92a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9512,6 +9512,13 @@ static void test_fontsetbuilder(void) hr = IDWriteFontSet_GetPropertyValues(fontset, 0, id, &exists, &values); ok(hr == S_OK, "Failed to get property value, hr %#x.\n", hr); + if (id == DWRITE_FONT_PROPERTY_ID_WEIGHT || id == DWRITE_FONT_PROPERTY_ID_STRETCH + || id == DWRITE_FONT_PROPERTY_ID_STYLE) + { + todo_wine + ok(exists, "Property %u expected to exist.\n", id); + } + if (!exists) continue;

1 0

Rémi Bernon : setupapi: Support installing DLLs with dots in their name.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: ef8fc24acf9fd57fa0764fe186171cc98fe604a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef8fc24acf9fd57fa0764fe1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 12 12:31:07 2021 +0100 setupapi: Support installing DLLs with dots in their name. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/fakedll.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index cf219916400..3196708a7f7 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -881,13 +881,18 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL ex WCHAR *destname = dest + lstrlenW(dest); WCHAR *name = wcsrchr( file, '\\' ) + 1; WCHAR *end = name + lstrlenW(name); + SIZE_T len = end - name; if (ext) lstrcpyW( end, ext ); - if (!(ret = read_file( file, &data, &size, expect_builtin ))) return 0; + if (!(ret = read_file( file, &data, &size, expect_builtin ))) + { + *end = 0; + return 0; + } - if (end > name + 2 && !wcsncmp( end - 2, L"16", 2 )) end -= 2; /* remove "16" suffix */ - memcpy( destname, name, (end - name) * sizeof(WCHAR) ); - destname[end - name] = 0; + if (end > name + 2 && !wcsncmp( end - 2, L"16", 2 )) len -= 2; /* remove "16" suffix */ + memcpy( destname, name, len * sizeof(WCHAR) ); + destname[len] = 0; if (!add_handled_dll( destname )) ret = -1; if (ret != -1) @@ -906,6 +911,7 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, const WCHAR *ext, BOOL ex } } *destname = 0; /* restore it for next file */ + *end = 0; return ret; } @@ -965,9 +971,14 @@ static void install_lib_dir( WCHAR *dest, WCHAR *file, const WCHAR *default_ext, { lstrcatW( name, L"\\" ); lstrcatW( name, data.name ); - if (!wcschr( data.name, '.' )) lstrcatW( name, default_ext ); - if (!install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy )) - install_fake_dll( dest, file, L".fake", FALSE, &delay_copy ); + if (wcschr( data.name, '.' )) /* module possibly already has an extension */ + { + if (install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", FALSE, &delay_copy )) continue; + } + lstrcatW( name, default_ext ); + if (install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy )) continue; + if (install_fake_dll( dest, file, L".fake", FALSE, &delay_copy )) continue; } else install_fake_dll( dest, file, NULL, expect_builtin, &delay_copy ); }

1 0

Jacek Caban : mshtml: Initialize HTMLOptionElementFactory object with compat mode.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 8de773d9f275395e525340c19b53610789fba753 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8de773d9f275395e525340c1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 17:39:47 2021 +0100 mshtml: Initialize HTMLOptionElementFactory object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlselect.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlselect.c b/dlls/mshtml/htmlselect.c index 13a2f8b3f6a..f94319e22a2 100644 --- a/dlls/mshtml/htmlselect.c +++ b/dlls/mshtml/htmlselect.c @@ -614,8 +614,8 @@ HRESULT HTMLOptionElementFactory_Create(HTMLInnerWindow *window, HTMLOptionEleme ret->ref = 1; ret->window = window; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLOptionElementFactory_iface, - &HTMLOptionElementFactory_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLOptionElementFactory_iface, + &HTMLOptionElementFactory_dispex, dispex_compat_mode(&window->event_target.dispex)); *ret_ptr = ret; return S_OK;

1 0

Jacek Caban : mshtml: Initialize HTMLTxtRange object with compat mode.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 8b0f1721bbc547fc85892b58f7d14acd424104e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b0f1721bbc547fc85892b58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 17:39:52 2021 +0100 mshtml: Initialize HTMLTxtRange object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/range.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index aa8e8942a87..d739c18d13e 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -1729,7 +1729,8 @@ HRESULT HTMLTxtRange_Create(HTMLDocumentNode *doc, nsIDOMRange *nsrange, IHTMLTx if(!ret) return E_OUTOFMEMORY; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLTxtRange_iface, &HTMLTxtRange_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLTxtRange_iface, &HTMLTxtRange_dispex, + dispex_compat_mode(&doc->node.event_target.dispex)); ret->IHTMLTxtRange_iface.lpVtbl = &HTMLTxtRangeVtbl; ret->IOleCommandTarget_iface.lpVtbl = &OleCommandTargetVtbl;

1 0

Jacek Caban : mshtml: Initialize HTMLSelectionObject object with compat mode.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 45c682c74bbef83d332e448e92525ad6b0312a48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45c682c74bbef83d332e448e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 17:39:57 2021 +0100 mshtml: Initialize HTMLSelectionObject object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/selection.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 4fe9a1708a1..9c1bfc15bb8 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -343,7 +343,8 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect if(!selection) return E_OUTOFMEMORY; - init_dispex(&selection->dispex, (IUnknown*)&selection->IHTMLSelectionObject_iface, &HTMLSelectionObject_dispex); + init_dispex_with_compat_mode(&selection->dispex, (IUnknown*)&selection->IHTMLSelectionObject_iface, + &HTMLSelectionObject_dispex, dispex_compat_mode(&doc->node.event_target.dispex)); selection->IHTMLSelectionObject_iface.lpVtbl = &HTMLSelectionObjectVtbl; selection->IHTMLSelectionObject2_iface.lpVtbl = &HTMLSelectionObject2Vtbl;

1 0

Jacek Caban : mshtml: Initialize HTMLXMLHttpRequestFactory object with compat mode.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: a2e4ee235ed1b78e9a62562adc49067a87ca4789 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2e4ee235ed1b78e9a62562a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 17:40:03 2021 +0100 mshtml: Initialize HTMLXMLHttpRequestFactory object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 0ee05f04e40..da5d0138117 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -1084,8 +1084,8 @@ HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow* window, HTMLXMLHttpReq ret->ref = 1; ret->window = window; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLXMLHttpRequestFactory_iface, - &HTMLXMLHttpRequestFactory_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLXMLHttpRequestFactory_iface, + &HTMLXMLHttpRequestFactory_dispex, dispex_compat_mode(&window->event_target.dispex)); *ret_ptr = ret; return S_OK;

1 0

Jacek Caban : mshtml: Initialize HTMLScreen object with compat mode.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 16b4bc2319614ba08929380734d18e9108ac828b URL: https://source.winehq.org/git/wine.git/?a=commit;h=16b4bc2319614ba089293807… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 17:40:13 2021 +0100 mshtml: Initialize HTMLScreen object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/omnavigator.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 69717ff7848..a373bbe1916 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1305,7 +1305,7 @@ static HRESULT WINAPI HTMLWindow2_get_screen(IHTMLWindow2 *iface, IHTMLScreen ** if(!window->screen) { HRESULT hres; - hres = HTMLScreen_Create(&window->screen); + hres = create_html_screen(dispex_compat_mode(&window->event_target.dispex), &window->screen); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e048127ee1a..784432b30b2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -911,7 +911,7 @@ HRESULT HTMLImageElementFactory_Create(HTMLInnerWindow*,HTMLImageElementFactory* HRESULT HTMLXMLHttpRequestFactory_Create(HTMLInnerWindow*,HTMLXMLHttpRequestFactory**) DECLSPEC_HIDDEN; HRESULT HTMLLocation_Create(HTMLInnerWindow*,HTMLLocation**) DECLSPEC_HIDDEN; IOmNavigator *OmNavigator_Create(void) DECLSPEC_HIDDEN; -HRESULT HTMLScreen_Create(IHTMLScreen**) DECLSPEC_HIDDEN; +HRESULT create_html_screen(compat_mode_t,IHTMLScreen**) DECLSPEC_HIDDEN; HRESULT create_performance(IHTMLPerformance**) DECLSPEC_HIDDEN; HRESULT create_history(HTMLInnerWindow*,OmHistory**) DECLSPEC_HIDDEN; HRESULT create_namespace_collection(IHTMLNamespaceCollection**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index f09b796e423..2a98c159332 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -561,7 +561,7 @@ static dispex_static_data_t HTMLScreen_dispex = { HTMLScreen_iface_tids }; -HRESULT HTMLScreen_Create(IHTMLScreen **ret) +HRESULT create_html_screen(compat_mode_t compat_mode, IHTMLScreen **ret) { HTMLScreen *screen; @@ -572,7 +572,7 @@ HRESULT HTMLScreen_Create(IHTMLScreen **ret) screen->IHTMLScreen_iface.lpVtbl = &HTMLSreenVtbl; screen->ref = 1; - init_dispex(&screen->dispex, (IUnknown*)&screen->IHTMLScreen_iface, &HTMLScreen_dispex); + init_dispex_with_compat_mode(&screen->dispex, (IUnknown*)&screen->IHTMLScreen_iface, &HTMLScreen_dispex, compat_mode); *ret = &screen->IHTMLScreen_iface; return S_OK;

1 0

Jacek Caban : mshtml: Initialize OmHistory object with compat mode.
by Alexandre Julliard 12 Mar '21

12 Mar '21

Module: wine Branch: master Commit: 65e2bac79eed9e4d2a9253726d6d5ad4903222d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65e2bac79eed9e4d2a925372… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 12 17:40:20 2021 +0100 mshtml: Initialize OmHistory object with compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 2a98c159332..7e99e1476f7 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -733,7 +733,8 @@ HRESULT create_history(HTMLInnerWindow *window, OmHistory **ret) if(!history) return E_OUTOFMEMORY; - init_dispex(&history->dispex, (IUnknown*)&history->IOmHistory_iface, &OmHistory_dispex); + init_dispex_with_compat_mode(&history->dispex, (IUnknown*)&history->IOmHistory_iface, &OmHistory_dispex, + dispex_compat_mode(&window->event_target.dispex)); history->IOmHistory_iface.lpVtbl = &OmHistoryVtbl; history->ref = 1;

1 0