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

MBCS to Unicode conversion bugs fixed

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

6
Source/DialogTemplate.cpp
View file

@ -52,7 +52,7 @@ void ReadVarLenArr(BYTE* &seeker, char* &readInto) {
DWORD dwStrLen = WCStrLen((WCHAR*)arr); DWORD dwStrLen = WCStrLen((WCHAR*)arr);
readInto = new char[dwStrLen]; readInto = new char[dwStrLen];
WideCharToMultiByte(CP_ACP, 0, (WCHAR*)arr, dwStrLen, readInto, dwStrLen, 0, 0); WideCharToMultiByte(CP_ACP, 0, (WCHAR*)arr, dwStrLen, readInto, dwStrLen, 0, 0);
seeker += (dwStrLen)*sizeof(WORD); seeker += (dwStrLen)*sizeof(WCHAR);
} }
break; break;
} }
@ -68,8 +68,8 @@ void ReadVarLenArr(BYTE* &seeker, char* &readInto) {
seeker += sizeof(WORD); \ seeker += sizeof(WORD); \
} \ } \
else { \ else { \
MultiByteToWideChar(CP_ACP, 0, x, -1, (WCHAR*)seeker, dwSize); \ int us = MultiByteToWideChar(CP_ACP, 0, x, -1, (WCHAR*)seeker, dwSize); \
seeker += (lstrlen(x)+1)*sizeof(WCHAR); \ seeker += us*sizeof(WCHAR); \
} \ } \
else \ else \
seeker += sizeof(WORD); seeker += sizeof(WORD);

5
Source/ResourceEditor.cpp
View file

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