Author: khornicek Date: Fri Oct 31 00:21:03 2014 New Revision: 65131
URL: http://svn.reactos.org/svn/reactos?rev=65131&view=rev Log: [WIN32K] - check for an attached surface a bit earlier in GreExtTextOutW - fixes Foobar 2000 CORE-7425
Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c
Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype.... ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Fri Oct 31 00:21:03 2014 @@ -3365,6 +3365,11 @@ BrushOrigin.x = 0; BrushOrigin.y = 0;
+ psurf = dc->dclevel.pSurface ; + + if(!psurf) + psurf = psurfDefaultBitmap; + if ((fuOptions & ETO_OPAQUE) && lprc) { DestRect.left = lprc->left; @@ -3383,7 +3388,7 @@ DC_vUpdateBackgroundBrush(dc);
IntEngBitBlt( - &dc->dclevel.pSurface->SurfObj, + &psurf->SurfObj, NULL, NULL, &dc->co.ClipObj, @@ -3573,8 +3578,6 @@ /* Lock blit with a dummy rect */ DC_vPrepareDCsForBlit(dc, NULL, NULL, NULL);
- psurf = dc->dclevel.pSurface ; - if(!psurf) psurf = psurfDefaultBitmap; SurfObj = &psurf->SurfObj ;
EXLATEOBJ_vInitialize(&exloRGB2Dst, &gpalRGB, psurf->ppal, 0, 0, 0);