usp10: Handle Ligature Substitution Subtable from GSUB.

This also involves a restructuring of the handling of glyph lookups from GSUB since Ligature Substitution can result in many glyphs being replaced with 1 glyph, and future looksup may result in one glyph being replaces with many glyphs.

usp10: Handle Ligature Substitution Subtable from GSUB.
6c732587 · Aric Stewart · Alexandre Julliard · ec62c33d · 6c732587 · 6c732587
Commit 6c732587 authored May 21, 2010 by Aric Stewart Committed by Alexandre Julliard May 24, 2010
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

shape.c dlls/usp10/shape.c +0 -0

usp10.c dlls/usp10/usp10.c +1 -1

usp10_internal.h dlls/usp10/usp10_internal.h +1 -1

No files found.
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -1397,7 +1397,7 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars,
            }
            rChars[i] = chInput;
        }
-        SHAPE_ShapeArabicGlyphs(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, cMaxGlyphs);
+        SHAPE_ShapeArabicGlyphs(hdc, (ScriptCache *)*psc, psa, rChars, cChars, pwOutGlyphs, pcGlyphs, cMaxGlyphs);
        heap_free(rChars);
    }
    else

--- a/dlls/usp10/usp10_internal.h
+++ b/dlls/usp10/usp10_internal.h
@@ -47,4 +47,4 @@ BOOL BIDI_DetermineLevels( LPCWSTR lpString, INT uCount, const SCRIPT_STATE *s,

 INT BIDI_ReorderV2lLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse);
 INT BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse);
-void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT cMaxGlyphs);
+void SHAPE_ShapeArabicGlyphs(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs);