Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-30 13:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 711505 - Callback application should be locked when doing updates from the service. r=rstrong.

Browse Source
This commit is contained in:
Brian R. Bondy 2012-01-04 23:19:16 -05:00
parent 7a9edfa579
commit 6015c72be7
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolkit/components/maintenanceservice/workmonitor.cpp
View File

@ -95,7 +95,7 @@ StartUpdateProcess(LPCWSTR updaterPath,
si.lpDesktop = L"winsta0\\Default";
PROCESS_INFORMATION pi = {0};
LOG(("Starting update process as the service in session 0."));
LOG(("Starting update process as the service in session 0.\n"));
// The updater command line is of the form:
// updater.exe update-dir apply [wait-pid [callback-dir callback-path args]]

6
toolkit/mozapps/update/common/updatehelper.cpp
View File

@ -422,8 +422,10 @@ WinLaunchServiceCommand(LPCWSTR exePath, int argc, LPWSTR* argv)
// Write out the command line arguments that are passed to updater.exe
// updater.exe's command line arguments look like this normally:
// updater.exe update-dir apply [wait-pid [callback-dir callback-path args]]
// We want everything except the callback application and its arguments.
LPWSTR commandLineBuffer = MakeCommandLine(min(argc, 4), argv);
// We pass everything including the callback application and its arguments.
// The only reason we pass the callback info though is to lock the exe so it
// is not launched during update.
LPWSTR commandLineBuffer = MakeCommandLine(argc, argv);
if (!commandLineBuffer) {
return FALSE;
}

11
toolkit/mozapps/update/updater/updater.cpp
View File

@ -1404,7 +1404,12 @@ LaunchCallbackApp(const NS_tchar *workingDir, int argc, NS_tchar **argv)
#elif defined(XP_MACOSX)
LaunchChild(argc, argv);
#elif defined(XP_WIN)
WinLaunchChild(argv[0], argc, argv, NULL);
// Do not allow the callback to run when running an update through the
// service as session 0. The unelevated updater.exe will do the launching.
WCHAR *usingService = _wgetenv(L"MOZ_USING_SERVICE");
if (!usingService) {
WinLaunchChild(argv[0], argc, argv, NULL);
}
#else
# warning "Need implementaton of LaunchCallbackApp"
#endif
@ -1672,11 +1677,12 @@ int NS_main(int argc, NS_tchar **argv)
const int callbackIndex = 5;
#if defined(XP_WIN)
WCHAR *usingService = _wgetenv(L"MOZ_USING_SERVICE");
// Launch a second instance of the updater with the runas verb on Windows
// when write access is denied to the installation directory.
HANDLE updateLockFileHandle;
NS_tchar elevatedLockFilePath[MAXPATHLEN];
if (argc > callbackIndex) {
if (argc > callbackIndex && !usingService) {
NS_tchar updateLockFilePath[MAXPATHLEN];
NS_tsnprintf(updateLockFilePath,
sizeof(updateLockFilePath)/sizeof(updateLockFilePath[0]),
@ -2009,7 +2015,6 @@ int NS_main(int argc, NS_tchar **argv)
// service if the service failed to apply the update. We want to update
// the service to a newer version in that case. If we are not running
// through the service, then MOZ_USING_SERVICE will not exist.
WCHAR *usingService = _wgetenv(L"MOZ_USING_SERVICE");
if (!usingService) {
if (!LaunchWinPostProcess(argv[2], gSourcePath, false, NULL)) {
LOG(("NS_main: The post update process could not be launched.\n"));