From 4a1c9f3e77fbd2b44c45d938d5590cf87246a9ac Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 18 Jul 2003 21:33:58 +0000 Subject: [PATCH] Back to normal messages git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2750 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/exehead/fileform.c | 11 +++++------ Source/exehead/lang.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Source/exehead/fileform.c b/Source/exehead/fileform.c index d7484730..0e5f85cf 100644 --- a/Source/exehead/fileform.c +++ b/Source/exehead/fileform.c @@ -109,7 +109,7 @@ const char * NSISCALL loadHeaders(int cl_flags) #if defined(NSIS_CONFIG_CRC_SUPPORT) && defined(NSIS_CONFIG_VISIBLE_SUPPORT) if (hwnd) DestroyWindow(hwnd); #endif//NSIS_CONFIG_CRC_SUPPORT - return "can't read self"; + return _LANG_INVALIDCRC; } if (!g_filehdrsize) @@ -124,7 +124,7 @@ const char * NSISCALL loadHeaders(int cl_flags) ) { if (h.length_of_all_following_data > left) - return "not enough data"; + return _LANG_INVALIDCRC; g_filehdrsize = m_pos; @@ -194,14 +194,14 @@ const char * NSISCALL loadHeaders(int cl_flags) if (hwnd) DestroyWindow(hwnd); #endif//NSIS_CONFIG_CRC_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 if (do_crc) { int fcrc; if (!ReadSelfFile(&fcrc, sizeof(int)) || crc != fcrc) - return "bad crc"; + return _LANG_INVALIDCRC; } #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) { GlobalFree((HGLOBAL)data); - wsprintf(g_caption, "can't read headers %d", crc); - return g_caption; + return _LANG_INVALIDCRC; } #if !defined(NSIS_COMPRESS_WHOLE) || !defined(NSIS_CONFIG_COMPRESSION_SUPPORT) diff --git a/Source/exehead/lang.h b/Source/exehead/lang.h index fd7e4c64..aa5c6389 100644 --- a/Source/exehead/lang.h +++ b/Source/exehead/lang.h @@ -12,7 +12,7 @@ "This could be the result of an incomplete download" #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"