December 2011 - Wine-commits

Alexandre Julliard : appwiz.cpl: Make the Gecko URL a proper link.
by Alexandre Julliard 01 Dec '11

01 Dec '11

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 8a3d0dc5341bac01829ecf306c724018797da3da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3d0dc5341bac01829ecf306… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 1 20:07:10 2011 +0100 po: Update German translation. --- po/de.po | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/po/de.po b/po/de.po index ac7f043..0c1bf12 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-29 18:54+0100\n" +"PO-Revision-Date: 2011-12-01 20:05+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2184,38 +2184,32 @@ msgid "Default MidiOut Device" msgstr "Standard MidiOut - Gerät" #: dinput.rc:40 -#, fuzzy msgid "Configure Devices" -msgstr "Kon&figurieren" +msgstr "Geräte konfigurieren" #: dinput.rc:45 msgid "Reset" -msgstr "" +msgstr "Rücksetzen" #: dinput.rc:48 -#, fuzzy msgid "Player" -msgstr "Abspielen" +msgstr "Player" #: dinput.rc:49 -#, fuzzy msgid "Device" -msgstr "De&vice:" +msgstr "Gerät" #: dinput.rc:50 -#, fuzzy msgid "Actions" -msgstr "Aktion" +msgstr "Aktionen" #: dinput.rc:51 -#, fuzzy msgid "Mapping" msgstr "Zuordnung" #: dinput.rc:53 -#, fuzzy msgid "Sort Assigned" -msgstr "Bereits zugewiesen\n" +msgstr "Zugewiesene sortieren" #: dinput.rc:34 msgid "Action" @@ -6507,9 +6501,8 @@ msgid "us" msgstr "µs" #: serialui.rc:25 -#, fuzzy msgid "Settings for %s" -msgstr "Eigenschaften für %s" +msgstr "Einstellungen für %s" #: serialui.rc:28 msgid "Baud Rate"

1 0

