Author: akhaldi Date: Sun Sep 29 14:33:09 2013 New Revision: 60448
URL: http://svn.reactos.org/svn/reactos?rev=60448&view=rev Log: [WIN32K] * Improve sanity checking in IntEngAlphaBlend(). Brought to you by Huw Campbell (huw .dot. campbell @at@ gmail .dot. com) CORE-7458 #resolve #comment Committed in r60448. Thanks ;)
Modified: trunk/reactos/win32ss/gdi/eng/alphablend.c
Modified: trunk/reactos/win32ss/gdi/eng/alphablend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/eng/alphablend.... ============================================================================== --- trunk/reactos/win32ss/gdi/eng/alphablend.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/eng/alphablend.c [iso-8859-1] Sun Sep 29 14:33:09 2013 @@ -118,7 +118,7 @@ OutputRect.top += Translate.y; OutputRect.bottom += Translate.y;
- ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom); + ASSERT(InputRect.left <= InputRect.right && InputRect.top <= InputRect.bottom);
Ret = FALSE; ClippingType = (ClipRegion == NULL) ? DC_TRIVIAL : ClipRegion->iDComplexity; @@ -141,7 +141,6 @@ Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); - ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom);
/* Aplha blend one rect */ Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend( @@ -170,7 +169,6 @@ Rect.right = InputRect.right + (CombinedRect.right - OutputRect.right) * (InputRect.right - InputRect.left) / (OutputRect.right - OutputRect.left); Rect.top = InputRect.top + (CombinedRect.top - OutputRect.top) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); Rect.bottom = InputRect.bottom + (CombinedRect.bottom - OutputRect.bottom) * (InputRect.bottom - InputRect.top) / (OutputRect.bottom - OutputRect.top); - ASSERT(InputRect.left < InputRect.right && InputRect.top < InputRect.bottom);
/* Alpha blend one rect */ Ret = DibFunctionsForBitmapFormat[OutputObj->iBitmapFormat].DIB_AlphaBlend(