Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Broaden the lock over the whole text rendering loop. Solves text corruption.

Browse source 
svn path=/trunk/; revision=19849
This commit is contained in:
Art Yerkes 2005-12-04 08:09:18 +00:00
parent f68caa66a7
commit 1cdc4a44ed
1 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/subsys/win32k/objects/text.c
View file

@ -1631,6 +1631,7 @@ NtGdiExtTextOut(
FontGDI = ObjToGDI(FontObj, FONT); FontGDI = ObjToGDI(FontObj, FONT);
ASSERT(FontGDI); ASSERT(FontGDI);
IntLockFreeType;
face = FontGDI->face; face = FontGDI->face;
if (face->charmap == NULL) if (face->charmap == NULL)
{ {
@ -1651,10 +1652,8 @@ NtGdiExtTextOut(
{ {
DPRINT1("WARNING: Could not find desired charmap!\n"); DPRINT1("WARNING: Could not find desired charmap!\n");
} }
IntLockFreeType;
error = FT_Set_Charmap(face, found); error = FT_Set_Charmap(face, found);
IntUnLockFreeType; if (error)
if (error)
{ {
DPRINT1("WARNING: Could not set the charmap!\n"); DPRINT1("WARNING: Could not set the charmap!\n");
} }
@ -1666,7 +1665,6 @@ NtGdiExtTextOut(
else else
RenderMode = FT_RENDER_MODE_MONO; RenderMode = FT_RENDER_MODE_MONO;
IntLockFreeType;
error = FT_Set_Pixel_Sizes( error = FT_Set_Pixel_Sizes(
face, face,
TextObj->logfont.lfWidth, TextObj->logfont.lfWidth,
@ -1674,10 +1672,10 @@ NtGdiExtTextOut(
(TextObj->logfont.lfHeight < 0 ? (TextObj->logfont.lfHeight < 0 ?
- TextObj->logfont.lfHeight : - TextObj->logfont.lfHeight :
TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight)); TextObj->logfont.lfHeight == 0 ? 11 : TextObj->logfont.lfHeight));
IntUnLockFreeType;
if (error) if (error)
{ {
DPRINT1("Error in setting pixel sizes: %u\n", error); DPRINT1("Error in setting pixel sizes: %u\n", error);
IntUnLockFreeType;
goto fail; goto fail;
} }
@ -1722,10 +1720,8 @@ NtGdiExtTextOut(
for (i = Start; i < Count; i++) for (i = Start; i < Count; i++)
{ {
IntLockFreeType;
glyph_index = FT_Get_Char_Index(face, *TempText); glyph_index = FT_Get_Char_Index(face, *TempText);
error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
IntUnLockFreeType;
if (error) if (error)
{ {
@ -1738,9 +1734,7 @@ NtGdiExtTextOut(
if (use_kerning && previous && glyph_index) if (use_kerning && previous && glyph_index)
{ {
FT_Vector delta; FT_Vector delta;
IntLockFreeType;
FT_Get_Kerning(face, previous, glyph_index, 0, &delta); FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
IntUnLockFreeType;
TextWidth += delta.x; TextWidth += delta.x;
} }
@ -1772,14 +1766,13 @@ NtGdiExtTextOut(
for (i = 0; i < Count; i++) for (i = 0; i < Count; i++)
{ {
IntLockFreeType;
glyph_index = FT_Get_Char_Index(face, *String); glyph_index = FT_Get_Char_Index(face, *String);
error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT); error = FT_Load_Glyph(face, glyph_index, FT_LOAD_DEFAULT);
IntUnLockFreeType;
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;
goto fail; goto fail;
} }
@ -1789,17 +1782,13 @@ NtGdiExtTextOut(
if (use_kerning && previous && glyph_index && NULL == Dx) if (use_kerning && previous && glyph_index && NULL == Dx)
{ {
FT_Vector delta; FT_Vector delta;
IntLockFreeType;
FT_Get_Kerning(face, previous, glyph_index, 0, &delta); FT_Get_Kerning(face, previous, glyph_index, 0, &delta);
IntUnLockFreeType;
TextLeft += delta.x; TextLeft += delta.x;
} }
if (glyph->format == ft_glyph_format_outline) if (glyph->format == ft_glyph_format_outline)
{ {
IntLockFreeType;
error = FT_Render_Glyph(glyph, RenderMode); error = FT_Render_Glyph(glyph, RenderMode);
IntUnLockFreeType;
if (error) if (error)
{ {
DPRINT1("WARNING: Failed to render glyph!\n"); DPRINT1("WARNING: Failed to render glyph!\n");
@ -1856,6 +1845,7 @@ NtGdiExtTextOut(
if ( !HSourceGlyph ) if ( !HSourceGlyph )
{ {
DPRINT1("WARNING: EngLockSurface() failed!\n"); DPRINT1("WARNING: EngLockSurface() failed!\n");
IntUnLockFreeType;
goto fail; goto fail;
} }
SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph); SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph);
@ -1863,6 +1853,7 @@ NtGdiExtTextOut(
{ {
EngDeleteSurface((HSURF)HSourceGlyph); EngDeleteSurface((HSURF)HSourceGlyph);
DPRINT1("WARNING: EngLockSurface() failed!\n"); DPRINT1("WARNING: EngLockSurface() failed!\n");
IntUnLockFreeType;
goto fail; goto fail;
} }
@ -1915,6 +1906,8 @@ NtGdiExtTextOut(
String++; String++;
} }
IntUnLockFreeType;
EngDeleteXlate(XlateObj); EngDeleteXlate(XlateObj);
EngDeleteXlate(XlateObj2); EngDeleteXlate(XlateObj2);
BITMAPOBJ_UnlockBitmap(BitmapObj); BITMAPOBJ_UnlockBitmap(BitmapObj);