Regkey functions return error code instead of bool

chrome_frame/ready_mode/internal/registry_ready_mode_state.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_frame/ready_mode/internal/registry_ready_mode_state.h"
 
 #include "base/time.h"
 #include "base/task.h"
 #include "base/win/registry.h"
 #include "chrome_frame/ready_mode/internal/installation_state.h"
@@ skipping 54 matching lines @@
     return READY_MODE_ACTIVE;
 
   return READY_MODE_TEMPORARILY_DECLINED;
 }
 
 bool RegistryReadyModeState::GetValue(int64* value, bool* exists) {
   *exists = false;
   *value = 0;
 
   base::win::RegKey config_key;
-  if (!config_key.Open(HKEY_CURRENT_USER, key_name_.c_str(), KEY_QUERY_VALUE)) {
-    DLOG(ERROR) << "Failed to open registry key " << key_name_;
+  LONG result = config_key.Open(HKEY_CURRENT_USER, key_name_.c_str(),
+                                KEY_QUERY_VALUE);
+  if (result != ERROR_SUCCESS) {
+    DLOG(ERROR) << "Failed to open registry key: " << key_name_ <<
+        " Error: " << result;
     return false;
   }
 
   if (!config_key.ValueExists(kReadyModeStateValue))
     return true;
 
-  int64 temp;
-  DWORD value_size = sizeof(temp);
-  DWORD type = 0;
-  if (!config_key.ReadValue(kReadyModeStateValue, &temp, &value_size, &type)) {
-    DLOG(ERROR) << "Failed to open registry key " << key_name_;
+  result = config_key.ReadValueInt64(kReadyModeStateValue, value);
+  if (result != ERROR_SUCCESS) {
+    DLOG(ERROR) << "Failed to open registry key: " << key_name_ <<
+        " Error: " << result;
     return false;
   }
 
-  if (value_size != sizeof(temp) || type != REG_QWORD) {
-    DLOG(ERROR) << "Unexpected state found under registry key " << key_name_
-                << " and value " << kReadyModeStateValue;
-    config_key.DeleteValue(kReadyModeStateValue);
-    return true;
-  }
-
-  *value = temp;
   *exists = true;
   return true;
 }
 
-bool RegistryReadyModeState::StoreValue(int64 value) {
+bool RegistryReadyModeState::StoreValue(const int64& value) {
   base::win::RegKey config_key;
-  if (config_key.Open(HKEY_CURRENT_USER, key_name_.c_str(), KEY_SET_VALUE) &&
-      config_key.WriteValue(kReadyModeStateValue, &value, sizeof(value),
-                            REG_QWORD)) {
-    return true;
+  LONG result = config_key.Open(HKEY_CURRENT_USER, key_name_.c_str(),
+                                KEY_SET_VALUE);
+  if (result == ERROR_SUCCESS) {
+     result = config_key.WriteValue(kReadyModeStateValue, &value, sizeof(value),
+                                    REG_QWORD);
   }
 
-  DLOG(ERROR) << "Failed to open or write to registry key " << key_name_
-              << " and value " << kReadyModeStateValue;
+  if (result != ERROR_SUCCESS) {
+    DLOG(ERROR) << "Failed to open or write to registry key " << key_name_
+                << " and value " << kReadyModeStateValue << " Error: "
+                << result;
+    return false;
+  }

[robertshield, 2011/01/12 15:01:34]

More nitty whining:
I found the original code easier to read than this new implementation. How
about:

base::win::RegKey config_key;
if (config_key.Open(HKEY_CURRENT_USER, key_name_.c_str(),
                    KEY_SET_VALUE) == ERROR_SUCCESS &&
    config_key.WriteValue(kReadyModeStateValue, &value, sizeof(value),
                          REG_QWORD) == ERROR_SUCCESS) {
 return true;
}

DLOG(ERROR) << "Failed to open or write to registry key " << key_name_
            << " and value " << kReadyModeStateValue;
            << " and value " << kReadyModeStateValue << " Error: "
            << result;
return false;

 
-  return false;
+  return true;
 }
 
 void RegistryReadyModeState::TemporarilyDeclineChromeFrame() {
   int64 value = GetNow().ToInternalValue();
 
   if (StoreValue(value))
     observer_->OnStateChange();
 }
 
 void RegistryReadyModeState::PermanentlyDeclineChromeFrame() {
   bool success = false;
 
   // Either change, by itself, will deactivate Ready Mode, though we prefer to
   // also unregister, in order to free up resources.
 
   if (StoreValue(0))
     success = true;
 
   if (installation_state_->UnregisterProduct())
     success = true;
 
   if (success)
     observer_->OnStateChange();
 }
 
 void RegistryReadyModeState::AcceptChromeFrame() {
   if (installation_state_->InstallProduct())
     observer_->OnStateChange();
 }