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

Back to normal messages

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2750 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-07-18 21:33:58 +00:00
parent bc035f9065
commit 4a1c9f3e77
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Source/exehead/fileform.c
View file

@ -109,7 +109,7 @@ const char * NSISCALL loadHeaders(int cl_flags)
#if defined(NSIS_CONFIG_CRC_SUPPORT) && defined(NSIS_CONFIG_VISIBLE_SUPPORT) #if defined(NSIS_CONFIG_CRC_SUPPORT) && defined(NSIS_CONFIG_VISIBLE_SUPPORT)
if (hwnd) DestroyWindow(hwnd); if (hwnd) DestroyWindow(hwnd);
#endif//NSIS_CONFIG_CRC_SUPPORT #endif//NSIS_CONFIG_CRC_SUPPORT
return "can't read self"; return _LANG_INVALIDCRC;
} }
if (!g_filehdrsize) if (!g_filehdrsize)
@ -124,7 +124,7 @@ const char * NSISCALL loadHeaders(int cl_flags)
) )
{ {
if (h.length_of_all_following_data > left) if (h.length_of_all_following_data > left)
return "not enough data"; return _LANG_INVALIDCRC;
g_filehdrsize = m_pos; g_filehdrsize = m_pos;
@ -194,14 +194,14 @@ 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 "couldn't find header"; if (!g_filehdrsize) return _LANG_INVALIDCRC;
#ifdef NSIS_CONFIG_CRC_SUPPORT #ifdef NSIS_CONFIG_CRC_SUPPORT
if (do_crc) if (do_crc)
{ {
int fcrc; int fcrc;
if (!ReadSelfFile(&fcrc, sizeof(int)) || crc != fcrc) if (!ReadSelfFile(&fcrc, sizeof(int)) || crc != fcrc)
return "bad crc"; return _LANG_INVALIDCRC;
} }
#endif//NSIS_CONFIG_CRC_SUPPORT #endif//NSIS_CONFIG_CRC_SUPPORT
@ -226,8 +226,7 @@ const char * NSISCALL loadHeaders(int cl_flags)
if ((crc = GetCompressedDataFromDataBlockToMemory(-1, data, h.length_of_header)) != h.length_of_header) if ((crc = GetCompressedDataFromDataBlockToMemory(-1, data, h.length_of_header)) != h.length_of_header)
{ {
GlobalFree((HGLOBAL)data); GlobalFree((HGLOBAL)data);
wsprintf(g_caption, "can't read headers %d", crc); return _LANG_INVALIDCRC;
return g_caption;
} }
#if !defined(NSIS_COMPRESS_WHOLE) || !defined(NSIS_CONFIG_COMPRESSION_SUPPORT) #if !defined(NSIS_COMPRESS_WHOLE) || !defined(NSIS_CONFIG_COMPRESSION_SUPPORT)

2
Source/exehead/lang.h
View file

@ -12,7 +12,7 @@
"This could be the result of an incomplete download" "This could be the result of an incomplete download"
#endif #endif
#define _LANG_ERRORWRITINGTEMP "Error writing temp file" #define _LANG_ERRORWRITINGTEMP "Error writing temp file. Make sure your temp directory is valid."
#define _LANG_UNINSTINITERROR "Error launching installer" #define _LANG_UNINSTINITERROR "Error launching installer"