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

fixed some compile errors caused by removing some config.h options

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3429 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-01-29 01:23:24 +00:00
parent 1d53ac7649
commit 851032d22a
6 changed files with 33 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/exehead/fileform.c
View file

@ -255,10 +255,14 @@ const char * NSISCALL loadHeaders(int cl_flags)
return _LANG_ERRORWRITINGTEMP;
}
dbd_srcpos = SetSelfFilePointer(g_filehdrsize + sizeof(firstheader));
#ifdef NSIS_CONFIG_CRC_SUPPORT
dbd_fulllen = dbd_srcpos - sizeof(h) + h.length_of_all_following_data - ((cl_flags & FH_FLAGS_NO_CRC) ? 0 : sizeof(int));
#else
dbd_fulllen = dbd_srcpos - sizeof(h) + h.length_of_all_following_data;
#endif//NSIS_CONFIG_CRC_SUPPORT
#else
SetSelfFilePointer(g_filehdrsize + sizeof(firstheader));
#endif
#endif//NSIS_COMPRESS_WHOLE
if (GetCompressedDataFromDataBlockToMemory(-1, data, h.length_of_header) != h.length_of_header)
{
@ -282,9 +286,10 @@ const char * NSISCALL loadHeaders(int cl_flags)
g_is_uninstaller++;
#endif
crc = BLOCKS_NUM;
while (crc--)
header->blocks[crc].offset += (int)data;
// set offsets to real memory offsets rather than installer's header offset
left = BLOCKS_NUM;
while (left--)
header->blocks[left].offset += (int)data;
#ifdef NSIS_COMPRESS_WHOLE
header->blocks[NB_DATA].offset = dbd_pos;