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

Shrunk some string buffer size.

Browse Source
This commit is contained in:
spx 2010-09-13 20:06:52 +00:00
parent 27b07f653c
commit 2cb88b0733
10 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/AboutDialog.cpp
View File

@ -309,7 +309,7 @@ void UpdateWidgets()
if ((*iter).version != 0) if ((*iter).version != 0)
{ {
WCHAR buffer[256]; WCHAR buffer[64];
swprintf(buffer, L"%i.%i", (*iter).version / 1000, (*iter).version % 1000); swprintf(buffer, L"%i.%i", (*iter).version / 1000, (*iter).version % 1000);
ListView_SetItemText(widget, i, 1, buffer); ListView_SetItemText(widget, i, 1, buffer);
} }

4
Library/ConfigParser.cpp
View File

@ -697,7 +697,7 @@ std::vector<Gdiplus::REAL> CConfigParser::ReadFloats(LPCTSTR section, LPCTSTR ke
int CConfigParser::ReadInt(LPCTSTR section, LPCTSTR key, int defValue) int CConfigParser::ReadInt(LPCTSTR section, LPCTSTR key, int defValue)
{ {
TCHAR buffer[256]; TCHAR buffer[32];
swprintf(buffer, L"%i", defValue); swprintf(buffer, L"%i", defValue);
const std::wstring& result = ReadString(section, key, buffer); const std::wstring& result = ReadString(section, key, buffer);
@ -752,7 +752,7 @@ int CConfigParser::ReadFormula(const std::wstring& result, double* resultValue)
Color CConfigParser::ReadColor(LPCTSTR section, LPCTSTR key, const Color& defValue) Color CConfigParser::ReadColor(LPCTSTR section, LPCTSTR key, const Color& defValue)
{ {
TCHAR buffer[256]; TCHAR buffer[128];
swprintf(buffer, L"%i, %i, %i, %i", defValue.GetR(), defValue.GetG(), defValue.GetB(), defValue.GetA()); swprintf(buffer, L"%i, %i, %i, %i", defValue.GetR(), defValue.GetG(), defValue.GetB(), defValue.GetA());
const std::wstring& result = ReadString(section, key, buffer); const std::wstring& result = ReadString(section, key, buffer);

2
Library/Litestep.cpp
View File

@ -520,7 +520,7 @@ BOOL LSLog(int nLevel, LPCTSTR pszModule, LPCTSTR pszMessage)
{ {
startTime = time; startTime = time;
} }
WCHAR buffer[MAX_PATH]; WCHAR buffer[128];
swprintf(buffer, L"(%02i:%02i:%02i.%03i) ", (time - startTime) / (1000 * 60* 60), ((time - startTime) / (1000 * 60)) % 60, ((time - startTime) / 1000) % 60, (time - startTime) % 1000); swprintf(buffer, L"(%02i:%02i:%02i.%03i) ", (time - startTime) / (1000 * 60* 60), ((time - startTime) / (1000 * 60)) % 60, ((time - startTime) / 1000) % 60, (time - startTime) % 1000);
std::wstring message(buffer); std::wstring message(buffer);

15
Library/Measure.cpp
View File

@ -506,8 +506,7 @@ double CMeasure::GetValueRange()
const WCHAR* CMeasure::GetStringValue(bool autoScale, double scale, int decimals, bool percentual) const WCHAR* CMeasure::GetStringValue(bool autoScale, double scale, int decimals, bool percentual)
{ {
static WCHAR buffer[MAX_LINE_LENGTH]; static WCHAR buffer[MAX_LINE_LENGTH];
static WCHAR buffer2[MAX_LINE_LENGTH]; WCHAR format[32];
double theValue = GetValue();
if(percentual) if(percentual)
{ {
@ -515,20 +514,20 @@ const WCHAR* CMeasure::GetStringValue(bool autoScale, double scale, int decimals
} }
else if(autoScale) else if(autoScale)
{ {
GetScaledValue(decimals, theValue, buffer); GetScaledValue(decimals, GetValue(), buffer);
} }
else else
{ {
if(decimals == 0) if(decimals == 0)
{ {
double val = theValue * (1.0 / scale); double val = GetValue() * (1.0 / scale);
val = (val + ( (val >= 0) ? 0.5 : -0.5 ) ); val += (val >= 0) ? 0.5 : -0.5;
swprintf(buffer, L"%lli", (LONGLONG)val); swprintf(buffer, L"%lli", (LONGLONG)val);
} }
else else
{ {
swprintf(buffer2, L"%%.%if", decimals); swprintf(format, L"%%.%if", decimals);
swprintf(buffer, buffer2, theValue * (1.0 / scale)); swprintf(buffer, format, GetValue() * (1.0 / scale));
} }
} }
@ -537,7 +536,7 @@ const WCHAR* CMeasure::GetStringValue(bool autoScale, double scale, int decimals
void CMeasure::GetScaledValue(int decimals, double theValue, WCHAR* buffer) void CMeasure::GetScaledValue(int decimals, double theValue, WCHAR* buffer)
{ {
WCHAR format[16]; WCHAR format[32];
double value = 0; double value = 0;
if(decimals == 0) if(decimals == 0)

6
Library/MeasureNet.cpp
View File

@ -586,7 +586,7 @@ void CMeasureNet::ResetStats()
*/ */
void CMeasureNet::ReadStats(const std::wstring& iniFile) void CMeasureNet::ReadStats(const std::wstring& iniFile)
{ {
WCHAR buffer[256]; WCHAR buffer[64];
int count = GetPrivateProfileInt(L"Statistics", L"NetStatsCount", 0, iniFile.c_str()); int count = GetPrivateProfileInt(L"Statistics", L"NetStatsCount", 0, iniFile.c_str());
c_StatValues.clear(); c_StatValues.clear();
@ -621,8 +621,8 @@ void CMeasureNet::ReadStats(const std::wstring& iniFile)
*/ */
void CMeasureNet::WriteStats(const std::wstring& iniFile) void CMeasureNet::WriteStats(const std::wstring& iniFile)
{ {
WCHAR buffer[256]; WCHAR buffer[32];
WCHAR buffer2[256]; WCHAR buffer2[64];
wsprintf(buffer, L"%i", c_StatValues.size() / 2); wsprintf(buffer, L"%i", c_StatValues.size() / 2);
WritePrivateProfileString(L"Statistics", L"NetStatsCount", buffer, iniFile.c_str()); WritePrivateProfileString(L"Statistics", L"NetStatsCount", buffer, iniFile.c_str());

2
Library/Meter.cpp
View File

@ -541,7 +541,7 @@ std::wstring CMeter::ReplaceMeasures(std::wstring source)
return source; return source;
} }
WCHAR buffer[256]; WCHAR buffer[64];
// Create the actual text (i.e. replace %1, %2, .. with the measure texts) // Create the actual text (i.e. replace %1, %2, .. with the measure texts)
for (size_t i = 0; i < stringValues.size(); ++i) for (size_t i = 0; i < stringValues.size(); ++i)

2
Library/MeterLine.cpp
View File

@ -92,7 +92,7 @@ void CMeterLine::Initialize()
*/ */
void CMeterLine::ReadConfig(const WCHAR* section) void CMeterLine::ReadConfig(const WCHAR* section)
{ {
WCHAR tmpName[256]; WCHAR tmpName[64];
// Store the current number of lines so we know if the buffer needs to be updated // Store the current number of lines so we know if the buffer needs to be updated
int oldLineCount = (int)m_Colors.size(); int oldLineCount = (int)m_Colors.size();

4
Library/MeterString.cpp
View File

@ -215,7 +215,7 @@ void CMeterString::Initialize()
*/ */
void CMeterString::ReadConfig(const WCHAR* section) void CMeterString::ReadConfig(const WCHAR* section)
{ {
WCHAR tmpName[256]; WCHAR tmpName[64];
// Store the current font values so we know if the font needs to be updated // Store the current font values so we know if the font needs to be updated
std::wstring oldFontFace = m_FontFace; std::wstring oldFontFace = m_FontFace;
@ -418,7 +418,7 @@ bool CMeterString::Update()
} }
else else
{ {
WCHAR buffer[256]; WCHAR buffer[64];
// Create the actual text (i.e. replace %1, %2, .. with the measure texts) // Create the actual text (i.e. replace %1, %2, .. with the measure texts)
std::wstring tmpText = m_Text; std::wstring tmpText = m_Text;

10
Library/MeterWindow.cpp
View File

@ -1606,14 +1606,14 @@ void CMeterWindow::ReadConfig()
if (!m_WindowX.empty() && m_WindowX[0] == L'(' && m_WindowX[m_WindowX.size() - 1] == L')') if (!m_WindowX.empty() && m_WindowX[0] == L'(' && m_WindowX[m_WindowX.size() - 1] == L')')
{ {
double value = parser.ReadFormula(section, L"WindowX", 0.0); double value = parser.ReadFormula(section, L"WindowX", 0.0);
WCHAR buffer[256]; WCHAR buffer[32];
swprintf(buffer, L"%i", (int)value); swprintf(buffer, L"%i", (int)value);
m_WindowX = buffer; m_WindowX = buffer;
} }
if (!m_WindowY.empty() && m_WindowY[0] == L'(' && m_WindowY[m_WindowY.size() - 1] == L')') if (!m_WindowY.empty() && m_WindowY[0] == L'(' && m_WindowY[m_WindowY.size() - 1] == L')')
{ {
double value = parser.ReadFormula(section, L"WindowY", 0.0); double value = parser.ReadFormula(section, L"WindowY", 0.0);
WCHAR buffer[256]; WCHAR buffer[32];
swprintf(buffer, L"%i", (int)value); swprintf(buffer, L"%i", (int)value);
m_WindowY = buffer; m_WindowY = buffer;
} }
@ -1682,7 +1682,7 @@ void CMeterWindow::ReadConfig()
*/ */
void CMeterWindow::WriteConfig() void CMeterWindow::WriteConfig()
{ {
WCHAR buffer[256]; WCHAR buffer[32];
std::wstring iniFile = m_Rainmeter->GetIniFile(); std::wstring iniFile = m_Rainmeter->GetIniFile();
const WCHAR* section = m_SkinName.c_str(); const WCHAR* section = m_SkinName.c_str();
@ -1757,7 +1757,7 @@ bool CMeterWindow::ReadSkin()
int appVersion = m_Parser.ReadInt(L"Rainmeter", L"AppVersion", 0); int appVersion = m_Parser.ReadInt(L"Rainmeter", L"AppVersion", 0);
if (appVersion > RAINMETER_VERSION) if (appVersion > RAINMETER_VERSION)
{ {
WCHAR buffer[256]; WCHAR buffer[128];
std::wstring text; std::wstring text;
if (appVersion % 1000 != 0) if (appVersion % 1000 != 0)
{ {
@ -1864,7 +1864,7 @@ bool CMeterWindow::ReadSkin()
} }
// Here we are checking to see if there are more than one local font // Here we are checking to see if there are more than one local font
// to be loaded. They will be named LocalFont2, LocalFont 3, etc. // to be loaded. They will be named LocalFont2, LocalFont 3, etc.
WCHAR tmpName[256]; WCHAR tmpName[64];
int i = 2; int i = 2;
bool loop = true; bool loop = true;
do do

10
Library/Rainmeter.cpp
View File

@ -1643,8 +1643,8 @@ void CRainmeter::CheckSkinVersions()
// DebugLog(L"New: %s", strVersionNew.c_str()); // DebugLog(L"New: %s", strVersionNew.c_str());
// Compare with the version entry in the Rainmeter.ini // Compare with the version entry in the Rainmeter.ini
WCHAR tmpSz[MAX_LINE_LENGTH] = {0}; WCHAR tmpSz[256] = {0};
GetPrivateProfileString(menu[i].name.c_str(), L"Version", L"", tmpSz, MAX_LINE_LENGTH, m_IniFile.c_str()); GetPrivateProfileString(menu[i].name.c_str(), L"Version", L"", tmpSz, 256, m_IniFile.c_str());
strVersionInIni = tmpSz; strVersionInIni = tmpSz;
// DebugLog(L"In Ini: %s", strVersionInIni.c_str()); // DebugLog(L"In Ini: %s", strVersionInIni.c_str());
@ -2827,7 +2827,7 @@ void CRainmeter::ReadGeneralSettings(std::wstring& iniFile)
for (UINT i = 1; i <= CSystem::GetMonitorCount(); ++i) for (UINT i = 1; i <= CSystem::GetMonitorCount(); ++i)
{ {
WCHAR buffer[256]; WCHAR buffer[64];
wsprintf(buffer, L"DesktopWorkArea@%i", i); wsprintf(buffer, L"DesktopWorkArea@%i", i);
area = parser.ReadString(L"Rainmeter", buffer, L""); area = parser.ReadString(L"Rainmeter", buffer, L"");
if (!area.empty()) if (!area.empty())
@ -3103,7 +3103,7 @@ void CRainmeter::UpdateDesktopWorkArea(bool reset)
std::wstring format = L"Applying DesktopWorkArea"; std::wstring format = L"Applying DesktopWorkArea";
if (i != 0) if (i != 0)
{ {
WCHAR buffer[256]; WCHAR buffer[64];
wsprintf(buffer, L"@%i", i); wsprintf(buffer, L"@%i", i);
format += buffer; format += buffer;
} }
@ -3604,7 +3604,7 @@ void CRainmeter::CreateMonitorMenu(HMENU monitorMenu, CMeterWindow* meterWindow)
for (size_t i = 0; i < monitors.size(); ++i) for (size_t i = 0; i < monitors.size(); ++i)
{ {
WCHAR buffer[256]; WCHAR buffer[64];
wsprintf(buffer, L"@%i: ", i + 1); wsprintf(buffer, L"@%i: ", i + 1);
std::wstring item = buffer; std::wstring item = buffer;