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

FileReadUTF16LE skips optional BOM and FileWriteUTF16LE can write a BOM with the /BOM switch

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6626 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2015-10-26 23:29:39 +00:00
parent 37c81f74f8
commit b54c831ff0
7 changed files with 59 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Source/exehead/util.c
View file

@ -456,6 +456,31 @@ BOOL NSISCALL myReadFile(HANDLE h, LPVOID buf, DWORD cb)
return r && cb == cbio;
}
// Reading skips the BOM if present, writing writes it to a empty file
HRESULT NSISCALL UTF16LEBOM(HANDLE h, INT_PTR ForWrite)
{
DWORD orgpos = SetFilePointer(h, 0, NULL, FILE_CURRENT), cbio;
if (0 == orgpos)
{
BYTE bom[2];
if (myReadFile(h, bom, 2) && (0xff == bom[0] && 0xfe == bom[1]))
{
return S_OK;
}
else if (ForWrite)
{
if (0 == SetFilePointer(h, 0, NULL, FILE_CURRENT)) // Is the file empty?
{
static const BYTE bom16le[] = { 0xff, 0xfe };
return (WriteFile(h, bom16le, 2, &cbio, NULL) && 2 == cbio)
? S_OK : E_FAIL;
}
}
SetFilePointer(h, 0, NULL, FILE_BEGIN); // The file may have starting with something that was not a BOM, undo the read
}
return S_FALSE;
}
#ifdef NSIS_SUPPORT_MOVEONREBOOT
#ifndef _WIN64
/** Modifies the wininit.ini file to rename / delete a file.