зеркало из https://github.com/mozilla/pjs.git
fixes bug 297147 "Update Windows registry after software update" r+a=bsmedberg
This commit is contained in:
darin%meer.net
Родитель
79a31e2b39
Коммит
aa85a21407
|
|
@ -0,0 +1,6 @@
|
|||
# These values are used to construct the registry keys for the Add/Remove
|
||||
# Programs dialog under Windows. They must be kept in sync with the values
|
||||
# used by the installer.
|
||||
fileUninstall=UninstallDeerPark.exe
|
||||
URLInfoAbout=http://www.mozilla.org/
|
||||
URLUpdateInfo=http://www.mozilla.org/products/firefox/
|
||||
|
|
@ -50,4 +50,7 @@ browser.jar:
|
|||
content/branding/aboutFooter.png (branding/aboutFooter.png)
|
||||
content/branding/searchconfig.properties (branding/searchconfig.properties)
|
||||
content/branding/icon64.png (branding/icon64.png)
|
||||
#ifdef XP_WIN
|
||||
content/branding/uninstall.properties (branding/uninstall.properties)
|
||||
#endif
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
# These values are used to construct the registry keys for the Add/Remove
|
||||
# Programs dialog under Windows. They must be kept in sync with the values
|
||||
# used by the installer.
|
||||
fileUninstall=UninstallThunderbird.exe
|
||||
URLInfoAbout=http://www.mozilla.org/
|
||||
URLUpdateInfo=http://www.mozilla.org/products/thunderbird/
|
||||
|
|
@ -49,6 +49,9 @@ messenger.jar:
|
|||
content/branding/about-credits.png (content/about-credits.png)
|
||||
content/branding/about-thunderbird.png (content/about-thunderbird.png)
|
||||
content/branding/thunderbird-watermark.png (content/thunderbird-watermark.png)
|
||||
#ifdef XP_WIN
|
||||
content/branding/uninstall.properties (content/uninstall.properties)
|
||||
#endif
|
||||
#endif
|
||||
# The following file should have an official-branding version also. See bug 286483
|
||||
content/branding/icon64.png (content/icon64.png)
|
||||
|
|
|
|||
|
|
@ -5,3 +5,6 @@ browser.jar:
|
|||
content/branding/aboutFooter.png (aboutFooter.png)
|
||||
content/branding/searchconfig.properties (searchconfig.properties)
|
||||
content/branding/icon64.png (icon64.png)
|
||||
#ifdef XP_WIN
|
||||
content/branding/uninstall.properties (uninstall.properties)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
# These values are used to construct the registry keys for the Add/Remove
|
||||
# Programs dialog under Windows. They must be kept in sync with the values
|
||||
# used by the installer.
|
||||
fileUninstall=UninstallFirefox.exe
|
||||
URLInfoAbout=http://www.mozilla.org/
|
||||
URLUpdateInfo=http://www.mozilla.org/products/firefox/
|
||||
|
|
@ -4,3 +4,6 @@ messenger.jar:
|
|||
content/branding/about-thunderbird.png (about-thunderbird.png)
|
||||
content/branding/thunderbird-wizard-badge.png (thunderbird-wizard-badge.png)
|
||||
content/branding/thunderbird-watermark.png (thunderbird-watermark.png)
|
||||
#ifdef XP_WIN
|
||||
content/branding/uninstall.properties (uninstall.properties)
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,6 @@
|
|||
# These values are used to construct the registry keys for the Add/Remove
|
||||
# Programs dialog under Windows. They must be kept in sync with the values
|
||||
# used by the installer.
|
||||
fileUninstall=UninstallThunderbird.exe
|
||||
URLInfoAbout=http://www.mozilla.org/
|
||||
URLUpdateInfo=http://www.mozilla.org/products/thunderbird/
|
||||
|
|
@ -50,8 +50,11 @@ endif
|
|||
|
||||
EXTRA_COMPONENTS = nsUpdateService.js
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
EXTRA_COMPONENTS += nsPostUpdateWin.js
|
||||
endif
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
nsUpdateService.js: nsUpdateService.js.in
|
||||
$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $^ > $@
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,504 @@
|
|||
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is the Update Service.
|
||||
*
|
||||
* The Initial Developer of the Original Code is Google Inc.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2005
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Darin Fisher <darin@meer.net> (original author)
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
/**
|
||||
* This file contains an implementation of nsIRunnable, which may be invoked
|
||||
* to perform post-update modifications to the windows registry and uninstall
|
||||
* logs required to complete an update of the application. This code is very
|
||||
* specific to the xpinstall wizard for windows.
|
||||
*/
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
/**
|
||||
* Console logging support
|
||||
*/
|
||||
function LOG(s) {
|
||||
dump("*** PostUpdateWin: " + s + "\n");
|
||||
}
|
||||
|
||||
/**
|
||||
* This function queries the XPCOM directory service.
|
||||
*/
|
||||
function getFile(key) {
|
||||
var dirSvc =
|
||||
Components.classes["@mozilla.org/file/directory_service;1"].
|
||||
getService(Components.interfaces.nsIProperties);
|
||||
return dirSvc.get(key, Components.interfaces.nsIFile);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new file object given a native file path.
|
||||
* @param path
|
||||
* The native file path.
|
||||
* @return nsILocalFile object for the given native file path.
|
||||
*/
|
||||
function newFile(path) {
|
||||
var file = Components.classes["@mozilla.org/file/local;1"]
|
||||
.createInstance(Components.interfaces.nsILocalFile);
|
||||
file.initWithPath(path);
|
||||
return file;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the current value of the locale. It's possible for this preference to
|
||||
* be localized, so we have to do a little extra work here. Similar code
|
||||
* exists in nsHttpHandler.cpp when building the UA string.
|
||||
*/
|
||||
function getLocale() {
|
||||
const prefName = "general.useragent.locale";
|
||||
var prefs =
|
||||
Components.classes["@mozilla.org/preferences-service;1"].
|
||||
getService(Components.interfaces.nsIPrefBranch);
|
||||
try {
|
||||
return prefs.getComplexValue(prefName,
|
||||
Components.interfaces.nsIPrefLocalizedString).data;
|
||||
} catch (e) {}
|
||||
|
||||
return prefs.getCharPref(prefName);
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
const URI_BRAND_PROPERTIES = "chrome://branding/locale/brand.properties";
|
||||
const URI_UNINSTALL_PROPERTIES = "chrome://branding/content/uninstall.properties";
|
||||
|
||||
const KEY_APPDIR = "XCurProcD";
|
||||
const KEY_WINDIR = "WinD";
|
||||
const KEY_COMPONENTS_DIR = "ComsD";
|
||||
const KEY_PLUGINS_DIR = "APlugns";
|
||||
const KEY_EXECUTABLE_FILE = "XREExeF";
|
||||
|
||||
/*
|
||||
RegKey.prototype = {
|
||||
// The name of the registry key
|
||||
name: "";
|
||||
|
||||
// An array of strings, where each even-indexed string names a value,
|
||||
// and the subsequent string provides data for the value.
|
||||
values: [];
|
||||
|
||||
// An array of RegKey objects.
|
||||
children: [];
|
||||
}
|
||||
*/
|
||||
|
||||
/**
|
||||
* This function creates a heirarchy of registry keys. If any of the
|
||||
* keys or values already exist, then they will be updated instead.
|
||||
* @param rootKey
|
||||
* The root registry key from which to create the new registry
|
||||
* keys.
|
||||
* @param data
|
||||
* A JS object with properties: "name", "values", and "children"
|
||||
* as defined above. All children of this key will be created.
|
||||
*/
|
||||
function createRegistryKeys(rootKey, data) {
|
||||
var key;
|
||||
try {
|
||||
key = rootKey.createChild(data.name, rootKey.ACCESS_WRITE);
|
||||
var i;
|
||||
if ("values" in data) {
|
||||
for (i = 0; i < data.values.length; i += 2)
|
||||
key.writeStringValue(data.values[i], data.values[i + 1]);
|
||||
}
|
||||
if ("children" in data) {
|
||||
for (i = 0; i < data.children.length; ++i)
|
||||
createRegistryKeys(key, data.children[i]);
|
||||
}
|
||||
key.close();
|
||||
} catch (e) {
|
||||
LOG(e);
|
||||
if (key)
|
||||
key.close();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* This function deletes the specified registry key and optionally all of its
|
||||
* children.
|
||||
* @param rootKey
|
||||
* The parent nsIwindowRegKey of the key to delete.
|
||||
* @param name
|
||||
* The name of the key to delete.
|
||||
* @param recurse
|
||||
* Pass true to also delete all children of the named key. Take care!
|
||||
*/
|
||||
function deleteRegistryKey(rootKey, name, recurse) {
|
||||
if (!rootKey.hasChild(name)) {
|
||||
LOG("deleteRegistryKey: rootKey does not have child: \"" + name + "\"");
|
||||
return;
|
||||
}
|
||||
if (recurse) {
|
||||
var key = rootKey.openChild(name, rootKey.ACCESS_ALL);
|
||||
try {
|
||||
for (var i = key.childCount - 1; i >= 0; --i)
|
||||
deleteRegistryKey(key, key.getChildName(i), true);
|
||||
} finally {
|
||||
key.close();
|
||||
}
|
||||
}
|
||||
rootKey.removeChild(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* This method walks the registry looking for the registry keys of
|
||||
* the previous version of the application.
|
||||
*/
|
||||
function locateOldInstall(key, ourInstallDir) {
|
||||
var result, childKey, productKey, mainKey;
|
||||
try {
|
||||
for (var i = 0; i < key.childCount; ++i) {
|
||||
var childName = key.getChildName(i);
|
||||
childKey = key.openChild(childName, key.ACCESS_READ);
|
||||
if (childKey.hasValue("CurrentVersion")) {
|
||||
for (var j = 0; j < childKey.childCount; ++j) {
|
||||
var productVer = childKey.getChildName(j);
|
||||
productKey = childKey.openChild(productVer, key.ACCESS_READ);
|
||||
if (productKey.hasChild("Main")) {
|
||||
mainKey = productKey.openChild("Main", key.ACCESS_READ);
|
||||
var installDir = mainKey.readStringValue("Install Directory");
|
||||
var menuPath = mainKey.readStringValue("Program Folder Path");
|
||||
mainKey.close();
|
||||
if (newFile(installDir).equals(ourInstallDir)) {
|
||||
result = new Object();
|
||||
result.fullName = childName;
|
||||
result.versionWithLocale = productVer;
|
||||
result.version = productVer.split(" ")[0];
|
||||
result.menuPath = menuPath;
|
||||
}
|
||||
}
|
||||
productKey.close();
|
||||
if (result)
|
||||
break;
|
||||
}
|
||||
}
|
||||
childKey.close();
|
||||
if (result)
|
||||
break;
|
||||
}
|
||||
} catch (e) {
|
||||
result = null;
|
||||
if (childKey)
|
||||
childKey.close();
|
||||
if (productKey)
|
||||
productKey.close();
|
||||
if (mainKey)
|
||||
mainKey.close();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete registry keys left-over from the previous version of the app
|
||||
* installed at our location.
|
||||
*/
|
||||
function deleteOldRegKeys(key, info) {
|
||||
deleteRegistryKey(key, info.fullName + " " + info.version, true);
|
||||
var productKey = key.openChild(info.fullName, key.ACCESS_ALL);
|
||||
var productCount;
|
||||
try {
|
||||
deleteRegistryKey(productKey, info.versionWithLocale, true);
|
||||
productCount = productKey.childCount;
|
||||
} finally {
|
||||
productKey.close();
|
||||
}
|
||||
if (productCount == 0)
|
||||
key.removeChild(info.fullName);
|
||||
}
|
||||
|
||||
/**
|
||||
* The installer sets various registry keys and values that may need to be
|
||||
* updated.
|
||||
*
|
||||
* This operation is a bit tricky since we do not know the previous value of
|
||||
* brandFullName. As a result, we must walk the registry looking for an
|
||||
* existing key that references the same install directory. We assume that
|
||||
* the value of vendorShortName does not change across updates.
|
||||
*/
|
||||
function updateRegistry() {
|
||||
LOG("updateRegistry");
|
||||
|
||||
var ourInstallDir = getFile(KEY_APPDIR);
|
||||
|
||||
var app =
|
||||
Components.classes["@mozilla.org/xre/app-info;1"].
|
||||
getService(Components.interfaces.nsIXULAppInfo).
|
||||
QueryInterface(Components.interfaces.nsIXULRuntime);
|
||||
|
||||
var sbs =
|
||||
Components.classes["@mozilla.org/intl/stringbundle;1"].
|
||||
getService(Components.interfaces.nsIStringBundleService);
|
||||
var brandBundle = sbs.createBundle(URI_BRAND_PROPERTIES);
|
||||
var brandFullName = brandBundle.GetStringFromName("brandFullName");
|
||||
var vendorShortName = brandBundle.GetStringFromName("vendorShortName");
|
||||
|
||||
var key =
|
||||
Components.classes["@mozilla.org/windows-registry-key;1"].
|
||||
createInstance(Components.interfaces.nsIWindowsRegKey);
|
||||
|
||||
var oldInstall;
|
||||
try {
|
||||
key.open(key.ROOT_KEY_LOCAL_MACHINE, "SOFTWARE\\" + vendorShortName,
|
||||
key.ACCESS_READ);
|
||||
oldInstall = locateOldInstall(key, ourInstallDir);
|
||||
} finally {
|
||||
key.close();
|
||||
}
|
||||
|
||||
if (!oldInstall) {
|
||||
LOG("no existing registry keys found");
|
||||
return;
|
||||
}
|
||||
|
||||
// Maybe nothing needs to be changed...
|
||||
if (oldInstall.fullName == brandFullName &&
|
||||
oldInstall.version == app.version) {
|
||||
LOG("registry is up-to-date");
|
||||
return;
|
||||
}
|
||||
|
||||
// Delete the old keys:
|
||||
try {
|
||||
key.open(key.ROOT_KEY_LOCAL_MACHINE, "SOFTWARE\\" + vendorShortName,
|
||||
key.ACCESS_READ);
|
||||
deleteOldRegKeys(key, oldInstall);
|
||||
} finally {
|
||||
key.close();
|
||||
}
|
||||
|
||||
// Create the new keys:
|
||||
|
||||
var versionWithLocale = app.version + " (" + getLocale() + ")";
|
||||
var installPath = ourInstallDir.path + "\\";
|
||||
var pathToExe = getFile(KEY_EXECUTABLE_FILE).path;
|
||||
|
||||
var Key_bin = {
|
||||
name: "bin",
|
||||
values: [
|
||||
"PathToExe", pathToExe
|
||||
]
|
||||
};
|
||||
var Key_extensions = {
|
||||
name: "Extensions",
|
||||
values: [
|
||||
"Components", getFile(KEY_COMPONENTS_DIR).path + "\\",
|
||||
"Plugins", getFile(KEY_PLUGINS_DIR).path + "\\"
|
||||
]
|
||||
};
|
||||
var Key_nameWithVersion = {
|
||||
name: brandFullName + " " + app.version,
|
||||
values: [
|
||||
"GeckoVer", app.platformVersion
|
||||
],
|
||||
children: [
|
||||
Key_bin,
|
||||
Key_extensions
|
||||
]
|
||||
};
|
||||
var Key_main = {
|
||||
name: "Main",
|
||||
values: [
|
||||
"Install Directory", installPath,
|
||||
"PathToExe", pathToExe,
|
||||
"Program Folder Path", oldInstall.menuPath
|
||||
]
|
||||
};
|
||||
var Key_uninstall = {
|
||||
name: "Uninstall",
|
||||
values: [
|
||||
"Description", brandFullName + " (" + app.version + ")",
|
||||
"Uninstall Log Folder", installPath + "uninstall"
|
||||
]
|
||||
};
|
||||
var Key_versionWithLocale = {
|
||||
name: versionWithLocale,
|
||||
children: [
|
||||
Key_main,
|
||||
Key_uninstall
|
||||
]
|
||||
};
|
||||
var Key_name = {
|
||||
name: brandFullName,
|
||||
values: [
|
||||
"CurrentVersion", versionWithLocale
|
||||
],
|
||||
children: [
|
||||
Key_versionWithLocale
|
||||
]
|
||||
};
|
||||
var Key_brand = {
|
||||
name: vendorShortName,
|
||||
children: [
|
||||
Key_name,
|
||||
Key_nameWithVersion
|
||||
]
|
||||
};
|
||||
|
||||
try {
|
||||
key.open(key.ROOT_KEY_LOCAL_MACHINE, "SOFTWARE", key.ACCESS_READ);
|
||||
createRegistryKeys(key, Key_brand);
|
||||
} finally {
|
||||
key.close();
|
||||
}
|
||||
|
||||
// Now, do the same thing for the Add/Remove Programs control panel:
|
||||
|
||||
const uninstallRoot =
|
||||
"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall";
|
||||
|
||||
try {
|
||||
key.open(key.ROOT_KEY_LOCAL_MACHINE, uninstallRoot, key.ACCESS_READ);
|
||||
var oldName = oldInstall.fullName + " (" + oldInstall.version + ")";
|
||||
deleteRegistryKey(key, oldName, false);
|
||||
} finally {
|
||||
key.close();
|
||||
}
|
||||
|
||||
var uninstallBundle = sbs.createBundle(URI_UNINSTALL_PROPERTIES);
|
||||
|
||||
var nameWithVersion = brandFullName + " (" + app.version + ")";
|
||||
var uninstaller = getFile(KEY_WINDIR);
|
||||
uninstaller.append(uninstallBundle.GetStringFromName("fileUninstall"));
|
||||
// XXX copy latest uninstaller to this location
|
||||
|
||||
var uninstallString =
|
||||
uninstaller.path + " /ua \"" + versionWithLocale + "\"";
|
||||
|
||||
Key_uninstall = {
|
||||
name: nameWithVersion,
|
||||
values: [
|
||||
"Comment", brandFullName,
|
||||
"DisplayIcon", pathToExe + ",0", // XXX don't hardcode me!
|
||||
"DisplayName", nameWithVersion,
|
||||
"DisplayVersion", versionWithLocale,
|
||||
"InstallLocation", ourInstallDir.path, // no trailing slash
|
||||
"Publisher", vendorShortName,
|
||||
"UninstallString", uninstallString,
|
||||
"URLInfoAbout", uninstallBundle.GetStringFromName("URLInfoAbout"),
|
||||
"URLUpdateInfo", uninstallBundle.GetStringFromName("URLUpdateInfo")
|
||||
]
|
||||
};
|
||||
|
||||
var child;
|
||||
try {
|
||||
key.open(key.ROOT_KEY_LOCAL_MACHINE, uninstallRoot, key.ACCESS_READ);
|
||||
createRegistryKeys(key, Key_uninstall);
|
||||
|
||||
// Create additional DWORD keys for NoModify and NoRepair:
|
||||
child = key.openChild(nameWithVersion, key.ACCESS_WRITE);
|
||||
child.writeIntValue("NoModify", 1);
|
||||
child.writeIntValue("NoRepair", 1);
|
||||
} finally {
|
||||
if (child)
|
||||
child.close();
|
||||
key.close();
|
||||
}
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
function nsPostUpdateWin() {
|
||||
}
|
||||
|
||||
nsPostUpdateWin.prototype = {
|
||||
QueryInterface: function(iid) {
|
||||
if (iid.equals(Components.interfaces.nsIRunnable) ||
|
||||
iid.equals(Components.interfaces.nsISupports))
|
||||
return this;
|
||||
throw Components.results.NS_ERROR_NO_INTERFACE;
|
||||
},
|
||||
|
||||
run: function() {
|
||||
try {
|
||||
updateRegistry();
|
||||
} catch (e) {
|
||||
LOG(e);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
var gModule = {
|
||||
registerSelf: function(compMgr, fileSpec, location, type) {
|
||||
compMgr = compMgr.QueryInterface(Components.interfaces.nsIComponentRegistrar);
|
||||
|
||||
for (var key in this._objects) {
|
||||
var obj = this._objects[key];
|
||||
compMgr.registerFactoryLocation(obj.CID, obj.className, obj.contractID,
|
||||
fileSpec, location, type);
|
||||
}
|
||||
},
|
||||
|
||||
getClassObject: function(compMgr, cid, iid) {
|
||||
if (!iid.equals(Components.interfaces.nsIFactory))
|
||||
throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
|
||||
|
||||
for (var key in this._objects) {
|
||||
if (cid.equals(this._objects[key].CID))
|
||||
return this._objects[key].factory;
|
||||
}
|
||||
|
||||
throw Components.results.NS_ERROR_NO_INTERFACE;
|
||||
},
|
||||
|
||||
_makeFactory: #1= function(ctor) {
|
||||
function ci(outer, iid) {
|
||||
if (outer != null)
|
||||
throw Components.results.NS_ERROR_NO_AGGREGATION;
|
||||
return (new ctor()).QueryInterface(iid);
|
||||
}
|
||||
return { createInstance: ci };
|
||||
},
|
||||
|
||||
_objects: {
|
||||
manager: { CID : Components.ID("{d15b970b-5472-40df-97e8-eb03a04baa82}"),
|
||||
contractID : "@mozilla.org/updates/post-update;1",
|
||||
className : "nsPostUpdateWin",
|
||||
factory : #1#(nsPostUpdateWin)
|
||||
},
|
||||
},
|
||||
|
||||
canUnload: function(compMgr) {
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
function NSGetModule(compMgr, fileSpec) {
|
||||
return gModule;
|
||||
}
|
||||
|
|
@ -48,6 +48,7 @@ const PREF_APP_UPDATE_URL_OVERRIDE = "app.update.url.override";
|
|||
const PREF_APP_UPDATE_SHOW_INSTALLED_UI = "app.update.showInstalledUI";
|
||||
const PREF_APP_UPDATE_LASTUPDATETIME_FMT = "app.update.lastUpdateTime.%ID%";
|
||||
const PREF_APP_EXTENSIONS_VERSION = "app.extensions.version";
|
||||
const PREF_GENERAL_USERAGENT_LOCALE = "general.useragent.locale";
|
||||
|
||||
const URI_UPDATE_PROMPT_DIALOG = "chrome://mozapps/content/update/updates.xul";
|
||||
const URI_UPDATE_HISTORY_DIALOG = "chrome://mozapps/content/update/history.xul";
|
||||
|
|
@ -86,6 +87,8 @@ const DOWNLOAD_CHUNK_SIZE = 65536;
|
|||
const DOWNLOAD_BACKGROUND_INTERVAL = 1;
|
||||
const DOWNLOAD_FOREGROUND_INTERVAL = 0;
|
||||
|
||||
const POST_UPDATE_CONTRACTID = "@mozilla.org/updates/post-update;1";
|
||||
|
||||
const nsILocalFile = Components.interfaces.nsILocalFile;
|
||||
const nsIUpdateService = Components.interfaces.nsIUpdateService;
|
||||
const nsIUpdateItem = Components.interfaces.nsIUpdateItem;
|
||||
|
|
@ -341,6 +344,20 @@ function getPref(func, preference, defaultValue) {
|
|||
return defaultValue;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the current value of the locale. It's possible for this preference to
|
||||
* be localized, so we have to do a little extra work here. Similar code
|
||||
* exists in nsHttpHandler.cpp when building the UA string.
|
||||
*/
|
||||
function getLocale() {
|
||||
try {
|
||||
return gPref.getComplexValue(PREF_GENERAL_USERAGENT_LOCALE,
|
||||
nsIPrefLocalizedString).data;
|
||||
} catch (e) {}
|
||||
|
||||
return gPref.getCharPref(PREF_GENERAL_USERAGENT_LOCALE);
|
||||
}
|
||||
|
||||
/**
|
||||
* An enumeration of items in a JS array.
|
||||
* @constructor
|
||||
|
|
@ -858,6 +875,12 @@ UpdateService.prototype = {
|
|||
update.statusText = bundle.GetStringFromName("installSuccess");
|
||||
LOG("UpdateService", "_postUpdateProcessing: Install Succeeded, Showing UI");
|
||||
prompter.showUpdateInstalled(update);
|
||||
|
||||
// Perform platform-specific post-update processing.
|
||||
if (POST_UPDATE_CONTRACTID in Components.classes) {
|
||||
Components.classes[POST_UPDATE_CONTRACTID].
|
||||
createInstance(Components.interfaces.nsIRunnable).run();
|
||||
}
|
||||
|
||||
// Done with this update. Clean it up.
|
||||
cleanup();
|
||||
|
|
@ -889,7 +912,7 @@ UpdateService.prototype = {
|
|||
LOG("UpdateService", "_postUpdateProcessing: No Status, No Update");
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
/**
|
||||
* Initialize Logging preferences, formatted like so:
|
||||
* app.update.log.<moduleName> = <true|false>
|
||||
|
|
@ -1458,13 +1481,11 @@ Checker.prototype = {
|
|||
return null;
|
||||
}
|
||||
|
||||
var locale = gPref.getCharPref("general.useragent.locale");
|
||||
|
||||
url = url.replace(/%PRODUCT%/g, gApp.name);
|
||||
url = url.replace(/%VERSION%/g, gApp.version);
|
||||
url = url.replace(/%BUILD_ID%/g, gApp.appBuildID);
|
||||
url = url.replace(/%BUILD_TARGET%/g, gApp.OS + "_" + gApp.XPCOMABI);
|
||||
url = url.replace(/%LOCALE%/g, locale);
|
||||
url = url.replace(/%LOCALE%/g, getLocale());
|
||||
url = url.replace(/\+/g, "%2B");
|
||||
|
||||
LOG("Checker", "update url: " + url);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче