ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msxml: Fix implementation of ISAXContentHandler_characters.

This commit is contained in:
Piotr Caban 2008-10-01 19:52:48 +02:00 committed by Alexandre Julliard
parent c7fc926552
commit 2a55b8d8e7
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/msxml3/saxreader.c
View File

@ -197,6 +197,23 @@ static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name)
return bstr;
}
BSTR bstr_from_xmlChar_wn(const xmlChar *buf, int len)
{
DWORD size;
LPWSTR str;
BSTR bstr;
if(!buf) return NULL;
size = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0);
str = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, size*sizeof(WCHAR));
if(!str) return NULL;
MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, size);
bstr = SysAllocStringLen(str, size);
HeapFree(GetProcessHeap(), 0, str);
return bstr;
}
static void format_error_message_from_id(saxlocator *This, HRESULT hr)
{
xmlStopParser(This->pParserCtxt);
@ -1176,8 +1193,6 @@ static void libxmlCharacters(
chEnd = This->lastCur+len;
while(*chEnd != '<') chEnd++;
Chars = bstr_from_xmlChar(ch);
lastCurCopy = This->lastCur;
columnCopy = This->column;
lineCopy = This->line;
@ -1195,7 +1210,7 @@ static void libxmlCharacters(
end++;
}
Chars = bstr_from_xmlChar(This->lastCur);
Chars = bstr_from_xmlChar_wn(This->lastCur, end-This->lastCur+2);
if(*end == '\r' && *(end+1) == '\n')
{