From 91243d1c1d3b2360aab5b134c74dcb279a9136d7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 15 Mar 2014 16:02:47 +0000 Subject: crash fix for time handling in HistoryStats 64 bits (thx to white_tiger) git-svn-id: http://svn.miranda-ng.org/main/trunk@8623 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HistoryStats/src/optionsctrlimpl.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/HistoryStats/src/optionsctrlimpl.h') diff --git a/plugins/HistoryStats/src/optionsctrlimpl.h b/plugins/HistoryStats/src/optionsctrlimpl.h index 9ee6474022..218a28718a 100644 --- a/plugins/HistoryStats/src/optionsctrlimpl.h +++ b/plugins/HistoryStats/src/optionsctrlimpl.h @@ -274,8 +274,8 @@ private: { public: static ext::string getDTFormatString(const ext::string& strFormat); - static SYSTEMTIME toSystemTime(DWORD dwTimestamp); - static DWORD fromSystemTime(const SYSTEMTIME& st); + static SYSTEMTIME toSystemTime(time_t timestamp); + static time_t fromSystemTime(const SYSTEMTIME& st); public: bool m_bDisableChildsOnNone; @@ -283,18 +283,18 @@ private: ext::string m_strFormat; ext::string m_strFormatDT; bool m_bNone; - DWORD m_dwTimestamp; + time_t m_timestamp; HWND m_hDateTimeWnd; private: void enableChildsDateTime(); bool getChildEnable(); - DWORD getTimestampValue(); + time_t getTimestampValue(); bool getTimestampNone(); ext::string getCombinedText(); public: - explicit DateTime(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szFormat, DWORD dwTimestamp, DWORD dwFlags, INT_PTR dwData); + explicit DateTime(OptionsCtrlImpl* pCtrl, Item* pParent, const TCHAR* szLabel, const TCHAR* szFormat, time_t timestamp, DWORD dwFlags, INT_PTR dwData); virtual void onToggle() { onActivate(); } virtual void onSelect(); @@ -308,8 +308,8 @@ private: bool isNone(); void setNone(); - DWORD getTimestamp(); - void setTimestamp(DWORD dwTimestamp); + time_t getTimestamp(); + void setTimestamp(time_t timestamp); void onDateTimeChange(); bool isMonthCalVisible(); }; @@ -444,4 +444,4 @@ private: bool getItemFreeRect(HTREEITEM hItem, RECT& outRect); }; -#endif // HISTORYSTATS_GUARD_OPTIONSCTRLIMPL_H \ No newline at end of file +#endif // HISTORYSTATS_GUARD_OPTIONSCTRLIMPL_H -- cgit v1.2.3