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

Use ReadFile helper function in exehead

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6395 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-07-25 19:18:34 +00:00
parent a5f0809ee9
commit 19b9a3e65a
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/exehead/exec.c
View file

@ -1406,7 +1406,6 @@ static int NSISCALL ExecuteEntry(entry *entry_)
#endif
{
TCHAR *textout=var1;
DWORD dw;
int rpos=0;
TCHAR *hptr=var0;
int maxlen=GetIntFromParm(2);
@ -1427,17 +1426,17 @@ static int NSISCALL ExecuteEntry(entry *entry_)
And what if the multibyte character needs two WCHARs?
*/
char tmpc;
if (!ReadFile(h,&tmpc,1,&dw,NULL) || dw != 1) break;
if (!myReadFile(h,&tmpc,1)) break;
if (0==MultiByteToWideChar(CP_ACP, 0, &tmpc, 1, &c, 1)) c = _T('?');
}
else
#endif
{
if (!ReadFile(h,&c,1,&dw,NULL) || dw != 1) break;
if (!myReadFile(h,&c,1)) break;
}
if (parm3)
{
myitoa(textout,(unsigned int)(_TUCHAR)c);
myitoa(textout,(unsigned char)c);
return 0;
}
if (lc == _T('\r') || lc == _T('\n'))