https://git.reactos.org/?p=reactos.git;a=commitdiff;h=476f94c0fe35700c5932ba...
commit 476f94c0fe35700c5932ba9764ef71f0dc66000a Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Thu Nov 24 12:28:10 2022 +0900 Commit: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com CommitDate: Thu Nov 24 12:28:10 2022 +0900
[NTGDI][FREETYPE] Formatting code; Follow up #4865 (a620c6f)
CORE-11848 --- win32ss/gdi/ntgdi/freetype.c | 70 +++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 36 deletions(-)
diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 3f1b63d0d62..f8508852025 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -5992,7 +5992,7 @@ IntExtTextOutW( FT_Vector delta;
/* Check if String is valid */ - if ((Count > 0xFFFF) || (Count > 0 && String == NULL)) + if (Count > 0xFFFF || (Count > 0 && String == NULL)) { EngSetLastError(ERROR_INVALID_PARAMETER); return FALSE; @@ -6000,15 +6000,12 @@ IntExtTextOutW(
if (PATH_IsPathOpen(dc->dclevel)) { - bResult = PATH_ExtTextOut(dc, - XStart, - YStart, - fuOptions, - (const RECTL *)lprc, - String, - Count, - (const INT *)Dx); - return bResult; + return PATH_ExtTextOut(dc, + XStart, YStart, + fuOptions, + lprc, + String, Count, + Dx); }
DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL); @@ -6030,7 +6027,9 @@ IntExtTextOutW( { Start.x = pdcattr->ptlCurrent.x; Start.y = pdcattr->ptlCurrent.y; - } else { + } + else + { Start.x = XStart; Start.y = YStart; } @@ -6060,7 +6059,7 @@ IntExtTextOutW(
if (dc->fs & (DC_ACCUM_APP|DC_ACCUM_WMGR)) { - IntUpdateBoundsRect(dc, &DestRect); + IntUpdateBoundsRect(dc, &DestRect); }
if (pdcattr->ulDirty_ & DIRTY_BACKGROUND) @@ -6069,18 +6068,17 @@ IntExtTextOutW( if (dc->dctype == DCTYPE_DIRECT) MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom);
- IntEngBitBlt( - SurfObj, - NULL, - NULL, - (CLIPOBJ *)&dc->co, - NULL, - &DestRect, - &SourcePoint, - &SourcePoint, - &dc->eboBackground.BrushObject, - &BrushOrigin, - ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY)); + IntEngBitBlt(SurfObj, + NULL, + NULL, + (CLIPOBJ *)&dc->co, + NULL, + &DestRect, + &SourcePoint, + &SourcePoint, + &dc->eboBackground.BrushObject, + &BrushOrigin, + ROP4_FROM_INDEX(R3_OPINDEX_PATCOPY));
if (dc->dctype == DCTYPE_DIRECT) MouseSafetyOnDrawEnd(dc->ppdev); @@ -6281,7 +6279,7 @@ IntExtTextOutW( HSourceGlyph = EngCreateBitmap(bitSize, realglyph->bitmap.pitch, BMF_8BPP, BMF_TOPDOWN, realglyph->bitmap.buffer); - if ( !HSourceGlyph ) + if (!HSourceGlyph) { DPRINT1("WARNING: EngCreateBitmap() failed!\n"); bResult = FALSE; @@ -6289,8 +6287,9 @@ IntExtTextOutW( FT_Done_Glyph((FT_Glyph)realglyph); break; } + SourceGlyphSurf = EngLockSurface((HSURF)HSourceGlyph); - if ( !SourceGlyphSurf ) + if (!SourceGlyphSurf) { EngDeleteSurface((HSURF)HSourceGlyph); DPRINT1("WARNING: EngLockSurface() failed!\n"); @@ -6324,16 +6323,15 @@ IntExtTextOutW( if (dc->dctype == DCTYPE_DIRECT) MouseSafetyOnDrawStart(dc->ppdev, DestRect.left, DestRect.top, DestRect.right, DestRect.bottom);
- if (!IntEngMaskBlt( - SurfObj, - SourceGlyphSurf, - (CLIPOBJ *)&dc->co, - &exloRGB2Dst.xlo, - &exloDst2RGB.xlo, - &DestRect, - (PPOINTL)&MaskRect, - &dc->eboText.BrushObject, - &BrushOrigin)) + if (!IntEngMaskBlt(SurfObj, + SourceGlyphSurf, + (CLIPOBJ *)&dc->co, + &exloRGB2Dst.xlo, + &exloDst2RGB.xlo, + &DestRect, + (PPOINTL)&MaskRect, + &dc->eboText.BrushObject, + &BrushOrigin)) { DPRINT1("Failed to MaskBlt a glyph!\n"); }
-
Katayama Hirofumi MZ