system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-20 01:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

xmllite: Support application defined IMalloc for reader.

Browse source
This commit is contained in:
Nikolay Sivov 2012-11-17 11:22:47 -05:00 committed by Alexandre Julliard
parent 3e23b5e589
commit c88cdc6e38
2 changed files with 74 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
dlls/xmllite/reader.c
View file

@ -26,6 +26,7 @@
#include "initguid.h"
#include "objbase.h"
#include "xmllite.h"
#include "xmllite_private.h"
#include "wine/debug.h"
@ -43,6 +44,7 @@ typedef struct _xmlreader
IXmlReaderInput *input;
ISequentialStream *stream;/* stored as sequential stream, cause currently
optimizations possible with IStream aren't implemented */
IMalloc *imalloc;
XmlReadState state;
DtdProcessing dtdmode;
UINT line, pos; /* reader position in XML stream */
@ -65,6 +67,23 @@ static inline xmlreaderinput *impl_from_IXmlReaderInput(IXmlReaderInput *iface)
return CONTAINING_RECORD(iface, xmlreaderinput, IXmlReaderInput_iface);
}
/* reader memory allocation functions */
static inline void *reader_alloc(xmlreader *reader, size_t len)
{
if (reader->imalloc)
return IMalloc_Alloc(reader->imalloc, len);
else
return heap_alloc(len);
}
static inline void reader_free(xmlreader *reader, void *mem)
{
if (reader->imalloc)
IMalloc_Free(reader->imalloc, mem);
else
heap_free(mem);
}
static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, void** ppvObject)
{
xmlreader *This = impl_from_IXmlReader(iface);
@ -90,23 +109,25 @@ static HRESULT WINAPI xmlreader_QueryInterface(IXmlReader *iface, REFIID riid, v
static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface)
{
xmlreader *This = impl_from_IXmlReader(iface);
TRACE("%p\n", This);
return InterlockedIncrement(&This->ref);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p)->(%d)\n", This, ref);
return ref;
}
static ULONG WINAPI xmlreader_Release(IXmlReader *iface)
{
xmlreader *This = impl_from_IXmlReader(iface);
LONG ref;
LONG ref = InterlockedDecrement(&This->ref);
TRACE("%p\n", This);
TRACE("(%p)->(%d)\n", This, ref);
ref = InterlockedDecrement(&This->ref);
if (ref == 0)
{
IMalloc *imalloc = This->imalloc;
if (This->input) IUnknown_Release(This->input);
if (This->stream) ISequentialStream_Release(This->stream);
HeapFree(GetProcessHeap(), 0, This);
reader_free(This, This);
if (imalloc) IMalloc_Release(imalloc);
}
return ref;
@ -438,7 +459,7 @@ static ULONG WINAPI xmlreaderinput_Release(IXmlReaderInput *iface)
if (ref == 0)
{
if (This->input) IUnknown_Release(This->input);
HeapFree(GetProcessHeap(), 0, This);
heap_free(This);
}
return ref;
@ -451,13 +472,11 @@ static const struct IUnknownVtbl xmlreaderinput_vtbl =
xmlreaderinput_Release
};
HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc)
HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc)
{
xmlreader *reader;
TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), pObject, pMalloc);
if (pMalloc) FIXME("custom IMalloc not supported yet\n");
TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc);
if (!IsEqualGUID(riid, &IID_IXmlReader))
{
@ -465,7 +484,10 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc)
return E_FAIL;
}
reader = HeapAlloc(GetProcessHeap(), 0, sizeof (*reader));
if (imalloc)
reader = IMalloc_Alloc(imalloc, sizeof(*reader));
else
reader = heap_alloc(sizeof(*reader));
if(!reader) return E_OUTOFMEMORY;
reader->IXmlReader_iface.lpVtbl = &xmlreader_vtbl;
@ -475,10 +497,12 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **pObject, IMalloc *pMalloc)
reader->state = XmlReadState_Closed;
reader->dtdmode = DtdProcessing_Prohibit;
reader->line = reader->pos = 0;
reader->imalloc = imalloc;
if (imalloc) IMalloc_AddRef(imalloc);
*pObject = &reader->IXmlReader_iface;
*obj = &reader->IXmlReader_iface;
TRACE("returning iface %p\n", *pObject);
TRACE("returning iface %p\n", *obj);
return S_OK;
}
@ -497,7 +521,7 @@ HRESULT WINAPI CreateXmlReaderInputWithEncodingName(IUnknown *stream,
if (!stream || !ppInput) return E_INVALIDARG;
readerinput = HeapAlloc(GetProcessHeap(), 0, sizeof (*readerinput));
readerinput = heap_alloc(sizeof(*readerinput));
if(!readerinput) return E_OUTOFMEMORY;
readerinput->IXmlReaderInput_iface.lpVtbl = &xmlreaderinput_vtbl;

35
dlls/xmllite/xmllite_private.h Normal file
View file

@ -0,0 +1,35 @@
/*
* XMLLite private things
*
* Copyright 2012 Nikolay Sivov for CodeWeavers
*
* 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
*/
#ifndef __XMLLITE_PRIVATE__
#define __XMLLITE_PRIVATE__
/* memory allocation functions */
static inline void *heap_alloc(size_t len)
{
return HeapAlloc(GetProcessHeap(), 0, len);
}
static inline BOOL heap_free(void *mem)
{
return HeapFree(GetProcessHeap(), 0, mem);
}
#endif /* __XMLLITE_PRIVATE__ */