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

Jacek Caban : mshtml: Initialize HTMLTxtRange object with compat mode.
by Alexandre Julliard March 12, 2021

March 12, 2021

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 HTMLOptionElementFactory object with compat mode.
by Alexandre Julliard March 12, 2021

March 12, 2021

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

Nikolay Sivov : dwrite: Add a helper to return font list item.
by Alexandre Julliard March 12, 2021

March 12, 2021

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: Enable 'meta' table properties for the font set.
by Alexandre Julliard March 12, 2021

March 12, 2021

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

Jacek Caban : mshtml: Initialize HTMLXMLHttpRequestFactory object with compat mode.
by Alexandre Julliard March 12, 2021

March 12, 2021

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

Nikolay Sivov : dwrite/tests: Test font set properties that should be always available.
by Alexandre Julliard March 12, 2021

March 12, 2021

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

Paul Gofman : ddraw/tests: Compute output caps instead of coding them in test_rt_caps().
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: b5a531d9b045e0a68795f6f62a8d8862dc6a9fdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5a531d9b045e0a68795f6f6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Mar 11 16:33:54 2021 +0300 ddraw/tests: Compute output caps instead of coding them in test_rt_caps(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 79 ++++++++++++--------------------- dlls/ddraw/tests/ddraw2.c | 78 +++++++++++--------------------- dlls/ddraw/tests/ddraw4.c | 108 +++++++++++++------------------------------- dlls/ddraw/tests/ddraw7.c | 111 +++++++++++++--------------------------------- 4 files changed, 116 insertions(+), 260 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b5a531d9b045e0a68795…

1 0

Nikolay Sivov : dwrite/tests: Reduce number of skipped test messages to one per test.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 3fb3b87210f91779980c7cf106da450ae8c73420 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fb3b87210f91779980c7cf1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 12 15:06:59 2021 +0300 dwrite/tests: Reduce number of skipped test messages to one per test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4b31c331872..e995f9441bd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2411,8 +2411,11 @@ static void test_GetMetrics(void) get_combined_font_name(familyW, faceW, nameW); - if (has_face_variations(fontface)) { - skip("%s: test does not support variable fonts.\n", wine_dbgstr_w(nameW)); + if (has_face_variations(fontface)) + { + static int once; + if (!once++) + skip("GetMetrics() test does not support variable fonts.\n"); IDWriteFontFace_Release(fontface); continue; } @@ -2841,8 +2844,11 @@ if (0) /* crashes on native */ hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - if (has_face_variations(fontface)) { - skip("%s: test does not support variable fonts.\n", wine_dbgstr_w(nameW)); + if (has_face_variations(fontface)) + { + static int once; + if (!once++) + skip("ConvertFontFaceToLOGFONT() test does not support variable fonts.\n"); IDWriteFontFace_Release(fontface); IDWriteFont_Release(font); continue; @@ -3810,8 +3816,11 @@ if (strcmp(winetest_platform, "wine")) { IDWriteLocalizedStrings_Release(names); - if (IDWriteFontFace_IsSymbolFont(fontface)) { - skip("Skipping for symbol font %s %s.\n", wine_dbgstr_w(familynameW), wine_dbgstr_w(facenameW)); + if (IDWriteFontFace_IsSymbolFont(fontface)) + { + static int once; + if (!once++) + skip("GetUnicodeRanges() test does not support symbol fonts.\n"); IDWriteFontFace_Release(fontface); continue; } @@ -4802,8 +4811,11 @@ if (0) { /* crashes on native */ has_variations = has_face_variations(fontface); IDWriteFontFace_Release(fontface); - if (has_variations) { - skip("%s: test does not support variable fonts.\n", wine_dbgstr_w(nameW)); + if (has_variations) + { + static int once; + if (!once++) + skip("ConvertFontToLOGFONT() test does not support variable fonts.\n"); IDWriteFont_Release(font); continue; }

1 0

Zebediah Figura : strmbase: Return void from renderer_disconnect.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 26476fcf483b9c7513644506f5f8bb834e3a90b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26476fcf483b9c7513644506… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Mar 11 17:21:59 2021 -0600 strmbase: Return void from renderer_disconnect. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 9 ++------- include/wine/strmbase.h | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 6ac01c3b8ae..2562b74932a 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -512,16 +512,12 @@ static HRESULT vmr_connect(struct strmbase_renderer *iface, const AM_MEDIA_TYPE return hr; } -static HRESULT vmr_disconnect(struct strmbase_renderer *This) +static void vmr_disconnect(struct strmbase_renderer *This) { struct quartz_vmr *filter = impl_from_IBaseFilter(&This->filter.IBaseFilter_iface); - HRESULT hr = S_OK; DWORD i; - if (!filter->mode) - return S_FALSE; - - if (filter->allocator && filter->presenter) + if (filter->mode && filter->allocator && filter->presenter) { for (i = 0; i < filter->num_surfaces; ++i) IDirect3DSurface9_Release(filter->surfaces[i]); @@ -530,7 +526,6 @@ static HRESULT vmr_disconnect(struct strmbase_renderer *This) IVMRSurfaceAllocator9_TerminateDevice(filter->allocator, filter->cookie); filter->num_surfaces = 0; } - return hr; } static void vmr_free(struct quartz_vmr *filter) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index dcb9b1bf3d9..9906a9ffd74 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -313,7 +313,7 @@ struct strmbase_renderer_ops void (*renderer_start_stream)(struct strmbase_renderer *iface); void (*renderer_stop_stream)(struct strmbase_renderer *iface); HRESULT (*renderer_connect)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); - HRESULT (*renderer_disconnect)(struct strmbase_renderer *iface); + void (*renderer_disconnect)(struct strmbase_renderer *iface); void (*renderer_destroy)(struct strmbase_renderer *iface); HRESULT (*renderer_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);

1 0

Huw Davies : riched20: Use EM_GETTEXTLENGTHEX to implement WM_GETTEXTLENGTH.
by Alexandre Julliard March 12, 2021

March 12, 2021

Module: wine Branch: master Commit: 859b1e896293db722b3646ef7fefe47fc2a142fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=859b1e896293db722b3646ef… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Mar 12 09:01:34 2021 +0000 riched20: Use EM_GETTEXTLENGTHEX to implement WM_GETTEXTLENGTH. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 4 +--- dlls/riched20/txthost.c | 9 +++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 217394eaafb..6532f7c65cb 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3969,10 +3969,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case WM_GETTEXTLENGTH: { GETTEXTLENGTHEX how; - - /* CR/LF conversion required in 2.0 mode, verbatim in 1.0 mode */ how.flags = GTL_CLOSE | (editor->bEmulateVersion10 ? 0 : GTL_USECRLF) | GTL_NUMCHARS; - how.codepage = unicode ? CP_UNICODE : CP_ACP; + how.codepage = CP_UNICODE; return ME_GetTextLengthEx(editor, &how); } case EM_GETTEXTLENGTHEX: diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 064ce3fb827..e401759991f 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -801,6 +801,15 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, FillRect( hdc, &rc, editor->hbrBackground ); return 1; } + case WM_GETTEXTLENGTH: + { + GETTEXTLENGTHEX params; + + params.flags = GTL_CLOSE | (host->emulate_10 ? 0 : GTL_USECRLF) | GTL_NUMCHARS; + params.codepage = unicode ? CP_UNICODE : CP_ACP; + hr = ITextServices_TxSendMessage( host->text_srv, EM_GETTEXTLENGTHEX, (WPARAM)&params, 0, &res ); + break; + } case WM_PAINT: { HDC hdc;

1 0