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

Nikolay Sivov : include: Update with recently added DirectWrite API.
by Alexandre Julliard 07 Apr '17

07 Apr '17

Module: wine Branch: master Commit: 61a1a266faa9fa7c959136b0ab0b5d7e01326878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a1a266faa9fa7c959136b0a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 7 18:37:19 2017 +0300 include: Update with recently added DirectWrite API. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index afe7e84..b80d033 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -344,6 +344,16 @@ interface IDWriteFontSetBuilder : IUnknown [ local, object, + uuid(3ff7715f-3cdc-4dc6-9b72-ec5621dccafd) +] +interface IDWriteFontSetBuilder1 : IDWriteFontSetBuilder +{ + HRESULT AddFontFile(IDWriteFontFile *file); +} + +[ + local, + object, uuid(9a1b41c3-d3bb-466a-87fc-fe67556a3b65) ] interface IDWriteFactory3 : IDWriteFactory2 @@ -498,3 +508,97 @@ interface IDWriteFactory4 : IDWriteFactory3 DWRITE_MATRIX const *transform, D2D1_POINT_2F *origins); } + +[ + local, + object, + uuid(ce25f8fd-863b-4d13-9651-c1f88dc73fe2) +] +interface IDWriteAsyncResult : IUnknown +{ + HANDLE GetWaitHandle(); + HRESULT GetResult(); +} + +typedef struct DWRITE_FILE_FRAGMENT +{ + UINT64 fileOffset; + UINT64 fragmentSize; +} DWRITE_FILE_FRAGMENT; + +[ + local, + object, + uuid(4db3757a-2c72-4ed9-b2b6-1ababe1aff9c) +] +interface IDWriteRemoteFontFileStream : IDWriteFontFileStream +{ + HRESULT GetLocalFileSize(UINT64 *size); + HRESULT GetFileFragmentLocality(UINT64 offset, UINT64 size, BOOL *is_local, UINT64 *partial_size); + DWRITE_LOCALITY GetLocality(); + HRESULT BeginDownload( + GUID const *operation_id, + DWRITE_FILE_FRAGMENT const *fragments, + UINT32 fragment_count, + IDWriteAsyncResult **async_result); +} + +typedef enum DWRITE_CONTAINER_TYPE +{ + DWRITE_CONTAINER_TYPE_UNKNOWN, + DWRITE_CONTAINER_TYPE_WOFF, + DWRITE_CONTAINER_TYPE_WOFF2, +} DWRITE_CONTAINER_TYPE; + +[ + local, + object, + uuid(68648c83-6ede-46c0-ab46-20083a887fde) +] +interface IDWriteRemoteFontFileLoader : IDWriteFontFileLoader +{ + HRESULT CreateRemoteStreamFromKey(void const *key, UINT32 key_size, IDWriteRemoteFontFileStream **stream); + HRESULT GetLocalityFromKey(void const *key, UINT32 key_size, DWRITE_LOCALITY *locality); + HRESULT CreateFontFileReferenceFromUrl( + IDWriteFactory *factory, + WCHAR const *base_url, + WCHAR const *file_url, + IDWriteFontFile **fontfile); +} + +[ + local, + object, + uuid(dc102f47-a12d-4b1c-822d-9e117e33043f) +] +interface IDWriteInMemoryFontFileLoader : IDWriteFontFileLoader +{ + HRESULT CreateInMemoryFontFileReference( + IDWriteFactory *factory, + void const *data, + UINT32 data_size, + IUnknown *owner, + IDWriteFontFile **fontfile); + UINT32 GetFileCount(); +} + +[ + local, + object, + uuid(958db99a-be2a-4f09-af7d-65189803d1d3) +] +interface IDWriteFactory5 : IDWriteFactory4 +{ + HRESULT CreateFontSetBuilder(IDWriteFontSetBuilder1 **fontset_builder); + HRESULT CreateInMemoryFontFileLoader(IDWriteFontFileLoader **loader); + HRESULT CreateHttpFontFileLoader( + WCHAR const *referrer_url, + WCHAR const *extra_headers, + IDWriteRemoteFontFileLoader **loader); + DWRITE_CONTAINER_TYPE AnalyzeContainerType(void const *data, UINT32 data_size); + HRESULT UnpackFontFile( + DWRITE_CONTAINER_TYPE container_type, + void const *data, + UINT32 data_size, + IDWriteFontFileStream **stream); +}

1 0

Nikolay Sivov : gdi32: Trace charmap encoding as 4 bytes tag.
by Alexandre Julliard 06 Apr '17

06 Apr '17

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 : wined3d: Get rid of surface_get_rect().
by Alexandre Julliard 06 Apr '17

06 Apr '17

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: Rename the chaining context tables in GSUB_apply_ChainContextSubst() to something more descriptive.
by Alexandre Julliard 06 Apr '17

06 Apr '17

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: Simplify the chaining context table assignments in GSUB_apply_ChainContextSubst ().
by Alexandre Julliard 06 Apr '17

06 Apr '17

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: Range check glyph counts in GSUB_apply_ChainContextSubst().
by Alexandre Julliard 06 Apr '17

06 Apr '17

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

Henri Verbeet : usp10: Avoid special handling if the substitution count is 0 in GSUB_apply_ChainContextSubst ().
by Alexandre Julliard 06 Apr '17

06 Apr '17

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

Marcin Mikołajczak : po: Updated Polish translation.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 72d2715880a713bc7168c4fd4fc97ab9c3a58b9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=72d2715880a713bc7168c4fd4… Author: Marcin Mikołajczak <m4sk1n(a)vivaldi.net> Date: Wed Apr 5 21:55:26 2017 +0200 po: Updated Polish translation. Signed-off-by: Marcin Mikołajczak <m4sk1n(a)vivaldi.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/pl.po | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/po/pl.po b/po/pl.po index 331549e..652eb7c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -2,13 +2,13 @@ # # Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014. # Adam "Saibamen" Stachowicz <saibamenppl(a)gmail.com>, 2015. -# Marcin Mikołajczak <m4sk1n(a)vivaldi.net>, 2017. +# Marcin Mikołajczak <marcin123407(a)vivaldi.net>, 2017. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-26 13:58+0100\n" +"PO-Revision-Date: 2017-04-05 21:48+0200\n" "Last-Translator: Marcin Mikołajczak <marcin123407(a)vivaldi.net>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" @@ -3719,7 +3719,7 @@ msgstr "Oczekiwany obiekt tablicowy" #: ../../include/wine/wine_common_ver.rc:129 msgid "Wine kernel DLL" -msgstr "" +msgstr "DLL jądra WINE" #: ../../include/wine/wine_common_ver.rc:134 winemac.rc:32 wineboot.rc:42 msgid "Wine" @@ -9389,9 +9389,8 @@ msgid "Confidentiality Required" msgstr "Wymagana poufność" #: wldap32.rc:46 -#, fuzzy msgid "SASL Bind in Progress" -msgstr "Zamykanie w toku.\n" +msgstr "Dowiązanie SASL nie powiodło się" #: wldap32.rc:48 msgid "No Such Attribute" @@ -12232,9 +12231,8 @@ msgid "Displays program information, version number and copyright" msgstr "Wyświetla informacje o programie, numerze wersji i prawach autorskich" #: regedit.rc:181 -#, fuzzy msgid "Unable to query the registry value '%1'." -msgstr "Błąd: Błąd dostępu do zdalnej maszyny\n" +msgstr "Nie można odnaleźć wartości rejestru '%1'." #: regedit.rc:182 msgid "Unable to edit registry keys of this type (%1!u!)." @@ -12265,9 +12263,8 @@ msgid "New Value #%d" msgstr "Nowa wartość #%d" #: regedit.rc:180 -#, fuzzy msgid "Unable to query the registry key '%1'." -msgstr "Błąd: Błąd dostępu do zdalnej maszyny\n" +msgstr "Nie można odnaleźć klucza rejestru '%1'." #: regedit.rc:152 msgid "Adds a new multi-string value" @@ -12282,10 +12279,10 @@ msgid "Confirm Key Delete" msgstr "Potwierdź usunięcie klucza" #: regedit.rc:188 -#, fuzzy msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Czy jesteś pewien, że chcesz usunąć '%1'?" +msgstr "" +"Czy na pewno chcesz usunąć klucz rejestru '%1' i wszystkie jego pochodne?" #: regsvr32.rc:32 msgid ""

1 0

