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

use winchar

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4887 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-01-25 13:07:28 +00:00
parent 478f9536e4
commit 249903acc8
1 changed files with 2 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Source/DialogTemplate.cpp
View file

@ -15,6 +15,7 @@
*/ */
#include "DialogTemplate.h" #include "DialogTemplate.h"
#include "winchar.h"
#include <cassert> // for assert(3) #include <cassert> // for assert(3)
#ifndef _WIN32 #ifndef _WIN32
# include "util.h" // for Unicode conversion functions # include "util.h" // for Unicode conversion functions
@ -58,21 +59,7 @@ void ReadVarLenArr(LPBYTE &seeker, char* &readInto, unsigned int uCodePage) {
break; break;
default: default:
{ {
int iStrLen = WideCharToMultiByte(uCodePage, 0, (WCHAR*)arr, -1, 0, 0, 0, 0); readInto = winchar_toansi(arr, uCodePage);
if (iStrLen)
{
readInto = new char[iStrLen];
if (!WideCharToMultiByte(uCodePage, 0, (WCHAR*)arr, -1, readInto, iStrLen, 0, 0))
{
delete [] readInto;
throw runtime_error("ReadVarLenArr - Unicode conversion failed.");
}
}
else
{
throw runtime_error("ReadVarLenArr - Unicode conversion failed.");
}
PWCHAR wseeker = PWCHAR(seeker); PWCHAR wseeker = PWCHAR(seeker);
while (*wseeker++); while (*wseeker++);
seeker = LPBYTE(wseeker); seeker = LPBYTE(wseeker);