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

Using standard wchar string functions instead of winchar_*

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6072 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-04-30 14:48:19 +00:00
parent b9a5d24705
commit f7f4d2f033
10 changed files with 72 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Source/ResourceVersionInfo.cpp
View file

@ -140,7 +140,7 @@ int GetVersionHeader (LPSTR &p, WORD &wLength, WORD &wValueLength, WORD &wType)
wType = *(WORD*)p;
p += sizeof(WORD);
szKey = (WCHAR*)p;
p += (winchar_strlen(szKey) + 1) * sizeof (WCHAR);
p += (wcslen(szKey) + 1) * sizeof (WCHAR);
while ( ((ULONG_PTR)p % 4) != 0 )
p++;
return p - baseP;
@ -171,7 +171,7 @@ void SaveVersionHeader (GrowBuf &strm, WORD wLength, WORD wValueLength, WORD wTy
strm.add (&wValueLength, sizeof (wValueLength));
strm.add (&wType, sizeof (wType));
keyLen = WORD((winchar_strlen(key) + 1) * sizeof (WCHAR));
keyLen = WORD((wcslen(key) + 1) * sizeof (WCHAR));
strm.add ((void*)key, keyLen);
PadStream(strm);
@ -210,11 +210,11 @@ void CResourceVersionInfo::ExportToStream(GrowBuf &strm, int Index)
PadStream (stringInfoStream);
p = stringInfoStream.getlen();
KeyName = winchar_fromTchar(pChildStrings->getname(i), codepage);
KeyValue = winchar_fromTchar(pChildStrings->getvalue(i), codepage);
SaveVersionHeader (stringInfoStream, 0, WORD(winchar_strlen(KeyValue) + 1), 1, KeyName, (void*)KeyValue);
delete [] KeyName;
delete [] KeyValue;
KeyName = wcsdup_fromTchar(pChildStrings->getname(i), codepage);
KeyValue = wcsdup_fromTchar(pChildStrings->getvalue(i), codepage);
SaveVersionHeader (stringInfoStream, 0, WORD(wcslen(KeyValue) + 1), 1, KeyName, (void*)KeyValue);
free(KeyName);
free(KeyValue);
wSize = WORD(stringInfoStream.getlen() - p);
*(WORD*)((PBYTE)stringInfoStream.get()+p)=wSize;