Aric Stewart : usp10: Convert tag in LoadedFeature to OPENTYPE_TAG.
Alexandre Julliard
julliard at winehq.org
Tue Jan 3 12:52:55 CST 2012
Module: wine
Branch: master
Commit: dbe02b96c5686bb92ac42a22c440b32929d51804
URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe02b96c5686bb92ac42a22c440b32929d51804
Author: Aric Stewart <aric at 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;
More information about the wine-cvs
mailing list