usp10: Replace more control characters with blanks.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2016-06-10 00:44:38 +02:00 committed by Alexandre Julliard
parent 68830f12e7
commit 9f5389de15
2 changed files with 3 additions and 3 deletions

View File

@ -1696,7 +1696,8 @@ static void test_ScriptShape(HDC hdc)
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
static const WCHAR space[] = {' ', 0}; static const WCHAR space[] = {' ', 0};
static const WCHAR blanks[] = {'\t', '\r', '\n', 0x001C, 0x001D, 0x001E, 0x001F,0}; static const WCHAR blanks[] = {'\t', '\r', '\n', 0x001c, 0x001d, 0x001e, 0x001f, 0x200e, 0x200f, /* LRM, RLM */
0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0}; /* LRE, RLE, PDF, LRO, RLO */
HFONT font, oldfont = NULL; HFONT font, oldfont = NULL;
LOGFONTA lf; LOGFONTA lf;

View File

@ -3177,8 +3177,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc,
pwOutGlyphs[i] = pwcChars[idx]; pwOutGlyphs[i] = pwcChars[idx];
/* overwrite some basic control glyphs to blank */ /* overwrite some basic control glyphs to blank */
if (psa && !psa->fNoGlyphIndex && psa->eScript == Script_Control && if (psa && !psa->fNoGlyphIndex && psa->eScript == Script_Control)
pwcChars[idx] < ((ScriptCache *)*psc)->tm.tmFirstChar)
{ {
if (pwcChars[idx] == 0x0009 || pwcChars[idx] == 0x000A || if (pwcChars[idx] == 0x0009 || pwcChars[idx] == 0x000A ||
pwcChars[idx] == 0x000D || pwcChars[idx] >= 0x001C) pwcChars[idx] == 0x000D || pwcChars[idx] >= 0x001C)