Regkey functions return error code instead of bool

chrome_frame/utils.cc

Index: chrome_frame/utils.cc
===================================================================
--- chrome_frame/utils.cc	(revision 71345)
+++ chrome_frame/utils.cc	(working copy)
@@ -233,7 +233,8 @@
   bool success = false;
   if (cf_state_key.Valid()) {
     if (set) {
-      success = cf_state_key.WriteValue(kChromeFramePersistNPAPIReg, 1);
+      LONG result = cf_state_key.WriteValue(kChromeFramePersistNPAPIReg, 1);
+      success = result == ERROR_SUCCESS;
     } else {
       // Unfortunately, DeleteValue returns true only if the value
       // previously existed, so we do a separate existence check to
@@ -255,7 +256,8 @@
   bool success = false;
   if (cf_state_key.Valid()) {
     DWORD val = 0;
-    if (cf_state_key.ReadValueDW(kChromeFramePersistNPAPIReg, &val)) {
+    LONG result = cf_state_key.ReadValueDW(kChromeFramePersistNPAPIReg, &val);
+    if (result = ERROR_SUCCESS) {

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

result == ERROR_SUCCESS
(I still prefer not having the local var in these cases.  I also strongly prefer
ERROR_SUCCESS == result for exactly this reason, but that's a battle I'm not
insane enough to get into now.  :-) )

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

Done.

       success = (val != 0);
     }
   }
@@ -676,11 +678,8 @@
   int ret = default_value;
   RegKey config_key;
   if (config_key.Open(HKEY_CURRENT_USER, kChromeFrameConfigKey,
-                      KEY_QUERY_VALUE)) {
-    int value = FALSE;
-    if (config_key.ReadValueDW(value_name, reinterpret_cast<DWORD*>(&value))) {
-      ret = value;
-    }
+                      KEY_QUERY_VALUE) == ERROR_SUCCESS) {
+    config_key.ReadValueDW(value_name, reinterpret_cast<DWORD*>(&ret));
   }
 
   return ret;
@@ -694,8 +693,8 @@
 bool SetConfigInt(const wchar_t* value_name, int value) {
   RegKey config_key;
   if (config_key.Create(HKEY_CURRENT_USER, kChromeFrameConfigKey,
-                        KEY_SET_VALUE)) {
-    if (config_key.WriteValue(value_name, value)) {
+                        KEY_SET_VALUE) == ERROR_SUCCESS) {
+    if (config_key.WriteValue(value_name, value) == ERROR_SUCCESS) {
       return true;
     }
   }
@@ -710,8 +709,10 @@
 bool DeleteConfigValue(const wchar_t* value_name) {
   RegKey config_key;
   if (config_key.Open(HKEY_CURRENT_USER, kChromeFrameConfigKey,
-                      KEY_WRITE)) {
-    return config_key.DeleteValue(value_name);
+                      KEY_WRITE) == ERROR_SUCCESS) {
+    if (config_key.DeleteValue(value_name) == ERROR_SUCCESS) {
+      return true;
+    }
   }
   return false;
 }
@@ -728,7 +729,9 @@
     // TODO(tommi): Implement caching for this config value as it gets
     // checked frequently.
     RegKey config_key;
-    if (config_key.Open(HKEY_CURRENT_USER, kChromeFrameConfigKey, KEY_READ)) {
+    LONG result = config_key.Open(HKEY_CURRENT_USER, kChromeFrameConfigKey,
+                                  KEY_READ);
+    if (result == ERROR_SUCCESS) {
       config_key.ReadValueDW(kEnableGCFRendererByDefault, &is_default);
     }
   }
@@ -751,7 +754,9 @@
   }
 
   RegKey config_key;
-  if (!config_key.Open(HKEY_CURRENT_USER, kChromeFrameConfigKey, KEY_READ))
+  LONG result = config_key.Open(HKEY_CURRENT_USER, kChromeFrameConfigKey,
+                                KEY_READ);
+  if (result != ERROR_SUCCESS)
     return RENDERER_TYPE_UNDETERMINED;
 
   RendererType renderer_type = RENDERER_TYPE_UNDETERMINED;