January 2012 - Wine-Commits

Piotr Caban : msvcp90: Update data pointer after resizing string.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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

Jacek Caban : ieframe: Remove useless #undef.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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

Hans Leidekker : msi: VolumeLabel and DiskPrompt are optional fields in the Media table.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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

Aric Stewart : usp10: Implement ScriptGetFontFeatureTags.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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: Convert tag in LoadedFeature to OPENTYPE_TAG.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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

André Hentschel : d3drm: Add IDirect3DRMFrame2 interface.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 8f0ac41d3f5c2da96423b536986f33f0697008aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0ac41d3f5c2da96423b5369… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 30 16:42:59 2011 +0100 d3drm: Add IDirect3DRMFrame2 interface. --- dlls/d3drm/Makefile.in | 1 + dlls/d3drm/d3drm.c | 14 +- dlls/d3drm/d3drm_private.h | 1 + dlls/d3drm/frame.c | 944 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 956 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f0ac41d3f5c2da96423b…

1 0

André Hentschel : ntdll/tests: Add optional return value for some win7 machines.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: cc50de11568d9b70ff07ad15fc473297d594f289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc50de11568d9b70ff07ad15f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Dec 30 16:33:23 2011 +0100 ntdll/tests: Add optional return value for some win7 machines. --- dlls/ntdll/tests/reg.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 5ca14eb..1bd0a01 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -396,7 +396,8 @@ static void test_NtCreateKey(void) /* Only attributes */ status = pNtCreateKey(NULL, 0, &attr, 0, 0, 0, 0); - ok(status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got: 0x%08x\n", status); + ok(status == STATUS_ACCESS_VIOLATION || status == STATUS_ACCESS_DENIED /* Win7 */, + "Expected STATUS_ACCESS_VIOLATION or STATUS_ACCESS_DENIED, got: 0x%08x\n", status); /* Length > sizeof(OBJECT_ATTRIBUTES) */ attr.Length *= 2;

1 0

Aric Stewart : usp10: Replace GSUB_get_feature with GSUB_GetFontFeatureTags .
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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: Replace GSUB_get_lang_table with GSUB_GetFontLanguageTags.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

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: Implement ScriptGetFontLanguageTags.
by Alexandre Julliard Jan. 3, 2012

Jan. 3, 2012

Module: wine Branch: master Commit: 0661d2d202ef00319cffb2dafec9fbe8df64e8c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0661d2d202ef00319cffb2daf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Jan 3 06:51:07 2012 -0600 usp10: Implement ScriptGetFontLanguageTags. --- dlls/usp10/shape.c | 121 ++++++++++++++++++++++++++++++++++++++++++- dlls/usp10/tests/usp10.c | 37 ++++++++++++- dlls/usp10/usp10.c | 11 ++++ dlls/usp10/usp10.spec | 2 +- dlls/usp10/usp10_internal.h | 9 +++ 5 files changed, 176 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0661d2d202ef00319cffb…

1 0