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

Additional change for r852.

Browse Source
This commit is contained in:
spx 2011-07-07 10:48:42 +00:00
parent bd7d787d93
commit 9bc238f9f2
1 changed files with 49 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Library/ConfigParser.cpp
View File

@ -1064,8 +1064,8 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
// Get all the sections (i.e. different meters) // Get all the sections (i.e. different meters)
std::list<std::wstring> sections; std::list<std::wstring> sections;
WCHAR* items = new WCHAR[MAX_LINE_LENGTH]; DWORD itemsSize = MAX_LINE_LENGTH;
DWORD size = MAX_LINE_LENGTH; WCHAR* items = new WCHAR[itemsSize];
WCHAR* pos = NULL; WCHAR* pos = NULL;
WCHAR* epos = NULL; WCHAR* epos = NULL;
@ -1075,22 +1075,22 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
while (true) while (true)
{ {
items[0] = 0; items[0] = 0;
DWORD res = GetPrivateProfileString(NULL, NULL, NULL, items, size, iniRead.c_str()); DWORD res = GetPrivateProfileString(NULL, NULL, NULL, items, itemsSize, iniRead.c_str());
if (res == 0) // File not found if (res == 0) // File not found
{ {
delete [] items; delete [] items;
if (temporary) CSystem::RemoveFile(iniRead); if (temporary) CSystem::RemoveFile(iniRead);
return; return;
} }
if (res < size - 2) // Fits in the buffer if (res < itemsSize - 2) // Fits in the buffer
{ {
epos = items + res; epos = items + res;
break; break;
} }
delete [] items; delete [] items;
size *= 2; itemsSize *= 2;
items = new WCHAR[size]; items = new WCHAR[itemsSize];
} }
// Read the sections // Read the sections
@ -1100,9 +1100,8 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
if (*pos) if (*pos)
{ {
std::wstring strTmp = StrToLower(pos); std::wstring strTmp = StrToLower(pos);
if (m_FoundSections.find(strTmp) == m_FoundSections.end()) if (m_FoundSections.insert(strTmp).second)
{ {
m_FoundSections.insert(strTmp);
m_Sections.push_back(pos); m_Sections.push_back(pos);
} }
sections.push_back(pos); sections.push_back(pos);
@ -1120,7 +1119,7 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
sections.push_back(L"Rainmeter"); sections.push_back(L"Rainmeter");
sections.push_back(config); sections.push_back(config);
if (depth == 0) if (depth == 0) // Add once
{ {
m_Sections.push_back(L"Rainmeter"); m_Sections.push_back(L"Rainmeter");
m_Sections.push_back(config); m_Sections.push_back(config);
@ -1128,27 +1127,26 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
} }
// Read the keys and values // Read the keys and values
DWORD bufferSize = MAX_LINE_LENGTH;
WCHAR* buffer = new WCHAR[bufferSize];
std::list<std::wstring>::const_iterator iter = sections.begin(); std::list<std::wstring>::const_iterator iter = sections.begin();
for ( ; iter != sections.end(); ++iter) for ( ; iter != sections.end(); ++iter)
{ {
std::unordered_set<std::wstring> foundKeys;
bool isVariables = (_wcsicmp((*iter).c_str(), L"Variables") == 0); bool isVariables = (_wcsicmp((*iter).c_str(), L"Variables") == 0);
// Read all "key=value" from the section
while (true) while (true)
{ {
items[0] = 0; items[0] = 0;
DWORD res = GetPrivateProfileString((*iter).c_str(), NULL, NULL, items, size, iniRead.c_str()); DWORD res = GetPrivateProfileSection((*iter).c_str(), items, itemsSize, iniRead.c_str());
if (res < size - 2) // Fits in the buffer if (res < itemsSize - 2) // Fits in the buffer
{ {
epos = items + res; epos = items + res;
break; break;
} }
delete [] items; delete [] items;
size *= 2; itemsSize *= 2;
items = new WCHAR[size]; items = new WCHAR[itemsSize];
} }
pos = items; pos = items;
@ -1156,36 +1154,45 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
{ {
if (*pos) if (*pos)
{ {
while (true) std::wstring key = pos;
std::wstring::size_type len = key.length(), sep = key.find_first_of(L'=');
if (sep != std::wstring::npos && sep != 0)
{ {
buffer[0] = 0; std::wstring value = key.substr(sep + 1, len - sep);
DWORD res = GetPrivateProfileString((*iter).c_str(), pos, L"", buffer, bufferSize, iniRead.c_str()); key.resize(sep);
if (res < bufferSize - 2) break; // Fits in the buffer
delete [] buffer; std::wstring lowerKey = StrToLower(key);
bufferSize *= 2; if (foundKeys.insert(lowerKey).second)
buffer = new WCHAR[bufferSize]; {
// Trim surrounded quotes from value
std::wstring::size_type valueLen = value.length();
if (valueLen >= 2 && (
(value[0] == L'\"' && value[valueLen - 1] == L'\"') ||
(value[0] == L'\'' && value[valueLen - 1] == L'\'')))
{
valueLen -= 2;
value.swap(value.substr(1, valueLen));
} }
if (_wcsnicmp(pos, L"@include", 8) == 0) if (wcsncmp(lowerKey.c_str(), L"@include", 8) == 0)
{ {
std::wstring strIncludeFile = buffer;
ReadVariables(); ReadVariables();
ReplaceVariables(strIncludeFile); ReplaceVariables(value);
if (strIncludeFile.find(L':') == std::wstring::npos && if (value.find(L':') == std::wstring::npos &&
(strIncludeFile.length() < 2 || (strIncludeFile[0] != L'\\' && strIncludeFile[0] != L'/') || (strIncludeFile[1] != L'\\' && strIncludeFile[1] != L'/'))) (valueLen < 2 || (value[0] != L'\\' && value[0] != L'/') || (value[1] != L'\\' && value[1] != L'/')))
{ {
// It's a relative path so add the current path as a prefix // It's a relative path so add the current path as a prefix
strIncludeFile.insert(0, CRainmeter::ExtractPath(iniFile)); value.insert(0, CRainmeter::ExtractPath(iniFile));
} }
ReadIniFile(iniFileMappings, strIncludeFile, config, depth + 1); ReadIniFile(iniFileMappings, value, config, depth + 1);
} }
else else
{ {
SetValue((*iter), pos, buffer, isVariables); SetValue((*iter), key, value, isVariables);
} }
}
pos += wcslen(pos) + 1; }
pos += len + 1;
} }
else // Empty string else // Empty string
{ {
@ -1193,7 +1200,6 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
} }
} }
} }
delete [] buffer;
delete [] items; delete [] items;
if (temporary) CSystem::RemoveFile(iniRead); if (temporary) CSystem::RemoveFile(iniRead);
} }