зеркало из https://github.com/mozilla/gecko-dev.git
Fix mac aliasing and AppleSingle decoding regressions. Make the Mac installer behave itself once again after being in a coma for two weeks.
This commit is contained in:
Родитель
35f27e9461
Коммит
1e9a75db5b
|
@ -126,7 +126,6 @@ nsInstallInfo::~nsInstallInfo()
|
||||||
MOZ_COUNT_DTOR(nsInstallInfo);
|
MOZ_COUNT_DTOR(nsInstallInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
|
static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
|
||||||
|
|
||||||
static NS_DEFINE_IID(kISoftwareUpdateIID, NS_ISOFTWAREUPDATE_IID);
|
static NS_DEFINE_IID(kISoftwareUpdateIID, NS_ISOFTWAREUPDATE_IID);
|
||||||
|
@ -1986,23 +1985,19 @@ nsInstall::FileOpFileWindowsShortcut(nsIFile* aTarget, nsIFile* aShortcutPath, n
|
||||||
}
|
}
|
||||||
|
|
||||||
PRInt32
|
PRInt32
|
||||||
nsInstall::FileOpFileMacAlias(nsString& aSourcePath, nsString& aAliasPath, PRInt32* aReturn)
|
nsInstall::FileOpFileMacAlias(nsIFile *aSourceFile, nsIFile *aAliasFile, PRInt32* aReturn)
|
||||||
{
|
{
|
||||||
|
|
||||||
*aReturn = nsInstall::SUCCESS;
|
*aReturn = nsInstall::SUCCESS;
|
||||||
|
|
||||||
#ifdef XP_MAC
|
#ifdef XP_MAC
|
||||||
//nsFileSpec nsfsSource(aSourcePath, PR_FALSE);
|
nsInstallFileOpItem* ifop = new nsInstallFileOpItem(this, NS_FOP_MAC_ALIAS, aSourceFile, aAliasFile, aReturn);
|
||||||
//nsFileSpec nsfsAlias(aAliasPath, PR_TRUE);
|
if (!ifop)
|
||||||
nsCOMPtr<nsILocalFile> nsfsSource;
|
{
|
||||||
nsCOMPtr<nsILocalFile> nsfsAlias;
|
*aReturn = SaveError(nsInstall::OUT_OF_MEMORY);
|
||||||
|
return NS_OK;
|
||||||
nsAutoCString tempSource(aSourcePath);
|
}
|
||||||
nsAutoCString tempAlias(aAliasPath);
|
|
||||||
NS_NewLocalFile(tempSource, getter_AddRefs(nsfsSource));
|
|
||||||
NS_NewLocalFile(tempAlias, getter_AddRefs(nsfsAlias));
|
|
||||||
nsInstallFileOpItem* ifop = new nsInstallFileOpItem(this, NS_FOP_MAC_ALIAS, nsfsSource, nsfsAlias, aReturn);
|
|
||||||
|
|
||||||
PRInt32 result = SanityCheck();
|
PRInt32 result = SanityCheck();
|
||||||
if (result != nsInstall::SUCCESS)
|
if (result != nsInstall::SUCCESS)
|
||||||
{
|
{
|
||||||
|
@ -2450,7 +2445,7 @@ nsInstall::ExtractFileFromJar(const nsString& aJarfile, nsIFile* aSuggestedName,
|
||||||
|
|
||||||
nsCOMPtr<nsILocalFileMac> tempExtractHereSpec;
|
nsCOMPtr<nsILocalFileMac> tempExtractHereSpec;
|
||||||
tempExtractHereSpec = do_QueryInterface(extractHereSpec, &rv);
|
tempExtractHereSpec = do_QueryInterface(extractHereSpec, &rv);
|
||||||
tempExtractHereSpec->GetFSSpec(&extractedSpec);
|
tempExtractHereSpec->GetResolvedFSSpec(&extractedSpec);
|
||||||
|
|
||||||
if ( nsAppleSingleDecoder::IsAppleSingleFile(&extractedSpec) )
|
if ( nsAppleSingleDecoder::IsAppleSingleFile(&extractedSpec) )
|
||||||
{
|
{
|
||||||
|
|
|
@ -245,7 +245,7 @@ class nsInstall
|
||||||
PRInt32 FileOpFileMove(nsInstallFolder& aSrc, nsInstallFolder& aTarget, PRInt32* aReturn);
|
PRInt32 FileOpFileMove(nsInstallFolder& aSrc, nsInstallFolder& aTarget, PRInt32* aReturn);
|
||||||
PRInt32 FileOpFileRename(nsInstallFolder& aSrc, nsString& aTarget, PRInt32* aReturn);
|
PRInt32 FileOpFileRename(nsInstallFolder& aSrc, nsString& aTarget, PRInt32* aReturn);
|
||||||
PRInt32 FileOpFileWindowsShortcut(nsIFile* aTarget, nsIFile* aShortcutPath, nsString& aDescription, nsIFile* aWorkingPath, nsString& aParams, nsIFile* aIcon, PRInt32 aIconId, PRInt32* aReturn);
|
PRInt32 FileOpFileWindowsShortcut(nsIFile* aTarget, nsIFile* aShortcutPath, nsString& aDescription, nsIFile* aWorkingPath, nsString& aParams, nsIFile* aIcon, PRInt32 aIconId, PRInt32* aReturn);
|
||||||
PRInt32 FileOpFileMacAlias(nsString& aSourcePath, nsString& aAliasPath, PRInt32* aReturn);
|
PRInt32 FileOpFileMacAlias(nsIFile *aSourceFile, nsIFile *aAliasFile, PRInt32* aReturn);
|
||||||
PRInt32 FileOpFileUnixLink(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
|
PRInt32 FileOpFileUnixLink(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
|
||||||
|
|
||||||
void LogComment(nsString& aComment);
|
void LogComment(nsString& aComment);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче