msxml: get_parseError
Huw D M Davies
h.davies1 at physics.ox.ac.uk
Tue Nov 8 05:42:49 CST 2005
Huw Davies <huw at codeweavers.com>
Implement get_parseError.
--
Huw Davies
huw at codeweavers.com
Index: dlls/msxml3/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/Makefile.in,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile.in
--- dlls/msxml3/Makefile.in 3 Sep 2005 09:39:39 -0000 1.7
+++ dlls/msxml3/Makefile.in 8 Nov 2005 11:39:41 -0000
@@ -15,7 +15,8 @@ C_SRCS = \
main.c \
node.c \
nodelist.c \
- nodemap.c
+ nodemap.c \
+ parseerror.c
SUBDIRS = tests
Index: dlls/msxml3/domdoc.c
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/domdoc.c,v
retrieving revision 1.15
diff -u -p -r1.15 domdoc.c
--- dlls/msxml3/domdoc.c 31 Oct 2005 21:04:31 -0000 1.15
+++ dlls/msxml3/domdoc.c 8 Nov 2005 11:39:41 -0000
@@ -757,8 +757,10 @@ static HRESULT WINAPI domdoc_get_parseEr
IXMLDOMDocument *iface,
IXMLDOMParseError** errorObj )
{
- FIXME("\n");
- return E_NOTIMPL;
+ FIXME("(%p)->(%p): creating a dummy parseError\n", iface, errorObj);
+ *errorObj = create_parseError(0, NULL, NULL, NULL, 0, 0, 0);
+ if(!*errorObj) return E_OUTOFMEMORY;
+ return S_OK;
}
Index: dlls/msxml3/msxml_private.h
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/msxml_private.h,v
retrieving revision 1.10
diff -u -p -r1.10 msxml_private.h
--- dlls/msxml3/msxml_private.h 3 Sep 2005 09:39:39 -0000 1.10
+++ dlls/msxml3/msxml_private.h 8 Nov 2005 11:39:41 -0000
@@ -47,6 +47,8 @@ extern BSTR bstr_from_xmlChar( const xml
#endif
+extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText,
+ LONG line, LONG linepos, LONG filepos );
extern HRESULT DOMDocument_create( IUnknown *pUnkOuter, LPVOID *ppObj );
#endif /* __MSXML_PRIVATE__ */
Index: dlls/msxml3/tests/domdoc.c
===================================================================
RCS file: /home/wine/wine/dlls/msxml3/tests/domdoc.c,v
retrieving revision 1.6
diff -u -p -r1.6 domdoc.c
--- dlls/msxml3/tests/domdoc.c 5 Nov 2005 10:42:45 -0000 1.6
+++ dlls/msxml3/tests/domdoc.c 8 Nov 2005 11:39:41 -0000
@@ -82,10 +82,12 @@ void test_domdoc( void )
{
HRESULT r;
IXMLDOMDocument *doc = NULL;
+ IXMLDOMParseError *error;
IXMLDOMElement *element = NULL;
VARIANT_BOOL b;
VARIANT var;
BSTR str;
+ long code;
r = CoCreateInstance( &CLSID_DOMDocument, NULL,
CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc );
@@ -225,6 +227,14 @@ void test_domdoc( void )
ok( b == VARIANT_TRUE, "failed to load XML string\n");
SysFreeString( str );
+ r = IXMLDOMDocument_get_parseError( doc, &error );
+ ok( r == S_OK, "returns %08lx\n", r );
+
+ r = IXMLDOMParseError_get_errorCode( error, &code );
+ ok( r == S_FALSE, "returns %08lx\n", r );
+ ok( code == 0, "code %ld\n", code );
+ IXMLDOMParseError_Release( error );
+
r = IXMLDocument_Release( doc );
ok( r == 0, "document ref count incorrect\n");
--- /dev/null 2004-02-23 21:02:56.000000000 +0000
+++ dlls/msxml3/parseerror.c 2005-11-08 11:39:28.792257227 +0000
@@ -0,0 +1,249 @@
+/*
+ * ParseError implementation
+ *
+ * Copyright 2005 Huw Davies
+ *
+ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+#define COBJMACROS
+
+#include <stdarg.h>
+#include <assert.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winuser.h"
+#include "ole2.h"
+#include "msxml.h"
+#include "xmldom.h"
+
+#include "msxml_private.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msxml);
+
+typedef struct
+{
+ const struct IXMLDOMParseErrorVtbl *lpVtbl;
+ LONG ref;
+ LONG code, line, linepos, filepos;
+ BSTR url, reason, srcText;
+} parse_error_t;
+
+static inline parse_error_t *impl_from_IXMLDOMParseError( IXMLDOMParseError *iface )
+{
+ return (parse_error_t *)((char*)iface - FIELD_OFFSET(parse_error_t, lpVtbl));
+}
+
+static HRESULT WINAPI parseError_QueryInterface(
+ IXMLDOMParseError *iface,
+ REFIID riid,
+ void** ppvObject )
+{
+ TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject);
+
+ if ( IsEqualGUID( riid, &IID_IUnknown ) ||
+ IsEqualGUID( riid, &IID_IDispatch ) ||
+ IsEqualGUID( riid, &IID_IXMLDOMParseError ) )
+ {
+ *ppvObject = iface;
+ }
+ else
+ return E_NOINTERFACE;
+
+ IXMLDOMParseError_AddRef( iface );
+
+ return S_OK;
+}
+
+static ULONG WINAPI parseError_AddRef(
+ IXMLDOMParseError *iface )
+{
+ parse_error_t *This = impl_from_IXMLDOMParseError( iface );
+ ULONG ref = InterlockedIncrement( &This->ref );
+ TRACE("(%p) ref now %ld\n", This, ref);
+ return ref;
+}
+
+static ULONG WINAPI parseError_Release(
+ IXMLDOMParseError *iface )
+{
+ parse_error_t *This = impl_from_IXMLDOMParseError( iface );
+ ULONG ref;
+
+ ref = InterlockedDecrement( &This->ref );
+ TRACE("(%p) ref now %ld\n", This, ref);
+ if ( ref == 0 )
+ {
+ SysFreeString(This->url);
+ SysFreeString(This->reason);
+ SysFreeString(This->srcText);
+ HeapFree( GetProcessHeap(), 0, This );
+ }
+
+ return ref;
+}
+
+static HRESULT WINAPI parseError_GetTypeInfoCount(
+ IXMLDOMParseError *iface,
+ UINT* pctinfo )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI parseError_GetTypeInfo(
+ IXMLDOMParseError *iface,
+ UINT iTInfo,
+ LCID lcid,
+ ITypeInfo** ppTInfo )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI parseError_GetIDsOfNames(
+ IXMLDOMParseError *iface,
+ REFIID riid,
+ LPOLESTR* rgszNames,
+ UINT cNames,
+ LCID lcid,
+ DISPID* rgDispId )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI parseError_Invoke(
+ IXMLDOMParseError *iface,
+ DISPID dispIdMember,
+ REFIID riid,
+ LCID lcid,
+ WORD wFlags,
+ DISPPARAMS* pDispParams,
+ VARIANT* pVarResult,
+ EXCEPINFO* pExcepInfo,
+ UINT* puArgErr )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI parseError_get_errorCode(
+ IXMLDOMParseError *iface,
+ LONG *code )
+{
+ parse_error_t *This = impl_from_IXMLDOMParseError( iface );
+ TRACE("(%p)->(%p)\n", This, code);
+
+ *code = This->code;
+
+ if(This->code == 0)
+ return S_FALSE;
+
+ return S_OK;
+}
+
+static HRESULT WINAPI parseError_get_url(
+ IXMLDOMParseError *iface,
+ BSTR *url )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI parseError_get_reason(
+ IXMLDOMParseError *iface,
+ BSTR *reason )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI parseError_get_srcText(
+ IXMLDOMParseError *iface,
+ BSTR *srcText )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI parseError_get_line(
+ IXMLDOMParseError *iface,
+ LONG *line )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI parseError_get_linepos(
+ IXMLDOMParseError *iface,
+ LONG *linepos )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI parseError_get_filepos(
+ IXMLDOMParseError *iface,
+ LONG *filepos )
+{
+ FIXME("\n");
+ return E_NOTIMPL;
+}
+
+static const struct IXMLDOMParseErrorVtbl parseError_vtbl =
+{
+ parseError_QueryInterface,
+ parseError_AddRef,
+ parseError_Release,
+ parseError_GetTypeInfoCount,
+ parseError_GetTypeInfo,
+ parseError_GetIDsOfNames,
+ parseError_Invoke,
+ parseError_get_errorCode,
+ parseError_get_url,
+ parseError_get_reason,
+ parseError_get_srcText,
+ parseError_get_line,
+ parseError_get_linepos,
+ parseError_get_filepos
+};
+
+IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText,
+ LONG line, LONG linepos, LONG filepos )
+{
+ parse_error_t *This;
+
+ This = HeapAlloc( GetProcessHeap(), 0, sizeof(*This) );
+ if ( !This )
+ return NULL;
+
+ This->lpVtbl = &parseError_vtbl;
+ This->ref = 1;
+
+ This->code = code;
+ This->url = url;
+ This->reason = reason;
+ This->srcText = srcText;
+ This->line = line;
+ This->linepos = linepos;
+ This->filepos = filepos;
+
+ return (IXMLDOMParseError*) &This->lpVtbl;
+}
More information about the wine-patches
mailing list