Commit 8b12f969 authored by grt's avatar grt Committed by Commit bot

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}
parent 3d0f7b0b
......@@ -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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment