Regkey functions return error code instead of bool

chrome/installer/util/install_util.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.
 //
 // See the corresponding header file for description of the functions in this
 // file.
 
 #include "chrome/installer/util/install_util.h"
 
 #include <shellapi.h>
@@ skipping 64 matching lines @@
   RegKey key(root, dist->GetUninstallRegPath().c_str(), KEY_READ);
   std::wstring uninstall_cmd;
   key.ReadValue(installer::kUninstallStringField, &uninstall_cmd);
   return uninstall_cmd;
 }
 
 Version* InstallUtil::GetChromeVersion(BrowserDistribution* dist,
                                        bool system_install) {
   DCHECK(dist);
   RegKey key;
+  HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
+  LONG result = key.Open(reg_root, dist->GetVersionKey().c_str(), KEY_READ);
+
   std::wstring version_str;
+  if (result == ERROR_SUCCESS)
+    result = key.ReadValue(google_update::kRegVersionField, &version_str);
 
-  HKEY reg_root = (system_install) ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-  if (!key.Open(reg_root, dist->GetVersionKey().c_str(), KEY_READ) ||
-      !key.ReadValue(google_update::kRegVersionField, &version_str)) {
+  key.Close();

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

Remove

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

Done.

+  Version* ret = NULL;
+  if (result == ERROR_SUCCESS && !version_str.empty()) {
+    VLOG(1) << "Existing " << dist->GetApplicationName()
+            << " version found " << version_str;
+    ret = Version::GetVersionFromString(WideToASCII(version_str));
+  } else {
     VLOG(1) << "No existing " << dist->GetApplicationName()
             << " install found.";
-    key.Close();
-    return NULL;
   }
-  key.Close();
-  VLOG(1) << "Existing " << dist->GetApplicationName()
-          << " version found " << version_str;
-  return Version::GetVersionFromString(WideToASCII(version_str));
+
+  return ret;
 }
 
 bool InstallUtil::IsOSSupported() {
   int major, minor;
   base::win::Version version = base::win::GetVersion();
   base::win::GetServicePackLevel(&major, &minor);
 
   // We do not support Win2K or older, or XP without service pack 2.
   VLOG(1) << "Windows Version: " << version
           << ", Service Pack: " << major << "." << minor;
@@ skipping 51 matching lines @@
   }
   return (dll_names_count > 0) && success;
 }
 
 // This method tries to delete a registry key and logs an error message
 // in case of failure. It returns true if deletion is successful,
 // otherwise false.
 bool InstallUtil::DeleteRegistryKey(RegKey& root_key,
                                     const std::wstring& key_path) {
   VLOG(1) << "Deleting registry key " << key_path;
-  if (!root_key.DeleteKey(key_path.c_str()) &&
-      ::GetLastError() != ERROR_FILE_NOT_FOUND) {
-    PLOG(ERROR) << "Failed to delete registry key: " << key_path;
+  LONG result = root_key.DeleteKey(key_path.c_str());
+  if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND) {
+    PLOG(ERROR) << "Failed to delete registry key: " << key_path
+                << " error: " << result;
     return false;
   }
   return true;
 }
 
 // This method tries to delete a registry value and logs an error message
 // in case of failure. It returns true if deletion is successful,
 // otherwise false.
 bool InstallUtil::DeleteRegistryValue(HKEY reg_root,
                                       const std::wstring& key_path,
                                       const std::wstring& value_name) {
   RegKey key(reg_root, key_path.c_str(), KEY_ALL_ACCESS);
   VLOG(1) << "Deleting registry value " << value_name;
-  if (key.ValueExists(value_name.c_str()) &&
-      !key.DeleteValue(value_name.c_str())) {
-    LOG(ERROR) << "Failed to delete registry value: " << value_name;
-    return false;
+  if (key.ValueExists(value_name.c_str())) {
+    LONG result = key.DeleteValue(value_name.c_str());
+    if (result != ERROR_SUCCESS) {
+      LOG(ERROR) << "Failed to delete registry value: " << value_name
+                 << " error: " << result;
+      return false;
+    }
   }
   return true;
 }
 
 // static
 int InstallUtil::GetInstallReturnCode(installer::InstallStatus status) {
   switch (status) {
     case installer::FIRST_INSTALL_SUCCESS:
     case installer::INSTALL_REPAIRED:
     case installer::NEW_VERSION_UPDATED:
     case installer::IN_USE_UPDATED:
       return 0;
     default:
       return status;
   }
 }