system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-08-31 15:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

usp10: Cache the script with the feature so that in caches with multiple scripts we do not fetch the wrong feature from the cache.

Browse source
This commit is contained in:
Aric Stewart 2011-11-20 21:06:18 -07:00 committed by Alexandre Julliard
parent 9097226a3c
commit 25d43d7a09
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dlls/usp10/shape.c
View file

@ -1094,11 +1094,16 @@ static const char* get_opentype_script(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCach
static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, const char* feat)
{
const GSUB_Feature *feature;
const char* script;
int i;
script = get_opentype_script(hdc,psa,psc,FALSE);
for (i = 0; i < psc->feature_count; i++)
if (strncmp(psc->features[i].tag,feat,4)==0)
{
if (strncmp(psc->features[i].tag,feat,4)==0 && strncmp(psc->features[i].script,script,4)==0)
return psc->features[i].feature;
}
feature = NULL;
@ -1146,6 +1151,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc
psc->features = HeapAlloc(GetProcessHeap(), 0, psc->feature_count * sizeof(LoadedFeature));
lstrcpynA(psc->features[psc->feature_count - 1].tag, feat, 5);
lstrcpynA(psc->features[psc->feature_count - 1].script, script, 5);
psc->features[psc->feature_count - 1].feature = feature;
return feature;
}

3
dlls/usp10/usp10_internal.h
View file

@ -82,7 +82,8 @@
#define GLYPH_MAX 65536
typedef struct {
char tag[4];
char tag[5];
char script[5];
LPCVOID feature;
} LoadedFeature;