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

64bit fixes and optimizations

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
Source/build.cpp
View file

@ -2316,7 +2316,7 @@ void CEXEBuild::AddStandardStrings()
}
#endif//NSIS_CONFIG_UNINSTALL_SUPPORT
#ifdef NSIS_SUPPORT_MOVEONREBOOT
cur_header->str_wininit = add_asciistring(_T("$WINDIR\\wininit.ini"));
cur_header->str_wininit = is_target_64bit() ? 0 : add_asciistring(_T("$WINDIR\\wininit.ini"));
#endif//NSIS_SUPPORT_MOVEONREBOOT
}
@ -2816,7 +2816,7 @@ int CEXEBuild::write_output(void)
if (db_opt_save)
{
UINT32 total_out_size_estimate=
size_t total_out_size_estimate=
m_exehead_size+sizeof(fh)+build_datablock.getlen()+(build_crcchk?sizeof(crc32_t):0);
int pc=(int)((db_opt_save*1000)/(db_opt_save+total_out_size_estimate));
FriendlySize fs(db_opt_save);