Alexandre Julliard : appwiz.cpl: Convert dialogs to po files.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: b247174ea7aae3cf4dd77cb73c409ed26ba7dc5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b247174ea7aae3cf4dd77cb73… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 1 20:17:33 2011 +0100 appwiz.cpl: Convert dialogs to po files. --- dlls/appwiz.cpl/Bg.rc | 35 --------- dlls/appwiz.cpl/Ca.rc | 85 -------------------- dlls/appwiz.cpl/Da.rc | 86 --------------------- dlls/appwiz.cpl/De.rc | 86 --------------------- dlls/appwiz.cpl/En.rc | 82 -------------------- dlls/appwiz.cpl/Es.rc | 85 -------------------- dlls/appwiz.cpl/Fr.rc | 86 --------------------- dlls/appwiz.cpl/He.rc | 86 --------------------- dlls/appwiz.cpl/Hu.rc | 83 -------------------- dlls/appwiz.cpl/It.rc | 83 -------------------- dlls/appwiz.cpl/Ja.rc | 85 -------------------- dlls/appwiz.cpl/Ko.rc | 84 -------------------- dlls/appwiz.cpl/Lt.rc | 83 -------------------- dlls/appwiz.cpl/Makefile.in | 29 +------- dlls/appwiz.cpl/Nl.rc | 83 -------------------- dlls/appwiz.cpl/No.rc | 83 -------------------- dlls/appwiz.cpl/Pl.rc | 81 ------------------- dlls/appwiz.cpl/Pt.rc | 151 ------------------------------------ dlls/appwiz.cpl/Ro.rc | 83 -------------------- dlls/appwiz.cpl/Ru.rc | 84 -------------------- dlls/appwiz.cpl/Si.rc | 83 -------------------- dlls/appwiz.cpl/Sr.rc | 147 ----------------------------------- dlls/appwiz.cpl/Sv.rc | 85 -------------------- dlls/appwiz.cpl/Tr.rc | 35 --------- dlls/appwiz.cpl/Uk.rc | 84 -------------------- dlls/appwiz.cpl/Zh.rc | 140 --------------------------------- dlls/appwiz.cpl/appwiz.rc | 57 ++++++++++++++ po/ar.po | 164 ++++++++++++++++++++++++++++++---------- po/bg.po | 175 ++++++++++++++++++++++++++++++++---------- po/ca.po | 172 ++++++++++++++++++++++++++++++++---------- po/cs.po | 170 +++++++++++++++++++++++++++++++---------- po/da.po | 172 +++++++++++++++++++++++++++++++---------- po/de.po | 173 ++++++++++++++++++++++++++++++++---------- po/el.po | 164 ++++++++++++++++++++++++++++++---------- po/en.po | 160 +++++++++++++++++++++++++++++---------- po/en_US.po | 171 +++++++++++++++++++++++++++++++---------- po/eo.po | 172 +++++++++++++++++++++++++++++++---------- po/es.po | 174 ++++++++++++++++++++++++++++++++---------- po/fa.po | 164 ++++++++++++++++++++++++++++++---------- po/fi.po | 178 +++++++++++++++++++++++++++++++++---------- po/fr.po | 173 ++++++++++++++++++++++++++++++++---------- po/he.po | 169 +++++++++++++++++++++++++++++++---------- po/hi.po | 161 +++++++++++++++++++++++++++++---------- po/hu.po | 175 ++++++++++++++++++++++++++++++++---------- po/it.po | 173 ++++++++++++++++++++++++++++++++---------- po/ja.po | 171 +++++++++++++++++++++++++++++++---------- po/ko.po | 171 +++++++++++++++++++++++++++++++---------- po/lt.po | 171 +++++++++++++++++++++++++++++++---------- po/ml.po | 161 +++++++++++++++++++++++++++++---------- po/nb_NO.po | 171 +++++++++++++++++++++++++++++++---------- po/nl.po | 174 ++++++++++++++++++++++++++++++++---------- po/or.po | 161 +++++++++++++++++++++++++++++---------- po/pa.po | 161 +++++++++++++++++++++++++++++---------- po/pl.po | 173 ++++++++++++++++++++++++++++++++---------- po/pt_BR.po | 173 ++++++++++++++++++++++++++++++++---------- po/pt_PT.po | 173 ++++++++++++++++++++++++++++++++---------- po/rm.po | 168 ++++++++++++++++++++++++++++++---------- po/ro.po | 174 ++++++++++++++++++++++++++++++++---------- po/ru.po | 174 ++++++++++++++++++++++++++++++++---------- po/sk.po | 170 +++++++++++++++++++++++++++++++---------- po/sl.po | 174 ++++++++++++++++++++++++++++++++---------- po/sr_RS(a)cyrillic.po | 172 +++++++++++++++++++++++++++++++---------- po/sr_RS(a)latin.po | 172 +++++++++++++++++++++++++++++++---------- po/sv.po | 172 +++++++++++++++++++++++++++++++---------- po/te.po | 161 +++++++++++++++++++++++++++++---------- po/th.po | 165 ++++++++++++++++++++++++++++++---------- po/tr.po | 175 ++++++++++++++++++++++++++++++++---------- po/uk.po | 170 +++++++++++++++++++++++++++++++---------- po/wa.po | 170 +++++++++++++++++++++++++++++++---------- po/wine.pot | 160 +++++++++++++++++++++++++++++---------- po/zh_CN.po | 165 +++++++++++++++++++++++++++++---------- po/zh_TW.po | 164 +++++++++++++++++++++++++++++---------- 72 files changed, 5853 insertions(+), 4047 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b247174ea7aae3cf4dd77…

1 0

