ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usp10: Convert tag in LoadedFeature to OPENTYPE_TAG.

This commit is contained in:
Aric Stewart 2012-01-03 06:51:20 -06:00 committed by Alexandre Julliard
parent f07321a82b
commit dbe02b96c5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/usp10/shape.c
View File

@ -1188,7 +1188,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc
for (i = 0; i < psc->feature_count; i++) 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; return psc->features[i].feature;
} }
@ -1231,7 +1231,7 @@ static LPCVOID load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc
else else
psc->features = HeapAlloc(GetProcessHeap(), 0, psc->feature_count * sizeof(LoadedFeature)); 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].script = script;
psc->features[psc->feature_count - 1].feature = feature; psc->features[psc->feature_count - 1].feature = feature;
return feature; return feature;

2
dlls/usp10/usp10_internal.h
View File

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