Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-27 09:00:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- add support for ETO_GLYPH_INDEX in NtGdiExtTextOut.

Browse source 
(fixes character shift problem in QT apps) see bug #975

svn path=/trunk/; revision=26839
This commit is contained in:
Sebastian Gasiorek 2007-05-19 13:55:23 +00:00
parent 9341afafbf
commit d6c16357c0
1 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
reactos/subsystems/win32/win32k/objects/text.c
View file

@ -1863,7 +1863,11 @@ NtGdiExtTextOut(
for (i = Start; i < Count; i++) for (i = Start; i < Count; i++)
{ {
glyph_index = FT_Get_Char_Index(face, *TempText); if (fuOptions & ETO_GLYPH_INDEX)
glyph_index = *TempText;
else
glyph_index = FT_Get_Char_Index(face, *TempText);
if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index,
TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)))
{ {
@ -1913,21 +1917,28 @@ NtGdiExtTextOut(
for (i = 0; i < Count; i++) for (i = 0; i < Count; i++)
{ {
glyph_index = FT_Get_Char_Index(face, *String); if (fuOptions & ETO_GLYPH_INDEX)
glyph_index = *String;
else
glyph_index = FT_Get_Char_Index(face, *String);
if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index, if (!(realglyph = NtGdiGlyphCacheGet(face, glyph_index,
TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight))) TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)))
{ {
error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
if (error) if (error)
{ {
DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index); DPRINT1("WARNING: Failed to load and render glyph! [index: %u]\n", glyph_index);
IntUnLockFreeType; IntUnLockFreeType;
goto fail; goto fail;
} }
glyph = face->glyph; glyph = face->glyph;
realglyph = NtGdiGlyphCacheSet(face, glyph_index, realglyph = NtGdiGlyphCacheSet(face,
TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight, glyph, RenderMode); glyph_index,
TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight,
glyph,
RenderMode);
} }
// DbgPrint("realglyph: %x\n", realglyph); // DbgPrint("realglyph: %x\n", realglyph);
// DbgPrint("TextLeft: %d\n", TextLeft); // DbgPrint("TextLeft: %d\n", TextLeft);