comctl32: Avoid using memset on RECTs.

Signed-off-by: Michael Stefaniuc <mstefani@redhat.de> Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32: Avoid using memset on RECTs.
2ea72e87 · Michael Stefaniuc · Alexandre Julliard · f333bf47 · 2ea72e87 · 2ea72e87
Commit 2ea72e87 authored Jul 29, 2016 by Michael Stefaniuc Committed by Alexandre Julliard Jul 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 10 deletions

status.c dlls/comctl32/status.c +2 -2

tab.c dlls/comctl32/tab.c +2 -8

No files found.
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -127,8 +127,8 @@ STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr)
         * textHeight pixels large */
        HDC hdc = GetDC(infoPtr->Self);
        RECT r;
-        memset (&r, 0, sizeof (r));
-        r.bottom = max(infoPtr->minHeight, tm.tmHeight);
+
+        SetRect(&r, 0, 0, 0, max(infoPtr->minHeight, tm.tmHeight));
        if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r)))
        {
            height = r.bottom - r.top;

--- a/dlls/comctl32/tab.c
+++ b/dlls/comctl32/tab.c
@@ -371,14 +371,8 @@ static BOOL TAB_InternalGetItemRect(
         (itemIndex < infoPtr->leftmostVisible)))
    {
        TRACE("Not Visible\n");
-        /* need to initialize these to empty rects */
-        if (itemRect)
-        {
-            memset(itemRect,0,sizeof(RECT));
-            itemRect->bottom = infoPtr->tabHeight;
-        }
-        if (selectedRect)
-            memset(selectedRect,0,sizeof(RECT));
+        SetRect(itemRect, 0, 0, 0, infoPtr->tabHeight);
+        SetRectEmpty(selectedRect);
        return FALSE;
    }