From 01ebc199ef9e1f3bf7d2118a86d0b570308b3db9 Mon Sep 17 00:00:00 2001 From: kichik Date: Thu, 25 Jan 2007 13:08:32 +0000 Subject: [PATCH] CreateUnicodeString -> winchar_fromansi git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4888 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/ResourceEditor.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Source/ResourceEditor.cpp b/Source/ResourceEditor.cpp index 4eb4672a..3230b59f 100644 --- a/Source/ResourceEditor.cpp +++ b/Source/ResourceEditor.cpp @@ -217,24 +217,11 @@ bool CResourceEditor::UpdateResourceW(WCHAR* szType, WCHAR* szName, LANGID wLang return true; } -static WCHAR* CreateUnicodeString(const char* szString) { - int iLen = MultiByteToWideChar(CP_ACP, 0, szString, -1, 0, 0); - if (iLen == 0) - throw runtime_error("Unicode conversion failed"); - - WCHAR* szwString = new WCHAR[iLen + 1]; - - if (MultiByteToWideChar(CP_ACP, 0, szString, -1, szwString, iLen + 1) == 0) - throw runtime_error("Unicode conversion failed"); - - return szwString; -} - static WCHAR* ResStringToUnicode(const char *szString) { if (IS_INTRESOURCE(szString)) return MAKEINTRESOURCEW(szString); else - return CreateUnicodeString(szString); + return winchar_fromansi(szString); } static void FreeUnicodeResString(WCHAR* szwString) {