Henri Verbeet : usp10: Return the logical offset in GPOS_apply_ContextPos( ).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 22101966cfe6764f0d36918caa8a7f10045d9d85
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=22101966cfe6764f0d36918caa...

Author: Henri Verbeet 
Date:   Sun Feb 19 19:02:31 2017 +0100

usp10: Return the logical offset in GPOS_apply_ContextPos().

Signed-off-by: Henri Verbeet 
Signed-off-by: Aric Stewart 
Signed-off-by: Alexandre Julliard

---

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: