February 2017 - Wine-commits

Henri Verbeet : usp10: Properly get glyph widths for OpenType fonts in ScriptPlaceOpenType().
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 4b22953ec5ce44b41e1f913d67549bff488f5ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b22953ec5ce44b41e1f913d6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 18:16:37 2017 +0100 usp10: Properly get glyph widths for OpenType fonts in ScriptPlaceOpenType(). I.e., don't use GetCharWidth32W() with glyph indices. This fixes glyph advances for OpenType fonts in wordpad. 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/usp10.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 3595ca2..f8a6aa5 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3347,15 +3347,24 @@ HRESULT WINAPI ScriptPlaceOpenType( HDC hdc, SCRIPT_CACHE *psc, SCRIPT_ANALYSIS } else if (!get_cache_glyph_widths(psc, pwGlyphs[i], &abc)) { + BOOL ret; if (!hdc) return E_PENDING; - if ((get_cache_pitch_family(psc) & TMPF_TRUETYPE) && !psa->fNoGlyphIndex) + if (get_cache_pitch_family(psc) & TMPF_TRUETYPE) { - if (!GetCharABCWidthsI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &abc)) return S_FALSE; + if (psa->fNoGlyphIndex) + ret = GetCharABCWidthsW(hdc, pwGlyphs[i], pwGlyphs[i], &abc); + else + ret = GetCharABCWidthsI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &abc); + if (!ret) return S_FALSE; } else { INT width; - if (!GetCharWidth32W(hdc, pwGlyphs[i], pwGlyphs[i], &width)) return S_FALSE; + if (psa->fNoGlyphIndex) + ret = GetCharWidth32W(hdc, pwGlyphs[i], pwGlyphs[i], &width); + else + ret = GetCharWidthI(hdc, 0, 1, (WORD *)&pwGlyphs[i], &width); + if (!ret) return S_FALSE; abc.abcB = width; abc.abcA = abc.abcC = 0; }

1 0

