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

msxml3: Support creating IXMLParser Interface.

This commit is contained in:
Alistair Leslie-Hughes 2011-08-30 20:13:11 +10:00 committed by Alexandre Julliard
parent 83daee9a89
commit 5df9ff3aa9
7 changed files with 517 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/msxml3/Makefile.in
View File

@ -34,7 +34,8 @@ C_SRCS = \
uuid.c \
xdr.c \
xmldoc.c \
xmlelem.c
xmlelem.c \
xmlparser.c
LEX_SRCS = xslpattern.l
@ -44,6 +45,8 @@ RC_SRCS = \
schemas.rc \
version.rc
IDL_R_SRCS = xmlparser.idl
IDL_H_SRCS = xmlparser.idl
IDL_TLB_SRCS = msxml3_v1.idl

8
dlls/msxml3/factory.c
View File

@ -35,6 +35,7 @@
#include "ole2.h"
#include "msxml.h"
#include "msxml2.h"
#include "xmlparser.h"
/* undef the #define in msxml2 so that we can access the v.2 version
independent CLSID as well as the v.3 one. */
@ -270,6 +271,7 @@ static ClassFactory saxreadcf = { { &ClassFactoryVtbl }, SAXXMLReader_create };
static ClassFactory httpreqcf = { { &ClassFactoryVtbl }, XMLHTTPRequest_create };
static ClassFactory xsltemplatecf = { { &ClassFactoryVtbl }, XSLTemplate_create };
static ClassFactory mxnsmanagercf = { {&ClassFactoryVtbl }, MXNamespaceManager_create };
static ClassFactory xmlparsercf = { { &ClassFactoryVtbl }, XMLParser_create };
/******************************************************************
* DllGetClassObject (MSXML3.@)
@ -347,6 +349,12 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv )
{
cf = &mxnsmanagercf.IClassFactory_iface;
}
else if( IsEqualCLSID( rclsid, &CLSID_XMLParser ) ||
IsEqualCLSID( rclsid, &CLSID_XMLParser26 ) ||
IsEqualCLSID( rclsid, &CLSID_XMLParser30 ) )
{
cf = &xmlparsercf.IClassFactory_iface;
}
if ( !cf )
return CLASS_E_CLASSNOTAVAILABLE;

1
dlls/msxml3/msxml_private.h
View File

@ -438,6 +438,7 @@ extern HRESULT XMLHTTPRequest_create(IUnknown*, void **) DECLSPEC_HIDDEN;
extern HRESULT XSLTemplate_create(IUnknown*, void**) DECLSPEC_HIDDEN;
extern HRESULT MXWriter_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN;
extern HRESULT MXNamespaceManager_create(IUnknown*,void**) DECLSPEC_HIDDEN;
extern HRESULT XMLParser_create(IUnknown*,void**) DECLSPEC_HIDDEN;
static inline const CLSID* DOMDocument_version(MSXML_VERSION v)
{

3
dlls/msxml3/tests/Makefile.in
View File

@ -5,6 +5,7 @@ C_SRCS = \
domdoc.c \
saxreader.c \
schema.c \
xmldoc.c
xmldoc.c \
xmlparser.c
@MAKE_TEST_RULES@

62
dlls/msxml3/tests/xmlparser.c Normal file
View File

@ -0,0 +1,62 @@
/*
* XML Parser implementation
*
* Copyright 2011 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
#define CONST_VTABLE
#include <stdio.h>
#include <assert.h>
#include "windows.h"
#include "ole2.h"
#include "initguid.h"
#include "wine/test.h"
DEFINE_GUID(IID_IXMLParser, 0xd242361e, 0x51a0, 0x11d2, 0x9c,0xaf, 0x00,0x60,0xb0,0xec,0x3d,0x39);
DEFINE_GUID(CLSID_XMLParser30, 0xf5078f31, 0xc551, 0x11d3, 0x89,0xb9, 0x00,0x00,0xf8,0x1f,0xe2,0x21);
static void create_test(void)
{
HRESULT hr;
IUnknown *parser;
hr = CoCreateInstance(&CLSID_XMLParser30, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLParser, (void**)&parser);
if (FAILED(hr))
{
win_skip("IXMLParser is not available (0x%08x)\n", hr);
return;
}
IUnknown_Release(parser);
}
START_TEST(xmlparser)
{
HRESULT hr;
hr = CoInitialize( NULL );
ok( hr == S_OK, "failed to init com\n");
if (hr != S_OK)
return;
create_test();
CoUninitialize();
}

421
dlls/msxml3/xmlparser.c Normal file
View File

@ -0,0 +1,421 @@
/*
* XML Parser implementation
*
* Copyright 2011 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>
#ifdef HAVE_LIBXML2
# include <libxml/parser.h>
# include <libxml/xmlerror.h>
# include <libxml/HTMLtree.h>
#endif
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "ole2.h"
#include "msxml6.h"
#include "msxml_private.h"
#include "initguid.h"
#include "xmlparser.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(msxml);
typedef struct _xmlparser
{
IXMLParser IXMLParser_iface;
LONG ref;
} xmlparser;
static inline xmlparser *impl_from_IXMLParser( IXMLParser *iface )
{
return CONTAINING_RECORD(iface, xmlparser, IXMLParser_iface);
}
/*** IUnknown methods ***/
static HRESULT WINAPI xmlparser_QueryInterface(IXMLParser* iface, REFIID riid, void **ppvObject)
{
xmlparser *This = impl_from_IXMLParser( iface );
TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject);
if ( IsEqualGUID( riid, &IID_IXMLParser ) ||
IsEqualGUID( riid, &IID_IXMLNodeSource ) ||
IsEqualGUID( riid, &IID_IUnknown ) )
{
*ppvObject = iface;
}
else
{
TRACE("Unsupported interface %s\n", debugstr_guid(riid));
*ppvObject = NULL;
return E_NOINTERFACE;
}
IXMLParser_AddRef((IUnknown*)*ppvObject);
return S_OK;
}
static ULONG WINAPI xmlparser_AddRef(IXMLParser* iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
ULONG ref = InterlockedIncrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref);
return ref;
}
static ULONG WINAPI xmlparser_Release(IXMLParser* iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
ULONG ref = InterlockedDecrement( &This->ref );
TRACE("(%p)->(%d)\n", This, ref);
if ( ref == 0 )
{
heap_free( This );
}
return ref;
}
/*** IXMLNodeSource methods ***/
static HRESULT WINAPI xmlparser_SetFactory(IXMLParser *iface, IXMLNodeFactory *pNodeFactory)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %p)\n", This, pNodeFactory);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_GetFactory(IXMLParser *iface, IXMLNodeFactory **ppNodeFactory)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p, %p)\n", This, ppNodeFactory);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_Abort(IXMLParser *iface, BSTR bstrErrorInfo)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p, %s)\n", This, debugstr_w(bstrErrorInfo));
return E_NOTIMPL;
}
static ULONG WINAPI xmlparser_GetLineNumber(IXMLParser *iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p)\n", This);
return 0;
}
static ULONG WINAPI xmlparser_GetLinePosition(IXMLParser *iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p)\n", This);
return 0;
}
static ULONG WINAPI xmlparser_GetAbsolutePosition(IXMLParser *iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p)\n", This);
return 0;
}
static HRESULT WINAPI xmlparser_GetLineBuffer(IXMLParser *iface, const WCHAR **ppBuf,
ULONG *len, ULONG *startPos)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %p %p %p)\n", This, ppBuf, len, startPos);
return 0;
}
static HRESULT WINAPI xmlparser_GetLastError(IXMLParser *iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p)\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_GetErrorInfo(IXMLParser *iface, BSTR *pErrorInfo)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %p)\n", This, pErrorInfo);
return E_NOTIMPL;
}
static ULONG WINAPI xmlparser_GetFlags(IXMLParser *iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p)\n", This);
return 0;
}
static HRESULT WINAPI xmlparser_GetURL(IXMLParser *iface, const WCHAR **ppBuf)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %p)\n", This, ppBuf);
return E_NOTIMPL;
}
/*** IXMLParser methods ***/
static HRESULT WINAPI xmlparser_SetURL(IXMLParser *iface,const WCHAR *pszBaseUrl,
const WCHAR *relativeUrl, BOOL async)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %s %s %d)\n", This, debugstr_w(pszBaseUrl), debugstr_w(relativeUrl), async);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_Load(IXMLParser *iface, BOOL bFullyAvailable,
IMoniker *pMon, LPBC pBC, DWORD dwMode)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %d %p %p %d)\n", This, bFullyAvailable, pMon, pBC, dwMode);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_SetInput(IXMLParser *iface, IUnknown *pStm)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %p)\n", This, pStm);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_PushData(IXMLParser *iface, const char *pData,
ULONG nChars, BOOL fLastBuffer)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %s %d %d)\n", This, debugstr_a(pData), nChars, fLastBuffer);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_LoadDTD(IXMLParser *iface, const WCHAR *baseUrl,
const WCHAR *relativeUrl)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %s %s)\n", This, debugstr_w(baseUrl), debugstr_w(relativeUrl));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_LoadEntity(IXMLParser *iface, const WCHAR *baseUrl,
const WCHAR *relativeUrl, BOOL fpe)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %s %s %d)\n", This, debugstr_w(baseUrl), debugstr_w(relativeUrl), fpe);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_ParseEntity(IXMLParser *iface, const WCHAR *text,
ULONG len, BOOL fpe)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %s %d %d)\n", This, debugstr_w(text), len, fpe);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_ExpandEntity(IXMLParser *iface, const WCHAR *text,
ULONG len)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %s %d)\n", This, debugstr_w(text), len);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_SetRoot(IXMLParser *iface, PVOID pRoot)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %p)\n", This, pRoot);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_GetRoot( IXMLParser *iface, PVOID *ppRoot)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %p)\n", This, ppRoot);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_Run(IXMLParser *iface, LONG chars)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %d)\n", This, chars);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_GetParserState(IXMLParser *iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p)\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_Suspend(IXMLParser *iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p)\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_Reset(IXMLParser *iface)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p)\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_SetFlags(IXMLParser *iface, ULONG flags)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %d)\n", This, flags);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_SetSecureBaseURL(IXMLParser *iface, const WCHAR *baseUrl)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %s)\n", This, debugstr_w(baseUrl));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlparser_GetSecureBaseURL( IXMLParser *iface, const WCHAR **ppBuf)
{
xmlparser *This = impl_from_IXMLParser( iface );
FIXME("(%p %p)\n", This, ppBuf);
return E_NOTIMPL;
}
static const struct IXMLParserVtbl xmlparser_vtbl =
{
xmlparser_QueryInterface,
xmlparser_AddRef,
xmlparser_Release,
xmlparser_SetFactory,
xmlparser_GetFactory,
xmlparser_Abort,
xmlparser_GetLineNumber,
xmlparser_GetLinePosition,
xmlparser_GetAbsolutePosition,
xmlparser_GetLineBuffer,
xmlparser_GetLastError,
xmlparser_GetErrorInfo,
xmlparser_GetFlags,
xmlparser_GetURL,
xmlparser_SetURL,
xmlparser_Load,
xmlparser_SetInput,
xmlparser_PushData,
xmlparser_LoadDTD,
xmlparser_LoadEntity,
xmlparser_ParseEntity,
xmlparser_ExpandEntity,
xmlparser_SetRoot,
xmlparser_GetRoot,
xmlparser_Run,
xmlparser_GetParserState,
xmlparser_Suspend,
xmlparser_Reset,
xmlparser_SetFlags,
xmlparser_SetSecureBaseURL,
xmlparser_GetSecureBaseURL
};
HRESULT XMLParser_create(IUnknown* pUnkOuter, void**ppObj)
{
xmlparser *This;
TRACE("(%p,%p)\n", pUnkOuter, ppObj);
if (pUnkOuter)
FIXME("support aggregation, outer\n");
This = heap_alloc( sizeof(xmlparser) );
if(!This)
return E_OUTOFMEMORY;
This->IXMLParser_iface.lpVtbl = &xmlparser_vtbl;
This->ref = 1;
*ppObj = &This->IXMLParser_iface;
TRACE("returning iface %p\n", *ppObj);
return S_OK;
}

