generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-24 07:54:31 +01:00
Code Issues Projects Releases Wiki Activity

latest sources from main repository

Browse Source
This commit is contained in:
Guenter Obiltschnig 2007-06-13 15:14:29 +00:00
parent 9913f74f8d
commit cfca5df1b6
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Util/src/WinRegistryConfiguration.cpp
View File

@ -1,7 +1,7 @@
//
// WinRegistryConfiguration.cpp
//
// $Id: //poco/Main/Util/src/WinRegistryConfiguration.cpp#6 $
// $Id: //poco/Main/Util/src/WinRegistryConfiguration.cpp#7 $
//
// Library: Util
// Package: Windows
@ -63,25 +63,27 @@ bool WinRegistryConfiguration::getRaw(const std::string& key, std::string& value
std::string keyName;
std::string fullPath = _rootPath + ConvertToRegFormat(key, keyName);
WinRegistryKey aKey(fullPath);
WinRegistryKey::Type type = aKey.type(keyName);
bool ret = true;
switch(type)
bool exists = aKey.exists(keyName);
if (exists)
{
case WinRegistryKey::REGT_STRING:
value = aKey.getString(keyName);
break;
case WinRegistryKey::REGT_STRING_EXPAND:
value = aKey.getStringExpand(keyName);
break;
case WinRegistryKey::REGT_DWORD:
value = Poco::NumberFormatter::format(aKey.getInt(keyName));
break;
default:
ret = false;
}
WinRegistryKey::Type type = aKey.type(keyName);
return ret;
switch (type)
{
case WinRegistryKey::REGT_STRING:
value = aKey.getString(keyName);
break;
case WinRegistryKey::REGT_STRING_EXPAND:
value = aKey.getStringExpand(keyName);
break;
case WinRegistryKey::REGT_DWORD:
value = Poco::NumberFormatter::format(aKey.getInt(keyName));
break;
default:
exists = false;
}
}
return exists;
}

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

@ -1,7 +1,7 @@
//
// WinConfigurationTest.cpp
//
// $Id: //poco/Main/Util/testsuite/src/WinConfigurationTest.cpp#5 $
// $Id: //poco/Main/Util/testsuite/src/WinConfigurationTest.cpp#6 $
//
// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH.
// and Contributors.
@ -64,6 +64,9 @@ void WinConfigurationTest::testConfiguration()
assert (reg->getString("name2") == "value2");
assert (reg->hasProperty("name1"));
assert (reg->hasProperty("name2"));
std::string dfl = reg->getString("nonexistent", "default");
assert (dfl == "default");
}