January 2012 - Wine-commits

Aric Stewart : usp10: Replace GSUB_get_lang_table with GSUB_GetFontLanguageTags.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: f07321a82ba088ce50d01451e04a57480defc3e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f07321a82ba088ce50d01451e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:16 2012 -0600 usp10: Replace GSUB_get_lang_table with GSUB_GetFontLanguageTags. --- dlls/usp10/shape.c | 56 ++++++++++----------------------------------------- 1 files changed, 11 insertions(+), 45 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0c59df0..0596f99 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -348,6 +348,7 @@ typedef struct { static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count); static HRESULT GSUB_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags, LPCVOID* script_table); +static HRESULT GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags, LPCVOID* language_table); typedef struct tagVowelComponents { @@ -766,31 +767,6 @@ static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) return -1; } -static const GSUB_LangSys* GSUB_get_lang_table( const GSUB_Script* script, const char* tag) -{ - int i; - int offset; - const GSUB_LangSys *Lang; - - TRACE("Deflang %x, LangCount %i\n",GET_BE_WORD(script->DefaultLangSys), GET_BE_WORD(script->LangSysCount)); - - for (i = 0; i < GET_BE_WORD(script->LangSysCount) ; i++) - { - offset = GET_BE_WORD(script->LangSysRecord[i].LangSys); - Lang = (const GSUB_LangSys*)((const BYTE*)script + offset); - - if ( strncmp(script->LangSysRecord[i].LangSysTag,tag,4)==0) - return Lang; - } - offset = GET_BE_WORD(script->DefaultLangSys); - if (offset) - { - Lang = (const GSUB_LangSys*)((const BYTE*)script + offset); - return Lang; - } - return NULL; -} - static const GSUB_Feature * GSUB_get_feature(const GSUB_Header *header, const GSUB_LangSys *lang, const char* tag) { int i; @@ -1220,39 +1196,29 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc if (psc->GSUB_Table) { - const GSUB_Script *script = NULL; - const GSUB_LangSys *language; + const GSUB_LangSys *language = NULL; int attempt = 2; OPENTYPE_TAG scriptTags; int cTags; - HRESULT hr; do { - hr = GSUB_GetFontScriptTags(psc, get_opentype_script(hdc,psa,psc,(attempt==2)), 1, &scriptTags, &cTags, (LPCVOID*)&script); + if (psc->userLang != 0) + GSUB_GetFontLanguageTags(psc, get_opentype_script(hdc,psa,psc,(attempt==2)), psc->userLang, 1, &scriptTags, &cTags, (LPCVOID*)&language); + else + GSUB_GetFontLanguageTags(psc, get_opentype_script(hdc,psa,psc,(attempt==2)), MS_MAKE_TAG('x','x','x','x'), 1, &scriptTags, &cTags, (LPCVOID*)&language); /* Need to get Lang tag */ attempt--; - if (SUCCEEDED(hr) && cTags && script) - { - if (psc->userLang != 0) - language = GSUB_get_lang_table(script,(char*)&psc->userLang); - else - language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ - if (language) - feature = GSUB_get_feature(psc->GSUB_Table, language, feat); - } + if (language) + feature = GSUB_get_feature(psc->GSUB_Table, language, feat); } while(attempt && !feature); /* try in the default (latin) table */ if (!feature) { - hr = GSUB_GetFontScriptTags(psc, MS_MAKE_TAG('l','a','t','n'), 1, &scriptTags, &cTags, (LPCVOID*)&script); - if (SUCCEEDED(hr) && script) - { - language = GSUB_get_lang_table(script, "xxxx"); /* Need to get Lang tag */ - if (language) - feature = GSUB_get_feature(psc->GSUB_Table, language, feat); - } + GSUB_GetFontLanguageTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('x','x','x','x'), 1, &scriptTags, &cTags, (LPCVOID*)&language); /* Need to get Lang tag */ + if (language) + feature = GSUB_get_feature(psc->GSUB_Table, language, feat); } }

1 0

