mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Fix unit tests from bug 311008 - the directory service keys will not be present when running under xpcshell, r=mossop
This commit is contained in:
parent
f4fc98e442
commit
1792c31fd0
@ -2395,31 +2395,49 @@ function ExtensionManager() {
|
|||||||
InstallLocations.put(profileLocation);
|
InstallLocations.put(profileLocation);
|
||||||
|
|
||||||
// Register per-user Install Location
|
// Register per-user Install Location
|
||||||
var appSystemUExtensions = getDirNoCreate("XREUSysExt", [gApp.ID]);
|
try {
|
||||||
var priority = Ci.nsIInstallLocation.PRIORITY_APP_SYSTEM_USER;
|
var appSystemUExtensions = getDirNoCreate("XREUSysExt", [gApp.ID]);
|
||||||
var systemLocation = new DirectoryInstallLocation(KEY_APP_SYSTEM_USER,
|
}
|
||||||
appSystemUExtensions, false,
|
catch(e) { }
|
||||||
priority, true);
|
|
||||||
InstallLocations.put(systemLocation);
|
if (appSystemUExtensions) {
|
||||||
|
var priority = Ci.nsIInstallLocation.PRIORITY_APP_SYSTEM_USER;
|
||||||
|
var systemLocation = new DirectoryInstallLocation(KEY_APP_SYSTEM_USER,
|
||||||
|
appSystemUExtensions, false,
|
||||||
|
priority, true);
|
||||||
|
|
||||||
|
InstallLocations.put(systemLocation);
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef XP_UNIX
|
#ifdef XP_UNIX
|
||||||
#ifndef XP_MACOSX
|
#ifndef XP_MACOSX
|
||||||
// Register App-System-Shared Install Location
|
// Register App-System-Shared Install Location
|
||||||
var appSystemSExtensions = getDirNoCreate("XRESysSExtPD", [gApp.ID]);
|
try {
|
||||||
var priority = Ci.nsIInstallLocation.PRIORITY_APP_SYSTEM_GLOBAL + 10;
|
var appSystemSExtensions = getDirNoCreate("XRESysSExtPD", [gApp.ID]);
|
||||||
var systemLocation = new DirectoryInstallLocation(KEY_APP_SYSTEM_SHARE,
|
}
|
||||||
appSystemSExtensions, true,
|
catch (e) { }
|
||||||
priority, true);
|
|
||||||
InstallLocations.put(systemLocation);
|
|
||||||
|
|
||||||
|
if (appSystemSExtensions) {
|
||||||
|
var priority = Ci.nsIInstallLocation.PRIORITY_APP_SYSTEM_GLOBAL + 10;
|
||||||
|
var systemLocation = new DirectoryInstallLocation(KEY_APP_SYSTEM_SHARE,
|
||||||
|
appSystemSExtensions, true,
|
||||||
|
priority, true);
|
||||||
|
InstallLocations.put(systemLocation);
|
||||||
|
}
|
||||||
|
|
||||||
// Register App-System-Local Install Location
|
// Register App-System-Local Install Location
|
||||||
var appSystemLExtensions = getDirNoCreate("XRESysLExtPD", [gApp.ID]);
|
try {
|
||||||
var priority = Ci.nsIInstallLocation.PRIORITY_APP_SYSTEM_GLOBAL + 20;
|
var appSystemLExtensions = getDirNoCreate("XRESysLExtPD", [gApp.ID]);
|
||||||
var systemLocation = new DirectoryInstallLocation(KEY_APP_SYSTEM_LOCAL,
|
}
|
||||||
appSystemLExtensions, true,
|
catch (e) { }
|
||||||
priority, true);
|
|
||||||
InstallLocations.put(systemLocation);
|
if (appSystemLExtensions) {
|
||||||
|
var priority = Ci.nsIInstallLocation.PRIORITY_APP_SYSTEM_GLOBAL + 20;
|
||||||
|
var systemLocation = new DirectoryInstallLocation(KEY_APP_SYSTEM_LOCAL,
|
||||||
|
appSystemLExtensions, true,
|
||||||
|
priority, true);
|
||||||
|
InstallLocations.put(systemLocation);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user