From: Aric Stewart Subject: Re: [PATCH 3/6] usp10: Return the logical offset in GPOS_apply_ContextPos(). Message-Id: <7eefb968-feb8-ac45-9a8a-bc455afa0498@codeweavers.com> Date: Tue, 21 Feb 2017 07:06:18 -0600 In-Reply-To: <1487527354-5563-3-git-send-email-hverbeet@codeweavers.com> References: <1487527354-5563-3-git-send-email-hverbeet@codeweavers.com> Signed-off-by: Aric Stewart On 2/19/17 12:02 PM, Henri Verbeet wrote: > Signed-off-by: Henri Verbeet > --- > 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: >