Regkey functions return error code instead of bool

webkit/plugins/npapi/plugin_list_win.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 "webkit/plugins/npapi/plugin_list.h"
 
 #include <tchar.h>
 
 #include <set>
 
@@ skipping 55 matching lines @@
 }
 
 // Gets the installed path for a registered app.
 bool GetInstalledPath(const char16* app, FilePath* out) {
   std::wstring reg_path(kRegistryApps);
   reg_path.append(L"\\");
   reg_path.append(app);
 
   base::win::RegKey key(HKEY_LOCAL_MACHINE, reg_path.c_str(), KEY_READ);
   std::wstring path;
-  if (key.ReadValue(kRegistryPath, &path)) {
+  if (key.ReadValue(kRegistryPath, &path) == ERROR_SUCCESS) {
     *out = FilePath(path);
     return true;
   }
 
   return false;
 }
 
 // Search the registry at the given path and detect plugin directories.
 void GetPluginsInRegistryDirectory(
     HKEY root_key,
     const std::wstring& registry_folder,
     std::set<FilePath>* plugin_dirs) {
   for (base::win::RegistryKeyIterator iter(root_key, registry_folder.c_str());
        iter.Valid(); ++iter) {
     // Use the registry to gather plugin across the file system.
     std::wstring reg_path = registry_folder;
     reg_path.append(L"\\");
     reg_path.append(iter.Name());
     base::win::RegKey key(root_key, reg_path.c_str(), KEY_READ);
 
     std::wstring path;
-    if (key.ReadValue(kRegistryPath, &path))
+    if (key.ReadValue(kRegistryPath, &path) == ERROR_SUCCESS)
       plugin_dirs->insert(FilePath(path));
   }
 }
 
 // Enumerate through the registry key to find all installed FireFox paths.
 // FireFox 3 beta and version 2 can coexist. See bug: 1025003
 void GetFirefoxInstalledPaths(std::vector<FilePath>* out) {
   base::win::RegistryKeyIterator it(HKEY_LOCAL_MACHINE,
                                     kRegistryFirefoxInstalled);
   for (; it.Valid(); ++it) {
     std::wstring full_path = std::wstring(kRegistryFirefoxInstalled) + L"\\" +
                              it.Name() + L"\\Main";
     base::win::RegKey key(HKEY_LOCAL_MACHINE, full_path.c_str(), KEY_READ);
     std::wstring install_dir;
-    if (!key.ReadValue(L"Install Directory", &install_dir))
+    if (key.ReadValue(L"Install Directory", &install_dir) != ERROR_SUCCESS)
       continue;
     out->push_back(FilePath(install_dir));
   }
 }
 
 // Get plugin directory locations from the Firefox install path.  This is kind
 // of a kludge, but it helps us locate the flash player for users that
 // already have it for firefox.  Not having to download yet-another-plugin
 // is a good thing.
 void GetFirefoxDirectory(std::set<FilePath>* plugin_dirs) {
@@ skipping 59 matching lines @@
 
 // Hardcoded logic to detect Java plugin location.
 void GetJavaDirectory(std::set<FilePath>* plugin_dirs) {
   // Load the new NPAPI Java plugin
   // 1. Open the main JRE key under HKLM
   base::win::RegKey java_key(HKEY_LOCAL_MACHINE, kRegistryJava,
                              KEY_QUERY_VALUE);
 
   // 2. Read the current Java version
   std::wstring java_version;
-  if (!java_key.ReadValue(kRegistryBrowserJavaVersion, &java_version))
+  if (java_key.ReadValue(kRegistryBrowserJavaVersion, &java_version)
+      != ERROR_SUCCESS)

[grt (UTC plus 2), 2011/01/16 04:19:48]

Wrapping

[amit, 2011/01/16 07:54:28]

Done.

     java_key.ReadValue(kRegistryCurrentJavaVersion, &java_version);
 
   if (!java_version.empty()) {
     java_key.OpenKey(java_version.c_str(), KEY_QUERY_VALUE);
 
     // 3. Install path of the JRE binaries is specified in "JavaHome"
     //    value under the Java version key.
     std::wstring java_plugin_directory;
-    if (java_key.ReadValue(kRegistryJavaHome, &java_plugin_directory)) {
+    if (java_key.ReadValue(kRegistryJavaHome, &java_plugin_directory)
+        == ERROR_SUCCESS) {

[grt (UTC plus 2), 2011/01/16 04:19:48]

Wrapping

       // 4. The new plugin resides under the 'bin/new_plugin'
       //    subdirectory.
       DCHECK(!java_plugin_directory.empty());
       java_plugin_directory.append(L"\\bin\\new_plugin");
 
       // 5. We don't know the exact name of the DLL but it's in the form
       //    NP*.dll so just invoke LoadPlugins on this path.
       plugin_dirs->insert(FilePath(java_plugin_directory));
     }
   }
@@ skipping 191 matching lines @@
       if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
         return false;
     }
   }
 
   return true;
 }
 
 }  // namespace npapi
 }  // namespace webkit