https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e56ec8892a737823b4b00...
commit 0e56ec8892a737823b4b008f02ae0261cbf0b64a Author: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org AuthorDate: Thu Mar 14 01:36:45 2019 +0100 Commit: Hermès Bélusca-Maïto hermes.belusca-maito@reactos.org CommitDate: Thu Mar 14 01:36:45 2019 +0100
[WIN32SS:NTGDI] Fix missing text in labels and buttons for .NET apps. CORE-15000
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. --- win32ss/gdi/ntgdi/freetype.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 7005057a07..5f9b2213ea 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -3693,6 +3693,7 @@ ftGdiGetGlyphOutline( switch (iFormat) { case GGO_BITMAP: + { width = gm.gmBlackBoxX; height = gm.gmBlackBoxY; pitch = ((width + 31) >> 5) << 2; @@ -3720,6 +3721,7 @@ ftGdiGetGlyphOutline( }
case ft_glyph_format_outline: + { ft_bitmap.width = width; ft_bitmap.rows = height; ft_bitmap.pitch = pitch; @@ -3737,12 +3739,15 @@ ftGdiGetGlyphOutline( FT_Outline_Get_Bitmap(g_FreeTypeLibrary, &ft_face->glyph->outline, &ft_bitmap); IntUnLockFreeType(); break; + }
default: DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format); return GDI_ERROR; } + break; + }
case GGO_GRAY2_BITMAP: case GGO_GRAY4_BITMAP: @@ -3828,6 +3833,8 @@ ftGdiGetGlyphOutline( DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format); return GDI_ERROR; } + + break; }
case GGO_NATIVE: @@ -3855,6 +3862,7 @@ ftGdiGetGlyphOutline( IntUnLockFreeType(); break; } + case GGO_BEZIER: { FT_Outline *outline = &ft_face->glyph->outline;