[XMLLITE]

- Sync to Wine 1.3.37

svn path=/trunk/; revision=56189
This commit is contained in:
Rafal Harabien 2012-03-19 15:17:34 +00:00
parent b13b27b51a
commit 8de2ad3d83
6 changed files with 486 additions and 10 deletions

View file

@ -6,6 +6,7 @@ spec2def(xmllite.dll xmllite.spec ADD_IMPORTLIB)
list(APPEND SOURCE
reader.c
writer.c
xmllite_main.c
#${REACTOS_BINARY_DIR}/include/psdk/xmllite_i.c
${CMAKE_CURRENT_BINARY_DIR}/xmllite_stubs.c

View file

@ -38,7 +38,7 @@ static HRESULT xmlreaderinput_query_for_stream(IXmlReaderInput *iface, void **pO
typedef struct _xmlreader
{
const IXmlReaderVtbl *lpVtbl;
IXmlReader IXmlReader_iface;
LONG ref;
IXmlReaderInput *input;
ISequentialStream *stream;/* stored as sequential stream, cause currently
@ -49,19 +49,19 @@ typedef struct _xmlreader
typedef struct _xmlreaderinput
{
const IUnknownVtbl *lpVtbl;
IXmlReaderInput IXmlReaderInput_iface;
LONG ref;
IUnknown *input; /* reference passed on IXmlReaderInput creation */
} xmlreaderinput;
static inline xmlreader *impl_from_IXmlReader(IXmlReader *iface)
{
return (xmlreader *)((char*)iface - FIELD_OFFSET(xmlreader, lpVtbl));
return CONTAINING_RECORD(iface, xmlreader, IXmlReader_iface);
}
static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface)
{
return (xmlreaderinput *)((char*)iface - FIELD_OFFSET(xmlreaderinput, lpVtbl));
return CONTAINING_RECORD(iface, xmlreaderinput, IXmlReaderInput_iface);
}
static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject)
@ -450,14 +450,14 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc)
reader = HeapAlloc(GetProcessHeap(), 0, sizeof (*reader));
if(!reader) return E_OUTOFMEMORY;
reader->lpVtbl = &xmlreader_vtbl;
reader->IXmlReader_iface.lpVtbl = &xmlreader_vtbl;
reader->ref = 1;
reader->stream = NULL;
reader->input = NULL;
reader->state = XmlReadState_Closed;
reader->line = reader->pos = 0;
*pObject = &reader->lpVtbl;
*pObject = &reader->IXmlReader_iface;
TRACE("returning iface %p\n", *pObject);
@ -481,11 +481,11 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream,
readerinput = HeapAlloc(GetProcessHeap(), 0, sizeof (*readerinput));
if(!readerinput) return E_OUTOFMEMORY;
readerinput->lpVtbl = &xmlreaderinput_vtbl;
readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl;
readerinput->ref = 1;
IUnknown_QueryInterface(stream, &IID_IUnknown, (void**)&readerinput->input);
*ppInput = (IXmlReaderInput*)&readerinput->lpVtbl;
*ppInput = &readerinput->IXmlReaderInput_iface;
TRACE("returning iface %p\n", *ppInput);

View file

