comctl32/monthcal: Check both min and max ranges in IsDateInValidRange.

72f17419 · Owen Rudge · Alexandre Julliard · e3ab9936 · 72f17419
Commit 72f17419 authored Mar 08, 2012 by Owen Rudge Committed by Alexandre Julliard Mar 12, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 7 deletions

monthcal.c dlls/comctl32/monthcal.c +10 -7

No files found.
--- a/dlls/comctl32/monthcal.c
+++ b/dlls/comctl32/monthcal.c
@@ -353,14 +353,17 @@ static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr,
  else if(MONTHCAL_CompareSystemTime(date, &min_allowed_date) == -1) {
     fix_st = &min_allowed_date;
  }
-  else if(infoPtr->rangeValid & GDTR_MAX) {
-     if((MONTHCAL_CompareSystemTime(date, &infoPtr->maxDate) == 1)) {
-       fix_st = &infoPtr->maxDate;
+  else {
+     if(infoPtr->rangeValid & GDTR_MAX) {
+        if((MONTHCAL_CompareSystemTime(date, &infoPtr->maxDate) == 1)) {
+           fix_st = &infoPtr->maxDate;
+        }
     }
-  }
-  else if(infoPtr->rangeValid & GDTR_MIN) {
-     if((MONTHCAL_CompareSystemTime(date, &infoPtr->minDate) == -1)) {
-       fix_st = &infoPtr->minDate;
+
+     if(infoPtr->rangeValid & GDTR_MIN) {
+        if((MONTHCAL_CompareSystemTime(date, &infoPtr->minDate) == -1)) {
+           fix_st = &infoPtr->minDate;
+        }
     }
  }