generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-17 01:15:59 +01:00
Code Issues Projects Releases Wiki Activity

WinRegistryConfiguration fix

Browse Source
This commit is contained in:
Günter Obiltschnig
2014-11-26 10:52:49 +01:00
parent c7e9067fde
commit c455631e45
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Util/src/WinRegistryConfiguration.cpp
View File

@@ -98,17 +98,17 @@ void WinRegistryConfiguration::enumerate(const std::string& key, Keys& range) co
{
// return all root level keys
#if defined(_WIN32_WCE)
range.push_back("HKEY_CLASSES_ROOT");
range.push_back("HKEY_CURRENT_USER");
range.push_back("HKEY_LOCAL_MACHINE");
range.push_back("HKEY_USERS");
#else
range.push_back("HKEY_CLASSES_ROOT");
range.push_back("HKEY_CURRENT_CONFIG");
range.push_back("HKEY_CURRENT_USER");
range.push_back("HKEY_LOCAL_MACHINE");
range.push_back("HKEY_PERFORMANCE_DATA");
range.push_back("HKEY_USERS");
#else
range.push_back("HKEY_CLASSES_ROOT");
range.push_back("HKEY_CURRENT_USER");
range.push_back("HKEY_LOCAL_MACHINE");
range.push_back("HKEY_USERS");
#endif
}
else

8
Util/testsuite/src/WinConfigurationTest.cpp
View File

@@ -110,6 +110,13 @@ void WinConfigurationTest::testConfiguration()
assert (pRootReg->getInt("HKEY_CURRENT_USER.Software.Applied Informatics.Test.name1") == 1);
pRootReg->keys(keys);
#if defined(_WIN32_WCE)
assert (keys.size() == 4);
assert (std::find(keys.begin(), keys.end(), "HKEY_CLASSES_ROOT") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_CURRENT_USER") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_LOCAL_MACHINE") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_USERS") != keys.end());
#else
assert (keys.size() == 6);
assert (std::find(keys.begin(), keys.end(), "HKEY_CLASSES_ROOT") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_CURRENT_CONFIG") != keys.end());
@@ -117,6 +124,7 @@ void WinConfigurationTest::testConfiguration()
assert (std::find(keys.begin(), keys.end(), "HKEY_LOCAL_MACHINE") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_PERFORMANCE_DATA") != keys.end());
assert (std::find(keys.begin(), keys.end(), "HKEY_USERS") != keys.end());
#endif
pRootReg->keys("HKEY_CURRENT_USER.Software.Applied Informatics.Test", keys);
assert (keys.size() == 5);