Index: src/ch/ch.rc =================================================================== diff -u -N -r30297d6aab17483da8e7b8323b4d17ff1a9f78d6 -r6a71d60b7ab5489db9ffc75784557e713df9a52f --- src/ch/ch.rc (.../ch.rc) (revision 30297d6aab17483da8e7b8323b4d17ff1a9f78d6) +++ src/ch/ch.rc (.../ch.rc) (revision 6a71d60b7ab5489db9ffc75784557e713df9a52f) @@ -348,13 +348,13 @@ CONTROL "DateTimePicker1",IDC_DATE1_DATETIMEPICKER, "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,108,157,109,15,0,HIDC_DATE1_DATETIMEPICKER CONTROL "DateTimePicker2",IDC_TIME1_DATETIMEPICKER, - "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,220,157,64,15,0,HIDC_TIME1_DATETIMEPICKER + "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP | 0x8,220,157,64,15,0,HIDC_TIME1_DATETIMEPICKER CONTROL "and",IDC_DATE2_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,176,30,10,0,HIDC_DATE2_CHECK COMBOBOX IDC_DATE2TYPE_COMBO,58,174,48,107,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP,0,HIDC_DATE2TYPE_COMBO CONTROL "DateTimePicker1",IDC_DATE2_DATETIMEPICKER, "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,108,173,109,15,0,HIDC_DATE2_DATETIMEPICKER CONTROL "DateTimePicker2",IDC_TIME2_DATETIMEPICKER, - "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP,220,173,64,15,0,HIDC_TIME2_DATETIMEPICKER + "SysDateTimePick32",DTS_RIGHTALIGN | DTS_UPDOWN | DTS_SHOWNONE | WS_TABSTOP | 0x8,220,173,64,15,0,HIDC_TIME2_DATETIMEPICKER CONTROL "By attributes",IDC_ATTRIBUTES_CHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,199,277,10,0,HIDC_ATTRIBUTES_CHECK CONTROL "Archive",IDC_ARCHIVE_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,29,212,81,10,0,HIDC_ARCHIVE_CHECK CONTROL "Read only",IDC_READONLY_CHECK,"Button",BS_AUTO3STATE | WS_TABSTOP,29,224,81,10,0,HIDC_READONLY_CHECK Index: src/libchcore/TDateTime.cpp =================================================================== diff -u -N -rb193a95402f2bf4c456fb9d65d111caaf6994823 -r6a71d60b7ab5489db9ffc75784557e713df9a52f --- src/libchcore/TDateTime.cpp (.../TDateTime.cpp) (revision b193a95402f2bf4c456fb9d65d111caaf6994823) +++ src/libchcore/TDateTime.cpp (.../TDateTime.cpp) (revision 6a71d60b7ab5489db9ffc75784557e713df9a52f) @@ -180,8 +180,6 @@ err = _localtime64_s(&tOtherTimeInfo, &rOtherDateTime.m_tTime); if(err != 0) THROW_CORE_EXCEPTION(eErr_InvalidData); - if(tThisTimeInfo.tm_isdst != tOtherTimeInfo.tm_isdst) - THROW_CORE_EXCEPTION(eErr_InternalProblem); time_t tDiffDateTime = 0; if(bCompareDate)