Alexandre Julliard : comctl32: Fix text wrapping in syslink when an item starts in the middle of a line.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 682b03731cb8139f3e1b3e143c1841a03ee19e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682b03731cb8139f3e1b3e143… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 1 20:30:16 2011 +0100 comctl32: Fix text wrapping in syslink when an item starts in the middle of a line. --- dlls/comctl32/syslink.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 823c7ac..42fb987 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -606,7 +606,7 @@ static PDOC_ITEM SYSLINK_GetPrevLink (const SYSLINK_INFO *infoPtr, PDOC_ITEM Cur * SYSLINK_WrapLine * Tries to wrap a line. */ -static BOOL SYSLINK_WrapLine (LPWSTR Text, WCHAR BreakChar, int *LineLen, +static BOOL SYSLINK_WrapLine (LPWSTR Text, WCHAR BreakChar, int x, int *LineLen, int nFit, LPSIZE Extent) { int i; @@ -625,7 +625,7 @@ static BOOL SYSLINK_WrapLine (LPWSTR Text, WCHAR BreakChar, int *LineLen, { Extent->cx = 0; Extent->cy = 0; - i = max( nFit, 1 ); + if (x == SL_LEFTMARGIN) i = max( nFit, 1 ); } } *LineLen = i; @@ -722,7 +722,7 @@ static VOID SYSLINK_Render (const SYSLINK_INFO *infoPtr, HDC hdc, PRECT pRect) if(n != 0) { - Wrap = SYSLINK_WrapLine(tx, infoPtr->BreakChar, &LineLen, nFit, &szDim); + Wrap = SYSLINK_WrapLine(tx, infoPtr->BreakChar, x, &LineLen, nFit, &szDim); if(LineLen == 0) {

1 0

Frédéric Delanoy : msvfw32: Fix a displayed label .
by Alexandre Julliard 01 Dec '11

01 Dec '11

1 0

Dmitry Timoshkov : kernel32: Add a bunch of VirtualProtect tests on a memory-mapped file.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: d7e428a40a480c54e015cf503a4cd21faad1b5df URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e428a40a480c54e015cf503… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Nov 29 13:54:44 2011 +0800 kernel32: Add a bunch of VirtualProtect tests on a memory-mapped file. --- dlls/kernel32/tests/virtual.c | 187 +++++++++++++++++++++++++++++++++------- 1 files changed, 154 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d7e428a40a480c54e015c…

1 0

Aric Stewart : usp10: Turn off dlig feature for hebrew. It is not used by default.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 5ed8160ec73b081285ebd776e0c835bcca45142b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ed8160ec73b081285ebd776e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 1 09:08:36 2011 -0600 usp10: Turn off dlig feature for hebrew. It is not used by default. --- dlls/usp10/shape.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 66d65c2..3911c1c 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -365,7 +365,7 @@ static const char* required_arabic_features[] = static OPENTYPE_FEATURE_RECORD hebrew_features[] = { - { MS_MAKE_TAG('d','l','i','g'), 1}, + { MS_MAKE_TAG('d','l','i','g'), 0}, }; static OPENTYPE_FEATURE_RECORD syriac_features[] =

1 0

Aric Stewart : usp10: Standard features are only ccmp and locl.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 711dd9b13a59ed3c43237531dc044d630f25785f URL: http://source.winehq.org/git/wine.git/?a=commit;h=711dd9b13a59ed3c43237531d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 1 09:08:42 2011 -0600 usp10: Standard features are only ccmp and locl. --- dlls/usp10/shape.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 3911c1c..e1cadd1 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -340,6 +340,12 @@ static const char* contextual_features[] = static OPENTYPE_FEATURE_RECORD standard_features[] = { + { MS_MAKE_TAG('c','c','m','p'), 1}, + { MS_MAKE_TAG('l','o','c','l'), 1}, +}; + +static OPENTYPE_FEATURE_RECORD latin_features[] = +{ { MS_MAKE_TAG('l','i','g','a'), 1}, { MS_MAKE_TAG('c','l','i','g'), 1}, }; @@ -539,11 +545,11 @@ typedef struct ScriptShapeDataTag { static const ScriptShapeData ShapingData[] = { {{ standard_features, 2}, NULL, "", "", NULL, NULL}, - {{ standard_features, 2}, NULL, "latn", "", NULL, NULL}, - {{ standard_features, 2}, NULL, "latn", "", NULL, NULL}, - {{ standard_features, 2}, NULL, "latn", "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn", "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn", "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn", "", NULL, NULL}, {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, - {{ standard_features, 2}, NULL, "latn", "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn", "", NULL, NULL}, {{ arabic_features, 6}, required_arabic_features, "arab", "", ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ arabic_features, 6}, required_arabic_features, "arab", "", ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ hebrew_features, 1}, NULL, "hebr", "", NULL, NULL}, @@ -583,7 +589,7 @@ static const ScriptShapeData ShapingData[] = {{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ devanagari_features, 6}, required_telugu_features, "mlym", "mlm2", ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, - {{ standard_features, 2}, NULL, "latn" , "", NULL, NULL}, + {{ latin_features, 2}, NULL, "latn" , "", NULL, NULL}, {{ standard_features, 2}, NULL, "" , "", NULL, NULL}, };

1 0

Aric Stewart : usp10: Apply lookups in order over the whole range of glyphs instead of individually to each glyph .
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: c4c9f8b041280535388ac10f50446fba899f1028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4c9f8b041280535388ac10f5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 1 09:09:25 2011 -0600 usp10: Apply lookups in order over the whole range of glyphs instead of individually to each glyph. --- dlls/usp10/shape.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index e1cadd1..9e09c86 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1027,7 +1027,7 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO return GSUB_E_NOGLYPH; } -static INT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* feature, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +static INT GSUB_apply_feature_all_lookups(const GSUB_Header * header, const GSUB_Feature* feature, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int i; int out_index = GSUB_E_NOGLYPH; @@ -1047,7 +1047,7 @@ static INT GSUB_apply_feature(const GSUB_Header * header, const GSUB_Feature* fe else { int out2; - out2 = GSUB_apply_feature(header, feature, glyphs, glyph_index, write_dir, glyph_count); + out2 = GSUB_apply_feature_all_lookups(header, feature, glyphs, glyph_index, write_dir, glyph_count); if (out2!=GSUB_E_NOGLYPH) out_index = out2; } @@ -1171,7 +1171,7 @@ static INT apply_GSUB_feature_to_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach return GSUB_E_NOFEATURE; TRACE("applying feature %s\n",feat); - return GSUB_apply_feature(psc->GSUB_Table, feature, glyphs, index, write_dir, glyph_count); + return GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature, glyphs, index, write_dir, glyph_count); } static VOID *load_gsub_table(HDC hdc) @@ -1419,23 +1419,32 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, WORD *pwOutGlyphs, int write_dir, INT* pcGlyphs, INT cChars, const char* feat, WORD *pwLogClust ) { - int i; - if (psc->GSUB_Table) { const GSUB_Feature *feature; + const GSUB_LookupList *lookup; + const GSUB_Header *header = psc->GSUB_Table; + int lookup_index, lookup_count; feature = load_GSUB_feature(hdc, psa, psc, feat); if (!feature) return GSUB_E_NOFEATURE; - i = 0; TRACE("applying feature %s\n",debugstr_an(feat,4)); - while(i < *pcGlyphs) - { + lookup = (const GSUB_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); + lookup_count = GET_BE_WORD(feature->LookupCount); + TRACE("%i lookups\n", lookup_count); + for (lookup_index = 0; lookup_index < lookup_count; lookup_index++) + { + int i; + i = 0; + TRACE("applying lookup (%i/%i)\n",lookup_index,lookup_count); + while(i < *pcGlyphs) + { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = GSUB_apply_feature(psc->GSUB_Table, feature, pwOutGlyphs, i, write_dir, pcGlyphs); + + nextIndex = GSUB_apply_lookup(lookup, GET_BE_WORD(feature->LookupListIndex[lookup_index]), pwOutGlyphs, i, write_dir, pcGlyphs); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, write_dir, cChars, pwLogClust); @@ -1443,6 +1452,7 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W } else i++; + } } return *pcGlyphs; } @@ -2134,7 +2144,7 @@ static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = GSUB_apply_feature(psc->GSUB_Table, feature, pwOutGlyphs, index, 1, pcGlyphs); + nextIndex = GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature, pwOutGlyphs, index, 1, pcGlyphs); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust);

1 0

Aric Stewart : usp10: Always apply features in logical order.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 302409ebe49fb42f434c3adbe8e351c6cdd18c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=302409ebe49fb42f434c3adbe… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Dec 1 09:09:41 2011 -0600 usp10: Always apply features in logical order. --- dlls/usp10/shape.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 9e09c86..7583326 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -726,7 +726,7 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN TRACE(" Glyph 0x%x ->",glyphs[glyph_index]); glyphs[glyph_index] = glyphs[glyph_index] + GET_BE_WORD(ssf1->DeltaGlyphID); TRACE(" 0x%x\n",glyphs[glyph_index]); - return glyph_index + 1; + return glyph_index + write_dir; } } else @@ -748,7 +748,7 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN TRACE(" Glyph is 0x%x ->",glyphs[glyph_index]); glyphs[glyph_index] = GET_BE_WORD(ssf2->Substitute[index]); TRACE("0x%x\n",glyphs[glyph_index]); - return glyph_index + 1; + return glyph_index + write_dir; } } } @@ -797,7 +797,7 @@ static INT GSUB_apply_MultipleSubst(const GSUB_LookupTable *look, WORD *glyphs, TRACE("\n"); } - return glyph_index + sub_count; + return glyph_index + (sub_count * write_dir); } } return GSUB_E_NOGLYPH; @@ -831,7 +831,7 @@ static INT GSUB_apply_AlternateSubst(const GSUB_LookupTable *look, WORD *glyphs, TRACE(" Glyph 0x%x ->",glyphs[glyph_index]); glyphs[glyph_index] = GET_BE_WORD(as->Alternate[0]); TRACE(" 0x%x\n",glyphs[glyph_index]); - return glyph_index + 1; + return glyph_index + write_dir; } } return GSUB_E_NOGLYPH; @@ -894,7 +894,7 @@ static INT GSUB_apply_LigatureSubst(const GSUB_LookupTable *look, WORD *glyphs, glyphs[j] =glyphs[j+CompCount]; *glyph_count = *glyph_count - CompCount; } - return replaceIdx + 1; + return replaceIdx + write_dir; } } } @@ -1338,7 +1338,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch else { int i; - int target_glyph = nextIndex - 1; + int target_glyph = nextIndex - write_dir; int seeking_glyph; int target_index = -1; int replacing_glyph = -1; @@ -1346,7 +1346,7 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch if (changeCount > 0) - target_glyph = nextIndex - (changeCount+1); + target_glyph = nextIndex - ((changeCount+1)*write_dir); seeking_glyph = target_glyph; @@ -1437,21 +1437,25 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W for (lookup_index = 0; lookup_index < lookup_count; lookup_index++) { int i; - i = 0; + + if (write_dir > 0) + i = 0; + else + i = *pcGlyphs-1; TRACE("applying lookup (%i/%i)\n",lookup_index,lookup_count); - while(i < *pcGlyphs) + while(i < *pcGlyphs && i >= 0) { INT nextIndex; INT prevCount = *pcGlyphs; nextIndex = GSUB_apply_lookup(lookup, GET_BE_WORD(feature->LookupListIndex[lookup_index]), pwOutGlyphs, i, write_dir, pcGlyphs); - if (nextIndex > GSUB_E_NOGLYPH) + if (*pcGlyphs != prevCount) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, write_dir, cChars, pwLogClust); i = nextIndex; } else - i++; + i+=write_dir; } } return *pcGlyphs;

1 0