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

fixed unicode conversion with iconv

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3585 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-07-08 18:32:27 +00:00
parent f52f1c921f
commit a4ea07f3fa
3 changed files with 23 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/ResourceEditor.cpp
View file

@ -403,13 +403,13 @@ CResourceDirectory* CResourceEditor::ScanDirectory(PRESOURCE_DIRECTORY rdRoot, P
szName[mbsSize] = 0;
#else
{
iconv_t cd = iconv_open("", "UCS-2");
iconv_t cd = iconv_open("CP1252", "UCS-2");
if (cd != (iconv_t) -1)
{
char *in = (char *) rds->NameString;
char *out = szName = new char[rds->Length * 2 + 1];
char *out = szName = new char[(rds->Length + 1) * sizeof(WCHAR)];
size_t insize = rds->Length;
size_t outsize = rds->Length * 2 + 1;
size_t outsize = (rds->Length + 1) * sizeof(WCHAR);
if (__iconv_adaptor(iconv, cd, &in, &insize, &out, &outsize) == (size_t) -1)
throw runtime_error("Unicode conversion failed");
iconv_close(cd);
@ -528,17 +528,17 @@ void CResourceEditor::WriteRsrcSec(BYTE* pbRsrcSec) {
iLen = MultiByteToWideChar(CP_ACP, 0, szName, iLen, szwName, iLen) - 1;
#else
{
iconv_t cd = iconv_open("UCS-2", "");
iconv_t cd = iconv_open("UCS-2", "CP1252");
if (cd != (iconv_t) -1)
{
char *in = szName;
char *out = (char *) szwName;
size_t insize = iLen + 1;
size_t outsize = (iLen + 1) * sizeof(unsigned short);
size_t outsize = insize * sizeof(WCHAR);
if (__iconv_adaptor(iconv, cd, &in, &insize, &out, &outsize) == (size_t) -1)
iLen = (WORD) -1;
else
iLen = (WORD) ((int) out - (int) szwName - 1);
iLen = (WORD) (((int) out - (int) szwName - 2) / 2);
iconv_close(cd);
}
else