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

18 bytes down

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1158 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-09-23 14:07:39 +00:00
parent 717b2389fc
commit 1683a1f248
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/build.cpp
View file

@ -270,10 +270,10 @@ CEXEBuild::CEXEBuild()
// Changed by Amir Szekely 11th July 2002
// Changed to fit the new format in which uninstaller icons are saved
m_unicon_data=(unsigned char *)malloc(unicondata_size+3*sizeof(DWORD));
memcpy(m_unicon_data+3*sizeof(DWORD),unicon_data+22,unicondata_size);
*(DWORD*)m_unicon_data = 1;
memcpy(m_unicon_data+2*sizeof(DWORD),unicon_data+22,unicondata_size);
*(DWORD*)(DWORD(m_unicon_data) + sizeof(DWORD)) = unicondata_size;
*(DWORD*)(DWORD(m_unicon_data) + 2*sizeof(DWORD)) = 0;
*(DWORD*)(DWORD(m_unicon_data) + 3*sizeof(DWORD)) = 0;
unicondata_size += 3*sizeof(DWORD);
m_inst_fileused=0;
@ -1674,9 +1674,9 @@ int CEXEBuild::uninstall_generate()
#endif
// Changed by Amir Szekely 11th July 2002
// This bunch of lines do CRC for the uninstaller icon data
unsigned char* seeker = m_unicon_data + sizeof(DWORD);
unsigned char* seeker = m_unicon_data;
DWORD dwEndOfIcons = 0;
for (DWORD i = 0; i < *(DWORD*)m_unicon_data; i++) {
while (*seeker) {
DWORD dwSize = *(DWORD*)seeker;
seeker += sizeof(DWORD);
DWORD dwOffset = *(DWORD*)seeker;
@ -1684,7 +1684,7 @@ int CEXEBuild::uninstall_generate()
// Do CRC for icon data
crc=CRC32(crc,seeker,dwSize);
seeker += dwSize;
if (i < (*(DWORD*)m_unicon_data) - 1) {
if (*seeker) {
// Do CRC for data between icons
crc=CRC32(crc,header_data_new+dwOffset+dwSize,(*(DWORD*)(seeker+sizeof(DWORD)))-dwOffset-dwSize);
}