From b18b76f59baccde6ebec11ff84a00fee73216791 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 12 Oct 2002 17:08:09 +0000 Subject: [PATCH] 32 bytes down git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1392 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/exehead/fileform.c | 15 ++------------- Source/exehead/fileform.h | 7 +++++-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/Source/exehead/fileform.c b/Source/exehead/fileform.c index 190fbb50..0c9f7714 100644 --- a/Source/exehead/fileform.c +++ b/Source/exehead/fileform.c @@ -123,7 +123,7 @@ const char * NSISCALL GetStringFromStringTab(int offs) #if !defined(NSIS_COMPRESS_WHOLE) || !defined(NSIS_CONFIG_COMPRESSION_SUPPORT) -static int NSISCALL _dodecomp(int offset, HANDLE hFileOut, char *outbuf, int outbuflen) +int NSISCALL _dodecomp(int offset, HANDLE hFileOut, char *outbuf, int outbuflen) { static char inbuffer[IBUFSIZE+OBUFSIZE]; char *outbuffer; @@ -301,7 +301,7 @@ static int NSISCALL __ensuredata(int amount) } -static int NSISCALL _dodecomp(int offset, HANDLE hFileOut, char *outbuf, int outbuflen) +int NSISCALL _dodecomp(int offset, HANDLE hFileOut, char *outbuf, int outbuflen) { DWORD r; int input_len; @@ -343,17 +343,6 @@ static int NSISCALL _dodecomp(int offset, HANDLE hFileOut, char *outbuf, int out } #endif//NSIS_COMPRESS_WHOLE - -int NSISCALL GetCompressedDataFromDataBlock(int offset, HANDLE hFileOut) -{ - return _dodecomp(offset,hFileOut,NULL,0); -} - -int NSISCALL GetCompressedDataFromDataBlockToMemory(int offset, char *out, int out_len) -{ - return _dodecomp(offset,NULL,out,out_len); -} - BOOL NSISCALL ReadSelfFile(LPVOID lpBuffer, DWORD nNumberOfBytesToRead) { DWORD rd; diff --git a/Source/exehead/fileform.h b/Source/exehead/fileform.h index db729859..2dabc643 100644 --- a/Source/exehead/fileform.h +++ b/Source/exehead/fileform.h @@ -445,12 +445,15 @@ int NSISCALL isheader(firstheader *h); // returns 0 on not header, length_of_dat // (or m_uninstheader) const char * NSISCALL loadHeaders(void); +int NSISCALL _dodecomp(int offset, HANDLE hFileOut, char *outbuf, int outbuflen); + +#define GetCompressedDataFromDataBlock(offset, hFileOut) _dodecomp(offset,hFileOut,NULL,0) +#define GetCompressedDataFromDataBlockToMemory(offset, out, out_len) _dodecomp(offset,NULL,out,out_len) + extern HANDLE g_db_hFile; extern int g_quit_flag; const char * NSISCALL GetStringFromStringTab(int offs); -int NSISCALL GetCompressedDataFromDataBlock(int offset, HANDLE hFileOut); -int NSISCALL GetCompressedDataFromDataBlockToMemory(int offset, char *out, int out_len); BOOL NSISCALL ReadSelfFile(LPVOID lpBuffer, DWORD nNumberOfBytesToRead); DWORD NSISCALL SetSelfFilePointer(LONG lDistanceToMove, DWORD dwMoveMethod);