@ -0,0 +1,413 @@
/*
* IXmlWriter 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 <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "objbase.h"
#include "xmllite.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(xmllite);
typedef struct _xmlwriter
{
IXmlWriter IXmlWriter_iface;
LONG ref;
} xmlwriter;
static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface)
{
return CONTAINING_RECORD(iface, xmlwriter, IXmlWriter_iface);
}
static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject);
if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_IXmlWriter))
{
*ppvObject = iface;
}
IXmlWriter_AddRef(iface);
return S_OK;
}
static ULONG WINAPI xmlwriter_AddRef(IXmlWriter *iface)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
TRACE("%p\n", This);
return InterlockedIncrement(&This->ref);
}
static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
LONG ref;
TRACE("%p\n", This);
ref = InterlockedDecrement(&This->ref);
if (ref == 0)
{
HeapFree(GetProcessHeap(), 0, This);
}
return ref;
}
/*** IXmlWriter methods ***/
static HRESULT WINAPI xmlwriter_SetOutput(IXmlWriter *iface, IUnknown *pOutput)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %p\n", This, pOutput);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_GetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR *ppValue)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %u %p\n", This, nProperty, ppValue);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_SetProperty(IXmlWriter *iface, UINT nProperty, LONG_PTR pValue)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %u %lu\n", This, nProperty, pValue);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteAttributes(IXmlWriter *iface, IXmlReader *pReader,
BOOL fWriteDefaultAttributes)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %p %d\n", This, pReader, fWriteDefaultAttributes);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteAttributeString(IXmlWriter *iface, LPCWSTR pwszPrefix,
LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri,
LPCWSTR pwszValue)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName),
wine_dbgstr_w(pwszNamespaceUri), wine_dbgstr_w(pwszValue));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteCData(IXmlWriter *iface, LPCWSTR pwszText)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s\n", This, wine_dbgstr_w(pwszText));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteCharEntity(IXmlWriter *iface, WCHAR wch)
{
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteChars(IXmlWriter *iface, const WCHAR *pwch, UINT cwch)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s %d\n", This, wine_dbgstr_w(pwch), cwch);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteComment(IXmlWriter *iface, LPCWSTR pwszComment)
{
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteDocType(IXmlWriter *iface, LPCWSTR pwszName, LPCWSTR pwszPublicId,
LPCWSTR pwszSystemId, LPCWSTR pwszSubset)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszName), wine_dbgstr_w(pwszPublicId),
wine_dbgstr_w(pwszSystemId), wine_dbgstr_w(pwszSubset));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteElementString(IXmlWriter *iface, LPCWSTR pwszPrefix,
LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri,
LPCWSTR pwszValue)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName),
wine_dbgstr_w(pwszNamespaceUri), wine_dbgstr_w(pwszValue));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteEndDocument(IXmlWriter *iface)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteEndElement(IXmlWriter *iface)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteEntityRef(IXmlWriter *iface, LPCWSTR pwszName)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s\n", This, wine_dbgstr_w(pwszName));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteFullEndElement(IXmlWriter *iface)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteName(IXmlWriter *iface, LPCWSTR pwszName)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s\n", This, wine_dbgstr_w(pwszName));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteNmToken(IXmlWriter *iface, LPCWSTR pwszNmToken)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s\n", This, wine_dbgstr_w(pwszNmToken));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteNode(IXmlWriter *iface, IXmlReader *pReader,
BOOL fWriteDefaultAttributes)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %p %d\n", This, pReader, fWriteDefaultAttributes);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteNodeShallow(IXmlWriter *iface, IXmlReader *pReader,
BOOL fWriteDefaultAttributes)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %p %d\n", This, pReader, fWriteDefaultAttributes);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteProcessingInstruction(IXmlWriter *iface, LPCWSTR pwszName,
LPCWSTR pwszText)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s %s\n", This, wine_dbgstr_w(pwszName), wine_dbgstr_w(pwszText));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteQualifiedName(IXmlWriter *iface, LPCWSTR pwszLocalName,
LPCWSTR pwszNamespaceUri)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s %s\n", This, wine_dbgstr_w(pwszLocalName), wine_dbgstr_w(pwszNamespaceUri));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteRaw(IXmlWriter *iface, LPCWSTR pwszData)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s\n", This, wine_dbgstr_w(pwszData));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteRawChars(IXmlWriter *iface, const WCHAR *pwch, UINT cwch)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s %d\n", This, wine_dbgstr_w(pwch), cwch);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteStartDocument(IXmlWriter *iface, XmlStandalone standalone)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p\n", This);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteStartElement(IXmlWriter *iface, LPCWSTR pwszPrefix,
LPCWSTR pwszLocalName, LPCWSTR pwszNamespaceUri)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s %s %s\n", This, wine_dbgstr_w(pwszPrefix), wine_dbgstr_w(pwszLocalName),
wine_dbgstr_w(pwszNamespaceUri));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteString(IXmlWriter *iface, LPCWSTR pwszText)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s\n", This, wine_dbgstr_w(pwszText));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteSurrogateCharEntity(IXmlWriter *iface, WCHAR wchLow, WCHAR wchHigh)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %d %d\n", This, wchLow, wchHigh);
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_WriteWhitespace(IXmlWriter *iface, LPCWSTR pwszWhitespace)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p %s\n", This, wine_dbgstr_w(pwszWhitespace));
return E_NOTIMPL;
}
static HRESULT WINAPI xmlwriter_Flush(IXmlWriter *iface)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
FIXME("%p\n", This);
return E_NOTIMPL;
}
static const struct IXmlWriterVtbl xmlwriter_vtbl =
{
xmlwriter_QueryInterface,
xmlwriter_AddRef,
xmlwriter_Release,
xmlwriter_SetOutput,
xmlwriter_GetProperty,
xmlwriter_SetProperty,
xmlwriter_WriteAttributes,
xmlwriter_WriteAttributeString,
xmlwriter_WriteCData,
xmlwriter_WriteCharEntity,
xmlwriter_WriteChars,
xmlwriter_WriteComment,
xmlwriter_WriteDocType,
xmlwriter_WriteElementString,
xmlwriter_WriteEndDocument,
xmlwriter_WriteEndElement,
xmlwriter_WriteEntityRef,
xmlwriter_WriteFullEndElement,
xmlwriter_WriteName,
xmlwriter_WriteNmToken,
xmlwriter_WriteNode,
xmlwriter_WriteNodeShallow,
xmlwriter_WriteProcessingInstruction,
xmlwriter_WriteQualifiedName,
xmlwriter_WriteRaw,
xmlwriter_WriteRawChars,
xmlwriter_WriteStartDocument,
xmlwriter_WriteStartElement,
xmlwriter_WriteString,
xmlwriter_WriteSurrogateCharEntity,
xmlwriter_WriteWhitespace,
xmlwriter_Flush
};
HRESULT WINAPI CreateXmlWriter(REFIID riid, void **pObject, IMalloc *pMalloc)
{
xmlwriter *writer;
TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc);
if (pMalloc) FIXME("custom IMalloc not supported yet\n");
if (!IsEqualGUID(riid, &IID_IXmlWriter))
{
ERR("Unexpected IID requested -> (%s)\n", wine_dbgstr_guid(riid));
return E_FAIL;
}
writer = HeapAlloc(GetProcessHeap(), 0, sizeof (*writer));
if(!writer) return E_OUTOFMEMORY;
writer->IXmlWriter_iface.lpVtbl = &xmlwriter_vtbl;
writer->ref = 1;
*pObject = &writer->IXmlWriter_iface;
TRACE("returning iface %p\n", *pObject);
return S_OK;
}

