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

msxml3: Added ISAXXMLReader_putContentHandler implementation.

Browse Source
This commit is contained in:
Piotr Caban 2008-07-08 21:00:20 +02:00 committed by Alexandre Julliard
parent 5b350582b9
commit 3fa75f49b4
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/msxml3/saxreader.c
View File

@ -49,6 +49,7 @@ typedef struct _saxreader
const struct IVBSAXXMLReaderVtbl *lpVtbl; const struct IVBSAXXMLReaderVtbl *lpVtbl;
const struct ISAXXMLReaderVtbl *lpSAXXMLReaderVtbl; const struct ISAXXMLReaderVtbl *lpSAXXMLReaderVtbl;
LONG ref; LONG ref;
struct ISAXContentHandler *contentHandler;
xmlSAXHandler sax; xmlSAXHandler sax;
} saxreader; } saxreader;
@ -111,6 +112,9 @@ static ULONG WINAPI saxxmlreader_Release(
ref = InterlockedDecrement( &This->ref ); ref = InterlockedDecrement( &This->ref );
if ( ref == 0 ) if ( ref == 0 )
{ {
if(This->contentHandler)
ISAXContentHandler_Release(This->contentHandler);
HeapFree( GetProcessHeap(), 0, This ); HeapFree( GetProcessHeap(), 0, This );
} }
@ -505,12 +509,8 @@ static HRESULT WINAPI isaxxmlreader_getContentHandler(
{ {
saxreader *This = impl_from_ISAXXMLReader( iface ); saxreader *This = impl_from_ISAXXMLReader( iface );
TRACE("(%p)->(%p)\n", This, pContentHandler); FIXME("(%p)->(%p) stub\n", This, pContentHandler);
if(This->contentHandler) return E_NOTIMPL;
ISAXContentHandler_AddRef(This->contentHandler);
*pContentHandler = This->contentHandler;
return S_OK;
} }
static HRESULT WINAPI isaxxmlreader_putContentHandler( static HRESULT WINAPI isaxxmlreader_putContentHandler(
@ -519,8 +519,14 @@ static HRESULT WINAPI isaxxmlreader_putContentHandler(
{ {
saxreader *This = impl_from_ISAXXMLReader( iface ); saxreader *This = impl_from_ISAXXMLReader( iface );
FIXME("(%p)->(%p) stub\n", This, contentHandler); TRACE("(%p)->(%p)\n", This, contentHandler);
return E_NOTIMPL; if(contentHandler)
ISAXContentHandler_AddRef(contentHandler);
if(This->contentHandler)
ISAXContentHandler_Release(This->contentHandler);
This->contentHandler = contentHandler;
return S_OK;
} }
static HRESULT WINAPI isaxxmlreader_getDTDHandler( static HRESULT WINAPI isaxxmlreader_getDTDHandler(
@ -661,6 +667,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj)
reader->lpVtbl = &saxreader_vtbl; reader->lpVtbl = &saxreader_vtbl;
reader->lpSAXXMLReaderVtbl = &isaxreader_vtbl; reader->lpSAXXMLReaderVtbl = &isaxreader_vtbl;
reader->ref = 1; reader->ref = 1;
reader->contentHandler = NULL;
*ppObj = &reader->lpVtbl; *ppObj = &reader->lpVtbl;