projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
installer
/
mini_installer
/
mini_installer.cc
diff --git
a/src/chrome/installer/mini_installer/mini_installer.cc
b/src/chrome/installer/mini_installer/mini_installer.cc
index
da3cf91
..
e00569c
100644
(file)
--- a/
src/chrome/installer/mini_installer/mini_installer.cc
+++ b/
src/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;
// 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;
// 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"=\"") ||
!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 &&
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;
}
exit_code != SUCCESS_EXIT_CODE)) {
success = false;
}