Henri Verbeet : usp10: Introduce an enumeration for GPOS lookup types.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 61e8a388b2628d90c604c100e762abd0d85ef67f URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e8a388b2628d90c604c100e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 19:02:29 2017 +0100 usp10: Introduce an enumeration for GPOS lookup types. As opposed to using magic numbers. 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 | 57 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a9aa4f4..a67bba7 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -48,6 +48,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); /* These are all structures needed for the cmap format 12 table */ #define CMAP_TAG MS_MAKE_TAG('c', 'm', 'a', 'p') +enum gpos_lookup_type +{ + GPOS_LOOKUP_ADJUST_SINGLE = 0x1, + GPOS_LOOKUP_ADJUST_PAIR = 0x2, + GPOS_LOOKUP_ATTACH_CURSIVE = 0x3, + GPOS_LOOKUP_ATTACH_MARK_TO_BASE = 0x4, + GPOS_LOOKUP_ATTACH_MARK_TO_LIGATURE = 0x5, + GPOS_LOOKUP_ATTACH_MARK_TO_MARK = 0x6, + GPOS_LOOKUP_POSITION_CONTEXT = 0x7, + GPOS_LOOKUP_POSITION_CONTEXT_CHAINED = 0x8, + GPOS_LOOKUP_POSITION_EXTENSION = 0x9, +}; + typedef struct { WORD platformID; WORD encodingID; @@ -1587,7 +1600,7 @@ static const BYTE *GPOS_get_subtable(const OT_LookupTable *look, int index) { int offset = GET_BE_WORD(look->SubTable[index]); - if (GET_BE_WORD(look->LookupType) == 9) + if (GET_BE_WORD(look->LookupType) == GPOS_LOOKUP_POSITION_EXTENSION) { const GPOS_ExtensionPosFormat1 *ext = (const GPOS_ExtensionPosFormat1 *)((const BYTE *)look + offset); if (GET_BE_WORD(ext->PosFormat) == 1) @@ -2250,13 +2263,15 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG int offset; const OT_LookupTable *look; int ppem = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading; - WORD type; + enum gpos_lookup_type type; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); type = GET_BE_WORD(look->LookupType); - TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); - if (type == 9) + TRACE("type %#x, flag %#x, subtables %u.\n", type, + GET_BE_WORD(look->LookupFlag), GET_BE_WORD(look->SubTableCount)); + + if (type == GPOS_LOOKUP_POSITION_EXTENSION) { if (GET_BE_WORD(look->SubTableCount)) { @@ -2278,7 +2293,7 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } switch (type) { - case 1: + case GPOS_LOOKUP_ADJUST_SINGLE: { double devX, devY; POINT adjust = {0,0}; @@ -2299,7 +2314,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } break; } - case 2: + + case GPOS_LOOKUP_ADJUST_PAIR: { POINT advance[2]= {{0,0},{0,0}}; POINT adjust[2]= {{0,0},{0,0}}; @@ -2333,7 +2349,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } return index; } - case 3: + + case GPOS_LOOKUP_ATTACH_CURSIVE: { POINT desU = {0,0}; double devX, devY; @@ -2348,7 +2365,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } break; } - case 4: + + case GPOS_LOOKUP_ATTACH_MARK_TO_BASE: { double devX, devY; POINT desU = {0,0}; @@ -2366,7 +2384,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } break; } - case 5: + + case GPOS_LOOKUP_ATTACH_MARK_TO_LIGATURE: { double devX, devY; POINT desU = {0,0}; @@ -2379,7 +2398,8 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } break; } - case 6: + + case GPOS_LOOKUP_ATTACH_MARK_TO_MARK: { double devX, devY; POINT desU = {0,0}; @@ -2393,14 +2413,17 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } break; } - case 7: - return GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); - case 8: - { - return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); - } + + case GPOS_LOOKUP_POSITION_CONTEXT: + return GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, + lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); + + case GPOS_LOOKUP_POSITION_CONTEXT_CHAINED: + return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, + lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); + default: - FIXME("We do not handle SubType %i\n",type); + FIXME("Unhandled GPOS lookup type %#x.\n", type); } return glyph_index+1; }

1 0

Henri Verbeet : usp10: Return the logical offset in GPOS_apply_PairAdjustment().
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 6e84358bcdc933b5c86afd781e96dae14ff5d0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e84358bcdc933b5c86afd781… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 19:02:30 2017 +0100 usp10: Return the logical offset in GPOS_apply_PairAdjustment(). The base index is redundant, and actually makes it harder to iterate in logical order in GPOS_apply_feature(). 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 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a67bba7..07066f6 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1695,7 +1695,8 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN int j; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; - if (glyph_index + write_dir < 0 || glyph_index + write_dir >= glyph_count) return glyph_index + 1; + if (glyph_index + write_dir < 0 || glyph_index + write_dir >= glyph_count) + return 1; TRACE("Pair Adjustment Positioning Subtable\n"); @@ -1731,7 +1732,7 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN TRACE("Format 1: Found Pair %x,%x\n",glyphs[glyph_index],glyphs[glyph_index+write_dir]); apply_pair_value( ppf1, ValueFormat1, ValueFormat2, pair_val_rec->Value1, ppem, ptAdjust, ptAdvance ); if (ValueFormat2) next++; - return glyph_index + next; + return next; } pair_val_rec = (const GPOS_PairValueRecord *)(pair_val_rec->Value1 + val_fmt1_size + val_fmt2_size); } @@ -1764,14 +1765,14 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN apply_pair_value( ppf2, ValueFormat1, ValueFormat2, pair_val, ppem, ptAdjust, ptAdvance ); if (ValueFormat2) next++; - return glyph_index + next; + return next; } } } else FIXME("Pair Adjustment Positioning: Format %i Unhandled\n",GET_BE_WORD(ppf1->PosFormat)); } - return glyph_index+1; + return 1; } static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, @@ -2320,11 +2321,12 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG POINT advance[2]= {{0,0},{0,0}}; POINT adjust[2]= {{0,0},{0,0}}; double devX, devY; - int index; + int index_offset; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; int offset_sign = (analysis->fRTL && analysis->fLogicalOrder) ? -1 : 1; - index = GPOS_apply_PairAdjustment(look, analysis, glyphs, glyph_index, glyph_count, ppem, adjust, advance); + index_offset = GPOS_apply_PairAdjustment(look, analysis, glyphs, + glyph_index, glyph_count, ppem, adjust, advance); if (adjust[0].x || adjust[0].y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust[0].x, adjust[0].y, &devX, &devY); @@ -2347,7 +2349,7 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG GPOS_convert_design_units_to_device(lpotm, lplogfont, advance[1].x, advance[1].y, &devX, &devY); piAdvance[glyph_index + write_dir] += round(devX); } - return index; + return glyph_index + index_offset; } case GPOS_LOOKUP_ATTACH_CURSIVE:

