mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-25 20:01:50 +00:00
64-bit fix for nsProfileLock.cpp. b=489720 sr=roc
This commit is contained in:
parent
e70f2603e4
commit
a39a754b56
@ -505,8 +505,12 @@ nsresult nsProfileLock::Lock(nsILocalFile* aProfileDir,
|
||||
|
||||
if (ioBytes == sizeof(LockProcessInfo))
|
||||
{
|
||||
processInfo.processAppSpec = nsnull;
|
||||
processInfo.processName = nsnull;
|
||||
#ifdef __LP64__
|
||||
processInfo.processAppRef = NULL;
|
||||
#else
|
||||
processInfo.processAppSpec = NULL;
|
||||
#endif
|
||||
processInfo.processName = NULL;
|
||||
processInfo.processInfoLength = sizeof(ProcessInfoRec);
|
||||
if (::GetProcessInformation(&lockProcessInfo.psn, &processInfo) == noErr &&
|
||||
processInfo.processLaunchDate == lockProcessInfo.launchDate)
|
||||
@ -625,15 +629,15 @@ nsresult nsProfileLock::Lock(nsILocalFile* aProfileDir,
|
||||
mLockFileDesc = open_noshr(filePath.get(), O_CREAT, 0666);
|
||||
if (mLockFileDesc == -1)
|
||||
{
|
||||
if ((errno == EVMSERR) && (vaxc$errno == RMS$_FLK))
|
||||
{
|
||||
return NS_ERROR_FILE_ACCESS_DENIED;
|
||||
}
|
||||
else
|
||||
{
|
||||
NS_ERROR("Failed to open lock file.");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
if ((errno == EVMSERR) && (vaxc$errno == RMS$_FLK))
|
||||
{
|
||||
return NS_ERROR_FILE_ACCESS_DENIED;
|
||||
}
|
||||
else
|
||||
{
|
||||
NS_ERROR("Failed to open lock file.");
|
||||
return NS_ERROR_FAILURE;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user