Regkey functions return error code instead of bool

chrome/browser/importer/ie_importer.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/importer/ie_importer.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlobj.h>
@@ skipping 247 matching lines @@
 
   const wchar_t kStorage2Path[] =
       L"Software\\Microsoft\\Internet Explorer\\IntelliForms\\Storage2";
 
   base::win::RegKey key(HKEY_CURRENT_USER, kStorage2Path, KEY_READ);
   base::win::RegistryValueIterator reg_iterator(HKEY_CURRENT_USER,
                                                 kStorage2Path);
   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) {
+    LONG result = key.ReadValue(reg_iterator.Name(), NULL, &value_len, NULL);
+    if (ERROR_SUCCESS == result && value_len) {
       // Query the encrypted data.
       std::vector<unsigned char> value;

[grt (UTC plus 2), 2011/01/11 03:51:30]

Do you mind doing a little extra cleanup here?  This is doing a bunch of
unneeded allocations, deallocations, and memcpys.  If you don't mind, please:
- move the "password_info" local up out of the while loop.
- remove the "value" local
- replace value.resize with password_info.encrypted_data.resize
- replace value.front with password_info.encrypted_data.front

[amit, 2011/01/12 04:11:23]

Done.

       value.resize(value_len);
-      if (key.ReadValue(reg_iterator.Name(), &value.front(), &value_len,
-                        NULL)) {
+      result = key.ReadValue(reg_iterator.Name(), &value.front(), &value_len,
+                             NULL);
+      if (ERROR_SUCCESS == result) {
         IE7PasswordInfo password_info;
         password_info.url_hash = reg_iterator.Name();
         password_info.encrypted_data = value;
         password_info.date_created = Time::Now();
 
         bridge_->AddIE7PasswordInfo(password_info);
       }
     }
 
     ++reg_iterator;
@@ skipping 73 matching lines @@
   std::map<std::string, TemplateURL*> search_engines_map;
   key.ReadValue(L"DefaultScope", &default_search_engine_name);
   base::win::RegistryKeyIterator key_iterator(HKEY_CURRENT_USER,
                                               kSearchScopePath);
   while (key_iterator.Valid()) {
     std::wstring sub_key_name = kSearchScopePath;
     sub_key_name.append(L"\\").append(key_iterator.Name());
     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;
     }
     // For the name, we try the default value first (as Live Search uses a
     // 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;
       }
     }
 
     std::string url(WideToUTF8(wide_url));
     std::map<std::string, TemplateURL*>::iterator t_iter =
         search_engines_map.find(url);
     TemplateURL* template_url =
@@ skipping 35 matching lines @@
 }
 
 void IEImporter::ImportHomepage() {
   const wchar_t kIESettingsMain[] =
       L"Software\\Microsoft\\Internet Explorer\\Main";
   const wchar_t kIEHomepage[] = L"Start Page";
   const wchar_t kIEDefaultHomepage[] = L"Default_Page_URL";
 
   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);
   if (!homepage.is_valid())
     return;
 
   // 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;
   }
 
   bridge_->AddHomePage(homepage);
 }
 
 bool IEImporter::GetFavoritesInfo(IEImporter::FavoritesInfo *info) {
   if (!source_path_.empty()) {
     // Source path exists during testing.
@@ skipping 12 matching lines @@
 
   // There is a Links folder under Favorites folder in Windows Vista, but it
   // is not recording in Vista's registry. So in Vista, we assume the Links
   // folder is under Favorites folder since it looks like there is not name
   // different in every language version of Windows Vista.
   if (base::win::GetVersion() < base::win::VERSION_VISTA) {
     // The Link folder name is stored in the registry.
     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 {
     info->links_folder = L"Links";
   }
 
   return true;
 }
 
 void IEImporter::ParseFavoritesFolder(const FavoritesInfo& info,
@@ skipping 88 matching lines @@
   return std::wstring(url);
 }
 
 int IEImporter::CurrentIEVersion() const {
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     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;
 }