Author: tkreuzer
Date: Thu Jan 22 21:03:46 2015
New Revision: 66075
URL:
http://svn.reactos.org/svn/reactos?rev=66075&view=rev
Log:
[WIN32K]
Fix broken ASSERTs
CORE-8938 #resolve
Modified:
trunk/reactos/win32ss/gdi/ntgdi/dclife.c
trunk/reactos/win32ss/gdi/ntgdi/region.c
Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Thu Jan 22 21:03:46 2015
@@ -459,7 +459,7 @@
DC_vUpdateDC(PDC pdc)
{
// PREGION VisRgn ;
- PPDEVOBJ ppdev = pdc->ppdev ;
+ PPDEVOBJ ppdev = pdc->ppdev;
pdc->dhpdev = ppdev->dhpdev;
Modified: trunk/reactos/win32ss/gdi/ntgdi/region.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/region.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/region.c [iso-8859-1] Thu Jan 22 21:03:46 2015
@@ -737,8 +737,8 @@
lpr = &rgnSrc->Buffer[i];
/* Make sure the source rect is not retarded */
- ASSERT(lpr->bottom > rect->top);
- ASSERT(lpr->right > rect->left);
+ ASSERT(lpr->bottom > lpr->top);
+ ASSERT(lpr->right > lpr->left);
/* We already checked above, this should hold true */
ASSERT(lpr->bottom > rect->top);
@@ -749,15 +749,15 @@
{
rpr = &rgnDst->Buffer[j];
- /* Crop the rect with the intersect rect and add offset */
+ /* Crop the rect with the intersect rect */
rpr->top = max(lpr->top, rect->top);
rpr->bottom = min(lpr->bottom, rect->bottom);
rpr->left = max(lpr->left, rect->left);
rpr->right = min(lpr->right, rect->right);
/* Make sure the resulting rect is not retarded */
- ASSERT(lpr->bottom > rect->top);
- ASSERT(lpr->right > rect->left);
+ ASSERT(rpr->bottom > rpr->top);
+ ASSERT(rpr->right > rpr->left);
/* Track new bounds */
if (rpr->left < left) left = rpr->left;