MBCS to Unicode conversion bugs fixed

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@688 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-08-16 09:06:55 +00:00
parent c05a873977
commit 06dbc9a22b
2 changed files with 6 additions and 5 deletions

View file

@ -445,8 +445,9 @@ void CResourceEditor::WriteRsrcSec(BYTE* pbRsrcSec) {
char* szName = cRDirE->GetName();
WORD iLen = lstrlen(szName);
WCHAR* szwName = new WCHAR[iLen];
MultiByteToWideChar(CP_ACP, 0, szName, iLen, szwName, iLen);
CopyMemory(seeker, &iLen, sizeof(WORD));
// MultiByteToWideChar return value includes the null char, so -1
iLen = MultiByteToWideChar(CP_ACP, 0, szName, iLen, szwName, iLen) - 1;
*(WORD*)seeker = iLen;
seeker += sizeof(WORD);
CopyMemory(seeker, szwName, iLen*sizeof(WCHAR));
seeker += iLen*sizeof(WCHAR);