View file

@ -1,6 +1,6 @@
@ stdcall CreateXmlReader(ptr ptr ptr)
@ stub CreateXmlReaderInputWithEncodingCodePage
@ stdcall CreateXmlReaderInputWithEncodingName(ptr ptr ptr long ptr ptr)
@ stub CreateXmlWriter
@ stdcall CreateXmlWriter(ptr ptr ptr)
@ stub CreateXmlWriterOutputWithEncodingCodePage
@ stub CreateXmlWriterOutputWithEncodingName

View file

@ -109,3 +109,65 @@ cpp_quote("typedef IUnknown IXmlReaderInput;")
cpp_quote("STDAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream, IMalloc *pMalloc,")
cpp_quote(" LPCWSTR encoding, BOOL hint,")
cpp_quote(" LPCWSTR base_uri, IXmlReaderInput **ppInput);")
typedef enum XmlStandalone
{
XmlStandalone_Omit,
XmlStandalone_Yes,
XmlStandalone_No,
_XmlStandalone_Last = XmlStandalone_No
} XmlStandalone;
typedef enum XmlWriterProperty
{
XmlWriterProperty_MultiLanguage,
XmlWriterProperty_Indent,
XmlWriterProperty_ByteOrderMark,
XmlWriterProperty_OmitXmlDeclaration,
XmlWriterProperty_ConformanceLevel,
_XmlWriterProperty_Last = XmlWriterProperty_OmitXmlDeclaration
} XmlWriterProperty;
/* IXmlWriter */
[
local,
object,
uuid(7279FC88-709D-4095-B63D-69FE4B0D9030),
pointer_default(unique)
]
interface IXmlWriter : IUnknown
{
HRESULT SetOutput([in] IUnknown *pOutput);
HRESULT GetProperty([in] UINT nProperty, [out] LONG_PTR *ppValue);
HRESULT SetProperty([in] UINT nProperty, [in] LONG_PTR pValue);
HRESULT WriteAttributes([in] IXmlReader *pReader, [in] BOOL fWriteDefaultAttributes);
HRESULT WriteAttributeString([in] LPCWSTR pwszPrefix, [in] LPCWSTR pwszLocalName,
[in] LPCWSTR pwszNamespaceUri, [in] LPCWSTR pwszValue);
HRESULT WriteCData([in] LPCWSTR pwszText);
HRESULT WriteCharEntity([in] WCHAR wch);
HRESULT WriteChars([in] const WCHAR *pwch, [in] UINT cwch);
HRESULT WriteComment([in] LPCWSTR pwszComment);
HRESULT WriteDocType([in] LPCWSTR pwszName, [in] LPCWSTR pwszPublicId,
[in] LPCWSTR pwszSystemId, [in] LPCWSTR pwszSubset);
HRESULT WriteElementString([in] LPCWSTR pwszPrefix, [in] LPCWSTR pwszLocalName,
[in] LPCWSTR pwszNamespaceUri, [in] LPCWSTR pwszValue);
HRESULT WriteEndDocument();
HRESULT WriteEndElement();
HRESULT WriteEntityRef([in] LPCWSTR pwszName);
HRESULT WriteFullEndElement();
HRESULT WriteName([in] LPCWSTR pwszName);
HRESULT WriteNmToken([in] LPCWSTR pwszNmToken);
HRESULT WriteNode([in] IXmlReader *pReader, [in] BOOL fWriteDefaultAttributes);
HRESULT WriteNodeShallow([in] IXmlReader *pReader, [in] BOOL fWriteDefaultAttributes);
HRESULT WriteProcessingInstruction([in] LPCWSTR pwszName, [in] LPCWSTR pwszText);
HRESULT WriteQualifiedName([in] LPCWSTR pwszLocalName, [in] LPCWSTR pwszNamespaceUri);
HRESULT WriteRaw([in] LPCWSTR pwszData);
HRESULT WriteRawChars([in] const WCHAR *pwch, [in] UINT cwch);
HRESULT WriteStartDocument([in] XmlStandalone standalone);
HRESULT WriteStartElement([in] LPCWSTR pwszPrefix, [in] LPCWSTR pwszLocalName,
[in] LPCWSTR pwszNamespaceUri);
HRESULT WriteString([in] LPCWSTR pwszText);
HRESULT WriteSurrogateCharEntity([in] WCHAR wchLow, [in] WCHAR wchHigh);
HRESULT WriteWhitespace([in] LPCWSTR pwszWhitespace);
HRESULT Flush();
}

View file

@ -188,7 +188,7 @@ reactos/dll/win32/xinput1_1 # Synced to Wine-1.3.37
reactos/dll/win32/xinput1_2 # Synced to Wine-1.3.37
reactos/dll/win32/xinput1_3 # Autosync
reactos/dll/win32/xinput9_1_0 # Synced to Wine-1.3.37
reactos/dll/win32/xmllite # Autosync
reactos/dll/win32/xmllite # Synced to Wine-1.3.37
reactos/dll/cpl/inetcpl # Synced to Wine-1.3.21