mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
backing out myu fix for bug #375710, based on comments from kimura
This commit is contained in:
parent
28e59734d6
commit
e6cefb4316
@ -129,36 +129,6 @@ function openFileOutputStream(file, flags) {
|
||||
return stream;
|
||||
}
|
||||
|
||||
/**
|
||||
* Determine if a file is a child of another file. Needed because
|
||||
* nsILocalFile.contains() has problems with short vs. long paths
|
||||
* see bug #375710 for more details
|
||||
*
|
||||
* @param aParent (nsILocalFile)
|
||||
* @param aChild (nsILocalFile)
|
||||
* @return true if aChild is a child of aParent. Will also return
|
||||
* true if aChild is same as aParent
|
||||
*/
|
||||
function canonicalRecursiveContains(aParent, aChild)
|
||||
{
|
||||
try {
|
||||
var current = aChild;
|
||||
while (current) {
|
||||
if (aParent.equals(current))
|
||||
return true;
|
||||
|
||||
var newCurrent = current.parent;
|
||||
if (newCurrent.equals(current))
|
||||
return false;
|
||||
|
||||
current = newCurrent;
|
||||
}
|
||||
}
|
||||
catch (ex) {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
||||
const PREFIX_FILE = "File: ";
|
||||
@ -222,7 +192,7 @@ InstallLogWriter.prototype = {
|
||||
.getService(Components.interfaces.nsIProperties);
|
||||
var programFilesDir = fileLocator.get(KEY_PROGRAMFILES,
|
||||
Components.interfaces.nsILocalFile);
|
||||
if (canonicalRecursiveContains(programFilesDir, updRoot)) {
|
||||
if (programFilesDir.contains(updRoot, true)) {
|
||||
var relativePath = updRoot.QueryInterface(Components.interfaces.nsILocalFile).
|
||||
getRelativeDescriptor(programFilesDir);
|
||||
var userLocalDir = fileLocator.get(KEY_LOCALDATA,
|
||||
|
@ -217,38 +217,6 @@ function getUpdateDir(pathArray) {
|
||||
return getDirInternal(KEY_APPDIR, pathArray, true, true);
|
||||
}
|
||||
|
||||
#ifdef XP_WIN
|
||||
/**
|
||||
* Determine if a file is a child of another file. Needed because
|
||||
* nsILocalFile.contains() has problems with short vs. long paths
|
||||
* see bug #375710 for more details
|
||||
*
|
||||
* @param aParent (nsILocalFile)
|
||||
* @param aChild (nsILocalFile)
|
||||
* @return true if aChild is a child of aParent. Will also return
|
||||
* true if aChild is same as aParent
|
||||
*/
|
||||
function canonicalRecursiveContains(aParent, aChild)
|
||||
{
|
||||
try {
|
||||
var current = aChild;
|
||||
while (current) {
|
||||
if (aParent.equals(current))
|
||||
return true;
|
||||
|
||||
var newCurrent = current.parent;
|
||||
if (newCurrent.equals(current))
|
||||
return false;
|
||||
|
||||
current = newCurrent;
|
||||
}
|
||||
}
|
||||
catch (ex) {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Gets the specified directory at the speciifed hierarchy under a
|
||||
* Directory Service key.
|
||||
@ -274,7 +242,7 @@ function getDirInternal(key, pathArray, shouldCreate, update) {
|
||||
if (update) {
|
||||
var programFilesDir = fileLocator.get(KEY_PROGRAMFILES,
|
||||
Components.interfaces.nsILocalFile);
|
||||
if (canonicalRecursiveContains(programFilesDir, dir)) {
|
||||
if (programFilesDir.contains(dir, true)) {
|
||||
var relativePath = dir.getRelativeDescriptor(programFilesDir);
|
||||
var userLocalDir = fileLocator.get(KEY_LOCALDATA,
|
||||
Components.interfaces.nsILocalFile).parent;
|
||||
@ -390,7 +358,7 @@ function getUpdatesDir(key) {
|
||||
#ifdef XP_WIN
|
||||
var programFilesDir = fileLocator.get(KEY_PROGRAMFILES,
|
||||
Components.interfaces.nsILocalFile);
|
||||
if (canonicalRecursiveContains(programFilesDir, appDir)) {
|
||||
if (programFilesDir.contains(appDir, true)) {
|
||||
var relativePath = appDir.getRelativeDescriptor(programFilesDir);
|
||||
var userLocalDir = fileLocator.get(KEY_LOCALDATA,
|
||||
Components.interfaces.nsILocalFile).parent;
|
||||
@ -2073,7 +2041,7 @@ Checker.prototype = {
|
||||
// Always stop the current check
|
||||
if (this._request)
|
||||
this._request.abort();
|
||||
|
||||
|
||||
const nsIUpdateChecker = Components.interfaces.nsIUpdateChecker;
|
||||
switch (duration) {
|
||||
case nsIUpdateChecker.CURRENT_SESSION:
|
||||
|
Loading…
Reference in New Issue
Block a user