Changeset 10097 for trunk/src/comctl32/datetime.c

Timestamp:

May 15, 2003, 4:25:14 PM (22 years ago)

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/comctl32/datetime.c (modified) (59 diffs)

trunk/src/comctl32/datetime.c

@@ -6 +6 @@
  * Copyright 2000 Chris Morgan <cmorgan@wpi.edu>
  *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  * TODO:
@@ -20 +33 @@
 #include "wingdi.h"
 #include "commctrl.h"
-#include "debugtools.h"
-
-#ifdef __WIN32OS2__
-#include "ccbase.h"
-#define inline
-#endif
-
-DEFAULT_DEBUG_CHANNEL(datetime);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(datetime);
 
 typedef struct
 {
-#ifdef __WIN32OS2__
-        COMCTL32_HEADER header;
-#endif
         HWND hMonthCal;
         HWND hUpdown;
@@ -51 +56 @@
         int *fieldspec;
         RECT *fieldRect;
-        int  *buflen;           
+        int  *buflen;
         char textbuf[256];
         POINT monthcal_pos;
@@ -61 +66 @@
 /* this list of defines is closely related to `allowedformatchars' defined
  * in datetime.c; the high nibble indicates the `base type' of the format
- * specifier. 
+ * specifier.
  * Do not change without first reading DATETIME_UseFormat.
- * 
+ *
  */
 
-#define DT_END_FORMAT      0 
+#define DT_END_FORMAT      0
 #define ONEDIGITDAY     0x01
 #define TWODIGITDAY     0x02
@@ -87 +92 @@
 #define ONEDIGITYEAR    0x71
 #define TWODIGITYEAR    0x72
-#ifdef __WIN32OS2__
+#define INVALIDFULLYEAR 0x73      /* FIXME - yyy is not valid - we'll treat it as yyyy */
 #define FULLYEAR        0x74
-#else
-#define FULLYEAR        0x73
-#endif
 #define FORMATCALLBACK  0x81      /* -> maximum of 0x80 callbacks possible */
 #define FORMATCALLMASK  0x80
@@ -109 +111 @@
 extern void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to);
 static const char *allowedformatchars = {"dhHmMstyX'"};
-#ifdef __WIN32OS2__
 static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1,-1};
-//DT all wine xxx.nls contains yyyy for FULLYEAR
-#else
-static const int maxrepetition [] = {4,2,2,2,4,2,2,3,-1,-1};
-#endif
+
 
 static LRESULT
@@ -126 +124 @@
   if (!lParam) return GDT_NONE;
 
-  if ((dwStyle & DTS_SHOWNONE) && 
-       (SendMessageA (infoPtr->hwndCheckbut, BM_GETCHECK, 0, 0)))
+  if ((dwStyle & DTS_SHOWNONE) &&
+       (SendMessageA (infoPtr->hwndCheckbut, BM_GETCHECK, 0, 0) == BST_UNCHECKED))
         return GDT_NONE;
 
@@ -142 +140 @@
   SYSTEMTIME *lprgSysTimeArray=(SYSTEMTIME *) lParam;
 
-  TRACE("%04x %08lx\n",wParam,lParam);
+  TRACE("%p %04x %08lx\n",hwnd, wParam, lParam);
   if (!lParam) return 0;
 
-  if (lParam==GDT_VALID) 
-        MONTHCAL_CopyTime (lprgSysTimeArray, &infoPtr->date);
-  if (lParam==GDT_NONE) {
-        infoPtr->dateValid=FALSE;
-    SendMessageA (infoPtr->hwndCheckbut, BM_SETCHECK, 0, 0);
-        }
+  TRACE("%04d/%02d/%02d %02d:%02d:%02d)\n",
+        lprgSysTimeArray->wYear, lprgSysTimeArray->wMonth, lprgSysTimeArray->wDay,
+        lprgSysTimeArray->wHour, lprgSysTimeArray->wMinute, lprgSysTimeArray->wSecond);
+
+  if (wParam==GDT_VALID) {
+      infoPtr->dateValid = TRUE;
+      MONTHCAL_CopyTime (lprgSysTimeArray, &infoPtr->date);
+      SendMessageA (infoPtr->hwndCheckbut, BM_SETCHECK, BST_CHECKED, 0);
+  } else if (wParam==GDT_NONE) {
+      infoPtr->dateValid = FALSE;
+      SendMessageA (infoPtr->hwndCheckbut, BM_SETCHECK, BST_UNCHECKED, 0);
+  }
+  InvalidateRect(hwnd, NULL, TRUE);
   return 1;
 }
+
 
 static LRESULT
@@ -203 +209 @@
 
   TRACE("\n");
