* Sync up to trunk HEAD (r62975).

[reactos.git] / dll / win32 / comctl32 / datetime.c

diff --git a/dll/win32/comctl32/datetime.c b/dll/win32/comctl32/datetime.c
index 3709b77..e76a744 100644 (file)
--- a/dll/win32/comctl32/datetime.c
+++ b/dll/win32/comctl32/datetime.c
@@ -60,7 +60,7 @@ typedef struct
     RECT checkbox;  /* checkbox allowing the control to be enabled/disabled */
     RECT calbutton; /* button that toggles the dropdown of the monthcal control */
     BOOL bCalDepressed; /* TRUE = cal button is depressed */
-    int  bDropdownEnabled;
+    BOOL bDropdownEnabled;
     int  select;
     WCHAR charsEntered[4];
     int nCharsEntered;
@@ -186,7 +186,7 @@ static BOOL DATETIME_IsDateInValidRange(const DATETIME_INFO *infoPtr, const SYST
 static BOOL
 DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *systime)
 {
-    if (!systime) return 0;
+    if (!systime) return FALSE;
 
     TRACE("%04d/%02d/%02d %02d:%02d:%02d\n",
           systime->wYear, systime->wMonth, systime->wDay,
@@ -205,7 +205,7 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, const SYSTEMTIME *sy
             return FALSE;
 
         /* Windows returns true if the date is valid but outside the limits set */
-        if (DATETIME_IsDateInValidRange(infoPtr, systime) == FALSE)
+        if (!DATETIME_IsDateInValidRange(infoPtr, systime))
             return TRUE;
 
         infoPtr->dateValid = TRUE;
@@ -819,8 +819,8 @@ DATETIME_HitTest (const DATETIME_INFO *infoPtr, POINT pt)
     return DTHT_NONE;
 }
 
-/* Returns index of a closest date field from given counting to left
-   or -1 if there's no such fields at left */
+/* Returns index of the nearest preceding date field from given,
+   or -1 if none was found */
 static int DATETIME_GetPrevDateField(const DATETIME_INFO *infoPtr, int i)
 {
     for(--i; i >= 0; i--)
@@ -834,7 +834,8 @@ static void
 DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr)
 {
     int fieldNum = infoPtr->select & DTHT_DATEFIELD;
-    int i, val=0, clamp_day=0;
+    int i, val = 0;
+    BOOL clamp_day = FALSE;
     SYSTEMTIME date = infoPtr->date;
     int oldyear;
 
@@ -858,7 +859,7 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr)
             date.wYear = date.wYear - (date.wYear%100) + val;
 
             if (DATETIME_IsDateInValidRange(infoPtr, &date))
-                clamp_day = 1;
+                clamp_day = TRUE;
             else
                 date.wYear = oldyear;
 
@@ -869,7 +870,7 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr)
             date.wYear = val;
 
             if (DATETIME_IsDateInValidRange(infoPtr, &date))
-                clamp_day = 1;
+                clamp_day = TRUE;
             else
                 date.wYear = oldyear;
 
@@ -877,7 +878,7 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr)
         case ONEDIGITMONTH:
         case TWODIGITMONTH:
             date.wMonth = val;
-            clamp_day = 1;
+            clamp_day = TRUE;
             break;
         case ONEDIGITDAY:
         case TWODIGITDAY: