64bit fixes and optimizations

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6486 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-05-19 22:03:09 +00:00
parent 0bcb8f40ed
commit 36deb84820
14 changed files with 74 additions and 51 deletions

View file

@ -265,6 +265,7 @@ HANDLE myOpenFile(const TCHAR *fn, DWORD da, DWORD cd)
);
}
#ifndef _WIN64
/** Modifies the wininit.ini file to rename / delete a file.
*
* @param prevName The previous / current name of the file.
@ -364,6 +365,7 @@ void RenameViaWininit(const TCHAR* prevName, const TCHAR* newName)
CloseHandle(hfile);
}
}
#endif
void DeleteFileOnReboot(TCHAR *pszFile)
{
@ -379,9 +381,10 @@ void DeleteFileOnReboot(TCHAR *pszFile)
fOk=mfea(pszFile, NULL, MOVEFILE_DELAY_UNTIL_REBOOT);
}
}
#ifndef _WIN64
if (!fOk)
{
RenameViaWininit(pszFile, NULL);
}
#endif
}