wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1202039 - Do not pretend to support IE7FormPasswords on Windows 8 and above; r=mattn

Browse Source
This commit is contained in:
Ehsan Akhgari 2015-09-13 13:38:05 -04:00
parent eb22bf8381
commit 84e9ad5b0b
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
browser/components/migration/IEProfileMigrator.js
View File

@ -12,6 +12,7 @@ const Cr = Components.results;
const kLoginsKey = "Software\\Microsoft\\Internet Explorer\\IntelliForms\\Storage2";
const kMainKey = "Software\\Microsoft\\Internet Explorer\\Main";
Cu.import("resource://gre/modules/AppConstants.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/Task.jsm");
@ -123,7 +124,7 @@ History.prototype = {
}
};
// IE password migrator supporting windows from XP until 7 and IE from 7 until 11
// IE form password migrator supporting windows from XP until 7 and IE from 7 until 11
function IE7FormPasswords () {
}
@ -524,9 +525,12 @@ IEProfileMigrator.prototype.getResources = function IE_getResources() {
MSMigrationUtils.getBookmarksMigrator()
, new History()
, MSMigrationUtils.getCookiesMigrator()
, new IE7FormPasswords()
, new Settings()
];
// Only support the form password migrator for Windows XP to 7.
if (AppConstants.isPlatformAndVersionAtMost("win", "6.1")) {
resources.push(new IE7FormPasswords());
}
return [r for each (r in resources) if (r.exists)];
};

6
toolkit/modules/AppConstants.jsm
View File

@ -150,6 +150,12 @@ this.AppConstants = Object.freeze({
Services.vc.compare(platformVersion, version) >= 0;
},
isPlatformAndVersionAtMost(platform, version) {
let platformVersion = Services.sysinfo.getProperty("version");
return platform == this.platform &&
Services.vc.compare(platformVersion, version) <= 0;
},
MOZ_CRASHREPORTER:
#ifdef MOZ_CRASHREPORTER
true,