Nikolay Sivov : comctl32/monthcal: Fix assumption about a single calendar for minimal rectangle calculation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8caeb2f735bdb024e9f7e36f03c43dc8f446393f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8caeb2f735bdb024e9f7e36f03...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Sun Aug  8 15:58:13 2010 +0400

comctl32/monthcal: Fix assumption about a single calendar for minimal rectangle calculation.

---

 dlls/comctl32/monthcal.c |   20 +++++++++-----------
 1 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c
index bf7ea7a..bf4e8b1 100644
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -1096,28 +1096,26 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT
 }
 
 static LRESULT
-MONTHCAL_GetMinReqRect(const MONTHCAL_INFO *infoPtr, LPRECT lpRect)
+MONTHCAL_GetMinReqRect(const MONTHCAL_INFO *infoPtr, RECT *rect)
 {
-  TRACE("rect %p\n", lpRect);
+  TRACE("rect %p\n", rect);
 
-  if(!lpRect) return FALSE;
+  if(!rect) return FALSE;
 
-  lpRect->left   = infoPtr->calendars[0].title.left;
-  lpRect->top    = infoPtr->calendars[0].title.top;
-  lpRect->right  = infoPtr->calendars[0].title.right;
-  lpRect->bottom = infoPtr->todayrect.bottom;
+  *rect = infoPtr->calendars[0].title;
+  rect->bottom = infoPtr->calendars[0].days.bottom + infoPtr->todayrect.bottom -
+                 infoPtr->todayrect.top;
 
-  AdjustWindowRect(lpRect, infoPtr->dwStyle, FALSE);
+  AdjustWindowRect(rect, infoPtr->dwStyle, FALSE);
 
   /* minimal rectangle is zero based */
-  OffsetRect(lpRect, -lpRect->left, -lpRect->top);
+  OffsetRect(rect, -rect->left, -rect->top);
 
-  TRACE("%s\n", wine_dbgstr_rect(lpRect));
+  TRACE("%s\n", wine_dbgstr_rect(rect));
 
   return TRUE;
 }
 
-
 static LRESULT
 MONTHCAL_GetColor(const MONTHCAL_INFO *infoPtr, INT index)
 {