Skip to content

W
wine-cw
Commit bf313ee8 authored by Lei Zhang's avatar Lei Zhang Committed by Alexandre Julliard
Browse files
Options

comctl32: Fix uninitialized, unused variables.

parent 5d05f7fc
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
dlls/comctl32/status.c
View file @ bf313ee8
...@@ -633,7 +633,6 @@ STATUSBAR_SetMinHeight (STATUS_INFO *infoPtr, INT height) ...@@ -633,7 +633,6 @@ STATUSBAR_SetMinHeight (STATUS_INFO *infoPtr, INT height)
RECT parent_rect; RECT parent_rect;
HTHEME theme; HTHEME theme;
GetClientRect (infoPtr->Notify, &parent_rect);
infoPtr->height = height + infoPtr->verticalBorder; infoPtr->height = height + infoPtr->verticalBorder;
if ((theme = GetWindowTheme (infoPtr->Self))) if ((theme = GetWindowTheme (infoPtr->Self)))
...@@ -651,13 +650,14 @@ STATUSBAR_SetMinHeight (STATUS_INFO *infoPtr, INT height) ...@@ -651,13 +650,14 @@ STATUSBAR_SetMinHeight (STATUS_INFO *infoPtr, INT height)
ReleaseDC (infoPtr->Self, hdc); ReleaseDC (infoPtr->Self, hdc);
} }
width = parent_rect.right - parent_rect.left; if (GetClientRect (infoPtr->Notify, &parent_rect))
x = parent_rect.left; {
y = parent_rect.bottom - infoPtr->height; width = parent_rect.right - parent_rect.left;
MoveWindow (infoPtr->Self, parent_rect.left, x = parent_rect.left;
parent_rect.bottom - infoPtr->height, y = parent_rect.bottom - infoPtr->height;
width, infoPtr->height, TRUE); MoveWindow (infoPtr->Self, x, y, width, infoPtr->height, TRUE);
STATUSBAR_SetPartBounds (infoPtr); STATUSBAR_SetPartBounds (infoPtr);
}
} }
return TRUE; return TRUE;
...@@ -1191,13 +1191,13 @@ STATUSBAR_WMSize (STATUS_INFO *infoPtr, WORD flags) ...@@ -1191,13 +1191,13 @@ STATUSBAR_WMSize (STATUS_INFO *infoPtr, WORD flags)
if (GetWindowLongW(infoPtr->Self, GWL_STYLE) & CCS_NORESIZE) return FALSE; if (GetWindowLongW(infoPtr->Self, GWL_STYLE) & CCS_NORESIZE) return FALSE;
/* width and height don't apply */ /* width and height don't apply */
GetClientRect (infoPtr->Notify, &parent_rect); if (!GetClientRect (infoPtr->Notify, &parent_rect))
return FALSE;
width = parent_rect.right - parent_rect.left; width = parent_rect.right - parent_rect.left;
x = parent_rect.left; x = parent_rect.left;
y = parent_rect.bottom - infoPtr->height; y = parent_rect.bottom - infoPtr->height;
MoveWindow (infoPtr->Self, parent_rect.left, MoveWindow (infoPtr->Self, x, y, width, infoPtr->height, TRUE);
parent_rect.bottom - infoPtr->height,
width, infoPtr->height, TRUE);
STATUSBAR_SetPartBounds (infoPtr); STATUSBAR_SetPartBounds (infoPtr);
return TRUE; return TRUE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment