[0.4.13][WIN32SS] Fix Opaque Text Fade while in Desktop Startup

This fixes CORE-16498, which got considerably more severe by
0.4.13-dev-209-g
dc7f4f682f

Thanks to the patches author Jim Tabor.
I merged manually analog 0.4.14-dev-594-g
5214a38fd0
This commit is contained in:
Joachim Henze 2019-12-10 00:04:19 +01:00
parent 056aed0216
commit aa2b39c872
3 changed files with 2 additions and 6 deletions

View file

@ -64,7 +64,6 @@ FASTCALL
DeleteRegion(
_In_ HRGN hrgn)
{
#if 0
PRGN_ATTR Rgn_Attr = GdiGetRgnAttr(hrgn);
if ( Rgn_Attr )
@ -78,7 +77,6 @@ DeleteRegion(
return TRUE;
}
}
#endif
return NtGdiDeleteObjectApp(hrgn);
}

View file

@ -949,9 +949,6 @@ BOOL
APIENTRY
NtGdiDeleteObjectApp(HANDLE hobj)
{
/* Complete all pending operations */
//NtGdiFlushUserBatch(); // FIXME: We shouldn't need this
if (GDI_HANDLE_IS_STOCKOBJ(hobj)) return TRUE;
if (GreGetObjectOwner(hobj) != GDI_OBJ_HMGR_POWNED)

View file

@ -1374,7 +1374,8 @@ INT WINAPI DrawTextExWorker( HDC hdc,
#ifndef _WIN32K_
if (!(flags & DT_NOCLIP) )
{
SelectClipRgn(hdc, hrgn);
SelectClipRgn(hdc, hrgn); // This should be NtGdiExtSelectClipRgn, but due to ReactOS build rules this option is next:
GdiFlush(); // Flush the batch and level up! See CORE-16498.
if (hrgn)
{
DeleteObject(hrgn);