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

[NTGDI:FREETYPE] Account for spaces in x-dimension of IntExtTextOutW function (#7274)

Browse source 
@I_Kill_Bugs fix

CORE-11787, CORE-17721 and CORE-19721

For function IntExtTextOutW with space character, the x-dimension should be taken into account.
Fixes HexEdit 1.2.1 right side of display window not being cleared.

Account for x-dimension if TA_UPDATECP flag set and 'String' is not NULL.

Clarify 'etx' is ASCII End of Text
This commit is contained in:
Doug Lyons 2024-09-01 13:18:23 -05:00 committed by GitHub
parent b6ae42492b
commit a1bff5b94e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
win32ss/gdi/ntgdi/freetype.c
View file

@ -6795,8 +6795,9 @@ IntExtTextOutW(
FONT_CACHE_ENTRY Cache; FONT_CACHE_ENTRY Cache;
FT_Matrix mat; FT_Matrix mat;
BOOL bNoTransform; BOOL bNoTransform;
DWORD ch0, ch1; DWORD ch0, ch1, etx = 3; // etx is ASCII End of Text
FONTLINK_CHAIN Chain; FONTLINK_CHAIN Chain;
SIZE spaceWidth;
/* Check if String is valid */ /* Check if String is valid */
if (Count > 0xFFFF || (Count > 0 && String == NULL)) if (Count > 0xFFFF || (Count > 0 && String == NULL))
@ -7062,6 +7063,22 @@ IntExtTextOutW(
bitSize.cx = realglyph->bitmap.width; bitSize.cx = realglyph->bitmap.width;
bitSize.cy = realglyph->bitmap.rows; bitSize.cy = realglyph->bitmap.rows;
/* Do chars other than space and etx have a bitSize.cx of zero? */
if (ch0 != L' ' && ch0 != etx && bitSize.cx == 0)
DPRINT1("WARNING: WChar 0x%04x has a bitSize.cx of zero\n", ch0);
/* Don't ignore spaces when computing offset.
* This completes the fix of CORE-11787. */
if ((pdcattr->flTextAlign & TA_UPDATECP) && ch0 == L' ' && bitSize.cx == 0)
{
IntUnLockFreeType();
/* Get the width of the space character */
TextIntGetTextExtentPoint(dc, TextObj, L" ", 1, 0, NULL, 0, &spaceWidth, 0);
IntLockFreeType();
bitSize.cx = spaceWidth.cx;
realglyph->left = 0;
}
MaskRect.right = realglyph->bitmap.width; MaskRect.right = realglyph->bitmap.width;
MaskRect.bottom = realglyph->bitmap.rows; MaskRect.bottom = realglyph->bitmap.rows;
@ -7166,8 +7183,8 @@ IntExtTextOutW(
previous = glyph_index; previous = glyph_index;
} }
/* Don't update position if String == NULL. Fixes CORE-19721. */
if (pdcattr->flTextAlign & TA_UPDATECP) if ((pdcattr->flTextAlign & TA_UPDATECP) && String)
pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x; pdcattr->ptlCurrent.x = DestRect.right - dc->ptlDCOrig.x;
if (plf->lfUnderline || plf->lfStrikeOut) /* Underline or strike-out? */ if (plf->lfUnderline || plf->lfStrikeOut) /* Underline or strike-out? */