summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authoramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 07:28:46 +0000
committeramit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 07:28:46 +0000
commite06f4d5c6bd7bad162c45784e39cd0114635eb42 (patch)
treee53d6b4188af6e49393babc92a797ed5734a1026 /chrome/browser
parent2b107a348f2b27934fe38680ec8010d743f61765 (diff)
downloadchromium_src-e06f4d5c6bd7bad162c45784e39cd0114635eb42.zip
chromium_src-e06f4d5c6bd7bad162c45784e39cd0114635eb42.tar.gz
chromium_src-e06f4d5c6bd7bad162c45784e39cd0114635eb42.tar.bz2
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
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/autofill/autofill_ie_toolbar_import_win.cc9
-rw-r--r--chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc4
-rw-r--r--chrome/browser/background_mode_manager_win.cc14
-rw-r--r--chrome/browser/enumerate_modules_model_win.cc4
-rw-r--r--chrome/browser/extensions/extension_rlz_apitest.cc8
-rw-r--r--chrome/browser/extensions/external_registry_extension_loader_win.cc8
-rw-r--r--chrome/browser/first_run/first_run_win.cc6
-rw-r--r--chrome/browser/importer/firefox_importer_utils_win.cc10
-rw-r--r--chrome/browser/importer/ie_importer.cc37
-rw-r--r--chrome/browser/plugin_service.cc4
-rw-r--r--chrome/browser/policy/configuration_policy_provider_delegate_win.cc57
-rw-r--r--chrome/browser/rlz/rlz_unittest.cc17
-rw-r--r--chrome/browser/shell_integration_win.cc6
-rw-r--r--chrome/browser/ui/views/external_protocol_dialog.cc2
-rw-r--r--chrome/browser/ui/views/shell_dialogs_win.cc4
15 files changed, 98 insertions, 92 deletions
diff --git a/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc b/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
index 05b7ade..3519de1 100644
--- a/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
+++ b/chrome/browser/autofill/autofill_ie_toolbar_import_win.cc
@@ -57,12 +57,13 @@ bool IsEmptySalt(std::wstring const& salt) {
string16 ReadAndDecryptValue(RegKey* key, const wchar_t* value_name) {
DWORD data_type = REG_BINARY;
DWORD data_size = 0;
- if (!key->ReadValue(value_name, NULL, &data_size, &data_type) ||
- !data_size || data_type != REG_BINARY)
+ LONG result = key->ReadValue(value_name, NULL, &data_size, &data_type);
+ if ((result != ERROR_SUCCESS) || !data_size || data_type != REG_BINARY)
return string16();
std::vector<uint8> data;
data.resize(data_size);
- if (key->ReadValue(value_name, &(data[0]), &data_size, &data_type)) {
+ result = key->ReadValue(value_name, &(data[0]), &data_size, &data_type);
+ if (result == ERROR_SUCCESS) {
std::string out_data;
if (DecryptData(data, &out_data)) {
// The actual data is in UTF16 already.
@@ -125,7 +126,7 @@ bool ImportSingleProfile(FormGroup* profile,
for (uint32 value_index = 0; value_index < key->ValueCount(); ++value_index) {
std::wstring value_name;
- if (!key->ReadName(value_index, &value_name))
+ if (key->ReadName(value_index, &value_name) != ERROR_SUCCESS)
continue;
RegToFieldMap::const_iterator it = reg_to_field.find(value_name);
if (it == reg_to_field.end())
diff --git a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
index 17e85db..972badb 100644
--- a/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
+++ b/chrome/browser/autofill/autofill_ie_toolbar_import_win_unittest.cc
@@ -92,8 +92,8 @@ void EncryptAndWrite(RegKey* key, const ValueDescription* value) {
memcpy(&data[0], value->value, data_size);
std::vector<uint8> encrypted_data = EncryptData(data);
- EXPECT_TRUE(key->WriteValue(value->value_name, &encrypted_data[0],
- encrypted_data.size(), REG_BINARY));
+ EXPECT_EQ(ERROR_SUCCESS, key->WriteValue(value->value_name,
+ &encrypted_data[0], encrypted_data.size(), REG_BINARY));
}
void CreateSubkey(RegKey* key, wchar_t const* subkey_name,
diff --git a/chrome/browser/background_mode_manager_win.cc b/chrome/browser/background_mode_manager_win.cc
index 2f10843..20d649c 100644
--- a/chrome/browser/background_mode_manager_win.cc
+++ b/chrome/browser/background_mode_manager_win.cc
@@ -38,8 +38,11 @@ void DisableLaunchOnStartupTask::Run() {
kBackgroundModeRegistrySubkey, KEY_READ);
base::win::RegKey write_key(kBackgroundModeRegistryRootKey,
kBackgroundModeRegistrySubkey, KEY_WRITE);
- if (read_key.ValueExists(key_name) && !write_key.DeleteValue(key_name))
- NOTREACHED() << "Failed to deregister launch on login.";
+ if (read_key.ValueExists(key_name)) {
+ LONG result = write_key.DeleteValue(key_name);
+ DCHECK_EQ(ERROR_SUCCESS, result) <<
+ "Failed to deregister launch on login. error: " << result;
+ }
}
void EnableLaunchOnStartupTask::Run() {
@@ -56,13 +59,14 @@ void EnableLaunchOnStartupTask::Run() {
std::wstring new_value = executable.value() + L" --no-startup-window";
if (read_key.ValueExists(key_name)) {
std::wstring current_value;
- if (read_key.ReadValue(key_name, &current_value) &&
+ if ((read_key.ReadValue(key_name, &current_value) == ERROR_SUCCESS) &&
(current_value == new_value)) {
return;
}
}
- if (!write_key.WriteValue(key_name, new_value.c_str()))
- NOTREACHED() << "Failed to register launch on login.";
+ LONG result = write_key.WriteValue(key_name, new_value.c_str());
+ DCHECK_EQ(ERROR_SUCCESS, result) <<
+ "Failed to register launch on login. error: " << result;
}
} // namespace
diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc
index 79e0604..3a23d10 100644
--- a/chrome/browser/enumerate_modules_model_win.cc
+++ b/chrome/browser/enumerate_modules_model_win.cc
@@ -423,12 +423,12 @@ void ModuleEnumerator::ReadShellExtensions(HKEY parent) {
std::wstring key(std::wstring(L"CLSID\\") + registration.Name() +
L"\\InProcServer32");
base::win::RegKey clsid;
- if (!clsid.Open(HKEY_CLASSES_ROOT, key.c_str(), KEY_READ)) {
+ if (clsid.Open(HKEY_CLASSES_ROOT, key.c_str(), KEY_READ) != ERROR_SUCCESS) {
++registration;
continue;
}
string16 dll;
- if (!clsid.ReadValue(L"", &dll)) {
+ if (clsid.ReadValue(L"", &dll) != ERROR_SUCCESS) {
++registration;
continue;
}
diff --git a/chrome/browser/extensions/extension_rlz_apitest.cc b/chrome/browser/extensions/extension_rlz_apitest.cc
index efb275a..f7f264d 100644
--- a/chrome/browser/extensions/extension_rlz_apitest.cc
+++ b/chrome/browser/extensions/extension_rlz_apitest.cc
@@ -80,14 +80,14 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Rlz) {
ASSERT_TRUE(key.Valid());
DWORD value;
- ASSERT_TRUE(key.ReadValueDW(L"D3I", &value));
+ ASSERT_EQ(ERROR_SUCCESS, key.ReadValueDW(L"D3I", &value));
ASSERT_EQ(1, value);
- ASSERT_TRUE(key.ReadValueDW(L"D3S", &value));
+ ASSERT_EQ(ERROR_SUCCESS, key.ReadValueDW(L"D3S", &value));
ASSERT_EQ(1, value);
- ASSERT_TRUE(key.ReadValueDW(L"D3F", &value));
+ ASSERT_EQ(ERROR_SUCCESS, key.ReadValueDW(L"D3F", &value));
ASSERT_EQ(1, value);
- ASSERT_TRUE(key.ReadValueDW(L"D4I", &value));
+ ASSERT_EQ(ERROR_SUCCESS, key.ReadValueDW(L"D4I", &value));
ASSERT_EQ(1, value);
key.Open(HKEY_CURRENT_USER, L"Software\\Google\\Common\\Rlz\\Events\\D",
diff --git a/chrome/browser/extensions/external_registry_extension_loader_win.cc b/chrome/browser/extensions/external_registry_extension_loader_win.cc
index 11c35f1..b3037c8 100644
--- a/chrome/browser/extensions/external_registry_extension_loader_win.cc
+++ b/chrome/browser/extensions/external_registry_extension_loader_win.cc
@@ -49,11 +49,13 @@ void ExternalRegistryExtensionLoader::LoadOnFileThread() {
std::wstring key_path = ASCIIToWide(kRegistryExtensions);
key_path.append(L"\\");
key_path.append(iterator.Name());
- if (key.Open(kRegRoot, key_path.c_str(), KEY_READ)) {
+ if (key.Open(kRegRoot, key_path.c_str(), KEY_READ) == ERROR_SUCCESS) {
std::wstring extension_path;
- if (key.ReadValue(kRegistryExtensionPath, &extension_path)) {
+ if (key.ReadValue(kRegistryExtensionPath, &extension_path)
+ == ERROR_SUCCESS) {
std::wstring extension_version;
- if (key.ReadValue(kRegistryExtensionVersion, &extension_version)) {
+ if (key.ReadValue(kRegistryExtensionVersion, &extension_version)
+ == ERROR_SUCCESS) {
std::string id = WideToASCII(iterator.Name());
StringToLowerASCII(&id);
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index ac09d18..179e43b 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -278,8 +278,10 @@ bool Upgrade::SwapNewChromeExeIfPresent() {
BrowserDistribution *dist = BrowserDistribution::GetDistribution();
base::win::RegKey key;
std::wstring rename_cmd;
- if (key.Open(reg_root, dist->GetVersionKey().c_str(), KEY_READ) &&
- key.ReadValue(google_update::kRegRenameCmdField, &rename_cmd)) {
+ if ((key.Open(reg_root, dist->GetVersionKey().c_str(),
+ KEY_READ) == ERROR_SUCCESS) &&
+ (key.ReadValue(google_update::kRegRenameCmdField,
+ &rename_cmd) == ERROR_SUCCESS)) {
base::ProcessHandle handle;
if (base::LaunchApp(rename_cmd, true, true, &handle)) {
DWORD exit_code;
diff --git a/chrome/browser/importer/firefox_importer_utils_win.cc b/chrome/browser/importer/firefox_importer_utils_win.cc
index 7fc2a41..16696b9 100644
--- a/chrome/browser/importer/firefox_importer_utils_win.cc
+++ b/chrome/browser/importer/firefox_importer_utils_win.cc
@@ -31,9 +31,9 @@ int GetCurrentFirefoxMajorVersionFromRegistry() {
base::win::RegKey reg_key(kFireFoxRegistryPaths[i],
L"Software\\Mozilla\\Mozilla Firefox", KEY_READ);
- bool result = reg_key.ReadValue(L"CurrentVersion", ver_buffer,
+ LONG result = reg_key.ReadValue(L"CurrentVersion", ver_buffer,
&ver_buffer_length, NULL);
- if (!result)
+ if (result != ERROR_SUCCESS)
continue;
highest_version = std::max(highest_version, _wtoi(ver_buffer));
}
@@ -47,9 +47,9 @@ std::wstring GetFirefoxInstallPathFromRegistry() {
DWORD buffer_length = sizeof(buffer);
base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, registry_path.c_str(),
KEY_READ);
- bool result = reg_key.ReadValue(L"CurrentVersion", buffer,
+ LONG result = reg_key.ReadValue(L"CurrentVersion", buffer,
&buffer_length, NULL);
- if (!result)
+ if (result != ERROR_SUCCESS)
return std::wstring();
registry_path += L"\\" + std::wstring(buffer) + L"\\Main";
buffer_length = sizeof(buffer);
@@ -57,7 +57,7 @@ std::wstring GetFirefoxInstallPathFromRegistry() {
registry_path.c_str(), KEY_READ);
result = reg_key_directory.ReadValue(L"Install Directory", buffer,
&buffer_length, NULL);
- if (!result)
+ if (result != ERROR_SUCCESS)
return std::wstring();
return buffer;
}
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index b26c306..484414f 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -263,19 +263,18 @@ void IEImporter::ImportPasswordsIE7() {
base::win::RegKey key(HKEY_CURRENT_USER, kStorage2Path, KEY_READ);
base::win::RegistryValueIterator reg_iterator(HKEY_CURRENT_USER,
kStorage2Path);
+ IE7PasswordInfo password_info;
while (reg_iterator.Valid() && !cancelled()) {
// Get the size of the encrypted data.
DWORD value_len = 0;
- if (key.ReadValue(reg_iterator.Name(), NULL, &value_len, NULL) &&
- value_len) {
+ key.ReadValue(reg_iterator.Name(), NULL, &value_len, NULL);
+ if (value_len) {
// Query the encrypted data.
- std::vector<unsigned char> value;
- value.resize(value_len);
- if (key.ReadValue(reg_iterator.Name(), &value.front(), &value_len,
- NULL)) {
- IE7PasswordInfo password_info;
+ password_info.encrypted_data.resize(value_len);
+ if (key.ReadValue(reg_iterator.Name(),
+ &password_info.encrypted_data.front(),
+ &value_len, NULL) == ERROR_SUCCESS) {
password_info.url_hash = reg_iterator.Name();
- password_info.encrypted_data = value;
password_info.date_created = Time::Now();
bridge_->AddIE7PasswordInfo(password_info);
@@ -366,7 +365,8 @@ void IEImporter::ImportSearchEngines() {
base::win::RegKey sub_key(HKEY_CURRENT_USER, sub_key_name.c_str(),
KEY_READ);
std::wstring wide_url;
- if (!sub_key.ReadValue(L"URL", &wide_url) || wide_url.empty()) {
+ if ((sub_key.ReadValue(L"URL", &wide_url) != ERROR_SUCCESS) ||
+ wide_url.empty()) {
VLOG(1) << "No URL for IE search engine at " << key_iterator.Name();
++key_iterator;
continue;
@@ -375,9 +375,10 @@ void IEImporter::ImportSearchEngines() {
// non displayable name in DisplayName, and the readable name under the
// default value).
std::wstring name;
- if (!sub_key.ReadValue(NULL, &name) || name.empty()) {
+ if ((sub_key.ReadValue(NULL, &name) != ERROR_SUCCESS) || name.empty()) {
// Try the displayable name.
- if (!sub_key.ReadValue(L"DisplayName", &name) || name.empty()) {
+ if ((sub_key.ReadValue(L"DisplayName", &name) != ERROR_SUCCESS) ||
+ name.empty()) {
VLOG(1) << "No name for IE search engine at " << key_iterator.Name();
++key_iterator;
continue;
@@ -433,7 +434,8 @@ void IEImporter::ImportHomepage() {
base::win::RegKey key(HKEY_CURRENT_USER, kIESettingsMain, KEY_READ);
std::wstring homepage_url;
- if (!key.ReadValue(kIEHomepage, &homepage_url) || homepage_url.empty())
+ if (key.ReadValue(kIEHomepage, &homepage_url) != ERROR_SUCCESS ||
+ homepage_url.empty())
return;
GURL homepage = GURL(homepage_url);
@@ -443,8 +445,8 @@ void IEImporter::ImportHomepage() {
// Check to see if this is the default website and skip import.
base::win::RegKey keyDefault(HKEY_LOCAL_MACHINE, kIESettingsMain, KEY_READ);
std::wstring default_homepage_url;
- if (keyDefault.ReadValue(kIEDefaultHomepage, &default_homepage_url) &&
- !default_homepage_url.empty()) {
+ LONG result = keyDefault.ReadValue(kIEDefaultHomepage, &default_homepage_url);
+ if (result == ERROR_SUCCESS && !default_homepage_url.empty()) {
if (homepage.spec() == GURL(default_homepage_url).spec())
return;
}
@@ -477,7 +479,8 @@ bool IEImporter::GetFavoritesInfo(IEImporter::FavoritesInfo *info) {
DWORD buffer_length = sizeof(buffer);
base::win::RegKey reg_key(HKEY_CURRENT_USER,
L"Software\\Microsoft\\Internet Explorer\\Toolbar", KEY_READ);
- if (!reg_key.ReadValue(L"LinksFolderName", buffer, &buffer_length, NULL))
+ if (reg_key.ReadValue(L"LinksFolderName", buffer,
+ &buffer_length, NULL) != ERROR_SUCCESS)
return false;
info->links_folder = buffer;
} else {
@@ -587,8 +590,8 @@ int IEImporter::CurrentIEVersion() const {
DWORD buffer_length = sizeof(buffer);
base::win::RegKey reg_key(HKEY_LOCAL_MACHINE,
L"Software\\Microsoft\\Internet Explorer", KEY_READ);
- bool result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
- version = (result ? _wtoi(buffer) : 0);
+ LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
+ version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
}
return version;
}
diff --git a/chrome/browser/plugin_service.cc b/chrome/browser/plugin_service.cc
index 1f178d9..cadc7e2 100644
--- a/chrome/browser/plugin_service.cc
+++ b/chrome/browser/plugin_service.cc
@@ -125,12 +125,12 @@ PluginService::PluginService()
HKEY_CURRENT_USER, webkit::npapi::kRegistryMozillaPlugins, KEY_NOTIFY);
hklm_key_.Create(
HKEY_LOCAL_MACHINE, webkit::npapi::kRegistryMozillaPlugins, KEY_NOTIFY);
- if (hkcu_key_.StartWatching()) {
+ if (hkcu_key_.StartWatching() == ERROR_SUCCESS) {
hkcu_event_.reset(new base::WaitableEvent(hkcu_key_.watch_event()));
hkcu_watcher_.StartWatching(hkcu_event_.get(), this);
}
- if (hklm_key_.StartWatching()) {
+ if (hklm_key_.StartWatching() == ERROR_SUCCESS) {
hklm_event_.reset(new base::WaitableEvent(hklm_key_.watch_event()));
hklm_watcher_.StartWatching(hklm_event_.get(), this);
}
diff --git a/chrome/browser/policy/configuration_policy_provider_delegate_win.cc b/chrome/browser/policy/configuration_policy_provider_delegate_win.cc
index 68947de..1f2f467 100644
--- a/chrome/browser/policy/configuration_policy_provider_delegate_win.cc
+++ b/chrome/browser/policy/configuration_policy_provider_delegate_win.cc
@@ -19,7 +19,7 @@ bool ReadRegistryStringValue(RegKey* key, const string16& name,
DWORD key_type = 0;
scoped_array<uint8> buffer;
- if (!key->ReadValue(name.c_str(), 0, &value_size, &key_type))
+ if (key->ReadValue(name.c_str(), 0, &value_size, &key_type) != ERROR_SUCCESS)
return false;
if (key_type != REG_SZ)
return false;
@@ -89,16 +89,14 @@ DictionaryValue* ConfigurationPolicyProviderDelegateWin::Load() {
bool ConfigurationPolicyProviderDelegateWin::GetRegistryPolicyString(
const string16& name, string16* result) const {
- string16 path = string16(kRegistrySubKey);
- RegKey policy_key;
+ RegKey policy_key(HKEY_LOCAL_MACHINE, kRegistrySubKey, KEY_READ);
// First try the global policy.
- if (policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str(), KEY_READ)) {
- if (ReadRegistryStringValue(&policy_key, name, result))
- return true;
- policy_key.Close();
- }
+ if (ReadRegistryStringValue(&policy_key, name, result))
+ return true;
+
// Fall back on user-specific policy.
- if (!policy_key.Open(HKEY_CURRENT_USER, path.c_str(), KEY_READ))
+ if (policy_key.Open(HKEY_CURRENT_USER, kRegistrySubKey,
+ KEY_READ) != ERROR_SUCCESS)
return false;
return ReadRegistryStringValue(&policy_key, name, result);
}
@@ -108,10 +106,11 @@ bool ConfigurationPolicyProviderDelegateWin::GetRegistryPolicyStringList(
string16 path = string16(kRegistrySubKey);
path += ASCIIToUTF16("\\") + key;
RegKey policy_key;
- if (!policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str(), KEY_READ)) {
- policy_key.Close();
+ if (policy_key.Open(HKEY_LOCAL_MACHINE, path.c_str(), KEY_READ) !=
+ ERROR_SUCCESS) {
// Fall back on user-specific policy.
- if (!policy_key.Open(HKEY_CURRENT_USER, path.c_str(), KEY_READ))
+ if (policy_key.Open(HKEY_CURRENT_USER, path.c_str(), KEY_READ) !=
+ ERROR_SUCCESS)
return false;
}
string16 policy_string;
@@ -125,34 +124,28 @@ bool ConfigurationPolicyProviderDelegateWin::GetRegistryPolicyStringList(
bool ConfigurationPolicyProviderDelegateWin::GetRegistryPolicyBoolean(
const string16& value_name, bool* result) const {
- DWORD value;
- RegKey hkcu_policy_key(HKEY_LOCAL_MACHINE, kRegistrySubKey, KEY_READ);
- if (hkcu_policy_key.ReadValueDW(value_name.c_str(), &value)) {
- *result = value != 0;
- return true;
- }
-
- RegKey hklm_policy_key(HKEY_CURRENT_USER, kRegistrySubKey, KEY_READ);
- if (hklm_policy_key.ReadValueDW(value_name.c_str(), &value)) {
- *result = value != 0;
- return true;
- }
- return false;
+ uint32 local_result = 0;
+ bool ret = GetRegistryPolicyInteger(value_name, &local_result);
+ if (ret)
+ *result = local_result != 0;
+ return ret;
}
bool ConfigurationPolicyProviderDelegateWin::GetRegistryPolicyInteger(
const string16& value_name, uint32* result) const {
- DWORD value;
- RegKey hkcu_policy_key(HKEY_LOCAL_MACHINE, kRegistrySubKey, KEY_READ);
- if (hkcu_policy_key.ReadValueDW(value_name.c_str(), &value)) {
+ DWORD value = 0;
+ RegKey policy_key(HKEY_LOCAL_MACHINE, kRegistrySubKey, KEY_READ);
+ if (policy_key.ReadValueDW(value_name.c_str(), &value) == ERROR_SUCCESS) {
*result = value;
return true;
}
- RegKey hklm_policy_key(HKEY_CURRENT_USER, kRegistrySubKey, KEY_READ);
- if (hklm_policy_key.ReadValueDW(value_name.c_str(), &value)) {
- *result = value;
- return true;
+ if (policy_key.Open(HKEY_CURRENT_USER, kRegistrySubKey, KEY_READ) ==
+ ERROR_SUCCESS) {
+ if (policy_key.ReadValueDW(value_name.c_str(), &value) == ERROR_SUCCESS) {
+ *result = value;
+ return true;
+ }
}
return false;
}
diff --git a/chrome/browser/rlz/rlz_unittest.cc b/chrome/browser/rlz/rlz_unittest.cc
index f2ca69f..1b53bf6e4 100644
--- a/chrome/browser/rlz/rlz_unittest.cc
+++ b/chrome/browser/rlz/rlz_unittest.cc
@@ -16,9 +16,10 @@ namespace {
// is nothing to clean.
bool CleanValue(const wchar_t* key_name, const wchar_t* value) {
RegKey key;
- if (!key.Open(HKEY_CURRENT_USER, key_name, KEY_READ | KEY_WRITE))
+ if (key.Open(HKEY_CURRENT_USER, key_name, KEY_READ | KEY_WRITE) !=
+ ERROR_SUCCESS)
return false;
- EXPECT_TRUE(key.DeleteValue(value));
+ EXPECT_EQ(ERROR_SUCCESS, key.DeleteValue(value));
return true;
}
@@ -33,8 +34,8 @@ TEST(RlzLibTest, RecordProductEvent) {
rlz_lib::CHROME_OMNIBOX, rlz_lib::FIRST_SEARCH));
const wchar_t kEvent1[] = L"C1F";
RegKey key1;
- EXPECT_TRUE(key1.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
- EXPECT_TRUE(key1.ReadValueDW(kEvent1, &recorded_value));
+ EXPECT_EQ(ERROR_SUCCESS, key1.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS, key1.ReadValueDW(kEvent1, &recorded_value));
EXPECT_EQ(1, recorded_value);
EXPECT_TRUE(CleanValue(kKeyName, kEvent1));
@@ -42,9 +43,9 @@ TEST(RlzLibTest, RecordProductEvent) {
rlz_lib::CHROME_HOME_PAGE, rlz_lib::SET_TO_GOOGLE));
const wchar_t kEvent2[] = L"C2S";
RegKey key2;
- EXPECT_TRUE(key2.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS, key2.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
DWORD value = 0;
- EXPECT_TRUE(key2.ReadValueDW(kEvent2, &recorded_value));
+ EXPECT_EQ(ERROR_SUCCESS, key2.ReadValueDW(kEvent2, &recorded_value));
EXPECT_EQ(1, recorded_value);
EXPECT_TRUE(CleanValue(kKeyName, kEvent2));
}
@@ -55,8 +56,8 @@ TEST(RlzLibTest, CleanProductEvents) {
rlz_lib::CHROME_OMNIBOX, rlz_lib::FIRST_SEARCH));
const wchar_t kEvent1[] = L"C1F";
RegKey key1;
- EXPECT_TRUE(key1.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
- EXPECT_TRUE(key1.ReadValueDW(kEvent1, &recorded_value));
+ EXPECT_EQ(ERROR_SUCCESS, key1.Open(HKEY_CURRENT_USER, kKeyName, KEY_READ));
+ EXPECT_EQ(ERROR_SUCCESS, key1.ReadValueDW(kEvent1, &recorded_value));
EXPECT_EQ(1, recorded_value);
EXPECT_TRUE(RLZTracker::ClearAllProductEvents(rlz_lib::CHROME));
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index b79c2d7..470a9535 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -346,7 +346,7 @@ ShellIntegration::DefaultBrowserState ShellIntegration::IsDefaultBrowser() {
std::wstring key_path(kChromeProtocols[i] + ShellUtil::kRegShellOpen);
base::win::RegKey key(root_key, key_path.c_str(), KEY_READ);
std::wstring value;
- if (!key.Valid() || !key.ReadValue(L"", &value))
+ if (!key.Valid() || (key.ReadValue(L"", &value) != ERROR_SUCCESS))
return NOT_DEFAULT_BROWSER;
// Need to normalize path in case it's been munged.
CommandLine command_line = CommandLine::FromString(value);
@@ -377,7 +377,7 @@ bool ShellIntegration::IsFirefoxDefaultBrowser() {
std::wstring app_cmd;
base::win::RegKey key(HKEY_CURRENT_USER,
ShellUtil::kRegVistaUrlPrefs, KEY_READ);
- if (key.Valid() && key.ReadValue(L"Progid", &app_cmd) &&
+ if (key.Valid() && (key.ReadValue(L"Progid", &app_cmd) == ERROR_SUCCESS) &&
app_cmd == L"FirefoxURL")
ff_default = true;
} else {
@@ -385,7 +385,7 @@ bool ShellIntegration::IsFirefoxDefaultBrowser() {
key_path.append(ShellUtil::kRegShellOpen);
base::win::RegKey key(HKEY_CLASSES_ROOT, key_path.c_str(), KEY_READ);
std::wstring app_cmd;
- if (key.Valid() && key.ReadValue(L"", &app_cmd) &&
+ if (key.Valid() && (key.ReadValue(L"", &app_cmd) == ERROR_SUCCESS) &&
std::wstring::npos != StringToLowerASCII(app_cmd).find(L"firefox"))
ff_default = true;
}
diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc
index 30aa4d8..61f0d38 100644
--- a/chrome/browser/ui/views/external_protocol_dialog.cc
+++ b/chrome/browser/ui/views/external_protocol_dialog.cc
@@ -176,7 +176,7 @@ std::wstring ExternalProtocolDialog::GetApplicationForProtocol(
std::wstring parameters = url_spec.substr(split_offset + 1,
url_spec.length() - 1);
std::wstring application_to_launch;
- if (cmd_key.ReadValue(NULL, &application_to_launch)) {
+ if (cmd_key.ReadValue(NULL, &application_to_launch) == ERROR_SUCCESS) {
ReplaceSubstringsAfterOffset(&application_to_launch, 0, L"%1", parameters);
return application_to_launch;
} else {
diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc
index f1c59b4..710aac2 100644
--- a/chrome/browser/ui/views/shell_dialogs_win.cc
+++ b/chrome/browser/ui/views/shell_dialogs_win.cc
@@ -75,9 +75,9 @@ static bool GetRegistryDescriptionFromExtension(const std::wstring& file_ext,
DCHECK(reg_description);
base::win::RegKey reg_ext(HKEY_CLASSES_ROOT, file_ext.c_str(), KEY_READ);
std::wstring reg_app;
- if (reg_ext.ReadValue(NULL, &reg_app) && !reg_app.empty()) {
+ if (reg_ext.ReadValue(NULL, &reg_app) == ERROR_SUCCESS && !reg_app.empty()) {
base::win::RegKey reg_link(HKEY_CLASSES_ROOT, reg_app.c_str(), KEY_READ);
- if (reg_link.ReadValue(NULL, reg_description))
+ if (reg_link.ReadValue(NULL, reg_description) == ERROR_SUCCESS)
return true;
}
return false;
generated by cgit v1.1 at 2025-03-14 02:33:01 +0000