Piotr Caban : msxml3: Improve QName_from_xmlChar implementation.
Alexandre Julliard
julliard at winehq.org
Mon Jul 19 11:05:31 CDT 2010
Module: wine
Branch: master
Commit: bf263947e7eff1351e7b9bc6a43c7beb9b3746f9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf263947e7eff1351e7b9bc6a43c7beb9b3746f9
Author: Piotr Caban <piotr at codeweavers.com>
Date: Sat Jul 17 14:06:27 2010 +0200
msxml3: Improve QName_from_xmlChar implementation.
---
dlls/msxml3/saxreader.c | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index b81a47e..a09f4ea 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -180,7 +180,6 @@ static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len)
static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name)
{
DWORD dLen, dLast;
- LPWSTR str;
BSTR bstr;
if(!name) return NULL;
@@ -190,16 +189,13 @@ static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name)
dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, NULL, 0)
+ MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, NULL, 0);
- str = heap_alloc(dLen * sizeof(WCHAR));
- if(!str)
+ bstr = SysAllocStringLen(NULL, dLen-1);
+ if(!bstr)
return NULL;
- dLast = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, str, dLen);
- str[dLast-1] = ':';
- MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, &str[dLast], dLen-dLast);
- bstr = SysAllocString(str);
-
- heap_free(str);
+ dLast = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, bstr, dLen);
+ bstr[dLast-1] = ':';
+ MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, &bstr[dLast], dLen-dLast);
return bstr;
}
More information about the wine-cvs
mailing list