Regkey functions return error code instead of bool

chrome_frame/ready_mode/internal/registry_ready_mode_state.cc

 // Copyright (c) 2011 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 <windows.h>
 
 #include "base/logging.h"
 #include "base/process_util.h"
@@ skipping 16 matching lines @@
 // Returns the new process handle, which the caller is responsible for closing,
 // or NULL upon failure.
 HANDLE LaunchCommandDirectly(const std::wstring& command_field) {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::wstring version_key_name(dist->GetVersionKey());
 
   HKEY roots[] = {HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE};
 
   for (int i = 0; i < arraysize(roots); i++) {
     base::win::RegKey version_key;
-    if (version_key.Open(roots[i], version_key_name.c_str(), KEY_QUERY_VALUE)) {
+    if (version_key.Open(roots[i], version_key_name.c_str(),
+                         KEY_QUERY_VALUE) == ERROR_SUCCESS) {
       std::wstring command_line;
-      if (version_key.ReadValue(command_field.c_str(), &command_line)) {
+      if (version_key.ReadValue(command_field.c_str(),
+                                &command_line) == ERROR_SUCCESS) {
         HANDLE launched_process = NULL;
         if (base::LaunchApp(command_line, false, true, &launched_process)) {
           return launched_process;
         }
       }
     }
   }
   return NULL;
 }
 
@@ skipping 129 matching lines @@
 
 void RegistryReadyModeState::NotifyObserver() {
   if (observer_ != NULL)
     observer_->OnStateChange(GetStatus());
 }
 
 bool RegistryReadyModeState::GetValue(int64* value, bool* exists) {
   *exists = false;
   *value = 0;
 
-  HKEY roots[] = {HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE};
-
+  HKEY roots[] = { HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE };
+  LONG result = ERROR_SUCCESS;
   for (int i = 0; i < arraysize(roots); i++) {
     base::win::RegKey config_key;
-
-    if (config_key.Open(roots[i], key_name_.c_str(), KEY_QUERY_VALUE)) {
-      if (config_key.ValueExists(installer::kChromeFrameReadyModeField)) {
-        int64 temp;
-        DWORD value_size = sizeof(temp);
-        DWORD type = 0;
-        if (!config_key.ReadValue(installer::kChromeFrameReadyModeField,
-                                  &temp, &value_size, &type)) {
-          DLOG(ERROR) << "Failed to read from registry key " << key_name_
-                      << " and value " << installer::kChromeFrameReadyModeField;
-          return false;
-        }
-
-        if (value_size != sizeof(temp) || type != REG_QWORD) {
-          DLOG(ERROR) << "Unexpected state found under registry key "
-                      << key_name_ << " and value "
-                      << installer::kChromeFrameReadyModeField;
-          return false;
-        }
-
-        *value = temp;
+    result = config_key.Open(HKEY_CURRENT_USER, key_name_.c_str(),

[grt (UTC plus 2), 2011/01/14 15:53:43]

HKEY_CURRENT_USER -> roots[i] as brettw pointed out.

[amit, 2011/01/15 01:28:11]

Done.

+                             KEY_QUERY_VALUE);
+    if (result == ERROR_SUCCESS) {
+      result = config_key.ReadInt64(installer::kChromeFrameReadyModeField,
+                                    value);
+      if (result == ERROR_SUCCESS) {
         *exists = true;
         return true;
       }
+      if (result != ERROR_FILE_NOT_FOUND) {
+        DLOG(ERROR) << "Failed to read from registry key " << key_name_
+                    << " and value " << installer::kChromeFrameReadyModeField
+                    << " error: " << result;
+        return false;
+      }
     }
   }
 
   return true;
 }
 
 void RegistryReadyModeState::RefreshStateAndNotify() {
   HRESULT hr = UrlMkSetSessionOption(URLMON_OPTION_USERAGENT_REFRESH,
                                      NULL, 0, 0);
   if (FAILED(hr)) {
@@ skipping 17 matching lines @@
 
 void RegistryReadyModeState::PermanentlyDeclineChromeFrame() {
   if (LaunchAndCheckCommand(google_update::kRegCFOptOutCmdField))
     RefreshStateAndNotify();
 }
 
 void RegistryReadyModeState::AcceptChromeFrame() {
   if (LaunchAndCheckCommand(google_update::kRegCFOptInCmdField))
     NotifyObserver();
 }