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

FileReadByte should not do any kind of conversion

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

10
Docs/src/history.but
View file

@ -1,5 +1,15 @@
\A{history} Changelog and Release Notes \A{history} Changelog and Release Notes
\H{v3.0a2} 3.0 Alpha 2
Released on ?
\S1{v3.0a2-cl} Changelog
\S2{} Minor Changes
\b FileReadByte no longer performs a Unicode conversion on non-ASCII characters
\H{v3.0a1} 3.0 Alpha 1 \H{v3.0a1} 3.0 Alpha 1
Released on July 14th, 2013 Released on July 14th, 2013

26
Source/exehead/exec.c
View file

@ -1420,19 +1420,21 @@ static int NSISCALL ExecuteEntry(entry *entry_)
{ {
TCHAR c; TCHAR c;
#ifdef _UNICODE #ifdef _UNICODE
if (which==EW_FGETS) if (which==EW_FGETS && !parm3)
{ {
/* BUGBUG: /* BUGBUG:
How is MBTWC supposed to be able to determine the correct WCHAR for a multibyte string when it only has 1 byte to look at? How is MBTWC supposed to be able to determine the correct WCHAR for a multibyte string when it only has 1 byte to look at?
And what if the multibyte character needs two WCHARs? And what if the multibyte character needs two WCHARs?
*/ */
char tmpc; char tmpc;
if (!ReadFile(h,&tmpc,1,&dw,NULL) || dw != 1) break; if (!ReadFile(h,&tmpc,1,&dw,NULL) || dw != 1) break;
if (0==MultiByteToWideChar(CP_ACP, 0, &tmpc, 1, &c, 1)) c = _T('?'); if (0==MultiByteToWideChar(CP_ACP, 0, &tmpc, 1, &c, 1)) c = _T('?');
} }
else else
#endif #endif
if (!ReadFile(h,&c,sizeof(c),&dw,NULL) || dw != sizeof(c)) break; {
if (!ReadFile(h,&c,1,&dw,NULL) || dw != 1) break;
}
if (parm3) if (parm3)
{ {
myitoa(textout,(unsigned int)(_TUCHAR)c); myitoa(textout,(unsigned int)(_TUCHAR)c);
@ -1440,8 +1442,10 @@ static int NSISCALL ExecuteEntry(entry *entry_)
} }
if (lc == _T('\r') || lc == _T('\n')) if (lc == _T('\r') || lc == _T('\n'))
{ {
if (lc == c || (c != _T('\r') && c != _T('\n'))) SetFilePointer(h,-((int)(sizeof(c))),NULL,FILE_CURRENT); if (lc == c || (c != _T('\r') && c != _T('\n')))
else textout[rpos++]=c; SetFilePointer(h,-((int)(sizeof(c))),NULL,FILE_CURRENT);
else
textout[rpos++]=c;
break; break;
} }
textout[rpos++]=c; textout[rpos++]=c;