April 2017 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Initial implementation of ComputeGlyphOrigins().
by Alexandre Julliard April 7, 2017

April 7, 2017

Module: wine Branch: master Commit: e258917a434731ed34a822d3dcb9272f3150dad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e258917a434731ed34a822d3d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 7 14:06:12 2017 +0300 dwrite: Initial implementation of ComputeGlyphOrigins(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/main.c | 82 +++++++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/font.c | 65 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 143 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9b5de8a..067bc8a 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -21,6 +21,7 @@ #define COBJMACROS #include <stdarg.h> +#include <math.h> #include "windef.h" #include "winbase.h" @@ -1438,14 +1439,86 @@ static HRESULT WINAPI dwritefactory4_TranslateColorGlyphRun(IDWriteFactory4 *ifa return E_NOTIMPL; } +static HRESULT compute_glyph_origins(DWRITE_GLYPH_RUN const *run, DWRITE_MEASURING_MODE measuring_mode, + D2D1_POINT_2F baseline_origin, DWRITE_MATRIX const *transform, D2D1_POINT_2F *origins) +{ + IDWriteFontFace1 *fontface1 = NULL; + DWRITE_FONT_METRICS metrics; + FLOAT rtl_factor; + UINT32 i; + + rtl_factor = run->bidiLevel & 1 ? -1.0f : 1.0f; + + if (run->fontFace) { + IDWriteFontFace_GetMetrics(run->fontFace, &metrics); + IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void **)&fontface1); + } + + for (i = 0; i < run->glyphCount; i++) { + FLOAT advance; + + /* Use nominal advances if not provided by caller. */ + if (run->glyphAdvances) + advance = rtl_factor * run->glyphAdvances[i]; + else { + INT32 a; + + advance = 0.0f; + switch (measuring_mode) + { + case DWRITE_MEASURING_MODE_NATURAL: + if (SUCCEEDED(IDWriteFontFace1_GetDesignGlyphAdvances(fontface1, 1, run->glyphIndices + i, &a, + run->isSideways))) + advance = rtl_factor * get_scaled_advance_width(a, run->fontEmSize, &metrics); + break; + case DWRITE_MEASURING_MODE_GDI_CLASSIC: + case DWRITE_MEASURING_MODE_GDI_NATURAL: + if (SUCCEEDED(IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, run->fontEmSize, + 1.0f, transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, + run->isSideways, 1, run->glyphIndices + i, &a))) + advance = rtl_factor * floorf(a * run->fontEmSize / metrics.designUnitsPerEm + 0.5f); + break; + default: + ; + } + } + + origins[i] = baseline_origin; + + /* Apply offsets. */ + if (run->glyphOffsets) { + FLOAT advanceoffset = rtl_factor * run->glyphOffsets[i].advanceOffset; + FLOAT ascenderoffset = -run->glyphOffsets[i].ascenderOffset; + + if (run->isSideways) { + origins[i].x += ascenderoffset; + origins[i].y += advanceoffset; + } + else { + origins[i].x += advanceoffset; + origins[i].y += ascenderoffset; + } + } + + if (run->isSideways) + baseline_origin.y += advance; + else + baseline_origin.x += advance; + } + + if (fontface1) + IDWriteFontFace1_Release(fontface1); + return S_OK; +} + static HRESULT WINAPI dwritefactory4_ComputeGlyphOrigins_(IDWriteFactory4 *iface, DWRITE_GLYPH_RUN const *run, D2D1_POINT_2F baseline_origin, D2D1_POINT_2F *origins) { struct dwritefactory *This = impl_from_IDWriteFactory4(iface); - FIXME("(%p)->(%p %p): stub\n", This, run, origins); + TRACE("(%p)->(%p (%f,%f) %p)\n", This, run, baseline_origin.x, baseline_origin.y, origins); - return E_NOTIMPL; + return compute_glyph_origins(run, DWRITE_MEASURING_MODE_NATURAL, baseline_origin, NULL, origins); } static HRESULT WINAPI dwritefactory4_ComputeGlyphOrigins(IDWriteFactory4 *iface, DWRITE_GLYPH_RUN const *run, @@ -1454,9 +1527,10 @@ static HRESULT WINAPI dwritefactory4_ComputeGlyphOrigins(IDWriteFactory4 *iface, { struct dwritefactory *This = impl_from_IDWriteFactory4(iface); - FIXME("(%p)->(%p %d %p %p): stub\n", This, run, measuring_mode, transform, origins); + TRACE("(%p)->(%p %d (%f,%f) %p %p)\n", This, run, measuring_mode, baseline_origin.x, baseline_origin.y, + transform, origins); - return E_NOTIMPL; + return compute_glyph_origins(run, measuring_mode, baseline_origin, transform, origins); } static const struct IDWriteFactory4Vtbl dwritefactoryvtbl = { diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 2bdc024..79aebe3 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -6858,6 +6858,70 @@ static void test_HasKerningPairs(void) IDWriteFactory_Release(factory); } +static void test_ComputeGlyphOrigins(void) +{ + IDWriteFactory4 *factory4; + IDWriteFactory *factory; + DWRITE_GLYPH_RUN run; + HRESULT hr; + D2D1_POINT_2F origins[2]; + D2D1_POINT_2F baseline_origin; + UINT16 glyphs[2]; + FLOAT advances[2]; + DWRITE_MATRIX m; + + factory = create_factory(); + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory4, (void **)&factory4); + IDWriteFactory_Release(factory); + if (FAILED(hr)) { + win_skip("ComputeGlyphOrigins() is not supported.\n"); + return; + } + + advances[0] = 10.0f; + advances[1] = 20.0f; + + run.fontFace = NULL; + run.fontEmSize = 16.0f; + run.glyphCount = 2; + run.glyphIndices = glyphs; + run.glyphAdvances = advances; + run.glyphOffsets = NULL; + run.isSideways = FALSE; + run.bidiLevel = 0; + + baseline_origin.x = 123.0f; + baseline_origin.y = 321.0f; + + memset(origins, 0, sizeof(origins)); + hr = IDWriteFactory4_ComputeGlyphOrigins_(factory4, &run, baseline_origin, origins); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(origins[0].x == 123.0f && origins[0].y == 321.0f, "origins[0] %f,%f\n", origins[0].x, origins[0].y); + ok(origins[1].x == 133.0f && origins[1].y == 321.0f, "origins[1] %f,%f\n", origins[1].x, origins[1].y); + + memset(origins, 0, sizeof(origins)); + hr = IDWriteFactory4_ComputeGlyphOrigins(factory4, &run, DWRITE_MEASURING_MODE_NATURAL, baseline_origin, + NULL, origins); + ok(origins[0].x == 123.0f && origins[0].y == 321.0f, "origins[0] %f,%f\n", origins[0].x, origins[0].y); + ok(origins[1].x == 133.0f && origins[1].y == 321.0f, "origins[1] %f,%f\n", origins[1].x, origins[1].y); + + /* transform is not applied to returned origins */ + m.m11 = 2.0f; + m.m12 = 0.0f; + m.m21 = 0.0f; + m.m22 = 1.0f; + m.dx = 0.0f; + m.dy = 0.0f; + + memset(origins, 0, sizeof(origins)); + hr = IDWriteFactory4_ComputeGlyphOrigins(factory4, &run, DWRITE_MEASURING_MODE_NATURAL, baseline_origin, + &m, origins); + ok(origins[0].x == 123.0f && origins[0].y == 321.0f, "origins[0] %f,%f\n", origins[0].x, origins[0].y); + ok(origins[1].x == 133.0f && origins[1].y == 321.0f, "origins[1] %f,%f\n", origins[1].x, origins[1].y); + + IDWriteFactory4_Release(factory4); +} + START_TEST(font) { IDWriteFactory *factory; @@ -6917,6 +6981,7 @@ START_TEST(font) test_font_properties(); test_HasVerticalGlyphVariants(); test_HasKerningPairs(); + test_ComputeGlyphOrigins(); IDWriteFactory_Release(factory); }

1 0

Henri Verbeet : wined3d: Get rid of surface_get_rect().
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: ecf1bbd5255ac68dd90efcef6a22f9de92d3f922 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecf1bbd5255ac68dd90efcef6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 12:03:41 2017 +0200 wined3d: Get rid of surface_get_rect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8a1ad4e..889a8d1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -175,19 +175,6 @@ static void surface_get_blt_info(GLenum target, const RECT *rect, GLsizei w, GLs } } -static void surface_get_rect(const struct wined3d_surface *surface, const RECT *rect_in, RECT *rect_out) -{ - if (rect_in) - *rect_out = *rect_in; - else - { - const struct wined3d_texture *texture = surface->container; - - SetRect(rect_out, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), - wined3d_texture_get_level_height(texture, surface->texture_level)); - } -} - /* Context activation is done by the caller. */ void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) @@ -2204,7 +2191,8 @@ static BOOL surface_load_drawable(struct wined3d_surface *surface, else restore_rt = NULL; - surface_get_rect(surface, NULL, &r); + SetRect(&r, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), + wined3d_texture_get_level_height(texture, surface->texture_level)); wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); device->blitter->ops->blitter_blit(device->blitter, WINED3D_BLIT_OP_COLOR_BLIT, context, surface, WINED3D_LOCATION_TEXTURE_RGB, &r,

1 0

Henri Verbeet : usp10: Range check glyph counts in GSUB_apply_ChainContextSubst().
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: f7b943edbc1e3227db13b3384f9513e98580b8ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b943edbc1e3227db13b3384… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 12:03:44 2017 +0200 usp10: Range check glyph counts in GSUB_apply_ChainContextSubst(). Like in GPOS_apply_ChainContextPos(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 76a559c..81a5180 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1291,10 +1291,22 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo offset = GET_BE_WORD(csc->ChainSubClassRule[i]); backtrack = (const GSUB_ChainSubClassRule_1 *)((BYTE *)csc + offset); backtrack_count = GET_BE_WORD(backtrack->BacktrackGlyphCount); + k = glyph_index + dirBacktrack * backtrack_count; + if (k < 0 || k >= *glyph_count) + continue; + input = (const GSUB_ChainSubClassRule_2 *)&backtrack->Backtrack[backtrack_count]; input_count = GET_BE_WORD(input->InputGlyphCount) - 1; + k = glyph_index + write_dir * input_count; + if (k < 0 || k >= *glyph_count) + continue; + lookahead = (const GSUB_ChainSubClassRule_3 *)&input->Input[input_count]; lookahead_count = GET_BE_WORD(lookahead->LookaheadGlyphCount); + k = glyph_index + dirLookahead * (input_count + lookahead_count); + if (k < 0 || k >= *glyph_count) + continue; + substitute = (const GSUB_ChainSubClassRule_4 *)&lookahead->LookAhead[lookahead_count]; for (k = 0; k < backtrack_count; ++k) @@ -1365,10 +1377,22 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo backtrack = (const GSUB_ChainContextSubstFormat3_1 *)ccsf1; backtrack_count = GET_BE_WORD(backtrack->BacktrackGlyphCount); + k = glyph_index + dirBacktrack * backtrack_count; + if (k < 0 || k >= *glyph_count) + continue; + input = (const GSUB_ChainContextSubstFormat3_2 *)&backtrack->Coverage[backtrack_count]; input_count = GET_BE_WORD(input->InputGlyphCount); + k = glyph_index + write_dir * (input_count - 1); + if (k < 0 || k >= *glyph_count) + continue; + lookahead = (const GSUB_ChainContextSubstFormat3_3 *)&input->Coverage[input_count]; lookahead_count = GET_BE_WORD(lookahead->LookaheadGlyphCount); + k = glyph_index + dirLookahead * (input_count + lookahead_count - 1); + if (k < 0 || k >= *glyph_count) + continue; + substitute = (const GSUB_ChainContextSubstFormat3_4 *)&lookahead->Coverage[lookahead_count]; for (k = 0; k < backtrack_count; ++k)

1 0

Nikolay Sivov : gdi32: Trace charmap encoding as 4 bytes tag.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 215e8b10a8c883ee03801a06f19f960b629c4c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=215e8b10a8c883ee03801a06f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 6 14:07:05 2017 +0300 gdi32: Trace charmap encoding as 4 bytes tag. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 49e8c2f..d627e7e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8389,7 +8389,10 @@ static DWORD get_font_unicode_ranges(FT_Face face, GLYPHSET *gs) } } else - FIXME("encoding %u not supported\n", face->charmap->encoding); + { + DWORD encoding = RtlUlongByteSwap(face->charmap->encoding); + FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); + } return num_ranges; } @@ -8701,9 +8704,10 @@ static DWORD freetype_GetKerningPairs( PHYSDEV dev, DWORD cPairs, KERNINGPAIR *k } else { + DWORD encoding = RtlUlongByteSwap(font->ft_face->charmap->encoding); ULONG n; - FIXME("encoding %u not supported\n", font->ft_face->charmap->encoding); + FIXME("encoding %s not supported\n", debugstr_an((char *)&encoding, 4)); for (n = 0; n <= 65535; n++) glyph_to_char[n] = (USHORT)n; }

