[PATCH] Added support for SAXXMLReader
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Mon Mar 24 22:19:10 CDT 2008
---
dlls/msxml3/Makefile.in | 1 +
dlls/msxml3/factory.c | 6 +
dlls/msxml3/msxml_private.h | 1 +
dlls/msxml3/saxreader.c | 378 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 386 insertions(+), 0 deletions(-)
create mode 100644 dlls/msxml3/saxreader.c
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index a75cd01..5b67030 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -26,6 +26,7 @@ C_SRCS = \
pi.c \
queryresult.c \
regsvr.c \
+ saxreader.c \
schema.c \
text.c \
uuid.c \
diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
index a973b04..cd0d108 100644
--- a/dlls/msxml3/factory.c
+++ b/dlls/msxml3/factory.c
@@ -133,6 +133,7 @@ static const struct IClassFactoryVtbl xmlcf_vtbl =
static xmlcf domdoccf = { &xmlcf_vtbl, DOMDocument_create };
static xmlcf schemacf = { &xmlcf_vtbl, SchemaCache_create };
static xmlcf xmldoccf = { &xmlcf_vtbl, XMLDocument_create };
+static xmlcf saxreadcf = { &xmlcf_vtbl, SAXXMLReader_create };
/******************************************************************
* DllGetClassObject (MSXML3.@)
@@ -162,6 +163,11 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv )
{
cf = (IClassFactory*) &domdoccf.lpVtbl;
}
+ else if( IsEqualCLSID( rclsid, &CLSID_SAXXMLReader) ||
+ IsEqualCLSID( rclsid, &CLSID_SAXXMLReader30 ))
+ {
+ cf = (IClassFactory*) &saxreadcf.lpVtbl;
+ }
if ( !cf )
return CLASS_E_CLASSNOTAVAILABLE;
diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
index 69214a3..5484d66 100644
--- a/dlls/msxml3/msxml_private.h
+++ b/dlls/msxml3/msxml_private.h
@@ -89,6 +89,7 @@ extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, B
extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj );
extern HRESULT SchemaCache_create( IUnknown *pUnkOuter, LPVOID *ppObj );
extern HRESULT XMLDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj );
+extern HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj );
/* typelibs */
enum tid_t {
diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c
new file mode 100644
index 0000000..0985986
--- /dev/null
+++ b/dlls/msxml3/saxreader.c
@@ -0,0 +1,378 @@
+/*
+ * SAX Reader implementation
+ *
+ * Copyright 2008 Alistair Leslie-Hughes
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+#define COBJMACROS
+
+#include "config.h"
+
+#include <stdarg.h>
+#include <assert.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "ole2.h"
+#include "msxml2.h"
+#include "wininet.h"
+#include "urlmon.h"
+#include "winreg.h"
+#include "shlwapi.h"
+
+#include "wine/debug.h"
+
+#include "msxml_private.h"
+
+#include "libxml/SAX2.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
+#ifdef HAVE_LIBXML2
+
+typedef struct _saxreader
+{
+ const struct IVBSAXXMLReaderVtbl *lpVtbl;
+ LONG ref;
+ xmlSAXHandler sax;
+} saxreader;
+
+static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface )
+{
+ return (saxreader *)((char*)iface - FIELD_OFFSET(saxreader, lpVtbl));
+};
+
+/*** IUnknown methods ***/
+static HRESULT WINAPI saxxmlreader_QueryInterface(IVBSAXXMLReader* iface, REFIID riid, void **ppvObject)
+{
+ saxreader *This = impl_from_IVBSAXXMLReader( iface );
+
+ TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject );
+
+ *ppvObject = NULL;
+
+ if ( IsEqualGUID( riid, &IID_IUnknown ) ||
+ IsEqualGUID( riid, &IID_IDispatch ) ||
+ IsEqualGUID( riid, &IID_IVBSAXXMLReader ))
+ {
+ *ppvObject = iface;
+ }
+ else
+ {
+ FIXME("interface %s not implemented\n", debugstr_guid(riid));
+ return E_NOINTERFACE;
+ }
+
+ IVBSAXXMLReader_AddRef( iface );
+
+ return S_OK;
+}
+
+static ULONG WINAPI saxxmlreader_AddRef(IVBSAXXMLReader* iface)
+{
+ saxreader *This = impl_from_IVBSAXXMLReader( iface );
+ TRACE("%p\n", This );
+ return InterlockedIncrement( &This->ref );
+}
+
+static ULONG WINAPI saxxmlreader_Release(
+ IVBSAXXMLReader* iface)
+{
+ saxreader *This = impl_from_IVBSAXXMLReader( iface );
+ LONG ref;
+
+ TRACE("%p\n", This );
+
+ ref = InterlockedDecrement( &This->ref );
+ if ( ref == 0 )
+ {
+ HeapFree( GetProcessHeap(), 0, This );
+ }
+
+ return ref;
+}
+/*** IDispatch ***/
+static HRESULT WINAPI saxxmlreader_GetTypeInfoCount( IVBSAXXMLReader *iface, UINT* pctinfo )
+{
+ saxreader *This = impl_from_IVBSAXXMLReader( iface );
+
+ TRACE("(%p)->(%p)\n", This, pctinfo);
+
+ *pctinfo = 1;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI saxxmlreader_GetTypeInfo(
+ IVBSAXXMLReader *iface,
+ UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo )
+{
+ saxreader *This = impl_from_IVBSAXXMLReader( iface );
+ HRESULT hr;
+
+ TRACE("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
+
+ hr = get_typeinfo(IVBSAXXMLReader_tid, ppTInfo);
+
+ return hr;
+}
+
+static HRESULT WINAPI saxxmlreader_GetIDsOfNames(
+ IVBSAXXMLReader *iface,
+ REFIID riid,
+ LPOLESTR* rgszNames,
+ UINT cNames,
+ LCID lcid,
+ DISPID* rgDispId)
+{
+ saxreader *This = impl_from_IVBSAXXMLReader( iface );
+ ITypeInfo *typeinfo;
+ HRESULT hr;
+
+ TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
+ lcid, rgDispId);
+
+ if(!rgszNames || cNames == 0 || !rgDispId)
+ return E_INVALIDARG;
+
+ hr = get_typeinfo(IVBSAXXMLReader_tid, &typeinfo);
+ if(SUCCEEDED(hr))
+ {
+ hr = ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId);
+ ITypeInfo_Release(typeinfo);
+ }
+
+ return hr;
+}
+
+static HRESULT WINAPI saxxmlreader_Invoke(
+ IVBSAXXMLReader *iface,
+ DISPID dispIdMember,
+ REFIID riid,
+ LCID lcid,
+ WORD wFlags,
+ DISPPARAMS* pDispParams,
+ VARIANT* pVarResult,
+ EXCEPINFO* pExcepInfo,
+ UINT* puArgErr)
+{
+ saxreader *This = impl_from_IVBSAXXMLReader( iface );
+ ITypeInfo *typeinfo;
+ HRESULT hr;
+
+ TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
+ lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
+
+ hr = get_typeinfo(IVBSAXXMLReader_tid, &typeinfo);
+ if(SUCCEEDED(hr))
+ {
+ hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams,
+ pVarResult, pExcepInfo, puArgErr);
+ ITypeInfo_Release(typeinfo);
+ }
+
+ return hr;
+}
+
+/*** IVBSAXXMLReader methods ***/
+static HRESULT WINAPI saxxmlreader_getFeature(
+ IVBSAXXMLReader* iface,
+ const WCHAR *pFeature,
+ VARIANT_BOOL *pValue)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_putFeature(
+ IVBSAXXMLReader* iface,
+ const WCHAR *pFeature,
+ VARIANT_BOOL vfValue)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_getProperty(
+ IVBSAXXMLReader* iface,
+ const WCHAR *pProp,
+ VARIANT *pValue)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_putProperty(
+ IVBSAXXMLReader* iface,
+ const WCHAR *pProp,
+ VARIANT value)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_getEntityResolver(
+ IVBSAXXMLReader* iface,
+ IVBSAXEntityResolver **pEntityResolver)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_putEntityResolver(
+ IVBSAXXMLReader* iface,
+ IVBSAXEntityResolver *pEntityResolver)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_getContentHandler(
+ IVBSAXXMLReader* iface,
+ IVBSAXContentHandler **ppContentHandler)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_putContentHandler(
+ IVBSAXXMLReader* iface,
+ IVBSAXContentHandler *contentHandler)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_getDTDHandler(
+ IVBSAXXMLReader* iface,
+ IVBSAXDTDHandler **pDTDHandler)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_putDTDHandler(
+ IVBSAXXMLReader* iface,
+ IVBSAXDTDHandler *pDTDHandler)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_getErrorHandler(
+ IVBSAXXMLReader* iface,
+ IVBSAXErrorHandler **pErrorHandler)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_putErrorHandler(
+ IVBSAXXMLReader* iface,
+ IVBSAXErrorHandler *errorHandler)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_getBaseURL(
+ IVBSAXXMLReader* iface,
+ const WCHAR **pBaseUrl)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_putBaseURL(
+ IVBSAXXMLReader* iface,
+ const WCHAR *pBaseUrl)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_getSecureBaseURL(
+ IVBSAXXMLReader* iface,
+ const WCHAR **pSecureBaseUrl)
+{
+ return E_NOTIMPL;
+}
+
+
+static HRESULT WINAPI saxxmlreader_putSecureBaseURL(
+ IVBSAXXMLReader* iface,
+ const WCHAR *secureBaseUrl)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_parse(
+ IVBSAXXMLReader* iface,
+ VARIANT varInput)
+{
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI saxxmlreader_parseURL(
+ IVBSAXXMLReader* iface,
+ const WCHAR *url)
+{
+ return E_NOTIMPL;
+}
+
+static const struct IVBSAXXMLReaderVtbl saxreader_vtbl =
+{
+ saxxmlreader_QueryInterface,
+ saxxmlreader_AddRef,
+ saxxmlreader_Release,
+ saxxmlreader_GetTypeInfoCount,
+ saxxmlreader_GetTypeInfo,
+ saxxmlreader_GetIDsOfNames,
+ saxxmlreader_Invoke,
+ saxxmlreader_getFeature,
+ saxxmlreader_putFeature,
+ saxxmlreader_getProperty,
+ saxxmlreader_putProperty,
+ saxxmlreader_getEntityResolver,
+ saxxmlreader_putEntityResolver,
+ saxxmlreader_getContentHandler,
+ saxxmlreader_putContentHandler,
+ saxxmlreader_getDTDHandler,
+ saxxmlreader_putDTDHandler,
+ saxxmlreader_getErrorHandler,
+ saxxmlreader_putErrorHandler,
+ saxxmlreader_getBaseURL,
+ saxxmlreader_putBaseURL,
+ saxxmlreader_getSecureBaseURL,
+ saxxmlreader_putSecureBaseURL,
+ saxxmlreader_parse,
+ saxxmlreader_parseURL
+};
+
+HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj)
+{
+ saxreader *reader;
+
+ TRACE("(%p,%p)\n", pUnkOuter, ppObj);
+
+ reader = HeapAlloc( GetProcessHeap(), 0, sizeof (*reader) );
+ if( !reader )
+ return E_OUTOFMEMORY;
+
+ reader->lpVtbl = &saxreader_vtbl;
+ reader->ref = 1;
+
+ TRACE("returning iface %p\n", *ppObj);
+ return S_OK;
+}
+
+#else
+
+HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj)
+{
+ MESSAGE("This program tried to use a SAX XML Reader object, but\n"
+ "libxml2 support was not present at compile time.\n");
+ return E_NOTIMPL;
+}
+
+#endif
--
1.5.4.1
--------------040809070208050401050804--
More information about the wine-patches
mailing list