commit 40388631f8536462ace8708c15f1eb858bf7b14b
author Piotr Caban <piotr.caban@gmail.com> Thu Jul 17 00:41:40 2008 +0200
committer Alexandre Julliard <julliard@winehq.org> Thu Jul 17 13:03:11 2008 +0200
tree 7effa367847064d12d026e01e74158488e85ac63
parent 669326344fa24c53a32b7b083629f9a33c3ca6be

msxml3: Added ISAXContentHandler_characters event.

dlls/msxml3/saxreader.c

diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
index 854584f..41c419c 100644
--- a/dlls/msxml3/saxreader.c
+++ b/dlls/msxml3/saxreader.c
@@ -202,6 +202,50 @@
     }
 }
 
+static void libxmlCharacters(
+        void *ctx,
+        const xmlChar *ch,
+        int len)
+{
+    BSTR Chars;
+    saxlocator *This = ctx;
+    const xmlChar *cur;
+    int pos;
+    HRESULT hr;
+
+    This->lastColumn = 1;
+    This->lastLine = xmlSAX2GetLineNumber(This->pParserCtxt);
+
+    cur = This->pParserCtxt->input->cur;
+    if(*cur != '<')
+    {
+        for(pos=0; pos<len; pos++)
+            if(*(cur+pos) == '\n') This->lastLine--;
+        cur--;
+    }
+    else
+    {
+        for(pos=0; pos<len; pos++)
+            if(*(cur-pos-1) == '\n') This->lastLine--;
+        cur = cur-len-1;
+    }
+    for(; *cur!='\n' && cur!=This->pParserCtxt->input->base; cur--)
+        This->lastColumn++;
+
+    if(This->saxreader->contentHandler)
+    {
+        Chars = bstr_from_xmlChar(ch);
+        hr = ISAXContentHandler_characters(This->saxreader->contentHandler, Chars, len);
+        SysFreeString(Chars);
+
+        if(FAILED(hr))
+        {
+            xmlStopParser(This->pParserCtxt);
+            This->ret = hr;
+        }
+    }
+}
+
 /*** ISAXLocator interface ***/
 /*** IUnknown methods ***/
 static HRESULT WINAPI isaxlocator_QueryInterface(ISAXLocator* iface, REFIID riid, void **ppvObject)
@@ -1004,6 +1048,7 @@
     reader->sax.endDocument = libxmlEndDocument;
     reader->sax.startElementNs = libxmlStartElementNS;
     reader->sax.endElementNs = libxmlEndElementNS;
+    reader->sax.characters = libxmlCharacters;
 
     *ppObj = &reader->lpVtbl;