-  return infoPtr->hMonthCal;
+  return (LRESULT)infoPtr->hMonthCal;
 }
 
@@ -228 +234 @@
 
 
-/* 
-   Split up a formattxt in actions. 
+/*
+   Split up a formattxt in actions.
    See ms documentation for the meaning of the letter codes/'specifiers'.
 
-   Notes: 
+   Notes:
    *'dddddd' is handled as 'dddd' plus 'dd'.
-   *unrecognized formats are strings (here given the type DT_STRING; 
+   *unrecognized formats are strings (here given the type DT_STRING;
    start of the string is encoded in lower bits of DT_STRING.
    Therefore, 'string' ends finally up as '<show seconds>tring'.
@@ -241 +247 @@
 
 
-static void 
+static void
 DATETIME_UseFormat (DATETIME_INFO *infoPtr, const char *formattxt)
 {
@@ -258 +264 @@
         TRACE ("\n%d %c:",i, formattxt[i]);
         for (j=0; j<len; j++) {
-                if (allowedformatchars[j]==formattxt[i]) {   
+                if (allowedformatchars[j]==formattxt[i]) {
                         TRACE ("%c[%d,%x]",allowedformatchars[j], *nrFields,
                                                          infoPtr->fieldspec[*nrFields]);
@@ -265 +271 @@
                                 break;
                         }
-                        if (infoPtr->fieldspec[*nrFields]>>4!=j) {   
-                                (*nrFields)++;  
+                        if (infoPtr->fieldspec[*nrFields]>>4!=j) {
+                                (*nrFields)++;
                                 infoPtr->fieldspec[*nrFields]=(j<<4) +1;
                                 break;
                         }
                         if ((infoPtr->fieldspec[*nrFields] & 0x0f)==maxrepetition[j]) {
-                                (*nrFields)++;  
+                                (*nrFields)++;
                                 infoPtr->fieldspec[*nrFields]=(j<<4) +1;
                                 break;
@@ -286 +292 @@
                         infoPtr->fieldspec[*nrFields]=DT_STRING+k;
                         infoPtr->buflen[*nrFields]=0;
-        } else 
+        } else
                 if ((infoPtr->fieldspec[*nrFields] & DT_STRING)!=DT_STRING)  {
                         (*nrFields)++;
                         infoPtr->fieldspec[*nrFields]=DT_STRING+k;
                         infoPtr->buflen[*nrFields]=0;
-                } 
+                }
                 infoPtr->textbuf[k]=formattxt[i];
                 k++;
@@ -309 +315 @@
 
 
-static LRESULT 
+static LRESULT
 DATETIME_SetFormat (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -320 +326 @@
         DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
 
-        if (dwStyle & DTS_LONGDATEFORMAT) 
+        if (dwStyle & DTS_LONGDATEFORMAT)
                 format_item=LOCALE_SLONGDATE;
-        else if (dwStyle & DTS_TIMEFORMAT) 
+        else if (dwStyle & DTS_TIMEFORMAT)
                 format_item=LOCALE_STIMEFORMAT;
         else /* DTS_SHORTDATEFORMAT */
@@ -328 +334 @@
         GetLocaleInfoA( GetSystemDefaultLCID(), format_item,format_buf,sizeof(format_buf));
         DATETIME_UseFormat (infoPtr, format_buf);
- }      
+ }
  else
         DATETIME_UseFormat (infoPtr, (char *) lParam);
@@ -336 +342 @@
 
 
-static LRESULT 
+static LRESULT
 DATETIME_SetFormatW (HWND hwnd, WPARAM wParam, LPARAM lParam)
 
@@ -351 +357 @@
         COMCTL32_Free (buf);
         return retval;
- } 
+ }
  else
         return DATETIME_SetFormat (hwnd, 0, 0);
