June 2011 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Fix source rectangle validation in wined3d_device_update_surface().
by Alexandre Julliard 16 Jun '11

16 Jun '11

Module: wine Branch: master Commit: 6f710d18fc1c3e6b077f8db6c64ed2bc84807ce2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f710d18fc1c3e6b077f8db6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 16 00:40:28 2011 +0200 wined3d: Fix source rectangle validation in wined3d_device_update_surface(). --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ba5db37..ed52831 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4786,8 +4786,8 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, r.bottom = src_surface->resource.height; src_rect = &r; } - else if (src_rect->left < 0 || src_rect->left >= r.right - || src_rect->top < 0 || src_rect->top >= r.bottom) + else if (src_rect->left < 0 || src_rect->left >= src_rect->right + || src_rect->top < 0 || src_rect->top >= src_rect->bottom) { WARN("Invalid source rectangle.\n"); return WINED3DERR_INVALIDCALL;

1 0

Aric Stewart : usp10: Apply 'cjct' to the Indic syllable.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 1be7e1bd62cf483a051aab173234f123fd40214f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be7e1bd62cf483a051aab173… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:42 2011 -0500 usp10: Apply 'cjct' to the Indic syllable. --- dlls/usp10/shape.c | 56 +++++++++++++++++++++------------------------------ 1 files changed, 23 insertions(+), 33 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 5fbe039..a372a16 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -415,9 +415,6 @@ static const char* required_devanagari_features[] = static OPENTYPE_FEATURE_RECORD devanagari_features[] = { - /* Base forms */ - { MS_MAKE_TAG('c','j','c','t'), 1}, - /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, { MS_MAKE_TAG('b','l','w','s'), 1}, @@ -445,9 +442,6 @@ static const char* required_bengali_features[] = static OPENTYPE_FEATURE_RECORD bengali_features[] = { - /* Base forms */ - { MS_MAKE_TAG('c','j','c','t'), 1}, - /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, { MS_MAKE_TAG('b','l','w','s'), 1}, @@ -477,9 +471,6 @@ static const char* required_gurmukhi_features[] = static OPENTYPE_FEATURE_RECORD gurmukhi_features[] = { - /* Base forms */ - { MS_MAKE_TAG('c','j','c','t'), 1}, - /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, { MS_MAKE_TAG('b','l','w','s'), 1}, @@ -507,9 +498,6 @@ static const char* required_oriya_features[] = static OPENTYPE_FEATURE_RECORD oriya_features[] = { - /* Base forms */ - { MS_MAKE_TAG('c','j','c','t'), 1}, - /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, { MS_MAKE_TAG('b','l','w','s'), 1}, @@ -536,7 +524,6 @@ static const char* required_tamil_features[] = static OPENTYPE_FEATURE_RECORD tamil_features[] = { - /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, { MS_MAKE_TAG('b','l','w','s'), 1}, @@ -565,9 +552,6 @@ static const char* required_telugu_features[] = static OPENTYPE_FEATURE_RECORD telugu_features[] = { - /* Base forms */ - { MS_MAKE_TAG('c','j','c','t'), 1}, - /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, { MS_MAKE_TAG('b','l','w','s'), 1}, @@ -612,25 +596,25 @@ static const ScriptShapeData ShapingData[] = {{ thai_features, 1}, NULL, "thai", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai}, - {{ devanagari_features, 7}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ devanagari_features, 7}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ bengali_features, 7}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, - {{ bengali_features, 7}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, - {{ gurmukhi_features, 7}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, - {{ gurmukhi_features, 7}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, - {{ devanagari_features, 7}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 7}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 7}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ oriya_features, 7}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, - {{ oriya_features, 7}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, + {{ devanagari_features, 6}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, + {{ devanagari_features, 6}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, + {{ bengali_features, 6}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ bengali_features, 6}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ gurmukhi_features, 6}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ gurmukhi_features, 6}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ devanagari_features, 6}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 6}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 6}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ oriya_features, 6}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, + {{ oriya_features, 6}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, {{ tamil_features, 6}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, {{ tamil_features, 6}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ telugu_features, 7}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, - {{ telugu_features, 7}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, - {{ telugu_features, 7}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ telugu_features, 7}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ telugu_features, 7}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, - {{ telugu_features, 7}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ telugu_features, 6}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ telugu_features, 6}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ telugu_features, 6}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, + {{ telugu_features, 6}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, + {{ telugu_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ telugu_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) @@ -2108,6 +2092,7 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const GSUB_Feature *rkrf = load_GSUB_feature(hdc, psa, psc, "rkrf"); const GSUB_Feature *pstf = load_GSUB_feature(hdc, psa, psc, "pstf"); const GSUB_Feature *vatu = load_GSUB_feature(hdc, psa, psc, "vatu"); + const GSUB_Feature *cjct = load_GSUB_feature(hdc, psa, psc, "cjct"); BOOL rphf = (load_GSUB_feature(hdc, psa, psc, "rphf") != NULL); BOOL pref = (load_GSUB_feature(hdc, psa, psc, "pref") != NULL); BOOL blwf = (load_GSUB_feature(hdc, psa, psc, "blwf") != NULL); @@ -2159,6 +2144,11 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, TRACE("applying feature vatu\n"); Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, vatu); } + if (cjct) + { + TRACE("applying feature cjct\n"); + Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, cjct); + } overall_shift += glyph_indexs.end - old_end; }

1 0

Aric Stewart : usp10: Condense duplicate Indic feature sets.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 4709b0bf5865b1ff9d8b2c34165b3e4914e2f4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4709b0bf5865b1ff9d8b2c341… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:46 2011 -0500 usp10: Condense duplicate Indic feature sets. --- dlls/usp10/shape.c | 78 +++++++++------------------------------------------ 1 files changed, 14 insertions(+), 64 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index a372a16..63a9a2f 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -440,16 +440,6 @@ static const char* required_bengali_features[] = NULL }; -static OPENTYPE_FEATURE_RECORD bengali_features[] = -{ - { MS_MAKE_TAG('p','r','e','s'), 1}, - { MS_MAKE_TAG('a','b','v','s'), 1}, - { MS_MAKE_TAG('b','l','w','s'), 1}, - { MS_MAKE_TAG('p','s','t','s'), 1}, - { MS_MAKE_TAG('h','a','l','n'), 1}, - { MS_MAKE_TAG('c','a','l','t'), 1}, -}; - static const char* required_gurmukhi_features[] = { "nukt", @@ -469,16 +459,6 @@ static const char* required_gurmukhi_features[] = NULL }; -static OPENTYPE_FEATURE_RECORD gurmukhi_features[] = -{ - { MS_MAKE_TAG('p','r','e','s'), 1}, - { MS_MAKE_TAG('a','b','v','s'), 1}, - { MS_MAKE_TAG('b','l','w','s'), 1}, - { MS_MAKE_TAG('p','s','t','s'), 1}, - { MS_MAKE_TAG('h','a','l','n'), 1}, - { MS_MAKE_TAG('c','a','l','t'), 1}, -}; - static const char* required_oriya_features[] = { "nukt", @@ -496,16 +476,6 @@ static const char* required_oriya_features[] = NULL }; -static OPENTYPE_FEATURE_RECORD oriya_features[] = -{ - { MS_MAKE_TAG('p','r','e','s'), 1}, - { MS_MAKE_TAG('a','b','v','s'), 1}, - { MS_MAKE_TAG('b','l','w','s'), 1}, - { MS_MAKE_TAG('p','s','t','s'), 1}, - { MS_MAKE_TAG('h','a','l','n'), 1}, - { MS_MAKE_TAG('c','a','l','t'), 1}, -}; - static const char* required_tamil_features[] = { "nukt", @@ -522,16 +492,6 @@ static const char* required_tamil_features[] = NULL }; -static OPENTYPE_FEATURE_RECORD tamil_features[] = -{ - { MS_MAKE_TAG('p','r','e','s'), 1}, - { MS_MAKE_TAG('a','b','v','s'), 1}, - { MS_MAKE_TAG('b','l','w','s'), 1}, - { MS_MAKE_TAG('p','s','t','s'), 1}, - { MS_MAKE_TAG('h','a','l','n'), 1}, - { MS_MAKE_TAG('c','a','l','t'), 1}, -}; - static const char* required_telugu_features[] = { "nukt", @@ -550,16 +510,6 @@ static const char* required_telugu_features[] = NULL }; -static OPENTYPE_FEATURE_RECORD telugu_features[] = -{ - { MS_MAKE_TAG('p','r','e','s'), 1}, - { MS_MAKE_TAG('a','b','v','s'), 1}, - { MS_MAKE_TAG('b','l','w','s'), 1}, - { MS_MAKE_TAG('p','s','t','s'), 1}, - { MS_MAKE_TAG('h','a','l','n'), 1}, - { MS_MAKE_TAG('c','a','l','t'), 1}, -}; - typedef struct ScriptShapeDataTag { TEXTRANGE_PROPERTIES defaultTextRange; const char** requiredFeatures; @@ -598,23 +548,23 @@ static const ScriptShapeData ShapingData[] = {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai}, {{ devanagari_features, 6}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, {{ devanagari_features, 6}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ bengali_features, 6}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, - {{ bengali_features, 6}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, - {{ gurmukhi_features, 6}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, - {{ gurmukhi_features, 6}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ devanagari_features, 6}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ devanagari_features, 6}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ devanagari_features, 6}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ devanagari_features, 6}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, {{ devanagari_features, 6}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, {{ devanagari_features, 6}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, {{ devanagari_features, 6}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ oriya_features, 6}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, - {{ oriya_features, 6}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, - {{ tamil_features, 6}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ tamil_features, 6}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ telugu_features, 6}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, - {{ telugu_features, 6}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, - {{ telugu_features, 6}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ telugu_features, 6}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ telugu_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, - {{ telugu_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ devanagari_features, 6}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, + {{ devanagari_features, 6}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, + {{ devanagari_features, 6}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, + {{ devanagari_features, 6}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, + {{ devanagari_features, 6}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ devanagari_features, 6}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ devanagari_features, 6}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, + {{ devanagari_features, 6}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, + {{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph)

1 0

Marcus Meissner : winspool.drv: Removed a superflous NULL check (Coverity).
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: dad3342907020d821c5200189c90b8b2ed1b1fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad3342907020d821c5200189… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jun 15 17:01:07 2011 +0200 winspool.drv: Removed a superflous NULL check (Coverity). --- dlls/winspool.drv/tests/info.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 2ef049f..9fb9070 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2609,14 +2609,11 @@ static void test_GetPrinterDriver(void) ok(filled >= calculated,"calculated %d != filled %d\n", calculated, filled); /* Obscure test - demonstrate that Windows zero fills the buffer, even on failure */ - if (di_2->pDataFile) - { - ret = GetPrinterDriver(hprn, NULL, level, buf, needed - 2, &filled); - ok(!ret, "level %d: GetPrinterDriver succeeded with less buffer than it should\n", level); - ok(di_2->pDataFile == NULL || - broken(di_2->pDataFile != NULL), /* Win9x/WinMe */ - "Even on failure, GetPrinterDriver clears the buffer to zeros\n"); - } + ret = GetPrinterDriver(hprn, NULL, level, buf, needed - 2, &filled); + ok(!ret, "level %d: GetPrinterDriver succeeded with less buffer than it should\n", level); + ok(di_2->pDataFile == NULL || + broken(di_2->pDataFile != NULL), /* Win9x/WinMe */ + "Even on failure, GetPrinterDriver clears the buffer to zeros\n"); } HeapFree(GetProcessHeap(), 0, buf);

1 0

Aric Stewart : usp10: Apply 'blwf' only to the below-base consonants in Indic syllables.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: d942d959a6aabb18054e35574382e0ba71378a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d942d959a6aabb18054e35574… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:28 2011 -0500 usp10: Apply 'blwf' only to the below-base consonants in Indic syllables. --- dlls/usp10/indic.c | 5 --- dlls/usp10/shape.c | 81 +++++++++++++++++++++++++++++++------------ dlls/usp10/usp10_internal.h | 5 +++ 3 files changed, 64 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d942d959a6aabb18054e3…

1 0

Aric Stewart : usp10: Apply 'pref' only to the pre-base consonants in Indic syllables.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 5a315fed8dd888475a1c7d37085fde3dd387c829 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a315fed8dd888475a1c7d370… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:32 2011 -0500 usp10: Apply 'pref' only to the pre-base consonants in Indic syllables. --- dlls/usp10/shape.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index d13c747..98a5929 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -545,8 +545,6 @@ static const char* required_tamil_features[] = static OPENTYPE_FEATURE_RECORD tamil_features[] = { - /* Base forms */ - { MS_MAKE_TAG('p','r','e','f'), 1}, /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, @@ -577,7 +575,6 @@ static const char* required_telugu_features[] = static OPENTYPE_FEATURE_RECORD telugu_features[] = { /* Base forms */ - { MS_MAKE_TAG('p','r','e','f'), 1}, { MS_MAKE_TAG('p','s','t','f'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ @@ -636,14 +633,14 @@ static const ScriptShapeData ShapingData[] = {{ devanagari_features, 8}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, {{ oriya_features, 8}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, {{ oriya_features, 8}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, - {{ tamil_features, 7}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ tamil_features, 7}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ telugu_features, 9}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, - {{ telugu_features, 9}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, - {{ telugu_features, 9}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ telugu_features, 9}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ telugu_features, 9}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, - {{ telugu_features, 9}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ tamil_features, 6}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, + {{ tamil_features, 6}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, + {{ telugu_features, 8}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ telugu_features, 8}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ telugu_features, 8}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, + {{ telugu_features, 8}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, + {{ telugu_features, 8}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ telugu_features, 8}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) @@ -2120,6 +2117,7 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const GSUB_Feature *akhn = load_GSUB_feature(hdc, psa, psc, "akhn"); const GSUB_Feature *rkrf = load_GSUB_feature(hdc, psa, psc, "rkrf"); BOOL rphf = (load_GSUB_feature(hdc, psa, psc, "rphf") != NULL); + BOOL pref = (load_GSUB_feature(hdc, psa, psc, "pref") != NULL); BOOL blwf = (load_GSUB_feature(hdc, psa, psc, "blwf") != NULL); BOOL half = (load_GSUB_feature(hdc, psa, psc, "half") != NULL); IndicSyllable glyph_indexs; @@ -2153,6 +2151,8 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, TRACE("applying feature rkrf\n"); Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, rkrf); } + if (pref) + Apply_Indic_PostBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, "pref"); if (blwf) Apply_Indic_PostBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, "blwf"); if (half)

1 0

Aric Stewart : usp10: Apply 'pstf' to the Indic syllable.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 7f0b49fd9d01039ef0bf1c43cd0ee57eb3f32943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0b49fd9d01039ef0bf1c43c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:36 2011 -0500 usp10: Apply 'pstf' to the Indic syllable. --- dlls/usp10/shape.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 98a5929..c0290cb 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -376,7 +376,6 @@ static OPENTYPE_FEATURE_RECORD sinhala_features[] = { /* Base forms */ { MS_MAKE_TAG('v','a','t','u'), 1}, - { MS_MAKE_TAG('p','s','t','f'), 1}, /* Presentation forms */ { MS_MAKE_TAG('b','l','w','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, @@ -450,7 +449,6 @@ static const char* required_bengali_features[] = static OPENTYPE_FEATURE_RECORD bengali_features[] = { /* Base forms */ - { MS_MAKE_TAG('p','s','t','f'), 1}, { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ @@ -484,7 +482,6 @@ static const char* required_gurmukhi_features[] = static OPENTYPE_FEATURE_RECORD gurmukhi_features[] = { /* Base forms */ - { MS_MAKE_TAG('p','s','t','f'), 1}, { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ @@ -516,7 +513,6 @@ static const char* required_oriya_features[] = static OPENTYPE_FEATURE_RECORD oriya_features[] = { /* Base forms */ - { MS_MAKE_TAG('p','s','t','f'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, @@ -575,7 +571,6 @@ static const char* required_telugu_features[] = static OPENTYPE_FEATURE_RECORD telugu_features[] = { /* Base forms */ - { MS_MAKE_TAG('p','s','t','f'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, @@ -614,7 +609,7 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, NULL, "cyrl", "", NULL, NULL}, {{ standard_features, 2}, NULL, "armn", "", NULL, NULL}, {{ standard_features, 2}, NULL, "geor", "", NULL, NULL}, - {{ sinhala_features, 5}, NULL, "sinh", "", ContextualShape_Sinhala, NULL}, + {{ sinhala_features, 4}, NULL, "sinh", "", ContextualShape_Sinhala, NULL}, {{ tibetan_features, 2}, NULL, "tibt", "", NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, "tibt", "", NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, "phag", "", ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, @@ -624,23 +619,23 @@ static const ScriptShapeData ShapingData[] = {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai}, {{ devanagari_features, 8}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, {{ devanagari_features, 8}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ bengali_features, 9}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, - {{ bengali_features, 9}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, - {{ gurmukhi_features, 9}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, - {{ gurmukhi_features, 9}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ bengali_features, 8}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ bengali_features, 8}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ gurmukhi_features, 8}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ gurmukhi_features, 8}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, {{ devanagari_features, 8}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, {{ devanagari_features, 8}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, {{ devanagari_features, 8}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ oriya_features, 8}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, - {{ oriya_features, 8}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, + {{ oriya_features, 7}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, + {{ oriya_features, 7}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, {{ tamil_features, 6}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, {{ tamil_features, 6}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, - {{ telugu_features, 8}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, - {{ telugu_features, 8}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, - {{ telugu_features, 8}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ telugu_features, 8}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, - {{ telugu_features, 8}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, - {{ telugu_features, 8}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ telugu_features, 7}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ telugu_features, 7}, required_telugu_features, "telu", "tel2", ContextualShape_Telugu, ShapeCharGlyphProp_Telugu}, + {{ telugu_features, 7}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, + {{ telugu_features, 7}, required_telugu_features, "knda", "knd2", ContextualShape_Kannada, ShapeCharGlyphProp_Kannada}, + {{ telugu_features, 7}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, + {{ telugu_features, 7}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, }; static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) @@ -2116,6 +2111,7 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const GSUB_Feature *nukt = load_GSUB_feature(hdc, psa, psc, "nukt"); const GSUB_Feature *akhn = load_GSUB_feature(hdc, psa, psc, "akhn"); const GSUB_Feature *rkrf = load_GSUB_feature(hdc, psa, psc, "rkrf"); + const GSUB_Feature *pstf = load_GSUB_feature(hdc, psa, psc, "pstf"); BOOL rphf = (load_GSUB_feature(hdc, psa, psc, "rphf") != NULL); BOOL pref = (load_GSUB_feature(hdc, psa, psc, "pref") != NULL); BOOL blwf = (load_GSUB_feature(hdc, psa, psc, "blwf") != NULL); @@ -2157,6 +2153,11 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, Apply_Indic_PostBase(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, "blwf"); if (half) Apply_Indic_Half(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs); + if (pstf) + { + TRACE("applying feature pstf\n"); + Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, pstf); + } overall_shift += glyph_indexs.end - old_end; }

1 0

Aric Stewart : usp10: Apply 'vatu' to the Indic syllable.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: c582e3b2a28579c6c29311dfad33464d5dcc4522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c582e3b2a28579c6c29311dfa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:39 2011 -0500 usp10: Apply 'vatu' to the Indic syllable. --- dlls/usp10/shape.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index c0290cb..5fbe039 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -374,8 +374,6 @@ static const char* required_syriac_features[] = static OPENTYPE_FEATURE_RECORD sinhala_features[] = { - /* Base forms */ - { MS_MAKE_TAG('v','a','t','u'), 1}, /* Presentation forms */ { MS_MAKE_TAG('b','l','w','s'), 1}, { MS_MAKE_TAG('a','b','v','s'), 1}, @@ -418,7 +416,6 @@ static const char* required_devanagari_features[] = static OPENTYPE_FEATURE_RECORD devanagari_features[] = { /* Base forms */ - { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, @@ -449,7 +446,6 @@ static const char* required_bengali_features[] = static OPENTYPE_FEATURE_RECORD bengali_features[] = { /* Base forms */ - { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, @@ -482,7 +478,6 @@ static const char* required_gurmukhi_features[] = static OPENTYPE_FEATURE_RECORD gurmukhi_features[] = { /* Base forms */ - { MS_MAKE_TAG('v','a','t','u'), 1}, { MS_MAKE_TAG('c','j','c','t'), 1}, /* Presentation forms */ { MS_MAKE_TAG('p','r','e','s'), 1}, @@ -609,7 +604,7 @@ static const ScriptShapeData ShapingData[] = {{ standard_features, 2}, NULL, "cyrl", "", NULL, NULL}, {{ standard_features, 2}, NULL, "armn", "", NULL, NULL}, {{ standard_features, 2}, NULL, "geor", "", NULL, NULL}, - {{ sinhala_features, 4}, NULL, "sinh", "", ContextualShape_Sinhala, NULL}, + {{ sinhala_features, 3}, NULL, "sinh", "", ContextualShape_Sinhala, NULL}, {{ tibetan_features, 2}, NULL, "tibt", "", NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, "tibt", "", NULL, ShapeCharGlyphProp_Tibet}, {{ tibetan_features, 2}, NULL, "phag", "", ContextualShape_Phags_pa, ShapeCharGlyphProp_Thai}, @@ -617,15 +612,15 @@ static const ScriptShapeData ShapingData[] = {{ thai_features, 1}, NULL, "thai", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai}, {{ thai_features, 1}, required_lao_features, "lao", "", NULL, ShapeCharGlyphProp_Thai}, - {{ devanagari_features, 8}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ devanagari_features, 8}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, - {{ bengali_features, 8}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, - {{ bengali_features, 8}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, - {{ gurmukhi_features, 8}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, - {{ gurmukhi_features, 8}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, - {{ devanagari_features, 8}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 8}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, - {{ devanagari_features, 8}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 7}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, + {{ devanagari_features, 7}, required_devanagari_features, "deva", "dev2", ContextualShape_Devanagari, ShapeCharGlyphProp_Devanagari}, + {{ bengali_features, 7}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ bengali_features, 7}, required_bengali_features, "beng", "bng2", ContextualShape_Bengali, ShapeCharGlyphProp_Bengali}, + {{ gurmukhi_features, 7}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ gurmukhi_features, 7}, required_gurmukhi_features, "guru", "gur2", ContextualShape_Gurmukhi, ShapeCharGlyphProp_Gurmukhi}, + {{ devanagari_features, 7}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 7}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, + {{ devanagari_features, 7}, required_devanagari_features, "gujr", "gjr2", ContextualShape_Gujarati, ShapeCharGlyphProp_Gujarati}, {{ oriya_features, 7}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, {{ oriya_features, 7}, required_oriya_features, "orya", "ory2", ContextualShape_Oriya, ShapeCharGlyphProp_Oriya}, {{ tamil_features, 6}, required_tamil_features, "taml", "tam2", ContextualShape_Tamil, ShapeCharGlyphProp_Tamil}, @@ -2112,6 +2107,7 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const GSUB_Feature *akhn = load_GSUB_feature(hdc, psa, psc, "akhn"); const GSUB_Feature *rkrf = load_GSUB_feature(hdc, psa, psc, "rkrf"); const GSUB_Feature *pstf = load_GSUB_feature(hdc, psa, psc, "pstf"); + const GSUB_Feature *vatu = load_GSUB_feature(hdc, psa, psc, "vatu"); BOOL rphf = (load_GSUB_feature(hdc, psa, psc, "rphf") != NULL); BOOL pref = (load_GSUB_feature(hdc, psa, psc, "pref") != NULL); BOOL blwf = (load_GSUB_feature(hdc, psa, psc, "blwf") != NULL); @@ -2158,6 +2154,11 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, TRACE("applying feature pstf\n"); Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, pstf); } + if (vatu) + { + TRACE("applying feature vatu\n"); + Apply_Indic_BasicForm(hdc, psc, psa, pwChars, cChars, &syllables[c], pwOutGlyphs, pcGlyphs, pwLogClust, lexical, &glyph_indexs, vatu); + } overall_shift += glyph_indexs.end - old_end; }

1 0

Aric Stewart : usp10: Do not require a separate call to find Indic base consonant.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 5f22264c1d71922aaf29361ac41b0606b0c9424a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f22264c1d71922aaf29361ac… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:04 2011 -0500 usp10: Do not require a separate call to find Indic base consonant. --- dlls/usp10/indic.c | 33 +++++++++++++++++---------------- dlls/usp10/shape.c | 10 ---------- dlls/usp10/usp10_internal.h | 1 - 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/usp10/indic.c b/dlls/usp10/indic.c index 568401d..1b29959 100644 --- a/dlls/usp10/indic.c +++ b/dlls/usp10/indic.c @@ -212,6 +212,22 @@ static INT Indic_process_next_syllable( LPCWSTR input, INT cChar, INT start, INT return parse_consonant_syllable(input, cChar, start, main, next, lex); } +static int FindBaseConsonant(LPWSTR input, IndicSyllable *s, lexical_function lex) +{ + int i; + /* try to find a base consonant */ + if (!is_consonant( lex(input[s->base]) )) + { + for (i = s->end; i >= s->start; i--) + if (is_consonant( lex(input[i]) )) + { + s->base = i; + break; + } + } + return s->base; +} + void Indic_ReorderCharacters( LPWSTR input, int cChar, IndicSyllable **syllables, int *syllable_count, lexical_function lex, reorder_function reorder_f) { int index = 0; @@ -242,6 +258,7 @@ void Indic_ReorderCharacters( LPWSTR input, int cChar, IndicSyllable **syllables (*syllables)[*syllable_count].start = index; (*syllables)[*syllable_count].base = center; (*syllables)[*syllable_count].end = next-1; + FindBaseConsonant(input, &(*syllables)[*syllable_count], lex); reorder_f(input, &(*syllables)[*syllable_count], lex); index = next; *syllable_count = (*syllable_count)+1; @@ -262,19 +279,3 @@ void Indic_ReorderCharacters( LPWSTR input, int cChar, IndicSyllable **syllables } TRACE("Processed %i of %i characters into %i syllables\n",index,cChar,*syllable_count); } - -int Indic_FindBaseConsonant(LPWSTR input, IndicSyllable *s, lexical_function lex) -{ - int i; - /* try to find a base consonant */ - if (!is_consonant( lex(input[s->base]) )) - { - for (i = s->end; i >= s->start; i--) - if (is_consonant( lex(input[i]) )) - { - s->base = i; - break; - } - } - return s->base; -} diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 99862f8..5c939f9 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1956,8 +1956,6 @@ static void Reorder_Like_Sinhala(LPWSTR pwChar, IndicSyllable *s, lexical_functi { TRACE("Syllable (%i..%i..%i)\n",s->start,s->base,s->end); if (s->start == s->base && s->base == s->end) return; - - Indic_FindBaseConsonant(pwChar, s, lexical); if (lexical(pwChar[s->base]) == lex_Vowel) return; Reorder_Ra_follows_base(pwChar, s, lexical); @@ -1968,8 +1966,6 @@ static void Reorder_Like_Devanagari(LPWSTR pwChar, IndicSyllable *s, lexical_fun { TRACE("Syllable (%i..%i..%i)\n",s->start,s->base,s->end); if (s->start == s->base && s->base == s->end) return; - - Indic_FindBaseConsonant(pwChar, s, lexical); if (lexical(pwChar[s->base]) == lex_Vowel) return; Reorder_Ra_follows_matra(pwChar, s, lexical); @@ -1980,8 +1976,6 @@ static void Reorder_Like_Bengali(LPWSTR pwChar, IndicSyllable *s, lexical_functi { TRACE("Syllable (%i..%i..%i)\n",s->start,s->base,s->end); if (s->start == s->base && s->base == s->end) return; - - Indic_FindBaseConsonant(pwChar, s, lexical); if (lexical(pwChar[s->base]) == lex_Vowel) return; Reorder_Ra_follows_base(pwChar, s, lexical); @@ -1992,8 +1986,6 @@ static void Reorder_Like_Kannada(LPWSTR pwChar, IndicSyllable *s, lexical_functi { TRACE("Syllable (%i..%i..%i)\n",s->start,s->base,s->end); if (s->start == s->base && s->base == s->end) return; - - Indic_FindBaseConsonant(pwChar, s, lexical); if (lexical(pwChar[s->base]) == lex_Vowel) return; Reorder_Ra_follows_syllable(pwChar, s, lexical); @@ -2004,8 +1996,6 @@ static void Reorder_Like_Malayalam(LPWSTR pwChar, IndicSyllable *s, lexical_func { TRACE("Syllable (%i..%i..%i)\n",s->start,s->base,s->end); if (s->start == s->base && s->base == s->end) return; - - Indic_FindBaseConsonant(pwChar, s, lexical); if (lexical(pwChar[s->base]) == lex_Vowel) return; Reorder_Ra_follows_matra(pwChar, s, lexical); diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 40dce16..7e7e257 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -121,4 +121,3 @@ HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANA void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; void Indic_ReorderCharacters( LPWSTR input, int cChars, IndicSyllable **syllables, int *syllable_count, lexical_function lexical_f, reorder_function reorder_f) DECLSPEC_HIDDEN; -int Indic_FindBaseConsonant(LPWSTR pwChar, IndicSyllable *syllable, lexical_function lex) DECLSPEC_HIDDEN;

1 0

Aric Stewart : usp10: Ignore ralf as well as pre, post and below base consonants when finding base.
by Alexandre Julliard 15 Jun '11

15 Jun '11

Module: wine Branch: master Commit: 80531cac3fb3578c719022ff26778ba83f4f06d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80531cac3fb3578c719022ff2… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jun 15 09:54:07 2011 -0500 usp10: Ignore ralf as well as pre, post and below base consonants when finding base. --- dlls/usp10/indic.c | 53 ++++++++++++++++++++++++++++++++++++++++-- dlls/usp10/shape.c | 38 ++++++++++++++++++++++-------- dlls/usp10/usp10_internal.h | 3 +- 3 files changed, 80 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80531cac3fb3578c71902…

1 0