wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Roberto Pungartnik : po: Update Spanish translation.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: aba849eb55453b439913334e394f69c681b01edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=aba849eb55453b439913334e… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat Mar 13 21:51:08 2021 -0300 po: Update Spanish translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/es.po | 728 ++++++++++++++++----------------------------------------------- 1 file changed, 182 insertions(+), 546 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aba849eb55453b439913…

1 0

Roberto Pungartnik : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: b89c183158ae618433368a47f32f0494013837a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b89c183158ae618433368a47… Author: Roberto Pungartnik <rpungartnik(a)gmail.com> Date: Sat Mar 13 21:50:12 2021 -0300 po: Update Brazilian Portuguese translation. Signed-off-by: Roberto Pungartnik <rpungartnik(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pt_BR.po | 84 ++++++++++++++++--------------------------------------------- 1 file changed, 22 insertions(+), 62 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index b04c35506ab..d5af03add65 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.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: 2020-09-25 18:58-0300\n" +"PO-Revision-Date: 2021-03-13 17:38-0300\n" "Last-Translator: Roberto Augusto Pungartnik <rpungartnik(a)gmail.com>\n" "Language-Team: Portuguese (Brazil)\n" "Language: pt_BR\n" @@ -20,26 +20,20 @@ msgid "Security" msgstr "Segurança" #: dlls/aclui/aclui.rc:32 -#, fuzzy -#| msgid "&User name:" msgid "&Group or user names:" -msgstr "&Nome de usuário:" +msgstr "&Grupo ou nome dos usuários:" #: dlls/aclui/aclui.rc:38 -#, fuzzy -#| msgid "Yellow" msgid "Allow" -msgstr "Amarelo" +msgstr "Permitir" #: dlls/aclui/aclui.rc:39 msgid "Deny" -msgstr "" +msgstr "Negado" #: dlls/aclui/aclui.rc:47 -#, fuzzy -#| msgid "Permission denied" msgid "Permissions for %1" -msgstr "Acesso negado" +msgstr "Permissões para %1" #: dlls/appwiz.cpl/appwiz.rc:58 msgid "Install/Uninstall" @@ -6964,10 +6958,8 @@ msgid "Not implemented.\n" msgstr "Não implementado.\n" #: dlls/kernel32/winerror.mc:3788 -#, fuzzy -#| msgid "RPC call failed.\n" msgid "Call failed.\n" -msgstr "Falha na chamada RPC.\n" +msgstr "Falha na chamada.\n" #: dlls/kernel32/winerror.mc:3760 msgid "No Signature found in file.\n" @@ -9949,16 +9941,12 @@ msgid "Iran Daylight Time" msgstr "Horário de verão do Irã" #: dlls/tzres/tzres.rc:204 -#, fuzzy -#| msgid "Haiti Standard Time" msgid "Saint Pierre Standard Time" -msgstr "Hora padrão do Haiti" +msgstr "Hora padrão de São Pedro" #: dlls/tzres/tzres.rc:205 -#, fuzzy -#| msgid "Haiti Daylight Time" msgid "Saint Pierre Daylight Time" -msgstr "Horário de verão do Haiti" +msgstr "Horário de verão de São Pedro" #: dlls/tzres/tzres.rc:170 msgid "Namibia Standard Time" @@ -10001,16 +9989,12 @@ msgid "Central Asia Daylight Time" msgstr "Horário de verão da Asia Central" #: dlls/tzres/tzres.rc:146 -#, fuzzy -#| msgid "Korea Standard Time" msgid "Lord Howe Standard Time" -msgstr "Hora padrão da Coreia" +msgstr "Hora padrão de Lord Howe" #: dlls/tzres/tzres.rc:147 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "Lord Howe Daylight Time" -msgstr "Horário de verão da Coreia" +msgstr "Horário de verão de Lord Howe" #: dlls/tzres/tzres.rc:40 msgid "Arabic Standard Time" @@ -10061,16 +10045,12 @@ msgid "Azerbaijan Daylight Time" msgstr "Horário de verão do Azerbaijão" #: dlls/tzres/tzres.rc:150 -#, fuzzy -#| msgid "Magadan Standard Time" msgid "Magallanes Standard Time" -msgstr "Hora padrão de Magadan" +msgstr "Hora padrão de Magalhães" #: dlls/tzres/tzres.rc:151 -#, fuzzy -#| msgid "Magadan Daylight Time" msgid "Magallanes Daylight Time" -msgstr "Horário de verão Magadan" +msgstr "Horário de verão Magalhães" #: dlls/tzres/tzres.rc:206 msgid "Samoa Standard Time" @@ -10121,16 +10101,12 @@ msgid "Line Islands Daylight Time" msgstr "Horário de verão das Ilhas Equatoriais" #: dlls/tzres/tzres.rc:92 -#, fuzzy -#| msgid "China Standard Time" msgid "Cuba Standard Time" -msgstr "Hora padrão da China" +msgstr "Hora padrão da Cuba" #: dlls/tzres/tzres.rc:93 -#, fuzzy -#| msgid "China Daylight Time" msgid "Cuba Daylight Time" -msgstr "Horário de verão da China" +msgstr "Horário de verão da Cuba" #: dlls/tzres/tzres.rc:136 msgid "Jordan Standard Time" @@ -10329,16 +10305,12 @@ msgid "US Eastern Daylight Time" msgstr "Horário de verão do Leste EUA" #: dlls/tzres/tzres.rc:182 -#, fuzzy -#| msgid "Korea Standard Time" msgid "North Korea Standard Time" -msgstr "Hora padrão da Coreia" +msgstr "Hora padrão da Coreia do Norte" #: dlls/tzres/tzres.rc:183 -#, fuzzy -#| msgid "Korea Daylight Time" msgid "North Korea Daylight Time" -msgstr "Horário de verão da Coreia" +msgstr "Horário de verão da Coreia do Norte" #: dlls/tzres/tzres.rc:220 msgid "Tasmania Standard Time" @@ -10429,16 +10401,12 @@ msgid "Arabian Daylight Time" msgstr "Horário de verão da Arábia Saudita" #: dlls/tzres/tzres.rc:222 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Tocantins Standard Time" -msgstr "Hora padrão de Montanha" +msgstr "Hora padrão de Tocantins" #: dlls/tzres/tzres.rc:223 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Tocantins Daylight Time" -msgstr "Horário de verão de Montanha" +msgstr "Horário de verão de Tocantins" #: dlls/tzres/tzres.rc:196 msgid "Russian Standard Time" @@ -10449,16 +10417,12 @@ msgid "Russian Daylight Time" msgstr "Horário de verão da Rússia" #: dlls/tzres/tzres.rc:48 -#, fuzzy -#| msgid "AUS Central Standard Time" msgid "Aus Central W. Standard Time" -msgstr "Hora padrão da Austrália Central" +msgstr "Hora padrão da Austrália Ocidental" #: dlls/tzres/tzres.rc:49 -#, fuzzy -#| msgid "AUS Central Daylight Time" msgid "Aus Central W. Daylight Time" -msgstr "Horário de verão da Austrália Central" +msgstr "Horário de verão da Austrália Ocidental" #: dlls/tzres/tzres.rc:194 msgid "Romance Standard Time" @@ -10677,16 +10641,12 @@ msgid "Egypt Daylight Time" msgstr "Horário de verão do Egito" #: dlls/tzres/tzres.rc:106 -#, fuzzy -#| msgid "Central Standard Time (Mexico)" msgid "Eastern Standard Time (Mexico)" -msgstr "Hora padrão Central(México)" +msgstr "Hora padrão Oriental(México)" #: dlls/tzres/tzres.rc:107 -#, fuzzy -#| msgid "Central Daylight Time (Mexico)" msgid "Eastern Daylight Time (Mexico)" -msgstr "Horário de verão Central(México)" +msgstr "Horário de verão Oriental(México)" #: dlls/tzres/tzres.rc:154 msgid "Mauritius Standard Time"

1 0

Nikolay Sivov : dwrite: Request one glyph outline at a time in GetGlyphRunOutline().
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 0ed0fd05c3364bb78a1ccb6ff0cb63c00283c697 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ed0fd05c3364bb78a1ccb6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:36:51 2021 +0300 dwrite: Request one glyph outline at a time in GetGlyphRunOutline(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 5 ++- dlls/dwrite/font.c | 39 ++++++++++++++++++++-- dlls/dwrite/freetype.c | 79 +++++++++++--------------------------------- 3 files changed, 57 insertions(+), 66 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 8c09a315f54..fe1a16c8899 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -463,9 +463,8 @@ extern void release_freetype(void) DECLSPEC_HIDDEN; extern HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT16 glyph, DWRITE_GLYPH_METRICS *metrics) DECLSPEC_HIDDEN; extern void freetype_notify_cacheremove(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; -extern HRESULT freetype_get_glyphrun_outline(IDWriteFontFace5 *fontface, float emsize, UINT16 const *glyphs, - float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, - IDWriteGeometrySink *sink) DECLSPEC_HIDDEN; +extern HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + D2D1_POINT_2F origin, IDWriteGeometrySink *sink) DECLSPEC_HIDDEN; extern UINT16 freetype_get_glyphcount(IDWriteFontFace5 *fontface) DECLSPEC_HIDDEN; extern void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap_desc) DECLSPEC_HIDDEN; extern BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e5050476938..0167878e912 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -827,16 +827,49 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace5 *iface, UINT16 const *glyphs, FLOAT const* advances, DWRITE_GLYPH_OFFSET const *offsets, UINT32 count, BOOL is_sideways, BOOL is_rtl, IDWriteGeometrySink *sink) { + D2D1_POINT_2F *origins, baseline_origin = { 0 }; + DWRITE_GLYPH_RUN run; + unsigned int i; + HRESULT hr; + TRACE("%p, %.8e, %p, %p, %p, %u, %d, %d, %p.\n", iface, emSize, glyphs, advances, offsets, count, is_sideways, is_rtl, sink); if (!glyphs || !sink) return E_INVALIDARG; - if (is_sideways) - FIXME("sideways mode is not supported.\n"); + if (!count) + return S_OK; - return freetype_get_glyphrun_outline(iface, emSize, glyphs, advances, offsets, count, is_rtl, sink); + run.fontFace = (IDWriteFontFace *)iface; + run.fontEmSize = emSize; + run.glyphCount = count; + run.glyphIndices = glyphs; + run.glyphAdvances = advances; + run.glyphOffsets = offsets; + run.isSideways = is_sideways; + run.bidiLevel = is_rtl ? 1 : 0; + + if (!(origins = heap_alloc(sizeof(*origins) * count))) + return E_OUTOFMEMORY; + + if (FAILED(hr = compute_glyph_origins(&run, DWRITE_MEASURING_MODE_NATURAL, baseline_origin, NULL, origins))) + { + heap_free(origins); + return hr; + } + + ID2D1SimplifiedGeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING); + + for (i = 0; i < count; ++i) + { + if (FAILED(hr = freetype_get_glyph_outline(iface, emSize, glyphs[i], origins[i], sink))) + WARN("Failed to get glyph outline for glyph %u.\n", glyphs[i]); + } + + heap_free(origins); + + return S_OK; } static DWRITE_RENDERING_MODE fontface_renderingmode_from_measuringmode(DWRITE_MEASURING_MODE measuring, diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index b770caac479..83b2ae1bc88 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -464,20 +464,14 @@ static void embolden_glyph(FT_Glyph glyph, FLOAT emsize) embolden_glyph_outline(&outline_glyph->outline, emsize); } -HRESULT freetype_get_glyphrun_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 const *glyphs, - float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, - IDWriteGeometrySink *sink) +HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + D2D1_POINT_2F origin, IDWriteGeometrySink *sink) { FTC_ScalerRec scaler; USHORT simulations; HRESULT hr = S_OK; FT_Size size; - if (!count) - return S_OK; - - ID2D1SimplifiedGeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING); - simulations = IDWriteFontFace5_GetSimulations(fontface); scaler.face_id = fontface; @@ -490,56 +484,22 @@ HRESULT freetype_get_glyphrun_outline(IDWriteFontFace5 *fontface, float emSize, EnterCriticalSection(&freetype_cs); if (pFTC_Manager_LookupSize(cache_manager, &scaler, &size) == 0) { - D2D1_POINT_2F origin; - unsigned int i; - - origin.x = origin.y = 0.0f; - for (i = 0; i < count; ++i) + if (pFT_Load_Glyph(size->face, glyph, FT_LOAD_NO_BITMAP) == 0) { - if (pFT_Load_Glyph(size->face, glyphs[i], FT_LOAD_NO_BITMAP) == 0) - { - FLOAT ft_advance = size->face->glyph->metrics.horiAdvance >> 6; - FT_Outline *outline = &size->face->glyph->outline; - D2D1_POINT_2F glyph_origin; - FT_Matrix m; - - if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) - embolden_glyph_outline(outline, emSize); - - m.xx = 1 << 16; - m.xy = simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE ? (1 << 16) / 3 : 0; - m.yx = 0; - m.yy = -(1 << 16); /* flip Y axis */ - - pFT_Outline_Transform(outline, &m); - - glyph_origin = origin; - - if (is_rtl) - { - glyph_origin.x -= ft_advance; - - if (offsets) - { - glyph_origin.x -= offsets[i].advanceOffset; - glyph_origin.y -= offsets[i].ascenderOffset; - } - - origin.x -= advances ? advances[i] : ft_advance; - } - else - { - if (offsets) - { - glyph_origin.x += offsets[i].advanceOffset; - glyph_origin.y -= offsets[i].ascenderOffset; - } - - origin.x += advances ? advances[i] : ft_advance; - } - - decompose_outline(outline, glyph_origin, sink); - } + FT_Outline *outline = &size->face->glyph->outline; + FT_Matrix m; + + if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) + embolden_glyph_outline(outline, emSize); + + m.xx = 1 << 16; + m.xy = simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE ? (1 << 16) / 3 : 0; + m.yx = 0; + m.yy = -(1 << 16); /* flip Y axis */ + + pFT_Outline_Transform(outline, &m); + + decompose_outline(outline, origin, sink); } } else @@ -837,9 +797,8 @@ HRESULT freetype_get_design_glyph_metrics(struct dwrite_fontface *fontface, UINT return E_NOTIMPL; } -HRESULT freetype_get_glyphrun_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 const *glyphs, - float const *advances, DWRITE_GLYPH_OFFSET const *offsets, unsigned int count, BOOL is_rtl, - IDWriteGeometrySink *sink) +HRESULT freetype_get_glyph_outline(IDWriteFontFace5 *fontface, float emSize, UINT16 glyph, + D2D1_POINT_2F origin, IDWriteGeometrySink *sink) { return E_NOTIMPL; }

