dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

No need to delayload MoveFileEx, OpenProcessToken, LookupPrivilegeValueW and AdjustTokenPrivileges on Win9x.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6635 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-11-15 23:06:57 +00:00
parent caf00a1195
commit 6eaea6479f
4 changed files with 11 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/exehead/util.c
View file

@ -595,22 +595,9 @@ void RenameViaWininit(const TCHAR* prevName, const TCHAR* newName)
void NSISCALL MoveFileOnReboot(LPCTSTR pszExisting, LPCTSTR pszNew)
{
#ifndef _WIN64 // Shut up GCC unused warning
BOOL fOk = FALSE;
BOOL fOk =
#endif
typedef BOOL (WINAPI *mfea_t)(LPCTSTR lpExistingFileName,LPCTSTR lpNewFileName,DWORD dwFlags);
mfea_t mfea;
#ifdef _WIN64
mfea=MoveFileEx;
#else
mfea=(mfea_t) myGetProcAddress(MGA_MoveFileEx);
if (mfea)
#endif
{
#ifndef _WIN64 // Shut up GCC unused warning
fOk=
#endif
mfea(pszExisting, pszNew, MOVEFILE_DELAY_UNTIL_REBOOT|MOVEFILE_REPLACE_EXISTING);
}
MoveFileEx(pszExisting, pszNew, MOVEFILE_DELAY_UNTIL_REBOOT|MOVEFILE_REPLACE_EXISTING);
#ifndef _WIN64
if (!fOk)
{
@ -1078,12 +1065,8 @@ struct MGA_FUNC MGA_FUNCS[] = {
#ifdef _UNICODE
#ifndef _WIN64
{"KERNEL32", "GetDiskFreeSpaceExW"},
{"KERNEL32", "MoveFileExW"},
{"KERNEL32", "GetUserDefaultUILanguage"},
{"ADVAPI32", "RegDeleteKeyExW"},
{"ADVAPI32", "OpenProcessToken"},
{"ADVAPI32", "LookupPrivilegeValueW"},
{"ADVAPI32", "AdjustTokenPrivileges"},
#endif
{"ADVAPI32", "InitiateShutdownW"},
{"SHLWAPI", "SHAutoComplete"},
@ -1091,12 +1074,8 @@ struct MGA_FUNC MGA_FUNCS[] = {
};
#else
{"KERNEL32", "GetDiskFreeSpaceExA"},
{"KERNEL32", "MoveFileExA"},
{"KERNEL32", "GetUserDefaultUILanguage"},
{"ADVAPI32", "RegDeleteKeyExA"},
{"ADVAPI32", "OpenProcessToken"},
{"ADVAPI32", "LookupPrivilegeValueA"},
{"ADVAPI32", "AdjustTokenPrivileges"},
{"ADVAPI32", "InitiateShutdownA"},
{"SHLWAPI", "SHAutoComplete"},
{"SHFOLDER", "SHGetFolderPathA"}