Regkey functions return error code instead of bool
Change the Regkey helper to consistently use and return LONG
instead of bool. Fix RegKey usage all over the code base and
get rid of workarounds due to lack of return value.
Reviewers:
brettw: everything (skip parts for other reviewers if you wish)
robertshield,grt: chrome_frame, installer
siggi: ceee
BUG=none
TEST=covered by existing tests
Review URL: http://codereview.chromium.org/6090006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71768 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome_frame/policy_settings.cc b/chrome_frame/policy_settings.cc
index 50e465f..116052b3 100644
--- a/chrome_frame/policy_settings.cc
+++ b/chrome_frame/policy_settings.cc
@@ -70,9 +70,11 @@
std::wstring settings_value(
ASCIIToWide(policy::key::kChromeFrameRendererSettings));
for (int i = 0; i < arraysize(kRootKeys); ++i) {
- if (config_key.Open(kRootKeys[i], policy::kRegistrySubKey, KEY_READ) &&
- config_key.ReadValueDW(settings_value.c_str(), &value)) {
- break;
+ if ((config_key.Open(kRootKeys[i], policy::kRegistrySubKey,
+ KEY_READ) == ERROR_SUCCESS) &&
+ (config_key.ReadValueDW(settings_value.c_str(),
+ &value) == ERROR_SUCCESS)) {
+ break;
}
}
@@ -124,10 +126,11 @@
std::wstring application_locale_value(
ASCIIToWide(policy::key::kApplicationLocaleValue));
for (int i = 0; i < arraysize(kRootKeys); ++i) {
- if (config_key.Open(kRootKeys[i], policy::kRegistrySubKey, KEY_READ) &&
- config_key.ReadValue(application_locale_value.c_str(),
- application_locale)) {
- break;
+ if ((config_key.Open(kRootKeys[i], policy::kRegistrySubKey,
+ KEY_READ) == ERROR_SUCCESS) &&
+ (config_key.ReadValue(application_locale_value.c_str(),
+ application_locale) == ERROR_SUCCESS)) {
+ break;
}
}
}