Aric Stewart : usp10: Convert tag in LoadedFeature to OPENTYPE_TAG.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: dbe02b96c5686bb92ac42a22c440b32929d51804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe02b96c5686bb92ac42a22c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:20 2012 -0600 usp10: Convert tag in LoadedFeature to OPENTYPE_TAG. --- dlls/usp10/shape.c | 4 ++-- dlls/usp10/usp10_internal.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 0596f99..ed9b477 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1188,7 +1188,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc for (i = 0; i < psc->feature_count; i++) { - if (strncmp(psc->features[i].tag,feat,4)==0 && psc->features[i].script == script) + if (psc->features[i].tag == MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3])&& psc->features[i].script == script) return psc->features[i].feature; } @@ -1231,7 +1231,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc else psc->features = HeapAlloc(GetProcessHeap(), 0, psc->feature_count * sizeof(LoadedFeature)); - lstrcpynA(psc->features[psc->feature_count - 1].tag, feat, 5); + psc->features[psc->feature_count - 1].tag = MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]); psc->features[psc->feature_count - 1].script = script; psc->features[psc->feature_count - 1].feature = feature; return feature; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 9eb6801..62307a5 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -126,7 +126,7 @@ #define GLYPH_MAX 65536 typedef struct { - char tag[5]; + OPENTYPE_TAG tag; OPENTYPE_TAG script; LPCVOID feature; } LoadedFeature;

1 0

Aric Stewart : usp10: Implement ScriptGetFontFeatureTags.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 3d98085d65cbc63fb0cc118acce2c3df1f204a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d98085d65cbc63fb0cc118ac… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:23 2012 -0600 usp10: Implement ScriptGetFontFeatureTags. --- dlls/usp10/shape.c | 130 +++++++++++++++++++++++++++++++++++++++++++ dlls/usp10/tests/usp10.c | 36 +++++++++++- dlls/usp10/usp10.c | 14 +++++ dlls/usp10/usp10.spec | 2 +- dlls/usp10/usp10_internal.h | 3 + 5 files changed, 182 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d98085d65cbc63fb0cc1…

1 0

