scottk/wlan-cloud-lib-poco
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-lib-poco.git synced 2025-11-01 02:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

- SF# 3559325: Util Windows broken in non-Unicode

Browse Source 
- port of rev. 1918 from 1.4.4 branch (fixed SF# 3519474)
- update VS 2010 Util projects with JSON
This commit is contained in:
Aleksandar Fabijanic
2012-08-19 01:42:38 +00:00
parent d8bbcc08a7
commit 47aadf0681
18 changed files with 344 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Util/src/WinRegistryConfiguration.cpp
View File

@@ -51,9 +51,11 @@ namespace Util {
WinRegistryConfiguration::WinRegistryConfiguration(const std::string& rootPath, REGSAM extraSam): _rootPath(rootPath), _extraSam(extraSam)
{
// rootPath must end with backslash
std::string::iterator it = _rootPath.end();
if (*(--it) != '\\')
_rootPath.append("\\");
if (!_rootPath.empty())
{
if (_rootPath[_rootPath.length() - 1] != '\\')
_rootPath += '\\';
}
}
@@ -102,7 +104,9 @@ void WinRegistryConfiguration::setRaw(const std::string& key, const std::string&
void WinRegistryConfiguration::enumerate(const std::string& key, Keys& range) const
{
if (key.empty())
std::string keyName;
std::string fullPath = _rootPath + convertToRegFormat(key, keyName);
if (fullPath.empty())
{
// return all root level keys
range.push_back("HKEY_CLASSES_ROOT");
@@ -114,8 +118,8 @@ void WinRegistryConfiguration::enumerate(const std::string& key, Keys& range) co
}
else
{
std::string keyName;
std::string fullPath = _rootPath + convertToRegFormat(key, keyName);
fullPath += '\\';
fullPath += keyName;
WinRegistryKey aKey(fullPath, true, _extraSam);
aKey.values(range);
aKey.subKeys(range);
@@ -138,7 +142,7 @@ std::string WinRegistryConfiguration::convertToRegFormat(const std::string& key,
return std::string();
}
std::string prefix(key.substr(0,pos));
value = key.substr(pos+1);
value = key.substr(pos + 1);
Poco::translateInPlace(prefix, ".", "\\");
return prefix;
}