1 0

Henri Verbeet : usp10: Return the logical offset in GPOS_apply_ContextPos( ).
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 22101966cfe6764f0d36918caa8a7f10045d9d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22101966cfe6764f0d36918ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 19:02:31 2017 +0100 usp10: Return the logical offset in GPOS_apply_ContextPos(). 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 07066f6..1371145 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2139,7 +2139,7 @@ static INT GPOS_apply_ContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, L TRACE("Position: %i -> %i %i\n",l, SequenceIndex, lookupIndex); GPOS_apply_lookup(psc, lpotm, lplogfont, analysis, piAdvance, lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, glyph_count, pGoffset); } - return glyph_index + 1; + return 1; } } @@ -2156,7 +2156,7 @@ static INT GPOS_apply_ContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, L else FIXME("Unhandled Contextual Positioning Format %i\n",GET_BE_WORD(cpf2->PosFormat)); } - return glyph_index + 1; + return 1; } static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, @@ -2417,7 +2417,7 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } case GPOS_LOOKUP_POSITION_CONTEXT: - return GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, + return glyph_index + GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); case GPOS_LOOKUP_POSITION_CONTEXT_CHAINED:

1 0

Henri Verbeet : usp10: Return the logical offset in GPOS_apply_ChainContextPos().
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 8d1566735ff3d44cd5ffd707a72df11b41a65464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d1566735ff3d44cd5ffd707a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 19:02:32 2017 +0100 usp10: Return the logical offset 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 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 1371145..0cf474d 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2249,14 +2249,14 @@ static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpo TRACE("Position: %i -> %i %i\n",k, SequenceIndex, lookupIndex); GPOS_apply_lookup(psc, lpotm, lplogfont, analysis, piAdvance, lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, glyph_count, pGoffset); } - return glyph_index + indexGlyphs + GET_BE_WORD(ccpf3_3->LookaheadGlyphCount); + return indexGlyphs + GET_BE_WORD(ccpf3_3->LookaheadGlyphCount); } - else return glyph_index + 1; + else return 1; } else FIXME("Unhandled Chaining Contextual Positioning Format %i\n",GET_BE_WORD(ccpf3->PosFormat)); } - return glyph_index + 1; + return 1; } static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, const OT_LookupList* lookup, INT lookup_index, const WORD *glyphs, INT glyph_index, INT glyph_count, GOFFSET *pGoffset) @@ -2421,7 +2421,7 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); case GPOS_LOOKUP_POSITION_CONTEXT_CHAINED: - return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, + return glyph_index + GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); default:

1 0

