Expose a function to get the path to a DLL.

chrome/app/client_util.cc

Index: chrome/app/client_util.cc
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index e12bec90705f0709ffe3f356cf062de17604a765..6440bf1de9e6be43338035a4ea3159b3ae04b61c 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -3,91 +3,17 @@
 // found in the LICENSE file.
 
 #include <windows.h>
-#include <shlwapi.h>
 
-#include "base/base_paths.h"
-#include "base/base_switches.h"
-#include "base/command_line.h"
-#include "base/compiler_specific.h"
-#include "base/environment.h"
+#include "chrome/app/client_util.h"
+
 #include "base/file_version_info.h"
-#include "base/lazy_instance.h"
+#include "base/files/file.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/path_service.h"
-#include "base/strings/string16.h"
-#include "base/strings/string_util.h"
-#include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/trace_event/trace_event.h"
 #include "base/version.h"
-#include "base/win/scoped_handle.h"
-#include "base/win/windows_version.h"
-#include "chrome/app/chrome_crash_reporter_client.h"
-#include "chrome/app/chrome_watcher_client_win.h"
-#include "chrome/app/chrome_watcher_command_line_win.h"
-#include "chrome/app/client_util.h"
-#include "chrome/app/image_pre_reader_win.h"
-#include "chrome/app/kasko_client.h"
-#include "chrome/chrome_watcher/chrome_watcher_main_api.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_result_codes.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/env_vars.h"
-#include "chrome/installer/util/google_update_constants.h"
-#include "chrome/installer/util/google_update_settings.h"
-#include "chrome/installer/util/install_util.h"
-#include "chrome/installer/util/util_constants.h"
-#include "components/crash/content/app/breakpad_win.h"
-#include "components/crash/content/app/crash_reporter_client.h"
-#include "content/public/app/sandbox_helper_win.h"
-#include "content/public/common/content_switches.h"
-#include "sandbox/win/src/sandbox.h"
 
 namespace {
-// The entry point signature of chrome.dll.
-typedef int (*DLL_MAIN)(HINSTANCE, sandbox::SandboxInterfaceInfo*);
-
-typedef void (*RelaunchChromeBrowserWithNewCommandLineIfNeededFunc)();
-
-base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client =
-    LAZY_INSTANCE_INITIALIZER;
-
-// Loads |module| after setting the CWD to |module|'s directory. Returns a
-// reference to the loaded module on success, or null on error.
-HMODULE LoadModuleWithDirectory(const base::FilePath& module, bool pre_read) {
-  ::SetCurrentDirectoryW(module.DirName().value().c_str());
-
-  if (pre_read) {
-    // We pre-read the binary to warm the memory caches (fewer hard faults to
-    // page parts of the binary in).
-    const size_t kStepSize = 1024 * 1024;
-    size_t percent = 100;
-    ImagePreReader::PartialPreReadImage(module.value().c_str(), percent,
-                                        kStepSize);
-  }
-
-  return ::LoadLibraryExW(module.value().c_str(), nullptr,
-                          LOAD_WITH_ALTERED_SEARCH_PATH);
-}
-
-void RecordDidRun(const base::FilePath& dll_path) {
-  bool system_level = !InstallUtil::IsPerUserInstall(dll_path);
-  GoogleUpdateSettings::UpdateDidRunState(true, system_level);
-}
-
-void ClearDidRun(const base::FilePath& dll_path) {
-  bool system_level = !InstallUtil::IsPerUserInstall(dll_path);
-  GoogleUpdateSettings::UpdateDidRunState(false, system_level);
-}
-
-bool InMetroMode() {
-  return (wcsstr(
-      ::GetCommandLineW(), L" -ServerName:DefaultBrowserServer") != nullptr);
-}
-
-typedef int (*InitMetro)();
 
 // Returns the directory in which the currently running executable resides.
 base::FilePath GetExecutableDir() {
@@ -96,8 +22,8 @@ base::FilePath GetExecutableDir() {
   return base::FilePath(path).DirName();
 }
 
-}  // namespace
-
+// Returns the version in the current module's version resource or the empty
+// string if none found.
 base::string16 GetCurrentModuleVersion() {
   scoped_ptr<FileVersionInfo> file_version_info(
       CREATE_FILE_VERSION_INFO_FOR_CURRENT_MODULE());
@@ -109,268 +35,29 @@ base::string16 GetCurrentModuleVersion() {
   return base::string16();
 }
 
-//=============================================================================
-
-MainDllLoader::MainDllLoader()
-  : dll_(nullptr), metro_mode_(InMetroMode()) {
+// Indicates whether a file exists and can be opened for reading.
+bool FileCanBeRead(const base::FilePath file_path) {
+  base::File file(file_path, base::File::FLAG_OPEN | base::File::FLAG_READ);

[grt (UTC plus 2), 2015/10/29 18:51:50]

nit: return base::File(...).IsValid();
also, just to confirm: are these the same perms used by the loader to bring an
image into the process?

[fdoray, 2015/10/30 14:45:45]

Done. And yes, I confirmed with ProcMon that I use the same parameters as the
loader.

+  return file.IsValid();
 }
 
-MainDllLoader::~MainDllLoader() {
-}
+}  // namespace
 
-// Loading chrome is an interesting affair. First we try loading from the
-// current directory to support run-what-you-compile and other development
-// scenarios.
-// If that fails then we look at the version resource in the current
-// module. This is the expected path for chrome.exe browser instances in an
-// installed build.
-HMODULE MainDllLoader::Load(base::string16* version, base::FilePath* module) {
-  const base::char16* dll_name = nullptr;
-  if (metro_mode_) {
-    dll_name = installer::kChromeMetroDll;
-  } else if (process_type_ == "service" || process_type_.empty()) {
-    dll_name = installer::kChromeDll;
-  } else if (process_type_ == "watcher") {
-    dll_name = kChromeWatcherDll;
-  } else {
-#if defined(CHROME_MULTIPLE_DLL)
-    dll_name = installer::kChromeChildDll;
-#else
-    dll_name = installer::kChromeDll;
-#endif
-  }
+base::FilePath GetModulePath(const base::char16* module_name,
+                             base::string16* version) {
+  DCHECK(module_name);
+  DCHECK(version);
 
-  const bool pre_read = !metro_mode_;
   base::FilePath module_dir = GetExecutableDir();
-  *module = module_dir.Append(dll_name);
-  HMODULE dll = LoadModuleWithDirectory(*module, pre_read);
-  if (!dll) {
-    base::string16 version_string(GetCurrentModuleVersion());
-    if (version_string.empty()) {
-      LOG(ERROR) << "No valid Chrome version found";
-      return nullptr;
-    }
-    *version = version_string;
-    *module = module_dir.Append(version_string).Append(dll_name);
-    dll = LoadModuleWithDirectory(*module, pre_read);
-    if (!dll) {
-      PLOG(ERROR) << "Failed to load Chrome DLL from " << module->value();
-      return nullptr;
-    }
-  }
-
-  DCHECK(dll);
-  return dll;
-}
-
-// Launching is a matter of loading the right dll, setting the CHROME_VERSION
-// environment variable and just calling the entry point. Derived classes can
-// add custom code in the OnBeforeLaunch callback.
-int MainDllLoader::Launch(HINSTANCE instance) {
-  const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
-  process_type_ = cmd_line.GetSwitchValueASCII(switches::kProcessType);
-
-  base::string16 version;
-  base::FilePath file;
-
-  if (metro_mode_) {
-    HMODULE metro_dll = Load(&version, &file);
-    if (!metro_dll)
-      return chrome::RESULT_CODE_MISSING_DATA;
+  base::FilePath module = module_dir.Append(module_name);
+  if (FileCanBeRead(module))
+    return module;
 
-    InitMetro chrome_metro_main =
-        reinterpret_cast<InitMetro>(::GetProcAddress(metro_dll, "InitMetro"));
-    return chrome_metro_main();
+  base::string16 version_string(GetCurrentModuleVersion());
+  if (version_string.empty()) {
+    LOG(ERROR) << "No valid Chrome version found";
+    return base::FilePath();
   }
-
-  if (process_type_ == "watcher") {
-    chrome::RegisterPathProvider();
-
-    base::win::ScopedHandle parent_process;
-    base::win::ScopedHandle on_initialized_event;
-    DWORD main_thread_id = 0;
-    if (!InterpretChromeWatcherCommandLine(cmd_line, &parent_process,
-                                           &main_thread_id,
-                                           &on_initialized_event)) {
-      return chrome::RESULT_CODE_UNSUPPORTED_PARAM;
-    }
-
-    base::FilePath default_user_data_directory;
-    if (!PathService::Get(chrome::DIR_USER_DATA, &default_user_data_directory))
-      return chrome::RESULT_CODE_MISSING_DATA;
-    // The actual user data directory may differ from the default according to
-    // policy and command-line arguments evaluated in the browser process.
-    // The hang monitor will simply be disabled if a window with this name is
-    // never instantiated by the browser process. Since this should be
-    // exceptionally rare it should not impact stability efforts.
-    base::string16 message_window_name = default_user_data_directory.value();
-
-    base::FilePath watcher_data_directory;
-    if (!PathService::Get(chrome::DIR_WATCHER_DATA, &watcher_data_directory))
-      return chrome::RESULT_CODE_MISSING_DATA;
-
-    base::string16 channel_name = GoogleUpdateSettings::GetChromeChannel(
-        !InstallUtil::IsPerUserInstall(cmd_line.GetProgram()));
-
-    // Intentionally leaked.
-    HMODULE watcher_dll = Load(&version, &file);
-    if (!watcher_dll)
-      return chrome::RESULT_CODE_MISSING_DATA;
-
-    ChromeWatcherMainFunction watcher_main =
-        reinterpret_cast<ChromeWatcherMainFunction>(
-            ::GetProcAddress(watcher_dll, kChromeWatcherDLLEntrypoint));
-    return watcher_main(chrome::kBrowserExitCodesRegistryPath,
-                        parent_process.Take(), main_thread_id,
-                        on_initialized_event.Take(),
-                        watcher_data_directory.value().c_str(),
-                        message_window_name.c_str(), channel_name.c_str());
-  }
-
-  // Initialize the sandbox services.
-  sandbox::SandboxInterfaceInfo sandbox_info = {0};
-  content::InitializeSandboxInfo(&sandbox_info);
-
-  crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
-  bool exit_now = true;
-  if (process_type_.empty()) {
-    if (breakpad::ShowRestartDialogIfCrashed(&exit_now)) {
-      // We restarted because of a previous crash. Ask user if we should
-      // Relaunch. Only for the browser process. See crbug.com/132119.
-      if (exit_now)
-        return content::RESULT_CODE_NORMAL_EXIT;
-    }
-  }
-  breakpad::InitCrashReporter(process_type_);
-
-  dll_ = Load(&version, &file);
-  if (!dll_)
-    return chrome::RESULT_CODE_MISSING_DATA;
-
-  scoped_ptr<base::Environment> env(base::Environment::Create());
-  env->SetVar(chrome::kChromeVersionEnvVar, base::WideToUTF8(version));
-
-  OnBeforeLaunch(process_type_, file);
-  DLL_MAIN chrome_main =
-      reinterpret_cast<DLL_MAIN>(::GetProcAddress(dll_, "ChromeMain"));
-  int rc = chrome_main(instance, &sandbox_info);
-  rc = OnBeforeExit(rc, file);
-  // Sandboxed processes close some system DLL handles after lockdown so ignore
-  // EXCEPTION_INVALID_HANDLE generated on Windows 10 during shutdown of these
-  // processes.
-  // TODO(wfh): Check whether MS have fixed this in Win10 RTM. crbug.com/456193
-  if (base::win::GetVersion() >= base::win::VERSION_WIN10)
-    breakpad::ConsumeInvalidHandleExceptions();
-  return rc;
-}
-
-void MainDllLoader::RelaunchChromeBrowserWithNewCommandLineIfNeeded() {
-  if (!dll_)
-    return;
-
-  RelaunchChromeBrowserWithNewCommandLineIfNeededFunc relaunch_function =
-      reinterpret_cast<RelaunchChromeBrowserWithNewCommandLineIfNeededFunc>(
-          ::GetProcAddress(dll_,
-                           "RelaunchChromeBrowserWithNewCommandLineIfNeeded"));
-  if (!relaunch_function) {
-    LOG(ERROR) << "Could not find exported function "
-               << "RelaunchChromeBrowserWithNewCommandLineIfNeeded";
-  } else {
-    relaunch_function();
-  }
-}
-
-//=============================================================================
-
-class ChromeDllLoader : public MainDllLoader {
- protected:
-  // MainDllLoader implementation.
-  void OnBeforeLaunch(const std::string& process_type,
-                      const base::FilePath& dll_path) override;
-  int OnBeforeExit(int return_code, const base::FilePath& dll_path) override;
-
- private:
-  scoped_ptr<ChromeWatcherClient> chrome_watcher_client_;
-#if defined(KASKO)
-  scoped_ptr<KaskoClient> kasko_client_;
-#endif  // KASKO
-};
-
-void ChromeDllLoader::OnBeforeLaunch(const std::string& process_type,
-                                     const base::FilePath& dll_path) {
-  if (process_type.empty()) {
-    RecordDidRun(dll_path);
-
-    // Launch the watcher process if stats collection consent has been granted.
-    if (g_chrome_crash_client.Get().GetCollectStatsConsent()) {
-      base::FilePath exe_path;
-      if (PathService::Get(base::FILE_EXE, &exe_path)) {
-        chrome_watcher_client_.reset(new ChromeWatcherClient(
-            base::Bind(&GenerateChromeWatcherCommandLine, exe_path)));
-        if (chrome_watcher_client_->LaunchWatcher()) {
-#if defined(KASKO)
-          kasko::api::MinidumpType minidump_type = kasko::api::SMALL_DUMP_TYPE;
-          if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-                  switches::kFullMemoryCrashReport)) {
-            minidump_type = kasko::api::FULL_DUMP_TYPE;
-          } else {
-            bool is_per_user_install =
-                g_chrome_crash_client.Get().GetIsPerUserInstall(
-                    base::FilePath(exe_path));
-            if (g_chrome_crash_client.Get().GetShouldDumpLargerDumps(
-                    is_per_user_install)) {
-              minidump_type = kasko::api::LARGER_DUMP_TYPE;
-            }
-          }
-
-          kasko_client_.reset(
-              new KaskoClient(chrome_watcher_client_.get(), minidump_type));
-#endif  // KASKO
-        }
-      }
-    }
-  } else {
-    // Set non-browser processes up to be killed by the system after the browser
-    // goes away. The browser uses the default shutdown order, which is 0x280.
-    // Note that lower numbers here denote "kill later" and higher numbers mean
-    // "kill sooner".
-    // This gets rid of most of those unsighly sad tabs on logout and shutdown.
-    ::SetProcessShutdownParameters(0x280 - 1, SHUTDOWN_NORETRY);
-  }
-}
-
-int ChromeDllLoader::OnBeforeExit(int return_code,
-                                  const base::FilePath& dll_path) {
-  // NORMAL_EXIT_CANCEL is used for experiments when the user cancels
-  // so we need to reset the did_run signal so omaha does not count
-  // this run as active usage.
-  if (chrome::RESULT_CODE_NORMAL_EXIT_CANCEL == return_code) {
-    ClearDidRun(dll_path);
-  }
-
-#if defined(KASKO)
-  kasko_client_.reset();
-#endif  // KASKO
-  chrome_watcher_client_.reset();
-
-  return return_code;
-}
-
-//=============================================================================
-
-class ChromiumDllLoader : public MainDllLoader {
- protected:
-  void OnBeforeLaunch(const std::string& process_type,
-                      const base::FilePath& dll_path) override {}
-  int OnBeforeExit(int return_code, const base::FilePath& dll_path) override {
-    return return_code;
-  }
-};
-
-MainDllLoader* MakeMainDllLoader() {
-#if defined(GOOGLE_CHROME_BUILD)
-  return new ChromeDllLoader();
-#else
-  return new ChromiumDllLoader();
-#endif
+  *version = version_string;
+  return module_dir.Append(version_string).Append(module_name);
 }