Regkey functions return error code instead of bool

ceee/installer_dll/installer_helper.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.
 //
 // Small DLL shim to register and unregister all CEEE components.
 
 #include "ceee/installer_dll/installer_helper.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ skipping 208 matching lines @@
   }
 }
 
 HRESULT RegisterFirefoxCeee(bool do_register) {
   HRESULT hr = STG_E_FILENOTFOUND;
   if (do_register) {
     FilePath path(GetFirefoxCeeePath());
 
     if (file_util::PathExists(path)) {
       base::win::RegKey key(HKEY_LOCAL_MACHINE, L"SOFTWARE", KEY_WRITE);
-      if (key.CreateKey(L"Mozilla", KEY_WRITE) &&
-          key.CreateKey(L"Firefox", KEY_WRITE) &&
-          key.CreateKey(L"extensions", KEY_WRITE) &&
-          key.WriteValue(kCeeeFirefoxExtensionName, path.value().c_str())) {
+      if ((key.CreateKey(L"Mozilla", KEY_WRITE) == ERROR_SUCCESS) &&

[Sigurður Ásgeirsson, 2011/01/10 21:02:43]

looks like this would be simpler with a path to a single CreateKey invocation?

+          (key.CreateKey(L"Firefox", KEY_WRITE) == ERROR_SUCCESS) &&
+          (key.CreateKey(L"extensions", KEY_WRITE) == ERROR_SUCCESS) &&
+          (key.WriteValue(kCeeeFirefoxExtensionName, path.value().c_str()))
+              == ERROR_SUCCESS) {
         hr = S_OK;
       } else {
         hr = com::AlwaysErrorFromLastError();
       }
     }
   } else {
     hr = S_OK;  // OK if not found, then there's nothing to do
     base::win::RegKey key(HKEY_LOCAL_MACHINE, L"SOFTWARE", KEY_READ);
-    if (key.OpenKey(L"Mozilla", KEY_READ) &&
-        key.OpenKey(L"Firefox", KEY_READ) &&
-        key.OpenKey(L"extensions", KEY_WRITE) &&
+    if ((key.OpenKey(L"Mozilla", KEY_READ) == ERROR_SUCCESS) &&
+        (key.OpenKey(L"Firefox", KEY_READ) == ERROR_SUCCESS) &&
+        (key.OpenKey(L"extensions", KEY_WRITE) == ERROR_SUCCESS) &&
         key.ValueExists(kCeeeFirefoxExtensionName)) {
-      if (!key.DeleteValue(kCeeeFirefoxExtensionName)) {
-        hr = com::AlwaysErrorFromLastError();
-      }
+      LONG result = key.DeleteValue(kCeeeFirefoxExtensionName);
+      hr = HRESULT_FROM_WIN32(result);
     }
   }
 
   return hr;
 }
 
 // Registers or unregisters this install as coming from the CEEE+CF channel if
 // it was installed using Omaha.
 HRESULT SetCeeeChannelModifier(bool new_value) {
   std::wstring reg_key(ceee_module_util::GetCromeFrameClientStateKey());
 
   base::win::RegKey key;
-  if (!key.Open(HKEY_LOCAL_MACHINE, reg_key.c_str(), KEY_ALL_ACCESS)) {
+  LONG result = key.Open(HKEY_LOCAL_MACHINE, reg_key.c_str(), KEY_ALL_ACCESS);
+  if (result != ERROR_SUCCESS) {
     // Omaha didn't install the key.  Perhaps no Omaha?  That's ok.
     return S_OK;
   }
 
   // We create the "ap" value if it doesn't exist.
   installer::ChannelInfo channel_info;
   channel_info.Initialize(key);
 
   if (channel_info.SetCeee(new_value) && !channel_info.Write(&key)) {
     return E_FAIL;
@@ skipping 125 matching lines @@
   LOG(WARNING) << "Call to unimplemented DllRegisterUserServer.";
   return S_OK;
 }
 
 // No-op entry point to keep user-level unregistration happy.
 // TODO(robertshield): Remove this as part of registration re-org.
 STDAPI DllUnregisterUserServer() {
   LOG(WARNING) << "Call to unimplemented DllUnregisterUserServer.";
   return S_OK;
 }