Use Environment::GetVar instead of the obscure EnvQueryStr function.

chrome/app/client_util.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 <windows.h>
 #include <shlwapi.h>
 
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_util.h"
@@ skipping 59 matching lines @@
 // Gets the path of the current exe with a trailing backslash.
 std::wstring GetExecutablePath() {
   wchar_t path[MAX_PATH];
   ::GetModuleFileNameW(NULL, path, MAX_PATH);
   if (!::PathRemoveFileSpecW(path))
     return std::wstring();
   std::wstring exe_path(path);
   return exe_path.append(L"\\");
 }
 
-// Not generic, we only handle strings up to 128 chars.
-bool EnvQueryStr(const wchar_t* key_name, std::wstring* value) {
-  wchar_t out[128];
-  DWORD count = sizeof(out)/sizeof(out[0]);
-  DWORD rv = ::GetEnvironmentVariableW(key_name, out, count);
-  if ((rv == 0) || (rv >= count))
-    return false;
-  *value = out;
-  return true;
-}
-
 // Expects that |dir| has a trailing backslash. |dir| is modified so it
 // contains the full path that was tried. Caller must check for the return
 // value not being null to dermine if this path contains a valid dll.
 HMODULE LoadChromeWithDirectory(std::wstring* dir) {
   ::SetCurrentDirectoryW(dir->c_str());
   const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
 #ifdef _WIN64
   if ((cmd_line.GetSwitchValueASCII(switches::kProcessType) ==
       switches::kNaClBrokerProcess) ||
       (cmd_line.GetSwitchValueASCII(switches::kProcessType) ==
@@ skipping 98 matching lines @@
 // if we should stick with an older dll version even if a new one is available
 // to support upgrade-in-place scenarios, and if that fails we finally we look
 // at the registry which should point us to the latest version.
 HMODULE MainDllLoader::Load(std::wstring* version, std::wstring* file) {
   std::wstring dir(GetExecutablePath());
   *file = dir;
   HMODULE dll = LoadChromeWithDirectory(file);
   if (dll)
     return dll;
 
-  if (!EnvQueryStr(
-          BrowserDistribution::GetDistribution()->GetEnvVersionKey().c_str(),
-          version)) {
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+
+  std::string version_value;
+  if (!env->GetVar(WideToUTF8(
+          BrowserDistribution::GetDistribution()->GetEnvVersionKey()).c_str(),
+          &version_value)) {
     std::wstring reg_path(GetRegistryPath());
+
+    *version = UTF8ToWide(version_value);
     // Look into the registry to find the latest version.
     if (!GetVersion(dir.c_str(), reg_path.c_str(), version))
       return NULL;
   }
 
   *file = dir;
   file->append(*version).append(L"\\");
   return LoadChromeWithDirectory(file);
 }
 
@@ skipping 76 matching lines @@
   }
 };
 
 MainDllLoader* MakeMainDllLoader() {
 #if defined(GOOGLE_CHROME_BUILD)
   return new ChromeDllLoader();
 #else
   return new ChromiumDllLoader();
 #endif
 }