Regkey functions return error code instead of bool

chrome/installer/setup/install_worker.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.
 //
 // This file contains the definitions of the installer functions that build
 // the WorkItemList used to install the application.
 
 #include "chrome/installer/setup/install_worker.h"
 
 #include <shlobj.h>
@@ skipping 325 matching lines @@
   }
 
   RegKey key;
   ChannelInfo other_info;
   std::vector<std::wstring>::const_iterator kscan = keys.begin();
   std::vector<std::wstring>::const_iterator kend = keys.end();
   for (; kscan != kend; ++kscan) {
     // Handle the case where the ClientState key doesn't exist by creating it.
     // This takes care of the multi-installer's package key, which is not
     // created by Google Update for us.
-    if (!key.Open(reg_root, kscan->c_str(), KEY_QUERY_VALUE) ||
-        !other_info.Initialize(key)) {
+    if ((key.Open(reg_root, kscan->c_str(), KEY_QUERY_VALUE) != ERROR_SUCCESS)
+        || (!other_info.Initialize(key))) {
       other_info.set_value(std::wstring());
     }
     if (!other_info.Equals(channel_info)) {
       if (!key.Valid())
         install_list->AddCreateRegKeyWorkItem(reg_root, *kscan);
       install_list->AddSetRegValueWorkItem(reg_root, *kscan,
                                            google_update::kRegApField,
                                            channel_info.value(), true);
     }
   }
@@ skipping 137 matching lines @@
         WorkItem::CreateConditionalWorkItemList(
             new Not(new ConditionRunIfFileExists(new_chrome_exe))));
     regular_update_work_items->set_log_message(
         "RegularUpdateWorkItemList");
 
     // Since this was not an in-use-update, delete 'opv' and 'cmd' keys.
     for (size_t i = 0; i < products.size(); ++i) {
       BrowserDistribution* dist = products[i]->distribution();
       std::wstring version_key(dist->GetVersionKey());
       regular_update_work_items->AddDeleteRegValueWorkItem(root, version_key,
-                                            google_update::kRegOldVersionField,
-                                            true);
+                                            google_update::kRegOldVersionField);
       regular_update_work_items->AddDeleteRegValueWorkItem(root, version_key,
-                                            google_update::kRegRenameCmdField,
-                                            true);
+                                            google_update::kRegRenameCmdField);
     }
 
     post_install_task_list->AddWorkItem(regular_update_work_items.release());
   }
 
   AddRegisterComDllWorkItemsForPackage(package, current_version, new_version,
                                        post_install_task_list);
 
   for (size_t i = 0; i < products.size(); ++i) {
     const Product* product = products[i];
@@ skipping 263 matching lines @@
     // installed with ready mode enabled (the --ready-mode switch should be set
     // in the registry) so deleting the value should have no effect.
     // In both cases (install/uninstall), we need to make sure that Chrome's
     // uninstallation command line does not include the --chrome-frame switch
     // so that uninstalling Chrome will no longer uninstall Chrome Frame.
 
     if (RegKey(root, product.package().properties()->GetStateKey().c_str(),
                KEY_QUERY_VALUE).Valid()) {
       list->AddDeleteRegValueWorkItem(root,
           product.package().properties()->GetStateKey(),
-          installer::kChromeFrameReadyModeField, REG_QWORD);
+          installer::kChromeFrameReadyModeField);
     }
 
     const Product* chrome = installer::FindProduct(product.package().products(),
         BrowserDistribution::CHROME_BROWSER);
     if (chrome) {
       // Chrome is already a part of this installation run, so we can assume
       // that the uninstallation arguments will be updated correctly.
     } else {
       // Chrome is not a part of this installation run, so we have to explicitly
       // check if Chrome is installed, and if so, update its uninstallation
       // command lines.
       BrowserDistribution* dist = BrowserDistribution::GetSpecificDistribution(
           BrowserDistribution::CHROME_BROWSER,
           MasterPreferences::ForCurrentProcess());
       update_chrome_uninstall_command =
           IsInstalledAsMulti(product.system_level(), dist);
     }
   }
 
   if (!ready_mode || !install) {
     list->AddDeleteRegValueWorkItem(root, version_key,
-                                    google_update::kRegCFTempOptOutCmdField,
-                                    REG_SZ);
+                                    google_update::kRegCFTempOptOutCmdField);
     list->AddDeleteRegValueWorkItem(root, version_key,
-                                    google_update::kRegCFEndTempOptOutCmdField,
-                                    REG_SZ);
+                                    google_update::kRegCFEndTempOptOutCmdField);
     list->AddDeleteRegValueWorkItem(root, version_key,
-                                    google_update::kRegCFOptOutCmdField,
-                                    REG_SZ);
+                                    google_update::kRegCFOptOutCmdField);
     list->AddDeleteRegValueWorkItem(root, version_key,
-                                    google_update::kRegCFOptInCmdField, REG_SZ);
+                                    google_update::kRegCFOptInCmdField);
   }
 
   if (update_chrome_uninstall_command) {
     // Chrome is not a part of this installation run, so we have to explicitly
     // check if Chrome is installed, and if so, update its uninstallation
     // command lines.
     BrowserDistribution* chrome_dist =
         BrowserDistribution::GetSpecificDistribution(
             BrowserDistribution::CHROME_BROWSER, prefs);
     const Package& pack = product.package();
@@ skipping 28 matching lines @@
   if (prefs.is_multi_install()) {
     uninstall_cmd->AppendSwitch(installer::switches::kMultiInstall);
   }
   bool value = false;
   if (prefs.GetBool(installer::master_preferences::kVerboseLogging,
                     &value) && value)
     uninstall_cmd->AppendSwitch(installer::switches::kVerboseLogging);
 }
 
 }  // namespace installer