system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-15 01:49:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

msxml3: Improve bstr_from_xmlCharN implementation.

Browse source
This commit is contained in:
Piotr Caban 2010-07-17 14:06:53 +02:00 committed by Alexandre Julliard
parent bf263947e7
commit 7a22365674
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dlls/msxml3/saxreader.c
View file

@ -158,7 +158,6 @@ static int namespacePop(saxlocator *locator)
static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len)
{
DWORD dLen;
LPWSTR str;
BSTR bstr;
if (!buf)
@ -166,13 +165,11 @@ static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len)
dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0);
if(len != -1) dLen++;
str = heap_alloc(dLen * sizeof (WCHAR));
if (!str)
bstr = SysAllocStringLen(NULL, dLen-1);
if (!bstr)
return NULL;
MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, dLen);
if(len != -1) str[dLen-1] = '\0';
bstr = SysAllocString(str);
heap_free(str);
MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, bstr, dLen);
if(len != -1) bstr[dLen-1] = '\0';
return bstr;
}