Module: wine Branch: master Commit: 9f5389de150c1be3f2d0cb1e9af567b8f9ef2eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f5389de150c1be3f2d0cb1e9a...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Fri Jun 10 00:44:38 2016 +0200
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
---
dlls/usp10/tests/usp10.c | 3 ++- dlls/usp10/usp10.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 0014b1c..d68b515 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1696,7 +1696,8 @@ static void test_ScriptShape(HDC hdc) for (i = 0; i < 2; i++) { 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; LOGFONTA lf;
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 07c2175..7038e8c 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3177,8 +3177,7 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, pwOutGlyphs[i] = pwcChars[idx];
/* overwrite some basic control glyphs to blank */ - if (psa && !psa->fNoGlyphIndex && psa->eScript == Script_Control && - pwcChars[idx] < ((ScriptCache *)*psc)->tm.tmFirstChar) + if (psa && !psa->fNoGlyphIndex && psa->eScript == Script_Control) { if (pwcChars[idx] == 0x0009 || pwcChars[idx] == 0x000A || pwcChars[idx] == 0x000D || pwcChars[idx] >= 0x001C)