Amend PATH for nacl64 so loader can find x64 CRT

components/nacl/browser/nacl_process_host.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 "components/nacl/browser/nacl_process_host.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 494 matching lines @@
   if (exe_path.empty())
     return false;
 
 #if defined(OS_WIN)
   // On Windows 64-bit NaCl loader is called nacl64.exe instead of chrome.exe
   if (RunningOnWOW64()) {
     if (!NaClBrowser::GetInstance()->GetNaCl64ExePath(&exe_path)) {
       SendErrorToRenderer("could not get path to nacl64.exe");
       return false;
     }
+
+#ifdef _DLL
+    // When using the DLL CRT on Windows, we need to amend the PATH to include
+    // the location of the x64 CRT DLLs. This is only the case when using a
+    // component=shared_library build (i.e. generally dev debug builds). The
+    // x86 CRT DLLs are in e.g. out\Debug for chrome.exe etc., so the x64 ones
+    // are put in out\Debug\x64 which we add to the PATH here so that loader
+    // can find them. See http://crbug.com/346034.
+    scoped_ptr<base::Environment> env(base::Environment::Create());
+    static const char kPath[] = "PATH";
+    std::string old_path;
+    base::FilePath module_path;
+    if (!PathService::Get(base::FILE_MODULE, &module_path)) {
+      SendErrorToRenderer("could not get path to current module");
+      return false;
+    }
+    std::string x64_crt_path =
+        base::WideToUTF8(module_path.DirName().Append(L"x64").value());
+    if (!env->GetVar(kPath, &old_path))
+      env->SetVar(kPath, x64_crt_path);
+    if (old_path.find(x64_crt_path) == std::string::npos) {

[cpu_(ooo_6.6-7.5), 2014/02/25 21:29:34]

if --> else if  ?

[scottmg, 2014/02/25 21:36:35]

Done.

+      std::string new_path(old_path);
+      new_path.append(";");
+      new_path.append(x64_crt_path);
+      env->SetVar(kPath, new_path);
+    }
+#endif  // _DLL
   }
 #endif
 
   scoped_ptr<CommandLine> cmd_line(new CommandLine(exe_path));
   CopyNaClCommandLineArguments(cmd_line.get());
 
   cmd_line->AppendSwitchASCII(switches::kProcessType,
                               switches::kNaClLoaderProcess);
   cmd_line->AppendSwitchASCII(switches::kProcessChannelID, channel_id);
   if (NaClBrowser::GetDelegate()->DialogsAreSuppressed())
@@ skipping 480 matching lines @@
         process_handle.Take(), info,
         base::MessageLoopProxy::current(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif
 
 }  // namespace nacl