mirror of
https://github.com/reactos/reactos.git
synced 2024-07-02 02:34:53 +00:00
[USER32]
- Add missing NULL-pointer checkes in rect functions - Small coding-style fixes svn path=/trunk/; revision=72052
This commit is contained in:
parent
155818fc70
commit
dea009126c
|
@ -41,11 +41,12 @@ WINAPI
|
||||||
CopyRect(LPRECT lprcDst,
|
CopyRect(LPRECT lprcDst,
|
||||||
CONST RECT *lprcSrc)
|
CONST RECT *lprcSrc)
|
||||||
{
|
{
|
||||||
if(lprcDst == NULL || lprcSrc == NULL)
|
if (lprcDst == NULL || lprcSrc == NULL)
|
||||||
return(FALSE);
|
return FALSE;
|
||||||
|
|
||||||
*lprcDst = *lprcSrc;
|
*lprcDst = *lprcSrc;
|
||||||
return(TRUE);
|
|
||||||
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,11 +75,15 @@ InflateRect(LPRECT rect,
|
||||||
int dx,
|
int dx,
|
||||||
int dy)
|
int dy)
|
||||||
{
|
{
|
||||||
|
if (rect == NULL)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
rect->left -= dx;
|
rect->left -= dx;
|
||||||
rect->top -= dy;
|
rect->top -= dy;
|
||||||
rect->right += dx;
|
rect->right += dx;
|
||||||
rect->bottom += dy;
|
rect->bottom += dy;
|
||||||
return(TRUE);
|
|
||||||
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -91,6 +96,9 @@ IntersectRect(LPRECT lprcDst,
|
||||||
CONST RECT *lprcSrc1,
|
CONST RECT *lprcSrc1,
|
||||||
CONST RECT *lprcSrc2)
|
CONST RECT *lprcSrc2)
|
||||||
{
|
{
|
||||||
|
if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
if (IsRectEmpty(lprcSrc1) || IsRectEmpty(lprcSrc2) ||
|
if (IsRectEmpty(lprcSrc1) || IsRectEmpty(lprcSrc2) ||
|
||||||
lprcSrc1->left >= lprcSrc2->right ||
|
lprcSrc1->left >= lprcSrc2->right ||
|
||||||
lprcSrc2->left >= lprcSrc1->right ||
|
lprcSrc2->left >= lprcSrc1->right ||
|
||||||
|
@ -98,13 +106,15 @@ IntersectRect(LPRECT lprcDst,
|
||||||
lprcSrc2->top >= lprcSrc1->bottom)
|
lprcSrc2->top >= lprcSrc1->bottom)
|
||||||
{
|
{
|
||||||
SetRectEmpty(lprcDst);
|
SetRectEmpty(lprcDst);
|
||||||
return(FALSE);
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
lprcDst->left = max(lprcSrc1->left, lprcSrc2->left);
|
lprcDst->left = max(lprcSrc1->left, lprcSrc2->left);
|
||||||
lprcDst->right = min(lprcSrc1->right, lprcSrc2->right);
|
lprcDst->right = min(lprcSrc1->right, lprcSrc2->right);
|
||||||
lprcDst->top = max(lprcSrc1->top, lprcSrc2->top);
|
lprcDst->top = max(lprcSrc1->top, lprcSrc2->top);
|
||||||
lprcDst->bottom = min(lprcSrc1->bottom, lprcSrc2->bottom);
|
lprcDst->bottom = min(lprcSrc1->bottom, lprcSrc2->bottom);
|
||||||
return(TRUE);
|
|
||||||
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -115,7 +125,10 @@ BOOL
|
||||||
WINAPI
|
WINAPI
|
||||||
IsRectEmpty(CONST RECT *lprc)
|
IsRectEmpty(CONST RECT *lprc)
|
||||||
{
|
{
|
||||||
return((lprc->left >= lprc->right) || (lprc->top >= lprc->bottom));
|
if (lprc == NULL)
|
||||||
|
return TRUE;
|
||||||
|
|
||||||
|
return ((lprc->left >= lprc->right) || (lprc->top >= lprc->bottom));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -128,14 +141,15 @@ OffsetRect(LPRECT rect,
|
||||||
int dx,
|
int dx,
|
||||||
int dy)
|
int dy)
|
||||||
{
|
{
|
||||||
if(rect == NULL)
|
if (rect == NULL)
|
||||||
return(FALSE);
|
return FALSE;
|
||||||
|
|
||||||
rect->left += dx;
|
rect->left += dx;
|
||||||
rect->top += dy;
|
rect->top += dy;
|
||||||
rect->right += dx;
|
rect->right += dx;
|
||||||
rect->bottom += dy;
|
rect->bottom += dy;
|
||||||
return(TRUE);
|
|
||||||
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -147,6 +161,9 @@ WINAPI
|
||||||
PtInRect(CONST RECT *lprc,
|
PtInRect(CONST RECT *lprc,
|
||||||
POINT pt)
|
POINT pt)
|
||||||
{
|
{
|
||||||
|
if (lprc == NULL)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
return((pt.x >= lprc->left) && (pt.x < lprc->right) &&
|
return((pt.x >= lprc->left) && (pt.x < lprc->right) &&
|
||||||
(pt.y >= lprc->top) && (pt.y < lprc->bottom));
|
(pt.y >= lprc->top) && (pt.y < lprc->bottom));
|
||||||
}
|
}
|
||||||
|
@ -159,7 +176,7 @@ SetRect(LPRECT lprc,
|
||||||
int xRight,
|
int xRight,
|
||||||
int yBottom)
|
int yBottom)
|
||||||
{
|
{
|
||||||
if (!lprc)
|
if (lprc == NULL)
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
||||||
lprc->left = xLeft;
|
lprc->left = xLeft;
|
||||||
|
@ -178,8 +195,12 @@ BOOL
|
||||||
WINAPI
|
WINAPI
|
||||||
SetRectEmpty(LPRECT lprc)
|
SetRectEmpty(LPRECT lprc)
|
||||||
{
|
{
|
||||||
|
if (lprc == NULL)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
lprc->left = lprc->right = lprc->top = lprc->bottom = 0;
|
lprc->left = lprc->right = lprc->top = lprc->bottom = 0;
|
||||||
return(TRUE);
|
|
||||||
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -194,13 +215,13 @@ SubtractRect(LPRECT lprcDst,
|
||||||
{
|
{
|
||||||
RECT tempRect;
|
RECT tempRect;
|
||||||
|
|
||||||
if(lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL)
|
if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL)
|
||||||
return(FALSE);
|
return FALSE;
|
||||||
|
|
||||||
if(!IntersectRect(&tempRect, lprcSrc1, lprcSrc2))
|
if (!IntersectRect(&tempRect, lprcSrc1, lprcSrc2))
|
||||||
{
|
{
|
||||||
*lprcDst = *lprcSrc1;
|
*lprcDst = *lprcSrc1;
|
||||||
return(TRUE);
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (EqualRect(&tempRect, lprcSrc1))
|
if (EqualRect(&tempRect, lprcSrc1))
|
||||||
|
@ -211,22 +232,22 @@ SubtractRect(LPRECT lprcDst,
|
||||||
|
|
||||||
*lprcDst = *lprcSrc1;
|
*lprcDst = *lprcSrc1;
|
||||||
|
|
||||||
if(lprcDst->top == tempRect.top && lprcDst->bottom == tempRect.bottom)
|
if (lprcDst->top == tempRect.top && lprcDst->bottom == tempRect.bottom)
|
||||||
{
|
{
|
||||||
if(lprcDst->left == tempRect.left)
|
if (lprcDst->left == tempRect.left)
|
||||||
lprcDst->left = tempRect.right;
|
lprcDst->left = tempRect.right;
|
||||||
else if(lprcDst->right == tempRect.right)
|
else if (lprcDst->right == tempRect.right)
|
||||||
lprcDst->right = tempRect.left;
|
lprcDst->right = tempRect.left;
|
||||||
}
|
}
|
||||||
else if(lprcDst->left == tempRect.left && lprcDst->right == tempRect.right)
|
else if (lprcDst->left == tempRect.left && lprcDst->right == tempRect.right)
|
||||||
{
|
{
|
||||||
if(lprcDst->top == tempRect.top)
|
if (lprcDst->top == tempRect.top)
|
||||||
lprcDst->top = tempRect.bottom;
|
lprcDst->top = tempRect.bottom;
|
||||||
else if(lprcDst->bottom == tempRect.bottom)
|
else if (lprcDst->bottom == tempRect.bottom)
|
||||||
lprcDst->bottom = tempRect.top;
|
lprcDst->bottom = tempRect.top;
|
||||||
}
|
}
|
||||||
|
|
||||||
return(TRUE);
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -239,12 +260,15 @@ UnionRect(LPRECT lprcDst,
|
||||||
CONST RECT *lprcSrc1,
|
CONST RECT *lprcSrc1,
|
||||||
CONST RECT *lprcSrc2)
|
CONST RECT *lprcSrc2)
|
||||||
{
|
{
|
||||||
|
if (lprcDst == NULL || lprcSrc1 == NULL || lprcSrc2 == NULL)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
if (IsRectEmpty(lprcSrc1))
|
if (IsRectEmpty(lprcSrc1))
|
||||||
{
|
{
|
||||||
if (IsRectEmpty(lprcSrc2))
|
if (IsRectEmpty(lprcSrc2))
|
||||||
{
|
{
|
||||||
SetRectEmpty(lprcDst);
|
SetRectEmpty(lprcDst);
|
||||||
return(FALSE);
|
return FALSE;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -266,5 +290,5 @@ UnionRect(LPRECT lprcDst,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return(TRUE);
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue