Module: wine Branch: master Commit: 354bd532915205e48ef08c2f26445de09439345f URL: http://source.winehq.org/git/wine.git/?a=commit;h=354bd532915205e48ef08c2f26...
Author: Hans Leidekker hans@codeweavers.com Date: Thu Oct 22 11:30:11 2015 +0200
webservices: Implement WsSetOutputToBuffer.
Signed-off-by: Hans Leidekker hans@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 82 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 4 deletions(-)
diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index c070d2f..4a8b88e 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -155,7 +155,7 @@ @ stub WsSetListenerProperty @ stub WsSetMessageProperty @ stdcall WsSetOutput(ptr ptr ptr ptr long ptr) -@ stub WsSetOutputToBuffer +@ stdcall WsSetOutputToBuffer(ptr ptr ptr long ptr) @ stub WsSetReaderPosition @ stub WsSetWriterPosition @ stub WsShutdownSessionChannel diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 821b082..5523926 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -57,7 +57,11 @@ writer_props[] =
struct writer { + ULONG write_pos; + char *write_bufptr; WS_XML_WRITER_OUTPUT_TYPE output_type; + struct xmlbuf *output_buf; + WS_HEAP *output_heap; ULONG prop_count; WS_XML_WRITER_PROPERTY prop[sizeof(writer_props)/sizeof(writer_props[0])]; }; @@ -102,6 +106,12 @@ static HRESULT get_writer_prop( struct writer *writer, WS_XML_WRITER_PROPERTY_ID return S_OK; }
+static void free_writer( struct writer *writer ) +{ + WsFreeHeap( writer->output_heap ); + heap_free( writer ); +} + /************************************************************************** * WsCreateWriter [webservices.@] */ @@ -132,11 +142,25 @@ HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG c hr = set_writer_prop( writer, properties[i].id, properties[i].value, properties[i].valueSize ); if (hr != S_OK) { - heap_free( writer ); + free_writer( writer ); return hr; } }
+ hr = get_writer_prop( writer, WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, &max_size, sizeof(max_size) ); + if (hr != S_OK) + { + free_writer( writer ); + return hr; + } + + hr = WsCreateHeap( max_size, 0, NULL, 0, &writer->output_heap, NULL ); + if (hr != S_OK) + { + free_writer( writer ); + return hr; + } + *handle = (WS_XML_WRITER *)writer; return S_OK; } @@ -149,7 +173,7 @@ void WINAPI WsFreeWriter( WS_XML_WRITER *handle ) struct writer *writer = (struct writer *)handle;
TRACE( "%p\n", handle ); - heap_free( writer ); + free_writer( writer ); }
#define XML_BUFFER_INITIAL_ALLOCATED_SIZE 256 @@ -169,6 +193,13 @@ static struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap ) return ret; }
+static void free_xmlbuf( struct xmlbuf *xmlbuf ) +{ + if (!xmlbuf) return; + ws_free( xmlbuf->heap, xmlbuf->ptr ); + ws_free( xmlbuf->heap, xmlbuf ); +} + /************************************************************************** * WsCreateXmlBuffer [webservices.@] */ @@ -201,6 +232,19 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT return get_writer_prop( writer, id, buf, size ); }
+static void set_output_buffer( struct writer *writer, struct xmlbuf *xmlbuf ) +{ + /* free current buffer if it's ours */ + if (writer->output_buf && writer->output_buf->heap == writer->output_heap) + { + free_xmlbuf( writer->output_buf ); + } + writer->output_buf = xmlbuf; + writer->output_type = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; + writer->write_bufptr = xmlbuf->ptr; + writer->write_pos = 0; +} + /************************************************************************** * WsSetOutput [webservices.@] */ @@ -217,6 +261,12 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING
if (!writer) return E_INVALIDARG;
+ for (i = 0; i < count; i++) + { + hr = set_writer_prop( writer, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) return hr; + } + switch (encoding->encodingType) { case WS_XML_WRITER_ENCODING_TYPE_TEXT: @@ -236,18 +286,44 @@ HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING switch (output->outputType) { case WS_XML_WRITER_OUTPUT_TYPE_BUFFER: - writer->output_type = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; + { + struct xmlbuf *xmlbuf; + + if (!(xmlbuf = alloc_xmlbuf( writer->output_heap ))) return E_OUTOFMEMORY; + set_output_buffer( writer, xmlbuf ); break; + } default: FIXME( "output type %u not supported\n", output->outputType ); return E_NOTIMPL; }
+ return S_OK; +} + +/************************************************************************** + * WsSetOutputToBuffer [webservices.@] + */ +HRESULT WINAPI WsSetOutputToBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, + const WS_XML_WRITER_PROPERTY *properties, ULONG count, + WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + struct xmlbuf *xmlbuf = (struct xmlbuf *)buffer; + HRESULT hr; + ULONG i; + + TRACE( "%p %p %p %u %p\n", handle, buffer, properties, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !xmlbuf) return E_INVALIDARG; + for (i = 0; i < count; i++) { hr = set_writer_prop( writer, properties[i].id, properties[i].value, properties[i].valueSize ); if (hr != S_OK) return hr; }
+ set_output_buffer( writer, xmlbuf ); return S_OK; }