1 0

Nikolay Sivov : dwrite/gdiinterop: Pass target transform when getting recommended rendering mode.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 6f9e1e078e9b264da812d238201be4e5ebe4e8be URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9e1e078e9b264da812d238… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:36:50 2021 +0300 dwrite/gdiinterop: Pass target transform when getting recommended rendering mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 4 ++-- dlls/dwrite/gdiinterop.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c0fff68ed15..e5050476938 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1265,7 +1265,7 @@ static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFac TRACE("%p, %.8e, %.8e, %.8e, %p, %d, %d, %d, %p, %p, %p.\n", iface, emSize, dpiX, dpiY, m, is_sideways, threshold, measuringmode, params, renderingmode, gridfitmode); - if (m) + if (m && memcmp(m, &identity, sizeof(*m))) FIXME("transform not supported %s\n", debugstr_matrix(m)); if (is_sideways) @@ -1452,7 +1452,7 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac TRACE("%p, %.8e, %.8e, %.8e, %p, %d, %d, %d, %p, %p, %p.\n", iface, emSize, dpiX, dpiY, m, is_sideways, threshold, measuring_mode, params, rendering_mode, gridfit_mode); - if (m) + if (m && memcmp(m, &identity, sizeof(*m))) FIXME("transform not supported %s\n", debugstr_matrix(m)); if (is_sideways) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 84d1f615f75..6a5953a67e9 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -369,7 +369,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac } hr = IDWriteFontFace3_GetRecommendedRenderingMode(fontface, run->fontEmSize, target->ppdip * 96.0f, - target->ppdip * 96.0f, NULL /* FIXME */, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, + target->ppdip * 96.0f, &target->m, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, params, &rendermode, &gridfitmode); IDWriteFontFace3_Release(fontface); if (FAILED(hr))

