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

Fixed CRC off and whole compression

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2763 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-07-22 08:33:25 +00:00
parent 21f668de9c
commit 7f1e93c85e
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Source/exehead/fileform.c
View file

@ -21,8 +21,7 @@
#define Z_OK BZ_OK #define Z_OK BZ_OK
#define Z_STREAM_END BZ_STREAM_END #define Z_STREAM_END BZ_STREAM_END
#endif//NSIS_COMPRESS_USE_BZIP2 #endif//NSIS_COMPRESS_USE_BZIP2
#endif//NSIS_CONFIG_COMPRESSION_SUPPORT
#endif
#include "ui.h" #include "ui.h"
@ -128,14 +127,14 @@ const char * NSISCALL loadHeaders(int cl_flags)
g_filehdrsize = m_pos; g_filehdrsize = m_pos;
#if defined(NSIS_CONFIG_SILENT_SUPPORT) && defined(NSIS_CONFIG_VISIBLE_SUPPORT) #if defined(NSIS_CONFIG_CRC_SUPPORT) || (defined(NSIS_CONFIG_SILENT_SUPPORT) && defined(NSIS_CONFIG_VISIBLE_SUPPORT))
cl_flags |= h.flags & FH_FLAGS_SILENT; cl_flags |= h.flags;
#endif//NSIS_CONFIG_SILENT_SUPPORT && NSIS_CONFIG_VISIBLE_SUPPORT #endif
#ifdef NSIS_CONFIG_CRC_SUPPORT #ifdef NSIS_CONFIG_CRC_SUPPORT
if ((h.flags & FH_FLAGS_FORCE_CRC) == 0) if ((cl_flags & FH_FLAGS_FORCE_CRC) == 0)
{ {
if ((cl_flags & FH_FLAGS_NO_CRC) | (h.flags & FH_FLAGS_NO_CRC)) if (cl_flags & FH_FLAGS_NO_CRC)
break; break;
} }
@ -194,7 +193,8 @@ const char * NSISCALL loadHeaders(int cl_flags)
if (hwnd) DestroyWindow(hwnd); if (hwnd) DestroyWindow(hwnd);
#endif//NSIS_CONFIG_CRC_SUPPORT #endif//NSIS_CONFIG_CRC_SUPPORT
#endif//NSIS_CONFIG_VISIBLE_SUPPORT #endif//NSIS_CONFIG_VISIBLE_SUPPORT
if (!g_filehdrsize) return _LANG_INVALIDCRC; if (!g_filehdrsize)
return _LANG_INVALIDCRC;
#ifdef NSIS_CONFIG_CRC_SUPPORT #ifdef NSIS_CONFIG_CRC_SUPPORT
if (do_crc) if (do_crc)
@ -223,7 +223,7 @@ const char * NSISCALL loadHeaders(int cl_flags)
SetSelfFilePointer(g_filehdrsize + sizeof(firstheader), FILE_BEGIN); SetSelfFilePointer(g_filehdrsize + sizeof(firstheader), FILE_BEGIN);
#endif #endif
if ((crc = GetCompressedDataFromDataBlockToMemory(-1, data, h.length_of_header)) != h.length_of_header) if (GetCompressedDataFromDataBlockToMemory(-1, data, h.length_of_header) != h.length_of_header)
{ {
GlobalFree((HGLOBAL)data); GlobalFree((HGLOBAL)data);
return _LANG_INVALIDCRC; return _LANG_INVALIDCRC;