24
dlls/msxml3/xmlparser.idl
View File

@ -324,9 +324,15 @@ interface IXMLParser : IXMLNodeSource
HRESULT GetSecureBaseURL([out] const WCHAR** ppwcBuf);
};
}
[
uuid(f5078f19-c551-11d3-89b9-0000f81fe221)
helpstring("XML Parser"),
uuid(f5078f19-c551-11d3-89b9-0000f81fe221),
threading(both),
progid("Msxml2.XMLParser"),
vi_progid("Msxml2.XMLParser"),
version(3.0)
]
coclass XMLParser
{
@ -334,7 +340,12 @@ coclass XMLParser
};
[
uuid(f5078f20-c551-11d3-89b9-0000f81fe221)
helpstring("XML Parser 2.6"),
uuid(f5078f20-c551-11d3-89b9-0000f81fe221),
threading(both),
progid("Msxml2.XMLParser.2.6"),
vi_progid("Msxml2.XMLParser"),
version(2.6)
]
coclass XMLParser26
{
@ -342,11 +353,14 @@ coclass XMLParser26
};
[
uuid(f5078f31-c551-11d3-89b9-0000f81fe221)
helpstring("XML Parser 3.0"),
uuid(f5078f31-c551-11d3-89b9-0000f81fe221),
threading(both),
progid("Msxml2.XMLParser.3.0"),
vi_progid("Msxml2.XMLParser"),
version(3.0)
]
coclass XMLParser30
{
[default] interface IXMLParser;
};
}