usp10: Use BOOL type where appropriate
Frédéric Delanoy
frederic.delanoy at gmail.com
Wed Feb 26 01:12:40 CST 2014
cf. http://msdn.microsoft.com/en-us/library/windows/desktop/dd374096%28v=vs.85%29.aspx
---
dlls/usp10/opentype.c | 32 ++++++++++++++++----------------
dlls/usp10/shape.c | 36 ++++++++++++++++++------------------
dlls/usp10/usp10.c | 26 +++++++++++++-------------
3 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c
index 166d823..5b3bdc7 100644
--- a/dlls/usp10/opentype.c
+++ b/dlls/usp10/opentype.c
@@ -645,34 +645,34 @@ void OpenType_GDEF_UpdateGlyphProps(ScriptCache *psc, const WORD *pwGlyphs, cons
{
case 0:
case BaseGlyph:
- pGlyphProp[i].sva.fClusterStart = 1;
- pGlyphProp[i].sva.fDiacritic = 0;
- pGlyphProp[i].sva.fZeroWidth = 0;
+ pGlyphProp[i].sva.fClusterStart = TRUE;
+ pGlyphProp[i].sva.fDiacritic = FALSE;
+ pGlyphProp[i].sva.fZeroWidth = FALSE;
break;
case LigatureGlyph:
- pGlyphProp[i].sva.fClusterStart = 1;
- pGlyphProp[i].sva.fDiacritic = 0;
- pGlyphProp[i].sva.fZeroWidth = 0;
+ pGlyphProp[i].sva.fClusterStart = TRUE;
+ pGlyphProp[i].sva.fDiacritic = FALSE;
+ pGlyphProp[i].sva.fZeroWidth = FALSE;
break;
case MarkGlyph:
- pGlyphProp[i].sva.fClusterStart = 0;
- pGlyphProp[i].sva.fDiacritic = 1;
- pGlyphProp[i].sva.fZeroWidth = 1;
+ pGlyphProp[i].sva.fClusterStart = FALSE;
+ pGlyphProp[i].sva.fDiacritic = TRUE;
+ pGlyphProp[i].sva.fZeroWidth = TRUE;
break;
case ComponentGlyph:
- pGlyphProp[i].sva.fClusterStart = 0;
- pGlyphProp[i].sva.fDiacritic = 0;
- pGlyphProp[i].sva.fZeroWidth = 0;
+ pGlyphProp[i].sva.fClusterStart = FALSE;
+ pGlyphProp[i].sva.fDiacritic = FALSE;
+ pGlyphProp[i].sva.fZeroWidth = FALSE;
break;
default:
ERR("Unknown glyph class %i\n",class);
- pGlyphProp[i].sva.fClusterStart = 1;
- pGlyphProp[i].sva.fDiacritic = 0;
- pGlyphProp[i].sva.fZeroWidth = 0;
+ pGlyphProp[i].sva.fClusterStart = TRUE;
+ pGlyphProp[i].sva.fDiacritic = FALSE;
+ pGlyphProp[i].sva.fZeroWidth = FALSE;
}
if (char_count == 0)
- pGlyphProp[i].sva.fClusterStart = 0;
+ pGlyphProp[i].sva.fClusterStart = FALSE;
}
}
diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c
index 91637d1..7389495 100644
--- a/dlls/usp10/shape.c
+++ b/dlls/usp10/shape.c
@@ -2841,7 +2841,7 @@ static void ShapeCharGlyphProp_Default( ScriptCache* psc, SCRIPT_ANALYSIS* psa,
if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */
{
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_BLANK;
- pCharProp[char_index[0]].fCanGlyphAlone = 1;
+ pCharProp[char_index[0]].fCanGlyphAlone = TRUE;
}
else
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER;
@@ -2867,14 +2867,14 @@ static void ShapeCharGlyphProp_Control( HDC hdc, ScriptCache *psc, SCRIPT_ANALYS
int i;
for (i = 0; i < cGlyphs; i++)
{
- pGlyphProp[i].sva.fClusterStart = 1;
- pGlyphProp[i].sva.fDiacritic = 0;
+ pGlyphProp[i].sva.fClusterStart = TRUE;
+ pGlyphProp[i].sva.fDiacritic = FALSE;
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_BLANK;
if (pwGlyphs[i] == psc->sfp.wgDefault)
- pGlyphProp[i].sva.fZeroWidth = 0;
+ pGlyphProp[i].sva.fZeroWidth = FALSE;
else
- pGlyphProp[i].sva.fZeroWidth = 1;
+ pGlyphProp[i].sva.fZeroWidth = TRUE;
}
}
@@ -2937,7 +2937,7 @@ static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI
if (pwcChars[char_index[0]] == 0x0020) /* space */
{
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_ARABIC_BLANK;
- pCharProp[char_index[0]].fCanGlyphAlone = 1;
+ pCharProp[char_index[0]].fCanGlyphAlone = TRUE;
}
else if (pwcChars[char_index[0]] == 0x0640) /* kashida */
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_ARABIC_KASHIDA;
@@ -3010,7 +3010,7 @@ static void ShapeCharGlyphProp_Hebrew( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSI
{
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER;
if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */
- pCharProp[char_index[0]].fCanGlyphAlone = 1;
+ pCharProp[char_index[0]].fCanGlyphAlone = TRUE;
}
}
@@ -3059,11 +3059,11 @@ static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS
continue;
if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */
- pCharProp[char_index[0]].fCanGlyphAlone = 1;
+ pCharProp[char_index[0]].fCanGlyphAlone = TRUE;
/* handle Thai SARA AM (U+0E33) differently than GDEF */
if (char_count == 1 && pwcChars[char_index[0]] == 0x0e33)
- pGlyphProp[i].sva.fClusterStart = 0;
+ pGlyphProp[i].sva.fClusterStart = FALSE;
}
UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp);
@@ -3098,7 +3098,7 @@ static void ShapeCharGlyphProp_None( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS*
if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */
{
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER;
- pCharProp[char_index[0]].fCanGlyphAlone = 1;
+ pCharProp[char_index[0]].fCanGlyphAlone = TRUE;
}
else
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE;
@@ -3129,7 +3129,7 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS
if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */
{
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_BLANK;
- pCharProp[char_index[0]].fCanGlyphAlone = 1;
+ pCharProp[char_index[0]].fCanGlyphAlone = TRUE;
}
else
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE;
@@ -3142,8 +3142,8 @@ static void ShapeCharGlyphProp_Tibet( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS
{
if (!pGlyphProp[i].sva.fClusterStart)
{
- pGlyphProp[i].sva.fDiacritic = 0;
- pGlyphProp[i].sva.fZeroWidth = 0;
+ pGlyphProp[i].sva.fDiacritic = FALSE;
+ pGlyphProp[i].sva.fZeroWidth = FALSE;
}
}
}
@@ -3181,12 +3181,12 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL
if (char_count ==1 && pwcChars[char_index[0]] == 0x0020) /* space */
{
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_BLANK;
- pCharProp[char_index[0]].fCanGlyphAlone = 1;
+ pCharProp[char_index[0]].fCanGlyphAlone = TRUE;
}
else
pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE;
- pGlyphProp[i].sva.fClusterStart = 0;
+ pGlyphProp[i].sva.fClusterStart = FALSE;
for (k = 0; k < char_count && !pGlyphProp[i].sva.fClusterStart; k++)
switch (lexical(pwcChars[char_index[k]]))
{
@@ -3201,12 +3201,12 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL
case lex_ZWNJ:
/* check for dangling joiners */
if (pwcChars[char_index[k]-1] == 0x0020 || pwcChars[char_index[k]+1] == 0x0020)
- pGlyphProp[i].sva.fClusterStart = 1;
+ pGlyphProp[i].sva.fClusterStart = TRUE;
else
k = char_count;
break;
default:
- pGlyphProp[i].sva.fClusterStart = 1;
+ pGlyphProp[i].sva.fClusterStart = TRUE;
break;
}
}
@@ -3227,7 +3227,7 @@ static void ShapeCharGlyphProp_BaseIndic( HDC hdc, ScriptCache *psc, SCRIPT_ANAL
{
if (pwLogClust[j] != g)
{
- pGlyphProp[pwLogClust[j]].sva.fClusterStart = 0;
+ pGlyphProp[pwLogClust[j]].sva.fClusterStart = FALSE;
pwLogClust[j] = g;
}
}
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index 94785b2..3866b07 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -1209,8 +1209,8 @@ HRESULT WINAPI ScriptApplyDigitSubstitution(const SCRIPT_DIGITSUBSTITUTE *sds,
}
sc->uDefaultLanguage = LANG_ENGLISH;
- sc->fContextDigits = 0;
- ss->fDigitSubstitute = 0;
+ sc->fContextDigits = FALSE;
+ ss->fDigitSubstitute = FALSE;
switch (sds->DigitSubstitute) {
case SCRIPT_DIGITSUBSTITUTE_CONTEXT:
@@ -1277,7 +1277,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
WORD baselevel = 0;
BOOL new_run;
WORD last_indic = -1;
- WORD layoutRTL = 0;
+ BOOL layoutRTL = FALSE;
BOOL forceLevels = FALSE;
INT consumed = 0;
@@ -1507,16 +1507,16 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
if (levels)
{
if (strength[cnt] == BIDI_STRONG)
- layoutRTL = (odd(levels[cnt]))?1:0;
+ layoutRTL = odd(levels[cnt]);
else
- layoutRTL = (psState->uBidiLevel || odd(levels[cnt]))?1:0;
+ layoutRTL = psState->uBidiLevel || odd(levels[cnt]);
pItems[index].a.fRTL = odd(levels[cnt]);
pItems[index].a.fLayoutRTL = layoutRTL;
pItems[index].a.s.uBidiLevel = levels[cnt];
}
else if (!pItems[index].a.s.uBidiLevel)
{
- layoutRTL = (odd(baselevel))?1:0;
+ layoutRTL = odd(baselevel);
pItems[index].a.s.uBidiLevel = baselevel;
pItems[index].a.fLayoutRTL = odd(baselevel);
pItems[index].a.fRTL = odd(baselevel);
@@ -1570,7 +1570,7 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
if (!new_run && strength && str == BIDI_STRONG)
{
- layoutRTL = odd(levels[cnt])?1:0;
+ layoutRTL = odd(levels[cnt]);
pItems[index].a.fLayoutRTL = layoutRTL;
}
@@ -1594,9 +1594,9 @@ static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars,
if (levels)
{
if (levels[cnt] == 0)
- layoutRTL = 0;
+ layoutRTL = FALSE;
else
- layoutRTL = (layoutRTL || odd(levels[cnt]))?1:0;
+ layoutRTL = layoutRTL || odd(levels[cnt]);
pItems[index].a.fRTL = odd(levels[cnt]);
pItems[index].a.fLayoutRTL = layoutRTL;
pItems[index].a.s.uBidiLevel = levels[cnt];
@@ -2884,14 +2884,14 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc,
if (rtl) idx = cChars - 1 - i;
/* FIXME: set to better values */
pOutGlyphProps[i].sva.uJustification = (pwcChars[idx] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER;
- pOutGlyphProps[i].sva.fClusterStart = 1;
- pOutGlyphProps[i].sva.fDiacritic = 0;
- pOutGlyphProps[i].sva.fZeroWidth = 0;
+ pOutGlyphProps[i].sva.fClusterStart = TRUE;
+ pOutGlyphProps[i].sva.fDiacritic = FALSE;
+ pOutGlyphProps[i].sva.fZeroWidth = FALSE;
pOutGlyphProps[i].sva.fReserved = 0;
pOutGlyphProps[i].sva.fShapeReserved = 0;
/* FIXME: have the shaping engine set this */
- pCharProps[i].fCanGlyphAlone = 0;
+ pCharProps[i].fCanGlyphAlone = FALSE;
pwLogClust[i] = idx;
}
--
1.9.0
More information about the wine-patches
mailing list