Andrey Gusev : uiautomationcore: Add UiaReturnRawElementProvider stub.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 20ed82860a26b98e07fc869b29dcb8d25fa039b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ed82860a26b98e07fc869b2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Apr 6 12:46:53 2017 +0300 uiautomationcore: Add UiaReturnRawElementProvider stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uiautomationcore/uia_main.c | 10 ++++++++++ dlls/uiautomationcore/uiautomationcore.spec | 2 +- include/uiautomationcoreapi.h | 1 + 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c index af98681..6e795ab 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -74,3 +74,13 @@ int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid) FIXME("(%d, %s) stub!\n", type, debugstr_guid(guid)); return 1; } + +/*********************************************************************** + * UiaReturnRawElementProvider (uiautomationcore.@) + */ +LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, + LPARAM lParam, IRawElementProviderSimple *elprov) +{ + FIXME("(%p, %lx, %lx, %p) stub!\n", hwnd, wParam, lParam, elprov); + return 0; +} diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec index ddf84f6..bff1303 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -83,7 +83,7 @@ @ stub UiaRaiseStructureChangedEvent @ stub UiaRegisterProviderCallback @ stub UiaRemoveEvent -@ stub UiaReturnRawElementProvider +@ stdcall UiaReturnRawElementProvider(long long long ptr) @ stub UiaSetFocus @ stub UiaTextRangeRelease @ stub ValuePattern_SetValue diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index fbe47ad..6c1752e 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -52,6 +52,7 @@ HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value); HRESULT WINAPI UiaGetReservedNotSupportedValue(IUnknown **value); int WINAPI UiaLookupId(enum AutomationIdentifierType type, const GUID *guid); BOOL WINAPI UiaPatternRelease(HUIAPATTERNOBJECT hobj); +LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); BOOL WINAPI UiaTextRangeRelease(HUIATEXTRANGE hobj); #ifdef __cplusplus

1 0

Hans Leidekker : winhttp: Ignore unknown schemes in WinHttpQueryAuthSchemes.
by Alexandre Julliard 06 Apr '17

06 Apr '17

Module: wine Branch: master Commit: 6b6ffb399a113a5125098671c1660e4c2c419d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6ffb399a113a5125098671c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Apr 6 09:38:12 2017 +0200 winhttp: Ignore unknown schemes in WinHttpQueryAuthSchemes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 16 ++++++++++------ dlls/winhttp/tests/winhttp.c | 11 ++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3cdb6ab..fc04794 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1311,7 +1311,7 @@ static DWORD auth_scheme_from_header( WCHAR *header ) static BOOL query_auth_schemes( request_t *request, DWORD level, LPDWORD supported, LPDWORD first ) { - DWORD index = 0; + DWORD index = 0, supported_schemes = 0, first_scheme = 0; BOOL ret = FALSE; for (;;) @@ -1332,15 +1332,19 @@ static BOOL query_auth_schemes( request_t *request, DWORD level, LPDWORD support } scheme = auth_scheme_from_header( buffer ); heap_free( buffer ); - if (!scheme) break; + if (!scheme) continue; - if (first && index == 1) - *first = *supported = scheme; - else - *supported |= scheme; + if (!first_scheme) first_scheme = scheme; + supported_schemes |= scheme; ret = TRUE; } + + if (ret) + { + *supported = supported_schemes; + *first = first_scheme; + } return ret; } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9802297..a5eff11 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2523,7 +2523,7 @@ static void test_multi_authentication(int port) static const WCHAR multiauthW[] = {'/','m','u','l','t','i','a','u','t','h',0}; static const WCHAR getW[] = {'G','E','T',0}; HINTERNET ses, con, req; - DWORD supported = 10, first = 9, target = 8; + DWORD supported, first, target; BOOL ret; ses = WinHttpOpen(test_useragent, WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); @@ -2542,11 +2542,12 @@ static void test_multi_authentication(int port) ret = WinHttpReceiveResponse(req, NULL); ok(ret, "expected success\n"); + supported = first = target = 0xdeadbeef; ret = WinHttpQueryAuthSchemes(req, &supported, &first, &target); - todo_wine ok(ret, "expected success\n"); - todo_wine ok(supported == (WINHTTP_AUTH_SCHEME_BASIC | WINHTTP_AUTH_SCHEME_NTLM), "got %x\n", supported); - todo_wine ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); - todo_wine ok(first == 1, "got %x\n", first); + ok(ret, "expected success\n"); + ok(supported == (WINHTTP_AUTH_SCHEME_BASIC | WINHTTP_AUTH_SCHEME_NTLM), "got %x\n", supported); + ok(target == WINHTTP_AUTH_TARGET_SERVER, "got %x\n", target); + ok(first == WINHTTP_AUTH_SCHEME_BASIC, "got %x\n", first); WinHttpCloseHandle(req); WinHttpCloseHandle(con);

1 0