1 0

Henri Verbeet : usp10: Simplify the chaining context table assignments in GSUB_apply_ChainContextSubst ().
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 24943fe5e294c2095775c5856530739e732a6fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=24943fe5e294c2095775c5856… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 12:03:43 2017 +0200 usp10: Simplify the chaining context table assignments in GSUB_apply_ChainContextSubst(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 71 +++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 39 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 7a4e866..76a559c 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1281,8 +1281,8 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo for (i = 0; i < count; i++) { + WORD backtrack_count, input_count, lookahead_count; int k; - int indexGlyphs; const GSUB_ChainSubClassRule_1 *backtrack; const GSUB_ChainSubClassRule_2 *input; const GSUB_ChainSubClassRule_3 *lookahead; @@ -1290,50 +1290,47 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo offset = GET_BE_WORD(csc->ChainSubClassRule[i]); backtrack = (const GSUB_ChainSubClassRule_1 *)((BYTE *)csc + offset); - - for (k = 0; k < GET_BE_WORD(backtrack->BacktrackGlyphCount); ++k) + backtrack_count = GET_BE_WORD(backtrack->BacktrackGlyphCount); + input = (const GSUB_ChainSubClassRule_2 *)&backtrack->Backtrack[backtrack_count]; + input_count = GET_BE_WORD(input->InputGlyphCount) - 1; + lookahead = (const GSUB_ChainSubClassRule_3 *)&input->Input[input_count]; + lookahead_count = GET_BE_WORD(lookahead->LookaheadGlyphCount); + substitute = (const GSUB_ChainSubClassRule_4 *)&lookahead->LookAhead[lookahead_count]; + + for (k = 0; k < backtrack_count; ++k) { WORD target_class = GET_BE_WORD(backtrack->Backtrack[k]); WORD glyph_class = OT_get_glyph_class(backtrack_class_table, glyphs[glyph_index + (dirBacktrack * (k+1))]); if (target_class != glyph_class) break; } - if (k != GET_BE_WORD(backtrack->BacktrackGlyphCount)) + if (k != backtrack_count) continue; TRACE("Matched Backtrack\n"); - input = (const GSUB_ChainSubClassRule_2 *)((BYTE *)backtrack + - FIELD_OFFSET(GSUB_ChainSubClassRule_1, Backtrack[GET_BE_WORD(backtrack->BacktrackGlyphCount)])); - - indexGlyphs = GET_BE_WORD(input->InputGlyphCount); - for (k = 0; k < indexGlyphs - 1; k++) + for (k = 0; k < input_count; ++k) { WORD target_class = GET_BE_WORD(input->Input[k]); WORD glyph_class = OT_get_glyph_class(input_class_table, glyphs[glyph_index + (write_dir * (k+1))]); if (target_class != glyph_class) break; } - if (k != indexGlyphs-1) + if (k != input_count) continue; TRACE("Matched IndexGlyphs\n"); - lookahead = (const GSUB_ChainSubClassRule_3 *)((BYTE *)input + - FIELD_OFFSET(GSUB_ChainSubClassRule_2, Input[GET_BE_WORD(input->InputGlyphCount) - 1])); - - for (k = 0; k < GET_BE_WORD(lookahead->LookaheadGlyphCount); ++k) + for (k = 0; k < lookahead_count; ++k) { WORD target_class = GET_BE_WORD(lookahead->LookAhead[k]); - WORD glyph_class = OT_get_glyph_class(lookahead_class_table, glyphs[glyph_index + (dirLookahead * (indexGlyphs+k))]); + WORD glyph_class = OT_get_glyph_class(lookahead_class_table, + glyphs[glyph_index + (dirLookahead * (input_count + k + 1))]); if (target_class != glyph_class) break; } - if (k != GET_BE_WORD(lookahead->LookaheadGlyphCount)) + if (k != lookahead_count) continue; TRACE("Matched LookAhead\n"); - substitute = (const GSUB_ChainSubClassRule_4 *)((BYTE *)lookahead + - FIELD_OFFSET(GSUB_ChainSubClassRule_3, LookAhead[GET_BE_WORD(lookahead->LookaheadGlyphCount)])); - if (GET_BE_WORD(substitute->SubstCount)) { for (k = 0; k < GET_BE_WORD(substitute->SubstCount); ++k) @@ -1356,61 +1353,57 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) { + WORD backtrack_count, input_count, lookahead_count; int k; - int indexGlyphs; const GSUB_ChainContextSubstFormat3_1 *backtrack; const GSUB_ChainContextSubstFormat3_2 *input; const GSUB_ChainContextSubstFormat3_3 *lookahead; const GSUB_ChainContextSubstFormat3_4 *substitute; int newIndex = glyph_index; - backtrack = (const GSUB_ChainContextSubstFormat3_1 *)ccsf1; - TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Substitution)\n"); - for (k = 0; k < GET_BE_WORD(backtrack->BacktrackGlyphCount); ++k) + backtrack = (const GSUB_ChainContextSubstFormat3_1 *)ccsf1; + backtrack_count = GET_BE_WORD(backtrack->BacktrackGlyphCount); + input = (const GSUB_ChainContextSubstFormat3_2 *)&backtrack->Coverage[backtrack_count]; + input_count = GET_BE_WORD(input->InputGlyphCount); + lookahead = (const GSUB_ChainContextSubstFormat3_3 *)&input->Coverage[input_count]; + lookahead_count = GET_BE_WORD(lookahead->LookaheadGlyphCount); + substitute = (const GSUB_ChainContextSubstFormat3_4 *)&lookahead->Coverage[lookahead_count]; + + for (k = 0; k < backtrack_count; ++k) { offset = GET_BE_WORD(backtrack->Coverage[k]); if (GSUB_is_glyph_covered((const BYTE *)ccsf1 + offset, glyphs[glyph_index + (dirBacktrack * (k + 1))]) == -1) break; } - if (k != GET_BE_WORD(backtrack->BacktrackGlyphCount)) + if (k != backtrack_count) continue; TRACE("Matched Backtrack\n"); - input = (const GSUB_ChainContextSubstFormat3_2 *)((BYTE *)ccsf1 + - FIELD_OFFSET(GSUB_ChainContextSubstFormat3_1, Coverage[GET_BE_WORD(backtrack->BacktrackGlyphCount)])); - - indexGlyphs = GET_BE_WORD(input->InputGlyphCount); - for (k = 0; k < indexGlyphs; k++) + for (k = 0; k < input_count; ++k) { offset = GET_BE_WORD(input->Coverage[k]); if (GSUB_is_glyph_covered((const BYTE *)ccsf1 + offset, glyphs[glyph_index + (write_dir * k)]) == -1) break; } - if (k != indexGlyphs) + if (k != input_count) continue; TRACE("Matched IndexGlyphs\n"); - lookahead = (const GSUB_ChainContextSubstFormat3_3 *)((BYTE *)input + - FIELD_OFFSET(GSUB_ChainContextSubstFormat3_2, Coverage[GET_BE_WORD(input->InputGlyphCount)])); - - for (k = 0; k < GET_BE_WORD(lookahead->LookaheadGlyphCount); ++k) + for (k = 0; k < lookahead_count; ++k) { offset = GET_BE_WORD(lookahead->Coverage[k]); if (GSUB_is_glyph_covered((const BYTE *)ccsf1 + offset, - glyphs[glyph_index + (dirLookahead * (indexGlyphs + k))]) == -1) + glyphs[glyph_index + (dirLookahead * (input_count + k))]) == -1) break; } - if (k != GET_BE_WORD(lookahead->LookaheadGlyphCount)) + if (k != lookahead_count) continue; TRACE("Matched LookAhead\n"); - substitute = (const GSUB_ChainContextSubstFormat3_4 *)((BYTE *)lookahead + - FIELD_OFFSET(GSUB_ChainContextSubstFormat3_3, Coverage[GET_BE_WORD(lookahead->LookaheadGlyphCount)])); - if (GET_BE_WORD(substitute->SubstCount)) { for (k = 0; k < GET_BE_WORD(substitute->SubstCount); ++k)

1 0

Henri Verbeet : usp10: Rename the chaining context tables in GSUB_apply_ChainContextSubst() to something more descriptive.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 02316e66131665e129ab1df70a6134b590f71f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=02316e66131665e129ab1df70… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 12:03:42 2017 +0200 usp10: Rename the chaining context tables in GSUB_apply_ChainContextSubst() to something more descriptive. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 101 ++++++++++++++++++++++++++------------------------ 1 file changed, 52 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=02316e66131665e129ab1…

1 0

Henri Verbeet : usp10: Avoid special handling if the substitution count is 0 in GSUB_apply_ChainContextSubst ().
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 9694aeb06d9417089c10b8b09ddffd0ba47eff02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9694aeb06d9417089c10b8b09… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 6 12:03:45 2017 +0200 usp10: Avoid special handling if the substitution count is 0 in GSUB_apply_ChainContextSubst(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 62 +++++++++++++++++++++------------------------------ 1 file changed, 26 insertions(+), 36 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 81a5180..a3346ef 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1237,7 +1237,6 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo } else if (GET_BE_WORD(ccsf1->SubstFormat) == 2) { - int newIndex = glyph_index; WORD offset, count; const void *backtrack_class_table; const void *input_class_table; @@ -1281,12 +1280,13 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo for (i = 0; i < count; i++) { - WORD backtrack_count, input_count, lookahead_count; + WORD backtrack_count, input_count, lookahead_count, substitute_count; int k; const GSUB_ChainSubClassRule_1 *backtrack; const GSUB_ChainSubClassRule_2 *input; const GSUB_ChainSubClassRule_3 *lookahead; const GSUB_ChainSubClassRule_4 *substitute; + int new_index = GSUB_E_NOGLYPH; offset = GET_BE_WORD(csc->ChainSubClassRule[i]); backtrack = (const GSUB_ChainSubClassRule_1 *)((BYTE *)csc + offset); @@ -1343,35 +1343,30 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo continue; TRACE("Matched LookAhead\n"); - if (GET_BE_WORD(substitute->SubstCount)) + substitute_count = GET_BE_WORD(substitute->SubstCount); + for (k = 0; k < substitute_count; ++k) { - for (k = 0; k < GET_BE_WORD(substitute->SubstCount); ++k) - { - int lookupIndex = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); - int SequenceIndex = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; - - TRACE("SUBST: %i -> %i %i\n",k, SequenceIndex, lookupIndex); - newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); - if (newIndex == GSUB_E_NOGLYPH) - { - ERR("Chain failed to generate a glyph\n"); - continue; - } - } - return newIndex; + WORD lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); + WORD sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; + + TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index); + new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, + glyph_index + sequence_index, write_dir, glyph_count); + if (new_index == GSUB_E_NOGLYPH) + ERR("Chain failed to generate a glyph.\n"); } - else return GSUB_E_NOGLYPH; + return new_index; } } else if (GET_BE_WORD(ccsf1->SubstFormat) == 3) { - WORD backtrack_count, input_count, lookahead_count; + WORD backtrack_count, input_count, lookahead_count, substitution_count; int k; const GSUB_ChainContextSubstFormat3_1 *backtrack; const GSUB_ChainContextSubstFormat3_2 *input; const GSUB_ChainContextSubstFormat3_3 *lookahead; const GSUB_ChainContextSubstFormat3_4 *substitute; - int newIndex = glyph_index; + int new_index = GSUB_E_NOGLYPH; TRACE(" subtype 3 (Coverage-based Chaining Context Glyph Substitution)\n"); @@ -1428,24 +1423,19 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo continue; TRACE("Matched LookAhead\n"); - if (GET_BE_WORD(substitute->SubstCount)) + substitution_count = GET_BE_WORD(substitute->SubstCount); + for (k = 0; k < substitution_count; ++k) { - for (k = 0; k < GET_BE_WORD(substitute->SubstCount); ++k) - { - int lookupIndex = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); - int SequenceIndex = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; - - TRACE("SUBST: %i -> %i %i\n",k, SequenceIndex, lookupIndex); - newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); - if (newIndex == GSUB_E_NOGLYPH) - { - ERR("Chain failed to generate a glyph\n"); - continue; - } - } - return newIndex; + WORD lookup_index = GET_BE_WORD(substitute->SubstLookupRecord[k].LookupListIndex); + WORD sequence_index = GET_BE_WORD(substitute->SubstLookupRecord[k].SequenceIndex) * write_dir; + + TRACE("SUBST: %u -> %u %u.\n", k, sequence_index, lookup_index); + new_index = GSUB_apply_lookup(lookup, lookup_index, glyphs, + glyph_index + sequence_index, write_dir, glyph_count); + if (new_index == GSUB_E_NOGLYPH) + ERR("Chain failed to generate a glyph.\n"); } - else return GSUB_E_NOGLYPH; + return new_index; } } return GSUB_E_NOGLYPH;