1 0

Nikolay Sivov : dwrite: Implement IDWriteFontSet1::CreateFontResource().
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: a56112c330b823be017d46d1b790459d1eca53c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a56112c330b823be017d46d1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:36:49 2021 +0300 dwrite: Implement IDWriteFontSet1::CreateFontResource(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 12 ++++++++++-- dlls/dwrite/tests/font.c | 8 ++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 4e2917854ba..c0fff68ed15 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7467,9 +7467,17 @@ static HRESULT WINAPI dwritefontset1_GetFontFaceReference(IDWriteFontSet3 *iface static HRESULT WINAPI dwritefontset1_CreateFontResource(IDWriteFontSet3 *iface, UINT32 index, IDWriteFontResource **resource) { - FIXME("%p, %u, %p.\n", iface, index, resource); + struct dwrite_fontset *set = impl_from_IDWriteFontSet3(iface); - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, index, resource); + + *resource = NULL; + + if (index >= set->count) + return E_INVALIDARG; + + return IDWriteFactory7_CreateFontResource(set->factory, set->entries[index]->file, + set->entries[index]->face_index, resource); } static HRESULT WINAPI dwritefontset1_CreateFontFace(IDWriteFontSet3 *iface, UINT32 index, IDWriteFontFace5 **fontface) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7aa871dcd3c..27c2a9d0b7d 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -10018,6 +10018,7 @@ static void test_family_font_set(void) unsigned int count, refcount; IDWriteFontSet1 *fontset, *fontset2; IDWriteLocalizedStrings *values; + IDWriteFontResource *resource; WCHAR buffW[64]; BOOL exists; HRESULT hr; @@ -10070,6 +10071,13 @@ static void test_family_font_set(void) IDWriteLocalizedStrings_Release(values); } + hr = IDWriteFontSet1_CreateFontResource(fontset, 100, &resource); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontSet1_CreateFontResource(fontset, 0, &resource); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IDWriteFontResource_Release(resource); + IDWriteFontSet1_Release(fontset2); IDWriteFontSet1_Release(fontset);

