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

Fixed winchar tests

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6430 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-01-22 09:54:21 +00:00
parent 069a18860a
commit 03405bcd96
10 changed files with 88 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Source/winchar.cpp
View file

@ -43,6 +43,21 @@ int WinWStrNICmpASCII(const WINWCHAR *a, const char *b, size_t n)
return diff;
}
WINWCHAR* WinWStrDupFromChar(const char *s, unsigned int cp)
{
size_t cch = MultiByteToWideChar(cp, 0, s, -1, 0, 0);
wchar_t *p = (wchar_t*) malloc(cch);
if (p)
{
MultiByteToWideChar(cp, 0, s, -1, p, cch);
#ifndef _WIN32
wchar_t *p2 = (wchar_t*) WinWStrDupFromWC(p);
free(p), p = p2;
#endif
}
return (WINWCHAR*) p;
}
#ifndef _WIN32
size_t WinWStrLen(const WINWCHAR *s)
{
@ -86,7 +101,7 @@ WINWCHAR* WinWStrDupFromWinWStr(const WINWCHAR *s)
return d;
}
WINWCHAR* WinWStrDupFromTChar(const TCHAR *s)
WINWCHAR* WinWStrDupFromWC(const wchar_t *s)
{
#ifdef MAKENSIS
WCToUTF16LEHlpr cnv;
@ -94,9 +109,9 @@ WINWCHAR* WinWStrDupFromTChar(const TCHAR *s)
return (WINWCHAR*) cnv.Detach();
#else
// NOTE: Anything outside the ASCII range will not convert correctly!
size_t cch = strlen(s);
size_t cch = wcslen(s);
WINWCHAR* p = (WINWCHAR*) malloc(++cch * 2);
if (p) for (size_t i = 0; i < cch; ++i) p[i] = s[i];
if (p) for (size_t i = 0; i < cch; ++i) p[i] = (unsigned char) s[i];
return p;
#endif
}