Nikolay Sivov : xmllite: Support external IMalloc for writer.
Alexandre Julliard
julliard at winehq.org
Tue May 13 14:23:46 CDT 2014
Module: wine
Branch: master
Commit: e58070ab833717daa7d56b5cbd73297b765686f5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e58070ab833717daa7d56b5cbd73297b765686f5
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Tue May 13 17:54:48 2014 +0400
xmllite: Support external IMalloc for writer.
---
dlls/xmllite/tests/writer.c | 4 ++--
dlls/xmllite/writer.c | 38 ++++++++++++++++++++++++++++----------
2 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c
index f182aeb..b5935c1 100644
--- a/dlls/xmllite/tests/writer.c
+++ b/dlls/xmllite/tests/writer.c
@@ -76,10 +76,10 @@ static void test_writer_create(void)
if (0)
{
pCreateXmlWriter(&IID_IXmlWriter, NULL, NULL);
- pCreateXmlWriter(NULL, (LPVOID*)&writer, NULL);
+ pCreateXmlWriter(NULL, (void**)&writer, NULL);
}
- hr = pCreateXmlWriter(&IID_IXmlWriter, (LPVOID*)&writer, NULL);
+ hr = pCreateXmlWriter(&IID_IXmlWriter, (void**)&writer, NULL);
ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);
IXmlWriter_Release(writer);
}
diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c
index a0e2703..5266049 100644
--- a/dlls/xmllite/writer.c
+++ b/dlls/xmllite/writer.c
@@ -47,6 +47,7 @@ typedef struct _xmlwriter
{
IXmlWriter IXmlWriter_iface;
LONG ref;
+ IMalloc *imalloc;
} xmlwriter;
static inline xmlwriter *impl_from_IXmlWriter(IXmlWriter *iface)
@@ -59,7 +60,7 @@ static inline xmlwriteroutput *impl_from_IXmlWriterOutput(IXmlWriterOutput *ifac
return CONTAINING_RECORD(iface, xmlwriteroutput, IXmlWriterOutput_iface);
}
-/* reader input memory allocation functions */
+/* writer output memory allocation functions */
static inline void *writeroutput_alloc(xmlwriteroutput *output, size_t len)
{
return m_alloc(output->imalloc, len);
@@ -70,6 +71,17 @@ static inline void writeroutput_free(xmlwriteroutput *output, void *mem)
m_free(output->imalloc, mem);
}
+/* writer memory allocation functions */
+static inline void *writer_alloc(xmlwriter *writer, size_t len)
+{
+ return m_alloc(writer->imalloc, len);
+}
+
+static inline void writer_free(xmlwriter *writer, void *mem)
+{
+ m_free(writer->imalloc, mem);
+}
+
static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, void **ppvObject)
{
xmlwriter *This = impl_from_IXmlWriter(iface);
@@ -102,8 +114,11 @@ static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface)
TRACE("%p\n", This);
ref = InterlockedDecrement(&This->ref);
- if (ref == 0)
- heap_free(This);
+ if (ref == 0) {
+ IMalloc *imalloc = This->imalloc;
+ writer_free(This, This);
+ if (imalloc) IMalloc_Release(imalloc);
+ }
return ref;
}
@@ -470,13 +485,11 @@ static const struct IUnknownVtbl xmlwriteroutputvtbl =
xmlwriteroutput_Release
};
-HRESULT WINAPI CreateXmlWriter(REFIID riid, void **pObject, IMalloc *pMalloc)
+HRESULT WINAPI CreateXmlWriter(REFIID riid, void **obj, IMalloc *imalloc)
{
xmlwriter *writer;
- 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_IXmlWriter))
{
@@ -484,15 +497,20 @@ HRESULT WINAPI CreateXmlWriter(REFIID riid, void **pObject, IMalloc *pMalloc)
return E_FAIL;
}
- writer = heap_alloc(sizeof(*writer));
+ if (imalloc)
+ writer = IMalloc_Alloc(imalloc, sizeof(*writer));
+ else
+ writer = heap_alloc(sizeof(*writer));
if(!writer) return E_OUTOFMEMORY;
writer->IXmlWriter_iface.lpVtbl = &xmlwriter_vtbl;
writer->ref = 1;
+ writer->imalloc = imalloc;
+ if (imalloc) IMalloc_AddRef(imalloc);
- *pObject = &writer->IXmlWriter_iface;
+ *obj = &writer->IXmlWriter_iface;
- TRACE("returning iface %p\n", *pObject);
+ TRACE("returning iface %p\n", *obj);
return S_OK;
}
More information about the wine-cvs
mailing list