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

Unicode port: adding UTF-16LE file functions

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6089 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-05-17 15:11:29 +00:00
parent 7a99fafa68
commit 24c02b97d0
6 changed files with 101 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Source/exehead/exec.c
View file

@ -1362,26 +1362,43 @@ static int NSISCALL ExecuteEntry(entry *entry_)
}
break;
case EW_FPUTS:
#ifdef _UNICODE
case EW_FPUTWS:
// Jim Park/Wizou: in Unicode version of NSIS, EW_FPUTS still deals with ANSI files (conversion is done). We add EW_FPUTWS to deal with Unicode files.
#endif
{
DWORD dw;
int l;
int l; // number of bytes to write
TCHAR *t=var0;
if (parm2)
if (parm2) // FileWriteByte or FileWriteWord
{
((_TUCHAR *)buf1)[0]=(_TUCHAR) GetIntFromParm(1);
l=1;
// Note: In Unicode version, we put a WORD in buf1[0] and will write 1 or 2 bytes, depending on FileWriteByte/Word.
((_TUCHAR *)buf1)[0]=(_TUCHAR) GetIntFromParm(1); // FIX_ENDIAN_INT16 needed?
l=(which==EW_FPUTS)?1:sizeof(TCHAR); // Note: This is optimized by the compiler into l=1 for ANSI compilation
}
#ifdef _UNICODE
else if (which==EW_FPUTS)
{
GetStringFromParm(0x21); // load string in buf2, convert it to ANSI in buf1
WideCharToMultiByte(CP_ACP, 0, buf2, -1, (LPSTR) buf1, NSIS_MAX_STRLEN, NULL, NULL);
l=lstrlenA((LPCSTR)buf1);
}
#endif
else
{
l=mystrlen(GetStringFromParm(0x11));
l=mystrlen(GetStringFromParm(0x11))*sizeof(TCHAR);
}
if (!*t || !WriteFile((HANDLE)myatoi(t),buf1,l*sizeof(TCHAR),&dw,NULL))
if (!*t || !WriteFile((HANDLE)myatoi(t),buf1,l,&dw,NULL))
{
exec_error++;
}
}
break;
case EW_FGETS:
#ifdef _UNICODE
case EW_FGETWS:
// Jim Park/Wizou: in Unicode version of NSIS, EW_FGETS still deals with ANSI files (conversion is done). We add EW_FGETWS to deal with Unicode files.
#endif
{
TCHAR *textout=var1;
DWORD dw;
@ -1397,6 +1414,15 @@ static int NSISCALL ExecuteEntry(entry *entry_)
while (rpos<maxlen)
{
TCHAR c;
#ifdef _UNICODE
if (which==EW_FGETS)
{
char tmpc;
if (!ReadFile(h,&tmpc,1,&dw,NULL) || dw != 1) break;
MultiByteToWideChar(CP_ACP, 0, &tmpc, 1, &c, 1);
}
else
#endif
if (!ReadFile(h,&c,sizeof(c),&dw,NULL) || dw != sizeof(c)) break;
if (parm3)
{

4
Source/exehead/fileform.h
View file

@ -167,6 +167,10 @@ enum
EW_FOPEN, // FileOpen: 4 [name, openmode, createmode, outputhandle]
EW_FPUTS, // FileWrite: 3 [handle, string, ?int:string]
EW_FGETS, // FileRead: 4 [handle, output, maxlen, ?getchar:gets]
#ifdef _UNICODE
EW_FPUTWS, // FileWriteUTF16LE: 3 [handle, string, ?int:string]
EW_FGETWS, // FileReadUTF16LE: 4 [handle, output, maxlen, ?getchar:gets]
#endif
EW_FSEEK, // FileSeek: 4 [handle, offset, mode, >=0?positionoutput]
#endif//NSIS_SUPPORT_FILEFUNCTIONS