From 3ad2582c4a4a6378f294f9256ecbcbdf0ae88e3a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 3 May 2018 16:02:14 +0200 Subject: mir_forkThread - stronger typizatioin for thread function parameter --- plugins/HistoryStats/src/settings.cpp | 2 +- plugins/HistoryStats/src/statistic.cpp | 12 +++++------- plugins/HistoryStats/src/statistic.h | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'plugins/HistoryStats/src') diff --git a/plugins/HistoryStats/src/settings.cpp b/plugins/HistoryStats/src/settings.cpp index 722e6e0c96..f41602217c 100644 --- a/plugins/HistoryStats/src/settings.cpp +++ b/plugins/HistoryStats/src/settings.cpp @@ -41,7 +41,7 @@ Settings::CharMapper::CharMapper(const Settings& settings) Settings::Filter::Filter(const ext::string& strID) : m_strID(strID), m_nMode(fwmWordsMatching), m_nRef(0) { - time_t curTime = time(nullptr); + time_t curTime = time(0); struct tm* curTM = localtime(&curTime); m_strName += utils::intToPadded(1900 + curTM->tm_year, 4); diff --git a/plugins/HistoryStats/src/statistic.cpp b/plugins/HistoryStats/src/statistic.cpp index 842e24106e..321ad138a7 100644 --- a/plugins/HistoryStats/src/statistic.cpp +++ b/plugins/HistoryStats/src/statistic.cpp @@ -1188,7 +1188,7 @@ Statistic::Statistic(const Settings& settings, InvocationSource invokedFrom, HIN m_nFirstTime(0), m_nLastTime(0) { - m_TimeStarted = TimeZone_ToLocal(time(nullptr)); + m_TimeStarted = TimeZone_ToLocal(time(0)); m_MSecStarted = GetTickCount(); m_AverageMinTime = settings.m_AverageMinTime * 24 * 60 * 60; // calculate seconds from days } @@ -1214,7 +1214,7 @@ bool Statistic::createStatistics() utils::centerDialog(m_hWndProgress); UpdateWindow(m_hWndProgress); - HANDLE hThread = mir_forkthread(threadProcSteps, (void*)this); + HANDLE hThread = mir_forkThread(threadProcSteps, this); bool bDone = false; MSG msg; @@ -1304,11 +1304,10 @@ void Statistic::createStatisticsSteps() setProgressLabel(false, TranslateT("Done")); } -void __cdecl Statistic::threadProc(void *lpParameter) +void __cdecl Statistic::threadProc(Statistic* pStats) { Thread_SetName("HistoryStats: Statistic::threadProc"); - Statistic* pStats = reinterpret_cast(lpParameter); SetEvent(pStats->m_hThreadPushEvent); // perform action @@ -1324,10 +1323,9 @@ void __cdecl Statistic::threadProc(void *lpParameter) m_bRunning = false; } -void __cdecl Statistic::threadProcSteps(void *lpParameter) +void __cdecl Statistic::threadProcSteps(Statistic *pStats) { Thread_SetName("HistoryStats: Statistic::threadProcSteps"); - Statistic *pStats = reinterpret_cast(lpParameter); if (pStats->m_Settings.m_ThreadLowPriority) SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_BELOW_NORMAL); @@ -1421,7 +1419,7 @@ void Statistic::run(const Settings& settings, InvocationSource invokedFrom, HINS Statistic *pStats = new Statistic(settings, invokedFrom, hInst); pStats->m_hThreadPushEvent = hEvent; // create worker thread - HANDLE hThread = mir_forkthread(threadProc, (void*)pStats); + HANDLE hThread = mir_forkThread(threadProc, pStats); // wait for thread to place itself on thread unwind stack if (hThread != nullptr) diff --git a/plugins/HistoryStats/src/statistic.h b/plugins/HistoryStats/src/statistic.h index e05254b5d7..fc4f2cacb0 100644 --- a/plugins/HistoryStats/src/statistic.h +++ b/plugins/HistoryStats/src/statistic.h @@ -160,8 +160,8 @@ private: explicit Statistic(const Settings& settings, InvocationSource invokedFrom, HINSTANCE hInst); bool createStatistics(); void createStatisticsSteps(); - static void __cdecl threadProc(void *lpParameter); - static void __cdecl threadProcSteps(void *lpParameter); + static void __cdecl threadProc(Statistic *pStats); + static void __cdecl threadProcSteps(Statistic *pStats); public: ~Statistic(); -- cgit v1.2.3