1 0

Alexandre Julliard : glu32: Implement gluCheckExtension.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 2bc75f1ab2efeb832f907a1ebe2ed51c2f5c2d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bc75f1ab2efeb832f907a1eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 15:18:37 2017 +0200 glu32: Implement gluCheckExtension. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/glu.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c index 8bf19f9..eaf04d5 100644 --- a/dlls/glu32/glu.c +++ b/dlls/glu32/glu.c @@ -74,6 +74,9 @@ typedef struct { #define GLU_TESS_EDGE_FLAG_DATA 100110 #define GLU_TESS_COMBINE_DATA 100111 +#define GLU_TRUE GL_TRUE +#define GLU_FALSE GL_FALSE + static void (*p_gluBeginCurve)( GLUnurbs* nurb ); static void (*p_gluBeginSurface)( GLUnurbs* nurb ); static void (*p_gluBeginTrim)( GLUnurbs* nurb ); @@ -523,7 +526,17 @@ const GLubyte * WINAPI wine_gluGetString( GLenum name ) */ GLboolean WINAPI wine_gluCheckExtension( const GLubyte *extName, const GLubyte *extString ) { - return 0; + const char *list = (const char *)extString; + const char *ext = (const char *)extName; + size_t len = strlen( ext ); + + while (list) + { + while (*list == ' ') list++; + if (!strncmp( list, ext, len ) && (!list[len] || list[len] == ' ')) return GLU_TRUE; + list = strchr( list, ' ' ); + } + return GLU_FALSE; } /***********************************************************************

1 0

Alexandre Julliard : glu32: Load libGLU dynamically.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: 3558acac7280323145966387a43ef5efd9908317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3558acac7280323145966387a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 6 12:57:29 2017 +0200 glu32: Load libGLU dynamically. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 45 +++++--- configure.ac | 6 +- dlls/glu32/Makefile.in | 2 - dlls/glu32/glu.c | 287 +++++++++++++++++++++++++++++++------------------ include/config.h.in | 3 + 5 files changed, 220 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3558acac7280323145966…

1 0

Józef Kucia : wined3d: Support SV_RenderTargetArrayIndex semantic for pixel shader inputs.
by Alexandre Julliard April 6, 2017

April 6, 2017

Module: wine Branch: master Commit: acb480e7e487259afe7798e9cb6c40ca3cb26e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=acb480e7e487259afe7798e9c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Apr 6 11:47:53 2017 +0200 wined3d: Support SV_RenderTargetArrayIndex semantic for pixel shader inputs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 10 ++++++++++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0d5a476..f434157 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -126,6 +126,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_ES3_compatibility", ARB_ES3_COMPATIBILITY }, {"GL_ARB_explicit_attrib_location", ARB_EXPLICIT_ATTRIB_LOCATION }, {"GL_ARB_fragment_coord_conventions", ARB_FRAGMENT_COORD_CONVENTIONS}, + {"GL_ARB_fragment_layer_viewport", ARB_FRAGMENT_LAYER_VIEWPORT }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, @@ -3845,6 +3846,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_COMPUTE_SHADER, MAKEDWORD_VERSION(4, 3)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, {ARB_ES3_COMPATIBILITY, MAKEDWORD_VERSION(4, 3)}, + {ARB_FRAGMENT_LAYER_VIEWPORT, MAKEDWORD_VERSION(4, 3)}, {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_IMAGE_SIZE, MAKEDWORD_VERSION(4, 3)}, {ARB_SHADER_STORAGE_BUFFER_OBJECT, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 21f543c..c8a970f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6444,6 +6444,14 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w "uintBitsToFloat(gl_FrontFacing ? 0xffffffffu : 0u), 0.0, 0.0, 0.0);\n", input->register_idx); } + else if (input->sysval_semantic == WINED3D_SV_RENDER_TARGET_ARRAY_INDEX && !semantic_idx) + { + if (gl_info->supported[ARB_FRAGMENT_LAYER_VIEWPORT]) + shader_addline(buffer, "ps_in[%u]%s = intBitsToFloat(gl_Layer);\n", + input->register_idx, reg_mask); + else + FIXME("ARB_fragment_layer_viewport is not supported.\n"); + } else { if (input->sysval_semantic) @@ -7051,6 +7059,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "#extension GL_ARB_derivative_control : enable\n"); if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) shader_addline(buffer, "#extension GL_ARB_fragment_coord_conventions : enable\n"); + if (gl_info->supported[ARB_FRAGMENT_LAYER_VIEWPORT]) + shader_addline(buffer, "#extension GL_ARB_fragment_layer_viewport : enable\n"); if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) shader_addline(buffer, "#extension GL_ARB_shader_texture_lod : enable\n"); /* The spec says that it doesn't have to be explicitly enabled, but the diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 6290032..4960fc7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -59,6 +59,7 @@ enum wined3d_gl_extension ARB_ES3_COMPATIBILITY, ARB_EXPLICIT_ATTRIB_LOCATION, ARB_FRAGMENT_COORD_CONVENTIONS, + ARB_FRAGMENT_LAYER_VIEWPORT, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT,

1 0