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

replaced WCStrLen with winchar_strlen

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5056 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-04-11 21:32:24 +00:00
parent 5dcb76d379
commit a8f8c50538
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/ResourceVersionInfo.cpp
View file

@ -145,7 +145,7 @@ int GetVersionHeader (LPSTR &p, WORD &wLength, WORD &wValueLength, WORD &wType)
wType = *(WORD*)p; wType = *(WORD*)p;
p += sizeof(WORD); p += sizeof(WORD);
szKey = (WCHAR*)p; szKey = (WCHAR*)p;
p += (WCStrLen(szKey)) * sizeof (WCHAR); p += (winchar_strlen(szKey) + 1) * sizeof (WCHAR);
while ( ((long)p % 4) != 0 ) while ( ((long)p % 4) != 0 )
p++; p++;
return p - baseP; return p - baseP;
@ -168,7 +168,7 @@ void SaveVersionHeader (GrowBuf &strm, WORD wLength, WORD wValueLength, WORD wTy
strm.add (&wValueLength, sizeof (wValueLength)); strm.add (&wValueLength, sizeof (wValueLength));
strm.add (&wType, sizeof (wType)); strm.add (&wType, sizeof (wType));
keyLen = (WCStrLen(key)) * sizeof (WCHAR); keyLen = (winchar_strlen(key) + 1) * sizeof (WCHAR);
strm.add ((void*)key, keyLen); strm.add ((void*)key, keyLen);
PadStream(strm); PadStream(strm);
@ -213,7 +213,7 @@ void CResourceVersionInfo::ExportToStream(GrowBuf &strm, int Index)
p = stringInfoStream.getlen(); p = stringInfoStream.getlen();
KeyName = winchar_fromansi(pChildStrings->getname(i), codepage); KeyName = winchar_fromansi(pChildStrings->getname(i), codepage);
KeyValue = winchar_fromansi(pChildStrings->getvalue(i), codepage); KeyValue = winchar_fromansi(pChildStrings->getvalue(i), codepage);
SaveVersionHeader (stringInfoStream, 0, WCStrLen(KeyValue), 1, KeyName, (void*)KeyValue); SaveVersionHeader (stringInfoStream, 0, winchar_strlen(KeyValue) + 1, 1, KeyName, (void*)KeyValue);
delete [] KeyName; delete [] KeyName;
delete [] KeyValue; delete [] KeyValue;
wSize = stringInfoStream.getlen() - p; wSize = stringInfoStream.getlen() - p;

7
Source/util.cpp
View file

@ -392,13 +392,6 @@ int generate_unicons_offsets(unsigned char* exeHeader, size_t exeHeaderSize, uns
} }
#endif // NSIS_CONFIG_UNINSTALL_SUPPORT #endif // NSIS_CONFIG_UNINSTALL_SUPPORT
// returns the number of WCHARs in str including null charcter
size_t WCStrLen(const WCHAR* szwStr) {
size_t i;
for (i = 0; szwStr[i]; i++);
return i+1;
}
#ifndef _WIN32 #ifndef _WIN32
char *CharPrev(const char *s, const char *p) { char *CharPrev(const char *s, const char *p) {
if (!s || !p || p < s) if (!s || !p || p < s)