Nikolay Sivov : comctl32/pager: Reduce pointer scope so it doesn' t point to inner scope vars (PVS-Studio).
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Aug 18 16:08:48 CDT 2014
Module: wine
Branch: master
Commit: 5741ebb8fdc5034734cfb96465e5f97ff326a18e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5741ebb8fdc5034734cfb96465e5f97ff326a18e
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Sat Aug 16 11:30:01 2014 +0400
comctl32/pager: Reduce pointer scope so it doesn't point to inner scope vars (PVS-Studio).
---
dlls/comctl32/pager.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c
index 74bca5e..bd9eb68 100644
--- a/dlls/comctl32/pager.c
+++ b/dlls/comctl32/pager.c
@@ -753,7 +753,7 @@ static LRESULT
PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y)
{
POINT clpt, pt;
- RECT wnrect, *btnrect = NULL;
+ RECT wnrect;
BOOL topLeft = FALSE;
INT btnstate = 0;
INT hit;
@@ -766,8 +766,9 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y)
ClientToScreen(infoPtr->hwndSelf, &pt);
GetWindowRect(infoPtr->hwndSelf, &wnrect);
if (PtInRect(&wnrect, pt)) {
- RECT TLbtnrect, BRbtnrect;
- PAGER_GetButtonRects(infoPtr, &TLbtnrect, &BRbtnrect, FALSE);
+ RECT topleft, bottomright, *rect = NULL;
+
+ PAGER_GetButtonRects(infoPtr, &topleft, &bottomright, FALSE);
clpt = pt;
MapWindowPoints(0, infoPtr->hwndSelf, &clpt, 1);
@@ -775,23 +776,23 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y)
if ((hit == PGB_TOPORLEFT) && (infoPtr->TLbtnState == PGF_NORMAL))
{
topLeft = TRUE;
- btnrect = &TLbtnrect;
+ rect = &topleft;
infoPtr->TLbtnState = PGF_HOT;
btnstate = infoPtr->TLbtnState;
}
else if ((hit == PGB_BOTTOMORRIGHT) && (infoPtr->BRbtnState == PGF_NORMAL))
{
topLeft = FALSE;
- btnrect = &BRbtnrect;
+ rect = &bottomright;
infoPtr->BRbtnState = PGF_HOT;
btnstate = infoPtr->BRbtnState;
}
/* If in one of the buttons the capture and draw buttons */
- if (btnrect)
+ if (rect)
{
TRACE("[%p] draw btn (%s), Capture %s, style %08x\n",
- infoPtr->hwndSelf, wine_dbgstr_rect(btnrect),
+ infoPtr->hwndSelf, wine_dbgstr_rect(rect),
(infoPtr->bCapture) ? "TRUE" : "FALSE",
infoPtr->dwStyle);
if (!infoPtr->bCapture)
@@ -804,7 +805,7 @@ PAGER_MouseMove (PAGER_INFO* infoPtr, INT keys, INT x, INT y)
SetTimer(infoPtr->hwndSelf, TIMERID1, 0x3e, 0);
hdc = GetWindowDC(infoPtr->hwndSelf);
/* OffsetRect(wnrect, 0 | 1, 0 | 1) */
- PAGER_DrawButton(hdc, infoPtr->clrBk, *btnrect,
+ PAGER_DrawButton(hdc, infoPtr->clrBk, *rect,
infoPtr->dwStyle & PGS_HORZ, topLeft, btnstate);
ReleaseDC(infoPtr->hwndSelf, hdc);
return 0;
More information about the wine-cvs
mailing list