@@ -358 +364 @@
 
 
-static void 
-DATETIME_ReturnTxt (DATETIME_INFO *infoPtr, int count, char *result)
+static void
+DATETIME_ReturnTxt (DATETIME_INFO *infoPtr, int count, char *result, int resultSize)
 {
  SYSTEMTIME date = infoPtr->date;
@@ -373 +379 @@
 
  if (!infoPtr->fieldspec) return;
- 
+
  spec=infoPtr->fieldspec[count];
  if (spec & DT_STRING) {
         int txtlen=infoPtr->buflen[count];
 
-        strncpy (result, infoPtr->textbuf + (spec &~ DT_STRING), txtlen);
+        if (txtlen > resultSize)
+            txtlen = resultSize - 1;
+        memcpy (result, infoPtr->textbuf + (spec &~ DT_STRING), txtlen);
         result[txtlen]=0;
         TRACE ("arg%d=%x->[%s]\n",count,infoPtr->fieldspec[count],result);
@@ -384 +392 @@
  }
 
-                
+
  switch (spec) {
-        case DT_END_FORMAT: 
+        case DT_END_FORMAT:
                 *result=0;
                 break;
-        case ONEDIGITDAY: 
+        case ONEDIGITDAY:
                 sprintf (result,"%d",date.wDay);
                 break;
-        case TWODIGITDAY: 
+        case TWODIGITDAY:
                 sprintf (result,"%.2d",date.wDay);
                 break;
-        case THREECHARDAY: 
+        case THREECHARDAY:
                 GetLocaleInfoA( LOCALE_USER_DEFAULT, LOCALE_SABBREVDAYNAME1+(date.wDayOfWeek+6)%7,
                                 result,4);
@@ -402 +410 @@
         case FULLDAY:
                 GetLocaleInfoA( LOCALE_USER_DEFAULT,LOCALE_SDAYNAME1+ (date.wDayOfWeek+6)%7,
-                                buffer,sizeof(buffer));
-                strcpy  (result,buffer);
-                break;
-        case ONEDIGIT12HOUR: 
-                if (date.wHour>12) 
+                               result, resultSize);
+                break;
+        case ONEDIGIT12HOUR:
+                if (date.wHour>12)
                         sprintf (result,"%d",date.wHour-12);
-                else 
+                else
                         sprintf (result,"%d",date.wHour);
                 break;
-        case TWODIGIT12HOUR: 
-                if (date.wHour>12) 
+        case TWODIGIT12HOUR:
+                if (date.wHour>12)
                         sprintf (result,"%.2d",date.wHour-12);
-                else 
+                else
                         sprintf (result,"%.2d",date.wHour);
                 break;
-        case ONEDIGIT24HOUR: 
+        case ONEDIGIT24HOUR:
                 sprintf (result,"%d",date.wHour);
                 break;
-        case TWODIGIT24HOUR: 
+        case TWODIGIT24HOUR:
                 sprintf (result,"%.2d",date.wHour);
                 break;
-        case ONEDIGITSECOND: 
+        case ONEDIGITSECOND:
                 sprintf (result,"%d",date.wSecond);
                 break;
-        case TWODIGITSECOND: 
+        case TWODIGITSECOND:
                 sprintf (result,"%.2d",date.wSecond);
                 break;
-        case ONEDIGITMINUTE: 
+        case ONEDIGITMINUTE:
                 sprintf (result,"%d",date.wMinute);
                 break;
-        case TWODIGITMINUTE: 
+        case TWODIGITMINUTE:
                 sprintf (result,"%.2d",date.wMinute);
                 break;
-        case ONEDIGITMONTH: 
+        case ONEDIGITMONTH:
                 sprintf (result,"%d",date.wMonth);
                 break;
-        case TWODIGITMONTH: 
+        case TWODIGITMONTH:
                 sprintf (result,"%.2d",date.wMonth);
                 break;
-        case THREECHARMONTH: 
+        case THREECHARMONTH:
                 GetLocaleInfoA( GetSystemDefaultLCID(),LOCALE_SMONTHNAME1+date.wMonth -1,
-                  buffer,sizeof(buffer));
+                               buffer,sizeof(buffer));
                 sprintf (result,"%.3s",buffer);
                 break;
-        case FULLMONTH:   
+        case FULLMONTH:
                 GetLocaleInfoA( GetSystemDefaultLCID(),LOCALE_SMONTHNAME1+date.wMonth -1,
 #ifdef __WIN32OS2__
@@ -452 +459 @@
                 strcpy  (result,buffer);
 #else
-                  result,sizeof(result));
+                               result, resultSize);
 #endif
                 break;
-        case ONELETTERAMPM:   
-                if (date.wHour<12) 
+        case ONELETTERAMPM:
+                if (date.wHour<12)
                         strcpy (result,"A");
-                else 
+                else
                         strcpy (result,"P");
                 break;
-        case TWOLETTERAMPM:   
-                if (date.wHour<12) 
+        case TWOLETTERAMPM:
+                if (date.wHour<12)
                         strcpy (result,"AM");
-                else 
+                else
                         strcpy (result,"PM");
                 break;
-        case FORMATCALLBACK:   
+        case FORMATCALLBACK:
                 FIXME ("Not implemented\n");
                 strcpy (result,"xxx");
                 break;
-        case ONEDIGITYEAR: 
+        case ONEDIGITYEAR:
                 sprintf (result,"%d",date.wYear-10* (int) floor(date.wYear/10));
                 break;
-        case TWODIGITYEAR: 
+        case TWODIGITYEAR:
                 sprintf (result,"%.2d",date.wYear-100* (int) floor(date.wYear/100));
                 break;
-        case FULLYEAR:   
+        case INVALIDFULLYEAR:
+        case FULLYEAR:
                 sprintf (result,"%d",date.wYear);
                 break;
     }
-        
+
         TRACE ("arg%d=%x->[%s]\n",count,infoPtr->fieldspec[count],result);
 }
 
 
-static void 
+static void
 DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number)
 {
@@ -497 +505 @@
  spec=infoPtr->fieldspec[number];
  if ((spec & DTHT_DATEFIELD)==0) return;
-                
+
  switch (spec) {
-        case ONEDIGITDAY: 
-        case TWODIGITDAY: 
-        case THREECHARDAY: 
+        case ONEDIGITDAY:
+        case TWODIGITDAY:
+        case THREECHARDAY:
         case FULLDAY:
                 date->wDay++;
                 if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear))
-                  date->wDay=1; 
-                break;
-        case ONEDIGIT12HOUR: 
-        case TWODIGIT12HOUR: 
-        case ONEDIGIT24HOUR: 
-        case TWODIGIT24HOUR: 
+                  date->wDay=1;
+                break;
+        case ONEDIGIT12HOUR:
+        case TWODIGIT12HOUR:
+        case ONEDIGIT24HOUR:
+        case TWODIGIT24HOUR:
                 date->wHour++;
                 if (date->wHour>23) date->wHour=0;
                 break;
-        case ONEDIGITSECOND: 
-        case TWODIGITSECOND: 
+        case ONEDIGITSECOND:
+        case TWODIGITSECOND:
                 date->wSecond++;
                 if (date->wSecond>59) date->wSecond=0;
                 break;
-        case ONEDIGITMINUTE: 
-        case TWODIGITMINUTE: 
+        case ONEDIGITMINUTE:
+        case TWODIGITMINUTE:
                 date->wMinute++;
                 if (date->wMinute>59) date->wMinute=0;
                 break;
-        case ONEDIGITMONTH: 
-        case TWODIGITMONTH: 
-        case THREECHARMONTH: 
-        case FULLMONTH:   
+        case ONEDIGITMONTH:
+        case TWODIGITMONTH:
+        case THREECHARMONTH:
+        case FULLMONTH:
                 date->wMonth++;
                 if (date->wMonth>12) date->wMonth=1;
-                if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear)) 
+                if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear))
                         date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
                 break;
-        case ONELETTERAMPM:   
-        case TWOLETTERAMPM:   
+        case ONELETTERAMPM:
+        case TWOLETTERAMPM:
                 date->wHour+=12;
                 if (date->wHour>23) date->wHour-=24;
                 break;
-        case FORMATCALLBACK:   
+        case FORMATCALLBACK:
                 FIXME ("Not implemented\n");
                 break;
-        case ONEDIGITYEAR: 
-        case TWODIGITYEAR: 
-        case FULLYEAR:   
+        case ONEDIGITYEAR:
+        case TWODIGITYEAR:
+        case FULLYEAR:
                 date->wYear++;
                 break;
@@ -551 +559 @@
 
 
-static void 
+static void
 DATETIME_DecreaseField (DATETIME_INFO *infoPtr, int number)
 {
@@ -562 +570 @@
  spec = infoPtr->fieldspec[number];
  if ((spec & DTHT_DATEFIELD)==0) return;
-                
+
  TRACE ("%x\n",spec);
 
  switch (spec) {
-        case ONEDIGITDAY: 
-        case TWODIGITDAY: 
-        case THREECHARDAY: 
+        case ONEDIGITDAY:
+        case TWODIGITDAY:
+        case THREECHARDAY:
         case FULLDAY:
                 date->wDay--;
-                if (date->wDay<1) 
+                if (date->wDay<1)
                   date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
                 break;
-        case ONEDIGIT12HOUR: 
-        case TWODIGIT12HOUR: 
-        case ONEDIGIT24HOUR: 
-        case TWODIGIT24HOUR: 
-                if (date->wHour) 
+        case ONEDIGIT12HOUR:
+        case TWODIGIT12HOUR:
+        case ONEDIGIT24HOUR:
+        case TWODIGIT24HOUR:
+                if (date->wHour)
                         date->wHour--;
                 else
                         date->wHour=23;
                 break;
-        case ONEDIGITSECOND: 
-        case TWODIGITSECOND: 
-                if (date->wHour) 
+        case ONEDIGITSECOND:
+        case TWODIGITSECOND:
+                if (date->wHour)
                         date->wSecond--;
                 else
                         date->wHour=59;
                 break;
-        case ONEDIGITMINUTE: 
-        case TWODIGITMINUTE: 
-                if (date->wMinute) 
+        case ONEDIGITMINUTE:
+        case TWODIGITMINUTE:
+                if (date->wMinute)
                         date->wMinute--;
                 else
                         date->wMinute=59;
                 break;
-        case ONEDIGITMONTH: 
-        case TWODIGITMONTH: 
-        case THREECHARMONTH: 
-        case FULLMONTH:   
-                if (date->wMonth>1) 
+        case ONEDIGITMONTH:
+        case TWODIGITMONTH:
+        case THREECHARMONTH:
+        case FULLMONTH:
+                if (date->wMonth>1)
                         date->wMonth--;
                 else
                         date->wMonth=12;
-                if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear)) 
+                if (date->wDay>MONTHCAL_MonthLength(date->wMonth,date->wYear))
                         date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
                 break;