Aric Stewart : usp10: Replace GSUB_get_feature with GSUB_GetFontFeatureTags .
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: f04b6b2fc87ac902d1147f1e5e94d9ef575619a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f04b6b2fc87ac902d1147f1e5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:27 2012 -0600 usp10: Replace GSUB_get_feature with GSUB_GetFontFeatureTags. --- dlls/usp10/shape.c | 78 +++++++++++------------------------------- dlls/usp10/usp10.c | 1 - dlls/usp10/usp10_internal.h | 3 -- 3 files changed, 21 insertions(+), 61 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 5801253..2358e53 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -349,6 +349,7 @@ typedef struct { static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count); static HRESULT GSUB_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags, LPCVOID* script_table); static HRESULT GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags, LPCVOID* language_table); +static HRESULT GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature); typedef struct tagVowelComponents { @@ -767,26 +768,6 @@ static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) return -1; } -static const GSUB_Feature * GSUB_get_feature(const GSUB_Header *header, const GSUB_LangSys *lang, const char* tag) -{ - int i; - const GSUB_FeatureList *feature; - feature = (const GSUB_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); - - TRACE("%i features\n",GET_BE_WORD(lang->FeatureCount)); - for (i = 0; i < GET_BE_WORD(lang->FeatureCount); i++) - { - int index = GET_BE_WORD(lang->FeatureIndex[i]); - if (strncmp(feature->FeatureRecord[index].FeatureTag,tag,4)==0) - { - const GSUB_Feature *feat; - feat = (const GSUB_Feature*)((const BYTE*)feature + GET_BE_WORD(feature->FeatureRecord[index].Feature)); - return feat; - } - } - return NULL; -} - static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; @@ -1180,61 +1161,44 @@ static OPENTYPE_TAG get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCac static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, const char* feat) { - const GSUB_Feature *feature; - OPENTYPE_TAG script; - int i; - - script = get_opentype_script(hdc,psa,psc,FALSE); - - for (i = 0; i < psc->feature_count; i++) - { - if (psc->features[i].tag == MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3])&& psc->features[i].script == script) - return psc->features[i].feature; - } - - feature = NULL; + LoadedFeature *feature = NULL; if (psc->GSUB_Table) { - const GSUB_LangSys *language = NULL; int attempt = 2; - OPENTYPE_TAG scriptTags; + OPENTYPE_TAG tags; + OPENTYPE_TAG language; + OPENTYPE_TAG script; int cTags; do { + script = get_opentype_script(hdc,psa,psc,(attempt==2)); if (psc->userLang != 0) - GSUB_GetFontLanguageTags(psc, get_opentype_script(hdc,psa,psc,(attempt==2)), psc->userLang, 1, &scriptTags, &cTags, (LPCVOID*)&language); + language = psc->userLang; else - GSUB_GetFontLanguageTags(psc, get_opentype_script(hdc,psa,psc,(attempt==2)), MS_MAKE_TAG('x','x','x','x'), 1, &scriptTags, &cTags, (LPCVOID*)&language); /* Need to get Lang tag */ - + language = MS_MAKE_TAG('d','f','l','t'); attempt--; - if (language) - feature = GSUB_get_feature(psc->GSUB_Table, language, feat); + + GSUB_GetFontFeatureTags(psc, script, language, FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), 1, &tags, &cTags, &feature); + } while(attempt && !feature); /* try in the default (latin) table */ if (!feature) - { - GSUB_GetFontLanguageTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('x','x','x','x'), 1, &scriptTags, &cTags, (LPCVOID*)&language); /* Need to get Lang tag */ - if (language) - feature = GSUB_get_feature(psc->GSUB_Table, language, feat); - } + GSUB_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), 1, &tags, &cTags, &feature); } - TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature); - - psc->feature_count++; - - if (psc->features) - psc->features = HeapReAlloc(GetProcessHeap(), 0, psc->features, psc->feature_count * sizeof(LoadedFeature)); + if (feature) + { + TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature->feature); + return feature->feature; + } else - psc->features = HeapAlloc(GetProcessHeap(), 0, psc->feature_count * sizeof(LoadedFeature)); - - psc->features[psc->feature_count - 1].tag = MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]); - psc->features[psc->feature_count - 1].script = script; - psc->features[psc->feature_count - 1].feature = feature; - return feature; + { + TRACE("Feature %s not located\n",debugstr_an(feat,4)); + return NULL; + } } static INT apply_GSUB_feature_to_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, WORD *glyphs, INT index, INT write_dir, INT* glyph_count, const char* feat) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 152db1e..1479b7c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -933,7 +933,6 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) heap_free(((ScriptCache *)*psc)->scripts[i].languages); } heap_free(((ScriptCache *)*psc)->scripts); - heap_free(((ScriptCache *)*psc)->features); heap_free(*psc); *psc = NULL; } diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 5fd5d75..6df9b50 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -127,7 +127,6 @@ typedef struct { OPENTYPE_TAG tag; - OPENTYPE_TAG script; LPCVOID feature; } LoadedFeature; @@ -156,8 +155,6 @@ typedef struct { LPVOID GDEF_Table; LPVOID CMAP_Table; LPVOID CMAP_format12_Table; - INT feature_count; - LoadedFeature *features; INT script_count; LoadedScript *scripts;

1 0

Aric Stewart : usp10: Have load_GSUB_feature return LoadedFeature*.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: c632f71e085fc1cf9ba3b35de7abb814939509c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c632f71e085fc1cf9ba3b35de… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:30 2012 -0600 usp10: Have load_GSUB_feature return LoadedFeature*. --- dlls/usp10/shape.c | 44 +++++++++++++++++++------------------------- 1 files changed, 19 insertions(+), 25 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 2358e53..1240739 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1159,7 +1159,7 @@ static OPENTYPE_TAG get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCac } } -static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, const char* feat) +static LoadedFeature* load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, const char* feat) { LoadedFeature *feature = NULL; @@ -1189,28 +1189,20 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc GSUB_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), 1, &tags, &cTags, &feature); } - if (feature) - { - TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature->feature); - return feature->feature; - } - else - { - TRACE("Feature %s not located\n",debugstr_an(feat,4)); - return NULL; - } + TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature); + return feature; } static INT apply_GSUB_feature_to_glyph(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, WORD *glyphs, INT index, INT write_dir, INT* glyph_count, const char* feat) { - const GSUB_Feature *feature; + LoadedFeature *feature; feature = load_GSUB_feature(hdc, psa, psc, feat); if (!feature) return GSUB_E_NOFEATURE; TRACE("applying feature %s\n",feat); - return GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature, glyphs, index, write_dir, glyph_count); + return GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature->feature, glyphs, index, write_dir, glyph_count); } static VOID *load_gsub_table(HDC hdc) @@ -1477,14 +1469,16 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W { if (psc->GSUB_Table) { + LoadedFeature *load_feature; 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) + load_feature = load_GSUB_feature(hdc, psa, psc, feat); + if (!load_feature) return GSUB_E_NOFEATURE; + feature = load_feature->feature; TRACE("applying feature %s\n",debugstr_an(feat,4)); lookup = (const GSUB_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); @@ -2195,7 +2189,7 @@ static inline void shift_syllable_glyph_indexs(IndicSyllable *glyph_index, INT i glyph_index->pref+= shift; } -static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllable, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical, IndicSyllable *glyph_index, const GSUB_Feature *feature ) +static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwChars, INT cChars, IndicSyllable *syllable, WORD *pwOutGlyphs, INT* pcGlyphs, WORD *pwLogClust, lexical_function lexical, IndicSyllable *glyph_index, LoadedFeature *feature ) { int index = glyph_index->start; @@ -2206,7 +2200,7 @@ static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature, pwOutGlyphs, index, 1, pcGlyphs); + nextIndex = GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature->feature, pwOutGlyphs, index, 1, pcGlyphs); if (nextIndex > GSUB_E_NOGLYPH) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, 1, cChars, pwLogClust); @@ -2332,13 +2326,13 @@ static void ShapeIndicSyllables(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, { int c; int overall_shift = 0; - const GSUB_Feature *locl = (modern)?load_GSUB_feature(hdc, psa, psc, "locl"):NULL; - 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 = (modern)?load_GSUB_feature(hdc, psa, psc, "rkrf"):NULL; - const GSUB_Feature *pstf = load_GSUB_feature(hdc, psa, psc, "pstf"); - const GSUB_Feature *vatu = (!rkrf)?load_GSUB_feature(hdc, psa, psc, "vatu"):NULL; - const GSUB_Feature *cjct = (modern)?load_GSUB_feature(hdc, psa, psc, "cjct"):NULL; + LoadedFeature *locl = (modern)?load_GSUB_feature(hdc, psa, psc, "locl"):NULL; + LoadedFeature *nukt = load_GSUB_feature(hdc, psa, psc, "nukt"); + LoadedFeature *akhn = load_GSUB_feature(hdc, psa, psc, "akhn"); + LoadedFeature *rkrf = (modern)?load_GSUB_feature(hdc, psa, psc, "rkrf"):NULL; + LoadedFeature *pstf = load_GSUB_feature(hdc, psa, psc, "pstf"); + LoadedFeature *vatu = (!rkrf)?load_GSUB_feature(hdc, psa, psc, "vatu"):NULL; + LoadedFeature *cjct = (modern)?load_GSUB_feature(hdc, psa, psc, "cjct"):NULL; 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); @@ -3592,7 +3586,7 @@ rpRangeProperties = &ShapingData[psa->eScript].defaultTextRange; HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa) { - const GSUB_Feature *feature; + LoadedFeature *feature; int i; if (!ShapingData[psa->eScript].requiredFeatures)

1 0

Aric Stewart : usp10: Cache feature lookups.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: f7a21f8cba067ec41214b35947bdeb82a1671fcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7a21f8cba067ec41214b3594… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:33 2012 -0600 usp10: Cache feature lookups. --- dlls/usp10/shape.c | 53 +++++++++++++++++++++++------------------- dlls/usp10/usp10.c | 5 ++++ dlls/usp10/usp10_internal.h | 2 + 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 1240739..b51e982 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -1089,18 +1089,23 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO return GSUB_E_NOGLYPH; } -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) +static INT apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +{ + const GSUB_Header *header = (const GSUB_Header *)table; + const GSUB_LookupList *lookup = (const GSUB_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); + + return GSUB_apply_lookup(lookup, lookup_index, glyphs, glyph_index, write_dir, glyph_count); +} + +static INT GSUB_apply_feature_all_lookups(LPCVOID header, LoadedFeature *feature, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int i; int out_index = GSUB_E_NOGLYPH; - const GSUB_LookupList *lookup; - lookup = (const GSUB_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); - - TRACE("%i lookups\n", GET_BE_WORD(feature->LookupCount)); - for (i = 0; i < GET_BE_WORD(feature->LookupCount); i++) + TRACE("%i lookups\n", feature->lookup_count); + for (i = 0; i < feature->lookup_count; i++) { - out_index = GSUB_apply_lookup(lookup, GET_BE_WORD(feature->LookupListIndex[i]), glyphs, glyph_index, write_dir, glyph_count); + out_index = apply_GSUB_lookup(header, feature->lookups[i], glyphs, glyph_index, write_dir, glyph_count); if (out_index != GSUB_E_NOGLYPH) break; } @@ -1202,7 +1207,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_all_lookups(psc->GSUB_Table, feature->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) @@ -1469,22 +1474,15 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W { if (psc->GSUB_Table) { - LoadedFeature *load_feature; - const GSUB_Feature *feature; - const GSUB_LookupList *lookup; - const GSUB_Header *header = psc->GSUB_Table; - int lookup_index, lookup_count; + LoadedFeature *feature; + int lookup_index; - load_feature = load_GSUB_feature(hdc, psa, psc, feat); - if (!load_feature) + feature = load_GSUB_feature(hdc, psa, psc, feat); + if (!feature) return GSUB_E_NOFEATURE; - feature = load_feature->feature; - TRACE("applying feature %s\n",debugstr_an(feat,4)); - 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++) + TRACE("applying feature %s: %i lookups\n",debugstr_an(feat,4),feature->lookup_count); + for (lookup_index = 0; lookup_index < feature->lookup_count; lookup_index++) { int i; @@ -1492,13 +1490,13 @@ static int apply_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, W i = 0; else i = *pcGlyphs-1; - TRACE("applying lookup (%i/%i)\n",lookup_index,lookup_count); + TRACE("applying lookup (%i/%i)\n",lookup_index,feature->lookup_count); 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); + nextIndex = apply_GSUB_lookup(psc->GSUB_Table, feature->lookups[lookup_index], pwOutGlyphs, i, write_dir, pcGlyphs); if (*pcGlyphs != prevCount) { UpdateClusters(nextIndex, *pcGlyphs - prevCount, write_dir, cChars, pwLogClust); @@ -2200,7 +2198,7 @@ static void Apply_Indic_BasicForm(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *ps { INT nextIndex; INT prevCount = *pcGlyphs; - nextIndex = GSUB_apply_feature_all_lookups(psc->GSUB_Table, feature->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); @@ -3855,10 +3853,17 @@ static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *languag for (i = 0; i < language->feature_count; i++) { + const GSUB_Feature *feature; + int j; int index = GET_BE_WORD(lang->FeatureIndex[i]); language->features[i].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]); language->features[i].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); + feature = (const GSUB_Feature*)language->features[i].feature; + language->features[i].lookup_count = GET_BE_WORD(feature->LookupCount); + language->features[i].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[i].lookup_count); + for (j = 0; j < language->features[i].lookup_count; j++) + language->features[i].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); } } } diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1479b7c..9ddff1b 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -929,7 +929,12 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) { int j; for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].language_count; j++) + { + int k; + for (k = 0; k < ((ScriptCache *)*psc)->scripts[i].languages[j].feature_count; k++) + heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features[k].lookups); heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features); + } heap_free(((ScriptCache *)*psc)->scripts[i].languages); } heap_free(((ScriptCache *)*psc)->scripts); diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 6df9b50..c606389 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -128,6 +128,8 @@ typedef struct { OPENTYPE_TAG tag; LPCVOID feature; + INT lookup_count; + WORD *lookups; } LoadedFeature; typedef struct {

1 0

Hans Leidekker : msi: Accept a missing left backquote in SQL identifiers.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 4def593456d720252ee319b2a561113cd55767d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4def593456d720252ee319b2a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 3 13:53:14 2012 +0100 msi: Accept a missing left backquote in SQL identifiers. --- dlls/msi/query.h | 2 +- dlls/msi/sql.y | 5 +++-- dlls/msi/tests/db.c | 30 ++++++++++++++++++++++++++++++ dlls/msi/tokenize.c | 5 ++++- 4 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 8f8a244..ca34b4c 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -131,7 +131,7 @@ UINT STORAGES_CreateView( MSIDATABASE *db, MSIVIEW **view ) DECLSPEC_HIDDEN; UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name ) DECLSPEC_HIDDEN; -int sqliteGetToken(const WCHAR *z, int *tokenType) DECLSPEC_HIDDEN; +int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip) DECLSPEC_HIDDEN; MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ) DECLSPEC_HIDDEN; diff --git a/dlls/msi/sql.y b/dlls/msi/sql.y index 548e142..ead7743 100644 --- a/dlls/msi/sql.y +++ b/dlls/msi/sql.y @@ -797,7 +797,7 @@ static column_info *parser_alloc_column( void *info, LPCWSTR table, LPCWSTR colu static int sql_lex( void *SQL_lval, SQL_input *sql ) { - int token; + int token, skip; struct sql_str * str = SQL_lval; do @@ -807,11 +807,12 @@ static int sql_lex( void *SQL_lval, SQL_input *sql ) return 0; /* end of input */ /* TRACE("string : %s\n", debugstr_w(&sql->command[sql->n])); */ - sql->len = sqliteGetToken( &sql->command[sql->n], &token ); + sql->len = sqliteGetToken( &sql->command[sql->n], &token, &skip ); if( sql->len==0 ) break; str->data = &sql->command[sql->n]; str->len = sql->len; + sql->n += skip; } while( token == TK_SPACE ); diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 6ecd642..d33eb0c 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -727,6 +727,36 @@ static void test_msibadqueries(void) r = try_query( hdb, "select * from 'c'"); ok(r == ERROR_BAD_QUERY_SYNTAX, "query failed\n"); + r = try_query( hdb, "select `c`.`b` from `c` order by `c`.`order`"); + ok( r == ERROR_BAD_QUERY_SYNTAX, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.b` from `c`"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.`b from `c`"); + ok( r == ERROR_BAD_QUERY_SYNTAX, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.b from `c`"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c.`b` from `c`"); + ok( r == ERROR_BAD_QUERY_SYNTAX, "query failed: %u\n", r ); + + r = try_query( hdb, "select c`.`b` from `c`"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + + r = try_query( hdb, "select c.`b` from `c`"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.`b` from c`"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.`b` from `c"); + ok( r == ERROR_BAD_QUERY_SYNTAX, "query failed: %u\n", r ); + + r = try_query( hdb, "select `c`.`b` from c"); + ok( r == ERROR_SUCCESS, "query failed: %u\n", r ); + r = try_query( hdb, "CREATE TABLE `\5a` (`b` CHAR NOT NULL PRIMARY KEY `b`)" ); ok( r == ERROR_SUCCESS , "query failed: %u\n", r ); diff --git a/dlls/msi/tokenize.c b/dlls/msi/tokenize.c index 64e14b8..c432888 100644 --- a/dlls/msi/tokenize.c +++ b/dlls/msi/tokenize.c @@ -190,8 +190,10 @@ static const char isIdChar[] = { ** -1 if the token is (or might be) incomplete. Store the token ** type in *tokenType before returning. */ -int sqliteGetToken(const WCHAR *z, int *tokenType){ +int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip){ int i; + + *skip = 0; switch( *z ){ case ' ': case '\t': case '\n': case '\f': for(i=1; isspace(z[i]) && z[i] != '\r'; i++){} @@ -280,6 +282,7 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){ } for(i=1; isIdChar[z[i]]; i++){} *tokenType = sqliteKeywordCode(z, i); + if( *tokenType == TK_ID && z[i] == '`' ) *skip = 1; return i; } *tokenType = TK_ILLEGAL;

1 0

Hans Leidekker : msi: VolumeLabel and DiskPrompt are optional fields in the Media table.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 2a1902161074ebe8bf1472f182983e9c4377f1af URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a1902161074ebe8bf1472f18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 3 13:53:50 2012 +0100 msi: VolumeLabel and DiskPrompt are optional fields in the Media table. --- dlls/msi/media.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index f8ed27e..d5ace5a 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -820,10 +820,13 @@ static UINT find_published_source(MSIPACKAGE *package, MSIMEDIAINFO *mi) volume, &volumesz, prompt, &promptsz) == ERROR_SUCCESS) { mi->disk_id = id; - mi->volume_label = msi_realloc(mi->volume_label, ++volumesz * sizeof(WCHAR)); - lstrcpyW(mi->volume_label, volume); - mi->disk_prompt = msi_realloc(mi->disk_prompt, ++promptsz * sizeof(WCHAR)); - lstrcpyW(mi->disk_prompt, prompt); + msi_free( mi->volume_label ); + if (!(mi->volume_label = msi_alloc( ++volumesz * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + strcpyW( mi->volume_label, volume ); + + msi_free( mi->disk_prompt ); + if (!(mi->disk_prompt = msi_alloc( ++promptsz * sizeof(WCHAR) ))) return ERROR_OUTOFMEMORY; + strcpyW( mi->disk_prompt, prompt ); if (source_matches_volume(mi, source)) {

1 0

Jacek Caban : ieframe: Remove useless #undef.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: 0633ee42582c459d1d22c0836771109cdb2d2689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0633ee42582c459d1d22c0836… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 3 16:49:45 2012 +0100 ieframe: Remove useless #undef. --- dlls/ieframe/ie.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 5fe0a26..5fbc368 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -625,8 +625,6 @@ static HRESULT WINAPI InternetExplorer_put_Resizable(IWebBrowser2 *iface, VARIAN return E_NOTIMPL; } -#undef impl_from_IWebBrowser2 - static const IWebBrowser2Vtbl InternetExplorerVtbl = { InternetExplorer_QueryInterface,

1 0

Piotr Caban : msvcp90: Update data pointer after resizing string.
by Alexandre Julliard 03 Jan '12

03 Jan '12

Module: wine Branch: master Commit: f90d5a8f724c16279ca1928531629c282ee5b173 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f90d5a8f724c16279ca192853… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 3 17:01:46 2012 +0100 msvcp90: Update data pointer after resizing string. --- dlls/msvcp90/string.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 189a0cc..27f3ab7 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -1958,8 +1958,10 @@ basic_string_char* __thiscall basic_string_char_replace_cstr_len(basic_string_ch if(basic_string_char_inside(this, str)) inside_pos = str-ptr; - if(len < str_len) + if(len < str_len) { basic_string_char_grow(this, this->size-len+str_len, FALSE); + ptr = basic_string_char_ptr(this); + } if(inside_pos == -1) { memmove(ptr+off+str_len, ptr+off+len, (this->size-off-len)*sizeof(char)); @@ -2044,8 +2046,10 @@ basic_string_char* __thiscall basic_string_char_replace_ch(basic_string_char *th if(MSVCP_basic_string_char_npos-count <= this->size-len) MSVCP__String_base_Xlen(); - if(len < count) + if(len < count) { basic_string_char_grow(this, this->size-len+count, FALSE); + ptr = basic_string_char_ptr(this); + } memmove(ptr+off+count, ptr+off+len, (this->size-off-len)*sizeof(char)); MSVCP_char_traits_char_assignn(ptr+off, count, ch); @@ -3911,8 +3915,10 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_cstr_len(basic_string_ if(basic_string_wchar_inside(this, str)) inside_pos = str-ptr; - if(len < str_len) + if(len < str_len) { basic_string_wchar_grow(this, this->size-len+str_len, FALSE); + ptr = basic_string_wchar_ptr(this); + } if(inside_pos == -1) { memmove(ptr+off+str_len, ptr+off+len, (this->size-off-len)*sizeof(wchar_t)); @@ -4005,8 +4011,10 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_ch(basic_string_wchar if(MSVCP_basic_string_wchar_npos-count <= this->size-len) MSVCP__String_base_Xlen(); - if(len < count) + if(len < count) { basic_string_wchar_grow(this, this->size-len+count, FALSE); + ptr = basic_string_wchar_ptr(this); + } memmove(ptr+off+count, ptr+off+len, (this->size-off-len)*sizeof(wchar_t)); MSVCP_char_traits_wchar_assignn(ptr+off, count, ch);

1 0