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

msxml3: Prepare libxml2 callbacks for IVBSAX... interfaces implementation.

This commit is contained in:
Piotr Caban 2008-07-31 16:48:03 +02:00 committed by Alexandre Julliard
parent cafbf853ab
commit c52e0919fb
1 changed files with 72 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
dlls/msxml3/saxreader.c
View File

@ -52,7 +52,9 @@ typedef struct _saxreader
const struct ISAXXMLReaderVtbl *lpSAXXMLReaderVtbl; const struct ISAXXMLReaderVtbl *lpSAXXMLReaderVtbl;
LONG ref; LONG ref;
struct ISAXContentHandler *contentHandler; struct ISAXContentHandler *contentHandler;
struct IVBSAXContentHandler *vbcontentHandler;
struct ISAXErrorHandler *errorHandler; struct ISAXErrorHandler *errorHandler;
struct IVBSAXErrorHandler *vberrorHandler;
xmlSAXHandler sax; xmlSAXHandler sax;
} saxreader; } saxreader;
@ -69,6 +71,7 @@ typedef struct _saxlocator
xmlChar *lastCur; xmlChar *lastCur;
int line; int line;
int column; int column;
BOOL vbInterface;
} saxlocator; } saxlocator;
typedef struct _saxattributes typedef struct _saxattributes
@ -152,8 +155,15 @@ static void format_error_message_from_id(saxlocator *This, HRESULT hr)
msg[0] = '\0'; msg[0] = '\0';
} }
ISAXErrorHandler_fatalError(This->saxreader->errorHandler, if(This->vbInterface)
(ISAXLocator*)&This->lpSAXLocatorVtbl, msg, hr); {
BSTR bstrMsg = SysAllocString(msg);
IVBSAXErrorHandler_fatalError(This->saxreader->vberrorHandler,
(IVBSAXLocator*)&This->lpVBSAXLocatorVtbl, &bstrMsg, hr);
}
else
ISAXErrorHandler_fatalError(This->saxreader->errorHandler,
(ISAXLocator*)&This->lpSAXLocatorVtbl, msg, hr);
} }
} }
@ -848,7 +858,11 @@ static void libxmlStartDocument(void *ctx)
if(This->saxreader->contentHandler) if(This->saxreader->contentHandler)
{ {
hr = ISAXContentHandler_startDocument(This->saxreader->contentHandler); if(This->vbInterface)
hr = IVBSAXContentHandler_startDocument(This->saxreader->vbcontentHandler);
else
hr = ISAXContentHandler_startDocument(This->saxreader->contentHandler);
if(hr != S_OK) if(hr != S_OK)
format_error_message_from_id(This, hr); format_error_message_from_id(This, hr);
} }
@ -868,7 +882,11 @@ static void libxmlEndDocument(void *ctx)
if(This->saxreader->contentHandler) if(This->saxreader->contentHandler)
{ {
hr = ISAXContentHandler_endDocument(This->saxreader->contentHandler); if(This->vbInterface)
hr = IVBSAXContentHandler_endDocument(This->saxreader->vbcontentHandler);
else
hr = ISAXContentHandler_endDocument(This->saxreader->contentHandler);
if(hr != S_OK) if(hr != S_OK)
format_error_message_from_id(This, hr); format_error_message_from_id(This, hr);
} }
@ -901,12 +919,18 @@ static void libxmlStartElementNS(
hr = SAXAttributes_create(&attr, nb_attributes, attributes); hr = SAXAttributes_create(&attr, nb_attributes, attributes);
if(hr == S_OK) if(hr == S_OK)
{ {
hr = ISAXContentHandler_startElement( if(This->vbInterface)
This->saxreader->contentHandler, hr = IVBSAXContentHandler_startElement(
NamespaceUri, SysStringLen(NamespaceUri), This->saxreader->vbcontentHandler,
LocalName, SysStringLen(LocalName), &NamespaceUri, &LocalName, &QName,
QName, SysStringLen(QName), (IVBSAXAttributes*)&attr->lpVBSAXAttributesVtbl);
(ISAXAttributes*)&attr->lpSAXAttributesVtbl); else
hr = ISAXContentHandler_startElement(
This->saxreader->contentHandler,
NamespaceUri, SysStringLen(NamespaceUri),
LocalName, SysStringLen(LocalName),
QName, SysStringLen(QName),
(ISAXAttributes*)&attr->lpSAXAttributesVtbl);
ISAXAttributes_Release((ISAXAttributes*)&attr->lpSAXAttributesVtbl); ISAXAttributes_Release((ISAXAttributes*)&attr->lpSAXAttributesVtbl);
} }
@ -941,11 +965,16 @@ static void libxmlEndElementNS(
LocalName = bstr_from_xmlChar(localname); LocalName = bstr_from_xmlChar(localname);
QName = bstr_from_xmlChar(localname); QName = bstr_from_xmlChar(localname);
hr = ISAXContentHandler_endElement( if(This->vbInterface)
This->saxreader->contentHandler, hr = IVBSAXContentHandler_endElement(
NamespaceUri, SysStringLen(NamespaceUri), This->saxreader->vbcontentHandler,
LocalName, SysStringLen(LocalName), &NamespaceUri, &LocalName, &QName);
QName, SysStringLen(QName)); else
hr = ISAXContentHandler_endElement(
This->saxreader->contentHandler,
NamespaceUri, SysStringLen(NamespaceUri),
LocalName, SysStringLen(LocalName),
QName, SysStringLen(QName));
SysFreeString(NamespaceUri); SysFreeString(NamespaceUri);
SysFreeString(LocalName); SysFreeString(LocalName);
@ -1011,7 +1040,14 @@ static void libxmlCharacters(
} }
else if(*end == '\r') Chars[end-This->lastCur] = '\n'; else if(*end == '\r') Chars[end-This->lastCur] = '\n';
hr = ISAXContentHandler_characters(This->saxreader->contentHandler, Chars, end-This->lastCur+1); if(This->vbInterface)
hr = IVBSAXContentHandler_characters(
This->saxreader->vbcontentHandler, &Chars);
else
hr = ISAXContentHandler_characters(
This->saxreader->contentHandler,
Chars, end-This->lastCur+1);
SysFreeString(Chars); SysFreeString(Chars);
if(hr != S_OK) if(hr != S_OK)
{ {
@ -1040,8 +1076,14 @@ static void libxmlSetDocumentLocator(
saxlocator *This = ctx; saxlocator *This = ctx;
HRESULT hr; HRESULT hr;
hr = ISAXContentHandler_putDocumentLocator(This->saxreader->contentHandler, if(This->vbInterface)
(ISAXLocator*)&This->lpSAXLocatorVtbl); hr = IVBSAXContentHandler_putref_documentLocator(
This->saxreader->vbcontentHandler,
(IVBSAXLocator*)&This->lpVBSAXLocatorVtbl);
else
hr = ISAXContentHandler_putDocumentLocator(
This->saxreader->contentHandler,
(ISAXLocator*)&This->lpSAXLocatorVtbl);
if(FAILED(hr)) if(FAILED(hr))
format_error_message_from_id(This, hr); format_error_message_from_id(This, hr);
@ -1072,8 +1114,15 @@ void libxmlFatalError(void *ctx, const char *msg, ...)
wszError = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); wszError = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
MultiByteToWideChar(CP_ACP, 0, message, -1, (LPWSTR)wszError, len); MultiByteToWideChar(CP_ACP, 0, message, -1, (LPWSTR)wszError, len);
ISAXErrorHandler_fatalError(This->saxreader->errorHandler, if(This->vbInterface)
(ISAXLocator*)&This->lpSAXLocatorVtbl, wszError, E_FAIL); {
BSTR bstrError = SysAllocString(wszError);
IVBSAXErrorHandler_fatalError(This->saxreader->vberrorHandler,
(IVBSAXLocator*)&This->lpVBSAXLocatorVtbl, &bstrError, E_FAIL);
}
else
ISAXErrorHandler_fatalError(This->saxreader->errorHandler,
(ISAXLocator*)&This->lpSAXLocatorVtbl, wszError, E_FAIL);
HeapFree(GetProcessHeap(), 0, wszError); HeapFree(GetProcessHeap(), 0, wszError);
@ -1213,7 +1262,7 @@ static const struct ISAXLocatorVtbl isaxlocator_vtbl =
isaxlocator_getSystemId isaxlocator_getSystemId
}; };
static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator) static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, BOOL vbInterface)
{ {
saxlocator *locator; saxlocator *locator;
@ -1223,6 +1272,7 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator)
locator->lpSAXLocatorVtbl = &isaxlocator_vtbl; locator->lpSAXLocatorVtbl = &isaxlocator_vtbl;
locator->ref = 1; locator->ref = 1;
locator->vbInterface = vbInterface;
locator->saxreader = reader; locator->saxreader = reader;
ISAXXMLReader_AddRef((ISAXXMLReader*)&reader->lpSAXXMLReaderVtbl); ISAXXMLReader_AddRef((ISAXXMLReader*)&reader->lpSAXXMLReaderVtbl);
@ -1814,7 +1864,7 @@ static HRESULT parse_buffer(saxreader *This, const char *buffer, int size)
saxlocator *locator; saxlocator *locator;
HRESULT hr; HRESULT hr;
hr = SAXLocator_create(This, &locator); hr = SAXLocator_create(This, &locator, FALSE);
if(FAILED(hr)) if(FAILED(hr))
return E_FAIL; return E_FAIL;