1 0

Nikolay Sivov : dwrite/tests: Extend tests for synthesized axis values.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 6fea399a84e730908db30c112af4106530d71683 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fea399a84e730908db30c11… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:36:48 2021 +0300 dwrite/tests: Extend tests for synthesized axis values. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c14c557c92a..7aa871dcd3c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -7822,10 +7822,31 @@ static void test_HasCharacter(void) ok(ref == 0, "factory not released, %u\n", ref); } +static BOOL has_main_axis_values(const DWRITE_FONT_AXIS_VALUE *values, unsigned int count) +{ + BOOL has_wght = FALSE, has_wdth = FALSE, has_ital = FALSE, has_slnt = FALSE; + unsigned int i; + + for (i = 0; i < count; ++i) + { + if (values[i].axisTag == DWRITE_FONT_AXIS_TAG_WEIGHT) + has_wght = TRUE; + else if (values[i].axisTag == DWRITE_FONT_AXIS_TAG_WIDTH) + has_wdth = TRUE; + else if (values[i].axisTag == DWRITE_FONT_AXIS_TAG_ITALIC) + has_ital = TRUE; + else if (values[i].axisTag == DWRITE_FONT_AXIS_TAG_SLANT) + has_slnt = TRUE; + } + + return has_wght && has_wdth && has_ital && has_slnt; +} + static void test_CreateFontFaceReference(void) { IDWriteFontFaceReference *ref, *ref1, *ref3; IDWriteFontFace3 *fontface, *fontface1; + DWRITE_FONT_AXIS_VALUE axis_values[16]; IDWriteFontCollection1 *collection; IDWriteFontFile *file, *file1; IDWriteFactory3 *factory; @@ -7978,7 +7999,15 @@ todo_wine (void **)&ref2))) { UINT32 axis_count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref2); - ok(axis_count > 0, "Unexpected axis value count.\n"); + todo_wine + ok(axis_count >= 4, "Unexpected axis value count.\n"); + + hr = IDWriteFontFaceReference1_GetFontAxisValues(ref2, axis_values, ARRAY_SIZE(axis_values)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + todo_wine + ok(has_main_axis_values(axis_values, axis_count), "Unexpected axis returned.\n"); + IDWriteFontFaceReference1_Release(ref2); } @@ -9394,9 +9423,11 @@ static void test_AnalyzeContainerType(void) static void test_fontsetbuilder(void) { IDWriteFontFaceReference *ref, *ref2, *ref3; + IDWriteFontFaceReference1 *ref1; IDWriteFontCollection1 *collection; IDWriteFontSetBuilder1 *builder1; IDWriteFontSetBuilder *builder; + DWRITE_FONT_AXIS_VALUE axis_values[4]; IDWriteFactory3 *factory; UINT32 count, i, refcount; IDWriteFontSet *fontset; @@ -9436,6 +9467,39 @@ static void test_fontsetbuilder(void) count = IDWriteFontSet_GetFontCount(fontset); ok(count == 2, "Unexpected font count %u.\n", count); + hr = IDWriteFontSet_GetFontFaceReference(fontset, 0, &ref); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + hr = IDWriteFontFaceReference_QueryInterface(ref, &IID_IDWriteFontFaceReference1, (void **)&ref1); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + count = IDWriteFontFaceReference1_GetFontAxisValueCount(ref1); + todo_wine + ok(count == 4, "Unexpected axis count %u.\n", count); + + if (count == 4) + { + hr = IDWriteFontFaceReference1_GetFontAxisValues(ref1, axis_values, ARRAY_SIZE(axis_values)); + ok(hr == S_OK, "Unexpected hr %#x.\n",hr); + + ok(axis_values[0].axisTag == DWRITE_FONT_AXIS_TAG_WEIGHT, "Unexpected tag[0] %s.\n", + wine_dbgstr_an((char *)&axis_values[0].axisTag, 4)); + ok(axis_values[0].value == 500.0f, "Unexpected value[0] %f.\n", axis_values[0].value); + ok(axis_values[1].axisTag == DWRITE_FONT_AXIS_TAG_WIDTH, "Unexpected tag[1] %s.\n", + wine_dbgstr_an((char *)&axis_values[1].axisTag, 4)); + ok(axis_values[1].value == 100.0f, "Unexpected value[1] %f.\n", axis_values[1].value); + ok(axis_values[2].axisTag == DWRITE_FONT_AXIS_TAG_ITALIC, "Unexpected tag[2] %s.\n", + wine_dbgstr_an((char *)&axis_values[2].axisTag, 4)); + ok(axis_values[2].value == 0.0f, "Unexpected value[2] %f.\n", axis_values[2].value); + ok(axis_values[3].axisTag == DWRITE_FONT_AXIS_TAG_SLANT, "Unexpected tag[3] %s.\n", + wine_dbgstr_an((char *)&axis_values[3].axisTag, 4)); + ok(axis_values[3].value == 0.0f, "Unexpected value[3] %f.\n", axis_values[3].value); + } + + IDWriteFontFaceReference1_Release(ref1); + + IDWriteFontFaceReference_Release(ref); + IDWriteFontSet_Release(fontset); IDWriteFontFile_Release(file);

1 0

Nikolay Sivov : dwrite: Test simulations mask bitwise for consistency.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: d871f04bbdcf991b2b4b4433fb156a5636c72587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d871f04bbdcf991b2b4b4433… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 15 10:36:47 2021 +0300 dwrite: Test simulations mask bitwise for consistency. This has no functional impact. Internal function is only called with one bit set at a time, but there is no reason to make it more confusing. 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, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 14be1b9fc1b..4e2917854ba 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -4022,7 +4022,7 @@ static HRESULT init_font_data(const struct fontface_desc *desc, struct dwrite_fo return S_OK; } -static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRITE_FONT_SIMULATIONS sim, +static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRITE_FONT_SIMULATIONS simulations, const WCHAR *facenameW, struct dwrite_font_data **ret) { struct dwrite_font_data *data; @@ -4035,10 +4035,10 @@ static HRESULT init_font_data_from_font(const struct dwrite_font_data *src, DWRI *data = *src; data->refcount = 1; - data->simulations |= sim; - if (sim == DWRITE_FONT_SIMULATIONS_BOLD) + data->simulations |= simulations; + if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) data->weight = DWRITE_FONT_WEIGHT_BOLD; - else if (sim == DWRITE_FONT_SIMULATIONS_OBLIQUE) + if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) data->style = DWRITE_FONT_STYLE_OBLIQUE; memset(data->info_strings, 0, sizeof(data->info_strings)); data->names = NULL;