-        case ONELETTERAMPM:   
-        case TWOLETTERAMPM:   
-                if (date->wHour<12) 
+        case ONELETTERAMPM:
+        case TWOLETTERAMPM:
+                if (date->wHour<12)
                         date->wHour+=12;
                 else
                         date->wHour-=12;
                 break;
-        case FORMATCALLBACK:   
+        case FORMATCALLBACK:
                 FIXME ("Not implemented\n");
                 break;
-        case ONEDIGITYEAR: 
-        case TWODIGITYEAR: 
-        case FULLYEAR:   
+        case ONEDIGITYEAR:
+        case TWODIGITYEAR:
+        case FULLYEAR:
                 date->wYear--;
                 break;
@@ -628 +636 @@
 
 
-static void 
+static void
 DATETIME_ResetFieldDown (DATETIME_INFO *infoPtr, int number)
 {
@@ -639 +647 @@
  spec = infoPtr->fieldspec[number];
  if ((spec & DTHT_DATEFIELD)==0) return;
-                
+
 
  switch (spec) {
-        case ONEDIGITDAY: 
-        case TWODIGITDAY: 
-        case THREECHARDAY: 
+        case ONEDIGITDAY:
+        case TWODIGITDAY:
+        case THREECHARDAY:
         case FULLDAY:
                 date->wDay = 1;
                 break;
-        case ONEDIGIT12HOUR: 
-        case TWODIGIT12HOUR: 
-        case ONEDIGIT24HOUR: 
-        case TWODIGIT24HOUR: 
-        case ONELETTERAMPM:   
-        case TWOLETTERAMPM:   
+        case ONEDIGIT12HOUR:
+        case TWODIGIT12HOUR:
+        case ONEDIGIT24HOUR:
+        case TWODIGIT24HOUR:
+        case ONELETTERAMPM:
+        case TWOLETTERAMPM:
                 date->wHour = 0;
                 break;
-        case ONEDIGITSECOND: 
-        case TWODIGITSECOND: 
+        case ONEDIGITSECOND:
+        case TWODIGITSECOND:
                 date->wSecond = 0;
                 break;
-        case ONEDIGITMINUTE: 
-        case TWODIGITMINUTE: 
+        case ONEDIGITMINUTE:
+        case TWODIGITMINUTE:
                 date->wMinute = 0;
                 break;
-        case ONEDIGITMONTH: 
-        case TWODIGITMONTH: 
-        case THREECHARMONTH: 
-        case FULLMONTH:   
+        case ONEDIGITMONTH:
+        case TWODIGITMONTH:
+        case THREECHARMONTH:
+        case FULLMONTH:
                 date->wMonth = 1;
-        case FORMATCALLBACK:   
+        case FORMATCALLBACK:
                 FIXME ("Not implemented\n");
                 break;
-        case ONEDIGITYEAR: 
-        case TWODIGITYEAR: 
-        /* FYI: On 9/14/1752 the calender changed and England and the American */
-        /* colonies changed to the Gregorian calender.  This change involved */
-        /* having September 14th following September 2nd.  So no date algorithms */
-        /* work before that date. */
-        case FULLYEAR:   
+        case ONEDIGITYEAR:
+        case TWODIGITYEAR:
+        /* FYI: On 1752/9/14 the calendar changed and England and the
+         * American colonies changed to the Gregorian calendar. This change
+         * involved having September 14th follow September 2nd. So no date
+         * algorithm works before that date.
+         */
+        case FULLYEAR:
                 date->wSecond = 0;
                 date->wMinute = 0;
@@ -691 +700 @@
 
 
-static void 
+static void
 DATETIME_ResetFieldUp (DATETIME_INFO *infoPtr, int number)
 {
@@ -702 +711 @@
  spec=infoPtr->fieldspec[number];
  if ((spec & DTHT_DATEFIELD)==0) return;
-                
+
  switch (spec) {
-        case ONEDIGITDAY: 
-        case TWODIGITDAY: 
-        case THREECHARDAY: 
+        case ONEDIGITDAY:
+        case TWODIGITDAY:
+        case THREECHARDAY:
         case FULLDAY:
                 date->wDay=MONTHCAL_MonthLength(date->wMonth,date->wYear);
                 break;
-        case ONEDIGIT12HOUR: 
-        case TWODIGIT12HOUR: 
-        case ONEDIGIT24HOUR: 
-        case TWODIGIT24HOUR: 
-        case ONELETTERAMPM:   
-        case TWOLETTERAMPM:   
+        case ONEDIGIT12HOUR:
+        case TWODIGIT12HOUR:
+        case ONEDIGIT24HOUR:
+        case TWODIGIT24HOUR:
+        case ONELETTERAMPM:
+        case TWOLETTERAMPM:
                 date->wHour=23;
                 break;
-        case ONEDIGITSECOND: 
-        case TWODIGITSECOND: 
+        case ONEDIGITSECOND:
+        case TWODIGITSECOND:
                 date->wSecond=59;
                 break;
-        case ONEDIGITMINUTE: 
-        case TWODIGITMINUTE: 
+        case ONEDIGITMINUTE:
+        case TWODIGITMINUTE:
                 date->wMinute=59;
                 break;
-        case ONEDIGITMONTH: 
-        case TWODIGITMONTH: 
-        case THREECHARMONTH: 
-        case FULLMONTH:   
+        case ONEDIGITMONTH:
+        case TWODIGITMONTH:
+        case THREECHARMONTH:
+        case FULLMONTH:
                 date->wMonth=12;
-        case FORMATCALLBACK:   
+        case FORMATCALLBACK:
                 FIXME ("Not implemented\n");
                 break;
-        case ONEDIGITYEAR: 
-        case TWODIGITYEAR: 
-        case FULLYEAR:   
+        case ONEDIGITYEAR:
+        case TWODIGITYEAR:
+        case FULLYEAR:
                 date->wYear=9999;    /* Y10K problem? naaah. */
                 break;
@@ -758 +767 @@
   SIZE size;
   COLORREF oldBk, oldTextColor;
-  
+
   /* draw control edge */
   TRACE("\n");
@@ -764 +773 @@
   FillRect(hdc, rcClient, hbr);
   DrawEdge(hdc, rcClient, EDGE_SUNKEN, BF_RECT);
-  DeleteObject(hbr);   
-        
+  DeleteObject(hbr);
+
   if (infoPtr->dateValid) {
     char txt[80];
@@ -771 +780 @@
     oldFont = SelectObject (hdc, infoPtr->hFont);
 
-    DATETIME_ReturnTxt (infoPtr, 0, txt);
+    DATETIME_ReturnTxt (infoPtr, 0, txt, sizeof(txt));
     GetTextExtentPoint32A (hdc, txt, strlen (txt), &size);
     rcDraw->bottom = size.cy+2;
@@ -780 +789 @@
 
     for (i=0; i<infoPtr->nrFields; i++) {
-      DATETIME_ReturnTxt (infoPtr, i, txt);
+      DATETIME_ReturnTxt (infoPtr, i, txt, sizeof(txt));
       GetTextExtentPoint32A (hdc, txt, strlen (txt), &size);
       field = & infoPtr->fieldRect[i];
@@ -832 +841 @@
     if (PtInRect (&infoPtr->fieldRect[i], pt)) {
       retval = i;
-      TRACE("Hit in date text in field %d\n", i);           
+      TRACE("Hit in date text in field %d\n", i);
       break;
     }
@@ -845 +854 @@
 DATETIME_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);  
+  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
   DWORD dwStyle = GetWindowLongA (hwnd, GWL_STYLE);
   int old, new;
@@ -867 +876 @@
   if (infoPtr->select == DTHT_MCPOPUP) {
     /* FIXME: button actually is only depressed during dropdown of the */
-    /* calender control and when the mouse is over the button window */
+    /* calendar control and when the mouse is over the button window */
     infoPtr->bCalDepressed = TRUE;
 
@@ -874 +883 @@
       infoPtr->monthcal_pos.x = infoPtr->rcClient.right - ((infoPtr->calbutton.right -
                                 infoPtr->calbutton.left) + 145);
-    else 
+    else
       infoPtr->monthcal_pos.x = 8;
 
@@ -887 +896 @@
         ShowWindow(infoPtr->hMonthCal, SW_SHOW);
 
-    TRACE ("dt:%x mc:%x mc parent:%x, desktop:%x, mcpp:%x\n",
-              hwnd,infoPtr->hMonthCal, 
+    TRACE ("dt:%p mc:%p mc parent:%p, desktop:%p, mcpp:%p\n",
+              hwnd,infoPtr->hMonthCal,
               GetParent (infoPtr->hMonthCal),
               GetDesktopWindow (),
@@ -904 +913 @@
 DATETIME_LButtonUp (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);  
+  DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
 
   TRACE("\n");
-  
+
   if(infoPtr->bCalDepressed == TRUE) {
     infoPtr->bCalDepressed = FALSE;
@@ -932 +941 @@
 
 static LRESULT
+DATETIME_Button_Command (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr(hwnd);
+
+    switch(HIWORD(wParam)) {
+    case BN_CLICKED:
+    {
+        DWORD state = SendMessageA((HWND)lParam, BM_GETCHECK, 0, 0);
+        if(state == BST_CHECKED)
+            infoPtr->dateValid = TRUE;
+        else
+            infoPtr->dateValid = FALSE;
+        InvalidateRect(hwnd, NULL, TRUE);
+        return 0;
+    }
+    default:
+        return 0;
+    }
+}
+          
+        
+        
+static LRESULT
+DATETIME_Command (HWND hwnd, WPARAM wParam, LPARAM lParam)
+{
+    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr(hwnd);
+
+    TRACE("%08x %08lx\n", wParam, lParam);
+    TRACE("hwndbutton = %p\n", infoPtr->hwndCheckbut);
+    if(infoPtr->hwndCheckbut == (HWND)lParam)
+        return DATETIME_Button_Command(hwnd, wParam, lParam);
+    return 0;
+}
+
+static LRESULT
 DATETIME_ParentNotify (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
- DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);   
+ DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
  LPNMHDR lpnmh = (LPNMHDR) lParam;
 
@@ -943 +987 @@
 #else
  TRACE ("%x,%lx\n",wParam, lParam);
- TRACE ("Got notification %x from %x\n", lpnmh->code, lpnmh->hwndFrom);
+ TRACE ("Got notification %x from %p\n", lpnmh->code, lpnmh->hwndFrom);
 #endif
- TRACE ("info: %x %x %x\n",hwnd,infoPtr->hMonthCal,infoPtr->hUpdown);
+ TRACE ("info: %p %p %p\n",hwnd,infoPtr->hMonthCal,infoPtr->hUpdown);
  return 0;
 }
@@ -954 +998 @@
 
 {
- DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);   
+ DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
  LPNMHDR lpnmh = (LPNMHDR) lParam;
 
  TRACE ("%x,%lx\n",wParam, lParam);
- TRACE ("Got notification %x from %x\n", lpnmh->code, lpnmh->hwndFrom);
- TRACE ("info: %x %x %x\n",hwnd,infoPtr->hMonthCal,infoPtr->hUpdown);
+ TRACE ("Got notification %x from %p\n", lpnmh->code, lpnmh->hwndFrom);
+ TRACE ("info: %p %p %p\n",hwnd,infoPtr->hMonthCal,infoPtr->hUpdown);
  return 0;
 }
 
 
-static LRESULT 
+static LRESULT
 DATETIME_KeyDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
@@ -983 +1027 @@
  switch (wParam) {
         case VK_ADD:
-        case VK_UP: 
+        case VK_UP:
                 DATETIME_IncreaseField (infoPtr,FieldNum);
                 DATETIME_SendDateTimeChangeNotify (hwnd);
@@ -1000 +1044 @@
                 DATETIME_SendDateTimeChangeNotify (hwnd);
                 break;
-        case VK_LEFT: 
+        case VK_LEFT:
                 do {
                         if (infoPtr->select==0) {
                                 infoPtr->select = infoPtr->nrFields - 1;
                                 wrap++;
-                        } else 
+                        } else
                         infoPtr->select--;
                 }
                 while ((infoPtr->fieldspec[infoPtr->select] & DT_STRING) && (wrap<2));
                 break;
-        case VK_RIGHT:  
+        case VK_RIGHT:
                 do {
                         infoPtr->select++;
@@ -1031 +1075 @@
 DATETIME_KillFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);        
+    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
 
     TRACE ("\n");
@@ -1049 +1093 @@
 DATETIME_SetFocus (HWND hwnd, WPARAM wParam, LPARAM lParam)
 {
-    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);        
+    DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
 
     TRACE ("\n");
 
     if (infoPtr->haveFocus==0) {
-        DATETIME_SendSimpleNotify (hwnd, NM_SETFOCUS);  
+        DATETIME_SendSimpleNotify (hwnd, NM_SETFOCUS);
         infoPtr->haveFocus = DTHT_GOTFOCUS;
     }
@@ -1068 +1112 @@
 
 {
- DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);   
+ DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
  NMDATETIMECHANGE dtdtc;
 
@@ -1111 +1155 @@
   infoPtr->rcClient.right = LOWORD(lParam);
 
-  TRACE("Height=%d, Width=%d\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right);
+  TRACE("Height=%ld, Width=%ld\n", infoPtr->rcClient.bottom, infoPtr->rcClient.right);
 
   /* use DrawEdge to adjust the size of rcEdge to get rcDraw */
   memcpy((&infoPtr->rcDraw), (&infoPtr->rcClient), sizeof(infoPtr->rcDraw));
 
-  DrawEdge((HDC)NULL, &(infoPtr->rcDraw), EDGE_SUNKEN, BF_RECT | BF_ADJUST);
-
-  /* set the size of the button that drops the calender down */
+  DrawEdge(NULL, &(infoPtr->rcDraw), EDGE_SUNKEN, BF_RECT | BF_ADJUST);
+
+  /* set the size of the button that drops the calendar down */
   /* FIXME: account for style that allows button on left side */
   infoPtr->calbutton.top   = infoPtr->rcDraw.top;
@@ -1136 +1180 @@
     infoPtr->monthcal_pos.x = infoPtr->rcClient.right - ((infoPtr->calbutton.right -
                                 infoPtr->calbutton.left) + 145);
-  else 
+  else
     infoPtr->monthcal_pos.x = 8;
 
@@ -1159 +1203 @@
   /* allocate memory for info structure */
   TRACE("%04x %08lx\n",wParam,lParam);
-#ifdef __WIN32OS2__
-  infoPtr = (DATETIME_INFO*)initControl(hwnd,sizeof(DATETIME_INFO));
-#else
   infoPtr = (DATETIME_INFO *)COMCTL32_Alloc (sizeof(DATETIME_INFO));
-#endif
   if (infoPtr == NULL) {
     ERR("could not allocate info memory!\n");
@@ -1172 +1212 @@
 
   if (dwStyle & DTS_SHOWNONE) {
-    infoPtr->hwndCheckbut=CreateWindowExA (0,"button", 0, 
-         WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX, 
+    infoPtr->hwndCheckbut=CreateWindowExA (0,"button", 0,
+         WS_CHILD | WS_VISIBLE | BS_AUTOCHECKBOX,
          2,2,13,13,
-         hwnd, 
-         0, GetWindowLongA  (hwnd, GWL_HINSTANCE), 0);
+         hwnd,
+         0, (HINSTANCE)GetWindowLongA  (hwnd, GWL_HINSTANCE), 0);
          SendMessageA (infoPtr->hwndCheckbut, BM_SETCHECK, 1, 0);
   }
@@ -1196 +1236 @@
 
   /* create the monthcal control */
-    infoPtr->hMonthCal = CreateWindowExA (0,"SysMonthCal32", 0, 
+    infoPtr->hMonthCal = CreateWindowExA (0,"SysMonthCal32", 0,
         WS_BORDER | WS_POPUP | WS_CLIPSIBLINGS,
         0, 0, 0, 0,
-        GetParent(hwnd), 
+        GetParent(hwnd),
         0, 0, 0);
 
@@ -1214 +1254 @@
 {
     DATETIME_INFO *infoPtr = DATETIME_GetInfoPtr (hwnd);
-        
+
     TRACE("\n");
     COMCTL32_Free (infoPtr);
@@ -1225 +1265 @@
 DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-
     if (!DATETIME_GetInfoPtr(hwnd) && (uMsg != WM_CREATE))
         return DefWindowProcA( hwnd, uMsg, wParam, lParam );
-    
+
     switch (uMsg)
     {
@@ -1301 +1340 @@
         return DATETIME_Destroy (hwnd, wParam, lParam);
 
+    case WM_COMMAND:
+        return DATETIME_Command (hwnd, wParam, lParam);
+
     default:
-        if (uMsg >= WM_USER)
+        if ((uMsg >= WM_USER) && (uMsg < WM_APP))
                 ERR("unknown msg %04x wp=%08x lp=%08lx\n",
                      uMsg, wParam, lParam);
-#ifdef __WIN32OS2__
-        return defComCtl32ProcA (hwnd, uMsg, wParam, lParam);
-#else
         return DefWindowProcA (hwnd, uMsg, wParam, lParam);
-#endif
     }
     return 0;
@@ -1329 +1367 @@
     wndClass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1);
     wndClass.lpszClassName = DATETIMEPICK_CLASSA;
- 
+
     RegisterClassA (&wndClass);
 }
@@ -1338 +1376 @@
 {
     TRACE("\n");
-    UnregisterClassA (DATETIMEPICK_CLASSA, (HINSTANCE)NULL);
-}
-
-
+    UnregisterClassA (DATETIMEPICK_CLASSA, NULL);
+}