diff options
| author | grt <grt@chromium.org> | 2014-09-24 08:59:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-24 15:59:58 +0000 |
| commit | 8b12f969b04be8c9a8a45931665844c9515f926b (patch) | |
| tree | 8719cd8a8669365ad9dd9a26bb46291b9e0f4455 /chrome/installer/mini_installer | |
| parent | 3d0f7b0b00a6a10f8561a6da04b0b2ab4565b6e2 (diff) | |
| download | chromium_src-8b12f969b04be8c9a8a45931665844c9515f926b.zip chromium_src-8b12f969b04be8c9a8a45931665844c9515f926b.tar.gz chromium_src-8b12f969b04be8c9a8a45931665844c9515f926b.tar.bz2 | |
Specify the path to the old setup.exe in the lpApplicationName parameter to CreateProcess.
This is a reland of http://crrev.com/3882aae7 since
http://crrev.com/40d8624d should have fixed the problem leading to
diff update failures.
BUG=340387
TEST=N/A
Review URL: https://codereview.chromium.org/596353002
Cr-Commit-Position: refs/heads/master@{#296428}
Diffstat (limited to 'chrome/installer/mini_installer')
| -rw-r--r-- | chrome/installer/mini_installer/mini_installer.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc index da3cf91..e00569c 100644 --- a/chrome/installer/mini_installer/mini_installer.cc +++ b/chrome/installer/mini_installer/mini_installer.cc @@ -405,10 +405,12 @@ bool UnpackBinaryResources(const Configuration& configuration, HMODULE module, // If we found setup 'B7' resource, handle it. if (setup_path->length() > 0) { CommandString cmd_line; + PathString exe_path; // Get the path to setup.exe first. bool success = true; - if (!GetSetupExePathFromRegistry(configuration, cmd_line.get(), - cmd_line.capacity()) || + if (!GetSetupExePathFromRegistry(configuration, exe_path.get(), + exe_path.capacity()) || + !cmd_line.append(exe_path.get()) || !cmd_line.append(L" --") || !cmd_line.append(kCmdUpdateSetupExe) || !cmd_line.append(L"=\"") || @@ -429,7 +431,7 @@ bool UnpackBinaryResources(const Configuration& configuration, HMODULE module, ProcessExitCode exit_code = SUCCESS_EXIT_CODE; if (success && - (!RunProcessAndWait(NULL, cmd_line.get(), &exit_code) || + (!RunProcessAndWait(exe_path.get(), cmd_line.get(), &exit_code) || exit_code != SUCCESS_EXIT_CODE)) { success = false; } |