chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Fixed the issue that Rainmeter crashes if a invalid format parameter is specified in MeasureTime/MeasureUptime.

Browse Source
This commit is contained in:
spx 2010-08-07 19:03:58 +00:00
parent 6f919cfa3f
commit 701178766d
3 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Library/MeasureTime.cpp
View File

@ -22,6 +22,13 @@
#include "MeasureTime.h" #include "MeasureTime.h"
#include "Rainmeter.h" #include "Rainmeter.h"
#include <time.h> #include <time.h>
#include <errno.h>
#include <crtdbg.h>
void MeasureTime_CRTInvalidParameterHandler(const wchar_t* expression, const wchar_t* function, const wchar_t* file, unsigned int line, uintptr_t pReserved)
{
// Do nothing.
}
int GetYearDay(int year, int month, int day) int GetYearDay(int year, int month, int day)
{ {
@ -71,6 +78,32 @@ CMeasureTime::~CMeasureTime()
{ {
} }
/*
** TimeToString
**
** Converts given time to string.
** This function is a wrapper function for wcsftime.
**
*/
void CMeasureTime::TimeToString(WCHAR* buf, size_t bufLen, const WCHAR* format, const struct tm* time)
{
if (bufLen > 0)
{
_invalid_parameter_handler oldHandler = _set_invalid_parameter_handler(MeasureTime_CRTInvalidParameterHandler);
_CrtSetReportMode(_CRT_ASSERT, 0);
errno = 0;
wcsftime(buf, bufLen, m_Format.c_str(), time);
if (errno == EINVAL)
{
DebugLog(L"Time: Invalid Format: Measure=[%s], Format=\"%s\"", m_Name.c_str(), format);
buf[0] = 0;
}
_set_invalid_parameter_handler(oldHandler);
}
}
/* /*
** Update ** Update
** **
@ -99,6 +132,8 @@ bool CMeasureTime::Update()
SYSTEMTIME sysToday; SYSTEMTIME sysToday;
FILETIME ftToday; FILETIME ftToday;
tmpSz[0] = 0;
ftToday.dwHighDateTime = m_Time.HighPart; ftToday.dwHighDateTime = m_Time.HighPart;
ftToday.dwLowDateTime = m_Time.LowPart; ftToday.dwLowDateTime = m_Time.LowPart;
@ -125,7 +160,7 @@ bool CMeasureTime::Update()
today.tm_yday = GetYearDay(sysToday.wYear, sysToday.wMonth, sysToday.wDay); today.tm_yday = GetYearDay(sysToday.wYear, sysToday.wMonth, sysToday.wDay);
today.tm_year = sysToday.wYear - 1900; today.tm_year = sysToday.wYear - 1900;
wcsftime(tmpSz, MAX_LINE_LENGTH, m_Format.c_str(), &today); TimeToString(tmpSz, MAX_LINE_LENGTH, m_Format.c_str(), &today);
} }
m_Value = wcstod(tmpSz, NULL); m_Value = wcstod(tmpSz, NULL);
@ -146,6 +181,8 @@ const WCHAR* CMeasureTime::GetStringValue(bool autoScale, double scale, int deci
static WCHAR tmpSz[MAX_LINE_LENGTH]; static WCHAR tmpSz[MAX_LINE_LENGTH];
struct tm today; struct tm today;
tmpSz[0] = 0;
SYSTEMTIME sysToday; SYSTEMTIME sysToday;
FILETIME ftToday; FILETIME ftToday;
ftToday.dwHighDateTime = m_Time.HighPart; ftToday.dwHighDateTime = m_Time.HighPart;
@ -176,12 +213,12 @@ const WCHAR* CMeasureTime::GetStringValue(bool autoScale, double scale, int deci
} }
else else
{ {
wcsftime(tmpSz, MAX_LINE_LENGTH, m_Format.c_str(), &today); TimeToString(tmpSz, MAX_LINE_LENGTH, m_Format.c_str(), &today);
} }
} }
else else
{ {
wcsftime(tmpSz, MAX_LINE_LENGTH, L"%H:%M:%S", &today); TimeToString(tmpSz, MAX_LINE_LENGTH, L"%H:%M:%S", &today);
} }
return CheckSubstitute(tmpSz); return CheckSubstitute(tmpSz);

2
Library/MeasureTime.h
View File

@ -32,6 +32,8 @@ public:
virtual const WCHAR* GetStringValue(bool autoScale, double scale, int decimals, bool percentual); virtual const WCHAR* GetStringValue(bool autoScale, double scale, int decimals, bool percentual);
private: private:
void TimeToString(WCHAR* buf, size_t bufLen, const WCHAR* format, const struct tm* time);
std::wstring m_Format; std::wstring m_Format;
LARGE_INTEGER m_DeltaTime; LARGE_INTEGER m_DeltaTime;
LARGE_INTEGER m_Time; LARGE_INTEGER m_Time;

10
Library/MeasureUptime.cpp
View File

@ -93,7 +93,15 @@ const WCHAR* CMeasureUptime::GetStringValue(bool autoScale, double scale, int de
time[2] %= 24; time[2] %= 24;
} }
FormatMessage(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, m_Format.c_str(), 0, 0, buffer, MAX_LINE_LENGTH, (char**)time); __try
{
FormatMessage(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ARGUMENT_ARRAY, m_Format.c_str(), 0, 0, buffer, MAX_LINE_LENGTH, (char**)time);
}
__except (EXCEPTION_EXECUTE_HANDLER)
{
DebugLog(L"Uptime: Invalid Format: Measure=[%s], Format=\"%s\"", m_Name.c_str(), m_Format.c_str());
buffer[0] = 0;
}
return CheckSubstitute(buffer); return CheckSubstitute(buffer);
} }