1 0

Michael Stefaniuc : devenum: Avoid the comma operator.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: c5c4e833920eacaf14ffb05410c2d51b9e2f1f80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5c4e833920eacaf14ffb054… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 14 22:54:38 2021 +0100 devenum: Avoid the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index f097c580261..b24e24f7f31 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -186,7 +186,7 @@ static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, reg_pins[1].nMediaTypes = output_count; reg_pins[1].lpMediaType = reg_types + count; reg_filter.dwVersion = 2; - reg_filter.dwMerit = MERIT_NORMAL + 0x800, + reg_filter.dwMerit = MERIT_NORMAL + 0x800; reg_filter.cPins2 = 2; reg_filter.rgPins2 = reg_pins;

1 0

Michael Stefaniuc : mshtml: Print the debug string and not the pointer to it.
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: be74418c8ca1035025d983873bc944e546b00b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=be74418c8ca1035025d98387… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 14 22:54:37 2021 +0100 mshtml: Print the debug string and not the pointer to it. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/nsio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 9ba5a6c8612..1ffc6325725 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2182,7 +2182,7 @@ static nsresult NSAPI nsCacheInfoChannel_GetCacheTokenCachedCharset(nsICacheInfo static nsresult NSAPI nsCacheInfoChannel_SetCacheTokenCachedCharset(nsICacheInfoChannel *iface, const nsACString *p) { nsChannel *This = impl_from_nsICacheInfoChannel(iface); - FIXME("(%p)->(%p)\n", This, debugstr_nsacstr(p)); + FIXME("(%p)->(%s)\n", This, debugstr_nsacstr(p)); return E_NOTIMPL; }

1 0

Michael Stefaniuc : wldap32: Remove redundant NULL check before heap_free().
by Alexandre Julliard 15 Mar '21

15 Mar '21

Module: wine Branch: master Commit: 35ee15eab36eafc660a50284529613ed9dd044da URL: https://source.winehq.org/git/wine.git/?a=commit;h=35ee15eab36eafc660a50284… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 14 22:54:36 2021 +0100 wldap32: Remove redundant NULL check before heap_free(). Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/page.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index a16ea52409e..07f29be0d50 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -241,11 +241,8 @@ ULONG CDECL ldap_get_paged_count( WLDAP32_LDAP *ld, PLDAPSearch search, return WLDAP32_LDAP_SUCCESS; } - if (search->cookie) - { - heap_free( search->cookie ); - search->cookie = NULL; - } + heap_free( search->cookie ); + search->cookie = NULL; ret = ldap_parse_page_controlW( ld, server_ctrls, count, &search->cookie ); if (ret == WLDAP32_LDAP_SUCCESS)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021