Henri Verbeet : usp10: Return the logical offset in GPOS_apply_lookup().
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: 6fec9b1325e47a279554be54fbd964c5667f9816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fec9b1325e47a279554be54f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 19:02:33 2017 +0100 usp10: Return the logical offset in GPOS_apply_lookup(). 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 | 8 ++++---- dlls/usp10/shape.c | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 0cf474d..e3aaf16 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2349,7 +2349,7 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG GPOS_convert_design_units_to_device(lpotm, lplogfont, advance[1].x, advance[1].y, &devX, &devY); piAdvance[glyph_index + write_dir] += round(devX); } - return glyph_index + index_offset; + return index_offset; } case GPOS_LOOKUP_ATTACH_CURSIVE: @@ -2417,17 +2417,17 @@ static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOG } case GPOS_LOOKUP_POSITION_CONTEXT: - return glyph_index + GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, + return GPOS_apply_ContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); case GPOS_LOOKUP_POSITION_CONTEXT_CHAINED: - return glyph_index + GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, + return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); default: FIXME("Unhandled GPOS lookup type %#x.\n", type); } - return glyph_index+1; + return 1; } INT OpenType_apply_GPOS_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, INT lookup_index, const WORD *glyphs, INT glyph_index, INT glyph_count, GOFFSET *pGoffset) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index bf333b2..9549d9f 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -889,7 +889,8 @@ static VOID GPOS_apply_feature(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPL { int j; for (j = 0; j < glyph_count; ) - j = OpenType_apply_GPOS_lookup(psc, lpotm, lplogfont, analysis, piAdvance, feature->lookups[i], glyphs, j, glyph_count, pGoffset); + j += OpenType_apply_GPOS_lookup(psc, lpotm, lplogfont, analysis, piAdvance, + feature->lookups[i], glyphs, j, glyph_count, pGoffset); } }

1 0

Henri Verbeet : usp10: Iterate in visual order in GPOS_apply_feature().
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: b6d541cac50d14314a6ffde9dd32d4b9644e1192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d541cac50d14314a6ffde9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Feb 19 19:02:34 2017 +0100 usp10: Iterate in visual order in GPOS_apply_feature(). In particular, cursive attachment application depends on previous visual order glyph offsets. Affects e.g. wordpad with Nastaliq fonts. 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/shape.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 9549d9f..5c257dd 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -882,15 +882,17 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W static VOID GPOS_apply_feature(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, LoadedFeature *feature, const WORD *glyphs, INT glyph_count, GOFFSET *pGoffset) { - int i; + int dir = analysis->fLogicalOrder && analysis->fRTL ? -1 : 1; + unsigned int start_idx, i, j; TRACE("%i lookups\n", feature->lookup_count); + + start_idx = dir < 0 ? glyph_count - 1 : 0; for (i = 0; i < feature->lookup_count; i++) { - int j; for (j = 0; j < glyph_count; ) j += OpenType_apply_GPOS_lookup(psc, lpotm, lplogfont, analysis, piAdvance, - feature->lookups[i], glyphs, j, glyph_count, pGoffset); + feature->lookups[i], glyphs, start_idx + dir * j, glyph_count, pGoffset); } }

1 0

