Add DIR_PROGRAM_FILES6432 to PathService to return "Program Files" on both 64-bit and 32-bit platfo…

base/base_paths_win.cc

 // Copyright (c) 2012 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 <shlobj.h>
 
 #include "base/base_paths.h"
+#include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/win/scoped_co_mem.h"
 #include "base/win/windows_version.h"
 
 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 using base::FilePath;
 
 namespace base {
 
 bool PathProviderWin(int key, FilePath* result) {
   // We need to go compute the value. It would be nice to support paths with
   // names longer than MAX_PATH, but the system functions don't seem to be
   // designed for it either, with the exception of GetTempPath (but other
   // things will surely break if the temp path is too long, so we don't bother
   // handling it.
   wchar_t system_buffer[MAX_PATH];
   system_buffer[0] = 0;
+  scoped_ptr<base::Environment> env(base::Environment::Create());

[grt (UTC plus 2), 2015/03/12 13:34:44]

move these down into a block in the base::DIR_PROGRAM_FILES6432 case. there's no
reason all callers should pay the price of these.

[Will Harris, 2015/03/12 20:34:29]

Done.

+  std::string programfiles_w6432;
 
   FilePath cur;
   switch (key) {
     case base::FILE_EXE:
       GetModuleFileName(NULL, system_buffer, MAX_PATH);
       cur = FilePath(system_buffer);
       break;
     case base::FILE_MODULE: {
       // the resource containing module is assumed to be the one that
       // this code lives in, whether that's a dll or exe
@@ skipping 19 matching lines @@
         cur = FilePath(system_buffer);
         break;
       }
       // Fall through to base::DIR_PROGRAM_FILES if we're on an X86 machine.
     case base::DIR_PROGRAM_FILES:
       if (FAILED(SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL,
                                  SHGFP_TYPE_CURRENT, system_buffer)))
         return false;
       cur = FilePath(system_buffer);
       break;
+    case base::DIR_PROGRAM_FILES6432:
+#if !defined(_WIN64)
+      // 32-bit process running in WOW64 sets ProgramW6432 environment variable.

[grt (UTC plus 2), 2015/03/12 13:34:44]

How about reducing the dependence on the variable by changing this to:

#if !defined(_WIN64)
    if (base::win::OSInfo::GetInstance()->wow64_status() ==
base::win::WOW64_ENABLED) {  // 32-bit running in WoW64.
      %ProgramW6432%
      break;
    }
#endif
    CSIDL_PROGRAM_FILES

they *should* amount to the same thing, but it seems safer to me to go to the
true source where possible.

[Will Harris, 2015/03/12 20:34:29]

Done.

+      // See https://msdn.microsoft.com/library/windows/desktop/aa384274.aspx
+      if (env->GetVar("ProgramW6432", &programfiles_w6432)) {
+        // GetVar returns UTF8 - convert back to Wide.
+        cur = FilePath(UTF8ToWide(programfiles_w6432));
+        break;
+      }
+#endif
+      if (FAILED(SHGetFolderPath(NULL, CSIDL_PROGRAM_FILES, NULL,
+                                 SHGFP_TYPE_CURRENT, system_buffer)))
+        return false;
+      cur = FilePath(system_buffer);
+      break;
     case base::DIR_IE_INTERNET_CACHE:
       if (FAILED(SHGetFolderPath(NULL, CSIDL_INTERNET_CACHE, NULL,
                                  SHGFP_TYPE_CURRENT, system_buffer)))
         return false;
       cur = FilePath(system_buffer);
       break;
     case base::DIR_COMMON_START_MENU:
       if (FAILED(SHGetFolderPath(NULL, CSIDL_COMMON_PROGRAMS, NULL,
                                  SHGFP_TYPE_CURRENT, system_buffer)))
         return false;
@@ skipping 85 matching lines @@
       break;
     default:
       return false;
   }
 
   *result = cur;
   return true;
 }
 
 }  // namespace base