Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 08:03:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.11][WIN32SS:NTGDI] Fix missing text in labels and buttons for .NET apps.

Browse source 
Fixes CORE-15000 "Totally Broken/messed up text in many .NET applications"
and its duplicates
CORE-14679 "Missing fonts in Reg Organizer 8.16"
CORE-15398 "Messed fonts in Microsoft SQL Server 2005 Express Edition"
CORE-15611 "Word 2003: Organization Chart has corrupted display"

There was a missing break statement in ftGdiGetGlyphOutline().
Found by JIRA contributor 'I_Kill_Bugs' :-)

Add also brackets around 'case's to make code navigation easier.

Fix picked from 0.4.12-dev-865-g
0e56ec8892
This commit is contained in:
Joachim Henze 2020-11-03 14:19:08 +01:00
parent 6bdb308df1
commit b854314683
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3775,6 +3775,7 @@ ftGdiGetGlyphOutline(
switch (iFormat) switch (iFormat)
{ {
case GGO_BITMAP: case GGO_BITMAP:
{
width = gm.gmBlackBoxX; width = gm.gmBlackBoxX;
height = gm.gmBlackBoxY; height = gm.gmBlackBoxY;
pitch = ((width + 31) >> 5) << 2; pitch = ((width + 31) >> 5) << 2;
@ -3802,6 +3803,7 @@ ftGdiGetGlyphOutline(
} }
case ft_glyph_format_outline: case ft_glyph_format_outline:
{
ft_bitmap.width = width; ft_bitmap.width = width;
ft_bitmap.rows = height; ft_bitmap.rows = height;
ft_bitmap.pitch = pitch; ft_bitmap.pitch = pitch;
@ -3819,12 +3821,15 @@ ftGdiGetGlyphOutline(
FT_Outline_Get_Bitmap(g_FreeTypeLibrary, &ft_face->glyph->outline, &ft_bitmap); FT_Outline_Get_Bitmap(g_FreeTypeLibrary, &ft_face->glyph->outline, &ft_bitmap);
IntUnLockFreeType(); IntUnLockFreeType();
break; break;
}
default: default:
DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format); DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format);
return GDI_ERROR; return GDI_ERROR;
} }
break; break;
}
case GGO_GRAY2_BITMAP: case GGO_GRAY2_BITMAP:
case GGO_GRAY4_BITMAP: case GGO_GRAY4_BITMAP:
@ -3910,6 +3915,8 @@ ftGdiGetGlyphOutline(
DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format); DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format);
return GDI_ERROR; return GDI_ERROR;
} }
break;
} }
case GGO_NATIVE: case GGO_NATIVE:
@ -3937,6 +3944,7 @@ ftGdiGetGlyphOutline(
IntUnLockFreeType(); IntUnLockFreeType();
break; break;
} }
case GGO_BEZIER: case GGO_BEZIER:
{ {
FT_Outline *outline = &ft_face->glyph->outline; FT_Outline *outline = &ft_face->glyph->outline;