Nikolay Sivov : usp10: Ignore device tables with invalid delta format.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: fefd15118fa643c16a34be889baf79cda1768a0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fefd15118fa643c16a34be889… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 20 02:36:39 2017 +0300 usp10: Ignore device tables with invalid delta format. Signed-off-by: Nikolay Sivov <nsivov(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 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index e3aaf16..1ad9c39 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1492,10 +1492,18 @@ static INT GPOS_get_device_table_value(const OT_DeviceTable *DeviceTable, WORD p static const WORD mask[3] = {3,0xf,0xff}; if (DeviceTable && ppem >= GET_BE_WORD(DeviceTable->StartSize) && ppem <= GET_BE_WORD(DeviceTable->EndSize)) { - int format = GET_BE_WORD(DeviceTable->DeltaFormat); + WORD format = GET_BE_WORD(DeviceTable->DeltaFormat); int index = ppem - GET_BE_WORD(DeviceTable->StartSize); int value; - TRACE("device table, format %i, index %i\n",format, index); + + TRACE("device table, format %#x, index %i\n", format, index); + + if (format & ~0x3) + { + WARN("invalid delta format %#x\n", format); + return 0; + } + index = index << format; value = (DeviceTable->DeltaValue[index/sizeof(WORD)] << (index%sizeof(WORD)))&mask[format-1]; TRACE("offset %i, value %i\n",index, value);

1 0

Jacek Caban : ole32: Added generic class factory implementation and use it for file moniker.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: cf7883f3960f20f1ed652d119269be9ad60c938f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7883f3960f20f1ed652d119… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 13:19:12 2017 +0100 ole32: Added generic class factory implementation and use it for file moniker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/filemoniker.c | 47 +---------------------------------------------- dlls/ole32/moniker.h | 2 +- dlls/ole32/oleproxy.c | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 3cd7da4..271e5bb 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -1541,31 +1541,7 @@ HRESULT FileMoniker_CreateFromDisplayName(LPBC pbc, LPCOLESTR szDisplayName, } -static HRESULT WINAPI FileMonikerCF_QueryInterface(LPCLASSFACTORY iface, - REFIID riid, LPVOID *ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI FileMonikerCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; /* non-heap based object */ -} - -static ULONG WINAPI FileMonikerCF_Release(LPCLASSFACTORY iface) -{ - return 1; /* non-heap based object */ -} - -static HRESULT WINAPI FileMonikerCF_CreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv) { FileMonikerImpl* newFileMoniker; HRESULT hr; @@ -1591,24 +1567,3 @@ static HRESULT WINAPI FileMonikerCF_CreateInstance(LPCLASSFACTORY iface, return hr; } - -static HRESULT WINAPI FileMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl FileMonikerCFVtbl = -{ - FileMonikerCF_QueryInterface, - FileMonikerCF_AddRef, - FileMonikerCF_Release, - FileMonikerCF_CreateInstance, - FileMonikerCF_LockServer -}; -static const IClassFactoryVtbl *FileMonikerCF = &FileMonikerCFVtbl; - -HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv) -{ - return IClassFactory_QueryInterface((IClassFactory *)&FileMonikerCF, riid, ppv); -} diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index c23e9d3..2b08384 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -30,7 +30,7 @@ DEFINE_OLEGUID( CLSID_CompositeMoniker, 0x309, 0, 0 ); DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); -HRESULT FileMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 8351f27..ba0703d 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -39,6 +39,51 @@ #include "moniker.h" #include "comcat.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(ole); + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) +{ + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) + { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%x)\n", fLock); + return S_OK; +} + +static const IClassFactoryVtbl FileMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + FileMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory FileMonikerCF = { &FileMonikerCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -56,7 +101,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualIID(rclsid,&CLSID_StdGlobalInterfaceTable) && (IsEqualIID(iid,&IID_IClassFactory) || IsEqualIID(iid,&IID_IUnknown))) return StdGlobalInterfaceTable_GetFactory(ppv); if (IsEqualCLSID(rclsid, &CLSID_FileMoniker)) - return FileMonikerCF_Create(iid, ppv); + return IClassFactory_QueryInterface(&FileMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker)) return ItemMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_AntiMoniker))

1 0

Jacek Caban : ole32: Use generic class factory for item moniker.
by Alexandre Julliard 21 Feb '17

21 Feb '17

Module: wine Branch: master Commit: dee64631ffeda2dffe4bb5d75405bbdf29873630 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dee64631ffeda2dffe4bb5d75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 21 13:19:24 2017 +0100 ole32: Use generic class factory for item moniker. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/itemmoniker.c | 50 +++--------------------------------------------- dlls/ole32/moniker.h | 2 +- dlls/ole32/oleproxy.c | 13 ++++++++++++- 3 files changed, 16 insertions(+), 49 deletions(-) diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 67bef5f..14beada 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -948,39 +948,16 @@ HRESULT WINAPI CreateItemMoniker(LPCOLESTR lpszDelim, LPCOLESTR lpszItem, IMoni hr = ItemMonikerImpl_Construct(newItemMoniker,lpszDelim,lpszItem); if (FAILED(hr)){ - HeapFree(GetProcessHeap(),0,newItemMoniker); - return hr; + return hr; } return ItemMonikerImpl_QueryInterface(&newItemMoniker->IMoniker_iface,&IID_IMoniker, (void**)ppmk); } -static HRESULT WINAPI ItemMonikerCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IClassFactory)) - { - *ppv = iface; - IClassFactory_AddRef(iface); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI ItemMonikerCF_AddRef(LPCLASSFACTORY iface) -{ - return 2; /* non-heap based object */ -} - -static ULONG WINAPI ItemMonikerCF_Release(LPCLASSFACTORY iface) -{ - return 1; /* non-heap based object */ -} - -static HRESULT WINAPI ItemMonikerCF_CreateInstance(LPCLASSFACTORY iface, - LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) +HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, + IUnknown *pUnk, REFIID riid, void **ppv) { ItemMonikerImpl* newItemMoniker; HRESULT hr; @@ -1006,24 +983,3 @@ static HRESULT WINAPI ItemMonikerCF_CreateInstance(LPCLASSFACTORY iface, return hr; } - -static HRESULT WINAPI ItemMonikerCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -{ - FIXME("(%d), stub!\n",fLock); - return S_OK; -} - -static const IClassFactoryVtbl ItemMonikerCFVtbl = -{ - ItemMonikerCF_QueryInterface, - ItemMonikerCF_AddRef, - ItemMonikerCF_Release, - ItemMonikerCF_CreateInstance, - ItemMonikerCF_LockServer -}; -static const IClassFactoryVtbl *ItemMonikerCF = &ItemMonikerCFVtbl; - -HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv) -{ - return IClassFactory_QueryInterface((IClassFactory *)&ItemMonikerCF, riid, ppv); -} diff --git a/dlls/ole32/moniker.h b/dlls/ole32/moniker.h index 2b08384..a811366 100644 --- a/dlls/ole32/moniker.h +++ b/dlls/ole32/moniker.h @@ -31,7 +31,7 @@ DEFINE_OLEGUID( CLSID_ClassMoniker, 0x31a, 0, 0 ); DEFINE_OLEGUID( CLSID_PointerMoniker, 0x306, 0, 0 ); HRESULT WINAPI FileMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); -HRESULT ItemMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; +HRESULT WINAPI ItemMoniker_CreateInstance(IClassFactory *iface, IUnknown *pUnk, REFIID riid, void **ppv); HRESULT AntiMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT CompositeMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; HRESULT ClassMonikerCF_Create(REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index ba0703d..b7a11a1 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -84,6 +84,17 @@ static const IClassFactoryVtbl FileMonikerCFVtbl = static IClassFactory FileMonikerCF = { &FileMonikerCFVtbl }; +static const IClassFactoryVtbl ItemMonikerCFVtbl = +{ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ItemMoniker_CreateInstance, + ClassFactory_LockServer +}; + +static IClassFactory ItemMonikerCF = { &ItemMonikerCFVtbl }; + /*********************************************************************** * DllGetClassObject [OLE32.@] */ @@ -103,7 +114,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid,LPVOID *ppv) if (IsEqualCLSID(rclsid, &CLSID_FileMoniker)) return IClassFactory_QueryInterface(&FileMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_ItemMoniker)) - return ItemMonikerCF_Create(iid, ppv); + return IClassFactory_QueryInterface(&ItemMonikerCF, iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_AntiMoniker)) return AntiMonikerCF_Create(iid, ppv); if (IsEqualCLSID(rclsid, &CLSID_CompositeMoniker))

1 0