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

Use myWriteFile helper function in exehead

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6628 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-10-31 16:27:34 +00:00
parent 1c1d1d5e12
commit 252adb2f39
4 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Source/exehead/fileform.c
View file

@ -430,8 +430,7 @@ int NSISCALL _dodecomp(int offset, HANDLE hFileOut, unsigned char *outbuf, int o
if (!outbuf)
{
DWORD r;
if (!WriteFile(hFileOut,outbuffer,u,&r,NULL) || (int)r != u) return -2;
if (!myWriteFile(hFileOut,outbuffer,u)) return -2;
retval+=u;
}
else
@ -452,9 +451,8 @@ int NSISCALL _dodecomp(int offset, HANDLE hFileOut, unsigned char *outbuf, int o
while (input_len > 0)
{
DWORD l=min(input_len,outbuffer_len);
DWORD t;
if (!ReadSelfFile((LPVOID)inbuffer,l)) return -3;
if (!WriteFile(hFileOut,inbuffer,l,&t,NULL) || l!=t) return -2;
if (!myWriteFile(hFileOut,inbuffer,l)) return -2;
retval+=l;
input_len-=l;
}
@ -498,7 +496,7 @@ static int NSISCALL __ensuredata(int amount)
g_inflate_stream.avail_in=l;
do
{
DWORD r,t;
DWORD r;
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT
if (g_header)
#ifdef NSIS_CONFIG_SILENT_SUPPORT
@ -520,7 +518,7 @@ static int NSISCALL __ensuredata(int amount)
r=BUGBUG64TRUNCATE(DWORD,(UINT_PTR)g_inflate_stream.next_out)-BUGBUG64TRUNCATE(DWORD,(UINT_PTR)_outbuffer);
if (r)
{
if (!WriteFile(dbd_hFile,_outbuffer,r,&t,NULL) || r != t)
if (!myWriteFile(dbd_hFile,_outbuffer,r))
{
return -2;
}
@ -568,10 +566,9 @@ int NSISCALL _dodecomp(int offset, HANDLE hFileOut, unsigned char *outbuf, int o
{
while (input_len > 0)
{
DWORD t;
DWORD l=min(input_len,IBUFSIZE);
if (!myReadFile(dbd_hFile,(LPVOID)_inbuffer,r=l)) return -3;
if (!WriteFile(hFileOut,_inbuffer,r,&t,NULL) || t != l) return -2;
if (!myWriteFile(hFileOut,_inbuffer,r)) return -2;
retval+=r;
input_len-=r;
dbd_pos+=r;