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 an issue that the following sections are ignored if ini-file contains null section "[]".

Browse Source
This commit is contained in:
spx 2010-11-24 13:43:20 +00:00
parent 6eeaa81901
commit 72da30c565
1 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
Library/ConfigParser.cpp
View File

@ -985,6 +985,7 @@ 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)
WCHAR* items = new WCHAR[MAX_LINE_LENGTH]; WCHAR* items = new WCHAR[MAX_LINE_LENGTH];
int size = MAX_LINE_LENGTH; int size = MAX_LINE_LENGTH;
WCHAR* epos = NULL;
// Get all the sections // Get all the sections
while(true) while(true)
@ -997,7 +998,11 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
if (temporary) CSystem::RemoveFile(iniRead); if (temporary) CSystem::RemoveFile(iniRead);
return; return;
} }
if (res < size - 2) break; // Fits in the buffer if (res < size - 2) // Fits in the buffer
{
epos = items + res;
break;
}
delete [] items; delete [] items;
size *= 2; size *= 2;
@ -1007,17 +1012,24 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
// Read the sections // Read the sections
std::list<std::wstring> sections; std::list<std::wstring> sections;
WCHAR* pos = items; WCHAR* pos = items;
while(wcslen(pos) > 0) while (pos < epos)
{ {
std::wstring strTmp(pos); if (*pos)
std::transform(strTmp.begin(), strTmp.end(), strTmp.begin(), ::towlower);
if (m_Keys.find(strTmp) == m_Keys.end())
{ {
m_Keys[strTmp] = std::vector<std::wstring>(); std::wstring strTmp(pos);
m_Sections.push_back(pos); std::transform(strTmp.begin(), strTmp.end(), strTmp.begin(), ::towlower);
if (m_Keys.find(strTmp) == m_Keys.end())
{
m_Keys[strTmp] = std::vector<std::wstring>();
m_Sections.push_back(pos);
}
sections.push_back(pos);
pos += wcslen(pos) + 1;
}
else // Empty string
{
++pos;
} }
sections.push_back(pos);
pos = pos + wcslen(pos) + 1;
} }
// Read the keys and values // Read the keys and values
@ -1031,48 +1043,59 @@ void CConfigParser::ReadIniFile(const std::vector<std::wstring>& iniFileMappings
{ {
items[0] = 0; items[0] = 0;
int res = GetPrivateProfileString((*iter).c_str(), NULL, NULL, items, size, iniRead.c_str()); int res = GetPrivateProfileString((*iter).c_str(), NULL, NULL, items, size, iniRead.c_str());
if (res < size - 2) break; // Fits in the buffer if (res < size - 2) // Fits in the buffer
{
epos = items + res;
break;
}
delete [] items; delete [] items;
size *= 2; size *= 2;
items = new WCHAR[size]; items = new WCHAR[size];
} }
WCHAR* pos = items; pos = items;
while(wcslen(pos) > 0) while (pos < epos)
{ {
std::wstring strKey = pos; if (*pos)
while(true)
{ {
buffer[0] = 0; std::wstring strKey = pos;
int res = GetPrivateProfileString((*iter).c_str(), strKey.c_str(), L"", buffer, bufferSize, iniRead.c_str());
if (res < bufferSize - 2) break; // Fits in the buffer
delete [] buffer; while(true)
bufferSize *= 2;
buffer = new WCHAR[bufferSize];
}
if (_wcsnicmp(strKey.c_str(), L"@include", 8) == 0)
{
std::wstring strIncludeFile = buffer;
ReadVariables();
ReplaceVariables(strIncludeFile);
if (strIncludeFile.find(L':') == std::wstring::npos &&
(strIncludeFile.length() < 2 || (strIncludeFile[0] != L'\\' && strIncludeFile[0] != L'/') || (strIncludeFile[1] != L'\\' && strIncludeFile[1] != L'/')))
{ {
// It's a relative path so add the current path as a prefix buffer[0] = 0;
strIncludeFile = CRainmeter::ExtractPath(iniFile) + strIncludeFile; int res = GetPrivateProfileString((*iter).c_str(), strKey.c_str(), L"", buffer, bufferSize, iniRead.c_str());
} if (res < bufferSize - 2) break; // Fits in the buffer
ReadIniFile(iniFileMappings, strIncludeFile, depth + 1);
}
else
{
SetValue((*iter), strKey, buffer);
}
pos = pos + wcslen(pos) + 1; delete [] buffer;
bufferSize *= 2;
buffer = new WCHAR[bufferSize];
}
if (_wcsnicmp(strKey.c_str(), L"@include", 8) == 0)
{
std::wstring strIncludeFile = buffer;
ReadVariables();
ReplaceVariables(strIncludeFile);
if (strIncludeFile.find(L':') == std::wstring::npos &&
(strIncludeFile.length() < 2 || (strIncludeFile[0] != L'\\' && strIncludeFile[0] != L'/') || (strIncludeFile[1] != L'\\' && strIncludeFile[1] != L'/')))
{
// It's a relative path so add the current path as a prefix
strIncludeFile = CRainmeter::ExtractPath(iniFile) + strIncludeFile;
}
ReadIniFile(iniFileMappings, strIncludeFile, depth + 1);
}
else
{
SetValue((*iter), strKey, buffer);
}
pos += wcslen(pos) + 1;
}
else // Empty string
{
++pos;
}
} }
} }
delete [] buffer; delete [] buffer;