October 2015 - Wine-commits

Hans Leidekker : webservices: Accept single quote as attribute value delimiter.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 63e0b485168e483c75694a212d46842038139001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e0b485168e483c75694a212… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:03 2015 +0200 webservices: Accept single quote as attribute value delimiter. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 8 +++++--- dlls/webservices/tests/reader.c | 23 +++++++++++++++++++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a8990d8..f85b5e7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -746,7 +746,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) { WS_XML_ATTRIBUTE *attr; WS_XML_UTF8_TEXT *text; - unsigned int len = 0, ch, skip; + unsigned int len = 0, ch, skip, quote; const char *start; HRESULT hr = WS_E_INVALID_FORMAT; @@ -775,7 +775,8 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) read_skip( reader, 1 ); read_skip_whitespace( reader ); - if (read_cmp( reader, "\"", 1 )) goto error; + if (read_cmp( reader, "\"", 1 ) && read_cmp( reader, "'", 1 )) goto error; + quote = read_utf8_char( reader, &skip ); read_skip( reader, 1 ); len = 0; @@ -783,7 +784,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) for (;;) { if (!(ch = read_utf8_char( reader, &skip ))) goto error; - if (ch == '"') break; + if (ch == quote) break; read_skip( reader, skip ); len += skip; } @@ -795,6 +796,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) return E_OUTOFMEMORY; } attr->value = (WS_XML_TEXT *)text; + attr->singleQuote = (quote == '\''); *ret = attr; return S_OK; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 0d32864..f4ac601 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -50,7 +50,7 @@ static const char data5[] = static const char data6[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" - "<text attr= \"value\" >test</text>"; + "<text attr= \"value\" attr2='value2'>test</text>"; static const char data8[] = "<node1><node2>test</node2></node1>"; @@ -872,7 +872,7 @@ static void test_WsReadNode(void) ok( elem->ns != NULL, "ns not set\n" ); ok( !elem->ns->length, "got %u\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 2, "got %u\n", elem->attributeCount ); ok( elem->attributes != NULL, "attributes not set\n" ); ok( !elem->isEmpty, "isEmpty not zero\n" ); @@ -894,6 +894,25 @@ static void test_WsReadNode(void) ok( attr->value->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", attr->value->textType ); ok( text->value.length == 5, "got %u\n", text->value.length ); ok( !memcmp( text->value.bytes, "value", 5 ), "wrong data\n" ); + + attr = elem->attributes[1]; + ok( attr->singleQuote == 1, "got %u\n", attr->singleQuote ); + ok( !attr->isXmlNs, "got %u\n", attr->isXmlNs ); + ok( attr->prefix != NULL, "prefix not set\n" ); + ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( attr->prefix->bytes == NULL, "bytes set\n" ); + ok( attr->localName != NULL, "localName not set\n" ); + ok( attr->localName->length == 5, "got %u\n", attr->localName->length ); + ok( !memcmp( attr->localName->bytes, "attr2", 5 ), "wrong data\n" ); + ok( attr->ns != NULL, "ns not set\n" ); + ok( !attr->ns->length, "got %u\n", attr->ns->length ); + ok( attr->ns->bytes == NULL, "bytes set\n" ); + ok( attr->value != NULL, "value not set\n" ); + + text = (WS_XML_UTF8_TEXT *)attr->value; + ok( attr->value->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", attr->value->textType ); + ok( text->value.length == 6, "got %u\n", text->value.length ); + ok( !memcmp( text->value.bytes, "value2", 6 ), "wrong data\n" ); } WsFreeReader( reader );

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 11c0f05ac98912316e8ab6895b14b09d6a1eb90c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c0f05ac98912316e8ab6895… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:04 2015 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/include/webservices.h b/include/webservices.h index d9d1052..7d9a0e2 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -27,6 +27,7 @@ typedef struct _WS_ERROR WS_ERROR; typedef struct _WS_HEAP WS_HEAP; typedef struct _WS_XML_BUFFER WS_XML_BUFFER; typedef struct _WS_XML_READER WS_XML_READER; +typedef struct _WS_XML_WRITER WS_XML_WRITER; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -81,6 +82,44 @@ typedef struct _WS_XML_READER_PROPERTY { } WS_XML_READER_PROPERTY; typedef enum { + WS_XML_WRITER_PROPERTY_MAX_DEPTH, + WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT, + WS_XML_WRITER_PROPERTY_MAX_ATTRIBUTES, + WS_XML_WRITER_PROPERTY_WRITE_DECLARATION, + WS_XML_WRITER_PROPERTY_INDENT, + WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE, + WS_XML_WRITER_PROPERTY_CHARSET, + WS_XML_WRITER_PROPERTY_BUFFERS, + WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, + WS_XML_WRITER_PROPERTY_BYTES, + WS_XML_WRITER_PROPERTY_IN_ATTRIBUTE, + WS_XML_WRITER_PROPERTY_MAX_MIME_PARTS_BUFFER_SIZE, + WS_XML_WRITER_PROPERTY_INITIAL_BUFFER, + WS_XML_WRITER_PROPERTY_ALLOW_INVALID_CHARACTER_REFERENCES, + WS_XML_WRITER_PROPERTY_MAX_NAMESPACES, + WS_XML_WRITER_PROPERTY_BYTES_WRITTEN, + WS_XML_WRITER_PROPERTY_BYTES_TO_CLOSE, + WS_XML_WRITER_PROPERTY_COMPRESS_EMPTY_ELEMENTS, + WS_XML_WRITER_PROPERTY_EMIT_UNCOMPRESSED_EMPTY_ELEMENTS +} WS_XML_WRITER_PROPERTY_ID; + +typedef struct _WS_XML_WRITER_PROPERTY { + WS_XML_WRITER_PROPERTY_ID id; + void *value; + ULONG valueSize; +} WS_XML_WRITER_PROPERTY; + +typedef struct _WS_BYTES { + ULONG length; + BYTE *bytes; +} WS_BYTES; + +typedef struct _WS_BUFFERS { + ULONG bufferCount; + WS_BYTES *buffers; +} WS_BUFFERS; + +typedef enum { WS_XML_READER_ENCODING_TYPE_TEXT = 1, WS_XML_READER_ENCODING_TYPE_BINARY = 2, WS_XML_READER_ENCODING_TYPE_MTOM = 3, @@ -92,6 +131,17 @@ typedef struct _WS_XML_READER_ENCODING { } WS_XML_READER_ENCODING; typedef enum { + WS_XML_WRITER_ENCODING_TYPE_TEXT = 1, + WS_XML_WRITER_ENCODING_TYPE_BINARY = 2, + WS_XML_WRITER_ENCODING_TYPE_MTOM = 3, + WS_XML_WRITER_ENCODING_TYPE_RAW = 4 +} WS_XML_WRITER_ENCODING_TYPE; + +typedef struct _WS_XML_WRITER_ENCODING { + WS_XML_WRITER_ENCODING_TYPE encodingType; +} WS_XML_WRITER_ENCODING; + +typedef enum { WS_CHARSET_AUTO, WS_CHARSET_UTF8, WS_CHARSET_UTF16LE, @@ -103,21 +153,39 @@ typedef struct _WS_XML_READER_TEXT_ENCODING { WS_CHARSET charSet; } WS_XML_READER_TEXT_ENCODING; +typedef struct _WS_XML_WRITER_TEXT_ENCODING { + WS_XML_WRITER_ENCODING encoding; + WS_CHARSET charSet; +} WS_XML_WRITER_TEXT_ENCODING; + typedef enum { WS_XML_READER_INPUT_TYPE_BUFFER = 1, WS_XML_READER_INPUT_TYPE_STREAM = 2 } WS_XML_READER_INPUT_TYPE; +typedef enum { + WS_XML_WRITER_OUTPUT_TYPE_BUFFER = 1, + WS_XML_WRITER_OUTPUT_TYPE_STREAM = 2 +} WS_XML_WRITER_OUTPUT_TYPE; + typedef struct _WS_XML_READER_INPUT { WS_XML_READER_INPUT_TYPE inputType; } WS_XML_READER_INPUT; +typedef struct _WS_XML_WRITER_OUTPUT { + WS_XML_WRITER_OUTPUT_TYPE outputType; +} WS_XML_WRITER_OUTPUT; + typedef struct _WS_XML_READER_BUFFER_INPUT { WS_XML_READER_INPUT input; void *encodedData; ULONG encodedDataSize; } WS_XML_READER_BUFFER_INPUT; +typedef struct _WS_XML_WRITER_BUFFER_OUTPUT { + WS_XML_WRITER_OUTPUT output; +} WS_XML_WRITER_BUFFER_OUTPUT; + typedef enum { WS_SHORT_CALLBACK, WS_LONG_CALLBACK @@ -208,6 +276,13 @@ typedef enum { } WS_READ_OPTION; typedef enum { + WS_WRITE_REQUIRED_VALUE = 1, + WS_WRITE_REQUIRED_POINTER = 2, + WS_WRITE_NILLABLE_VALUE = 3, + WS_WRITE_NILLABLE_POINTER = 4 +} WS_WRITE_OPTION; + +typedef enum { WS_TYPE_ATTRIBUTE_FIELD_MAPPING, WS_ATTRIBUTE_FIELD_MAPPING, WS_ELEMENT_FIELD_MAPPING, @@ -233,6 +308,15 @@ typedef struct _WS_ITEM_RANGE { ULONG maxItemCount; } WS_ITEM_RANGE; +enum +{ + WS_FIELD_POINTER = 0x1, + WS_FIELD_OPTIONAL = 0x2, + WS_FIELD_NILLABLE = 0x4, + WS_FIELD_NILLABLE_ITEM = 0x8, + WS_FIELD_OTHER_NAMESPACE = 0x10 +}; + typedef struct _WS_FIELD_DESCRIPTION { WS_FIELD_MAPPING mapping; WS_XML_STRING *localName; @@ -248,6 +332,13 @@ typedef struct _WS_FIELD_DESCRIPTION { WS_ITEM_RANGE *itemRange; } WS_FIELD_DESCRIPTION; +enum +{ + WS_STRUCT_ABSTRACT = 0x1, + WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT = 0x2, + WS_STRUCT_IGNORE_UNHANDLED_ATTRIBUTES = 0x4 +}; + typedef struct _WS_STRUCT_DESCRIPTION { ULONG size; ULONG alignment; @@ -353,18 +444,21 @@ typedef struct _WS_XML_NODE_POSITION { HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY*, ULONG, WS_ERROR**); HRESULT WINAPI WsCreateHeap(SIZE_T, SIZE_T, const WS_HEAP_PROPERTY*, ULONG, WS_HEAP**, WS_ERROR*); HRESULT WINAPI WsCreateReader(const WS_XML_READER_PROPERTY*, ULONG, WS_XML_READER**, WS_ERROR*); +HRESULT WINAPI WsCreateWriter(const WS_XML_WRITER_PROPERTY*, ULONG, WS_XML_WRITER**, WS_ERROR*); HRESULT WINAPI WsFillReader(WS_XML_READER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFindAttribute(WS_XML_READER*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, ULONG*, WS_ERROR*); void WINAPI WsFreeError(WS_ERROR*); void WINAPI WsFreeHeap(WS_HEAP*); void WINAPI WsFreeReader(WS_XML_READER*); +void WINAPI WsFreeWriter(WS_XML_WRITER*); HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetReaderNode(WS_XML_READER*, const WS_XML_NODE**, WS_ERROR*); HRESULT WINAPI WsGetReaderPosition(WS_XML_READER*, WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsGetReaderProperty(WS_XML_READER*, WS_XML_READER_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetWriterProperty(WS_XML_WRITER*, WS_XML_WRITER_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetXmlAttribute(WS_XML_READER*, const WS_XML_STRING*, WS_HEAP*, WCHAR**, ULONG*, WS_ERROR*); HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_READ_OPTION, @@ -380,7 +474,10 @@ HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, HRESULT WINAPI WsSetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, const void*, ULONG); HRESULT WINAPI WsSetInput(WS_XML_READER*, const WS_XML_READER_ENCODING*, const WS_XML_READER_INPUT*, const WS_XML_READER_PROPERTY*, ULONG, WS_ERROR*); - +HRESULT WINAPI WsSetOutput(WS_XML_WRITER*, const WS_XML_WRITER_ENCODING*, const WS_XML_WRITER_OUTPUT*, + const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteType(WS_XML_WRITER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_WRITE_OPTION, + const void*, ULONG, WS_ERROR*); #define WS_S_ASYNC 0x003d0000 #define WS_S_END 0x003d0001

1 0

Hans Leidekker : webservices: Implement WsCreateWriter and WsFreeWriter.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 65e04e006e8902ac90eecb8267c57ad7b2dc93fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e04e006e8902ac90eecb826… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:05 2015 +0200 webservices: Implement WsCreateWriter and WsFreeWriter. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/Makefile.in | 3 +- dlls/webservices/reader.c | 21 +---- dlls/webservices/webservices.spec | 4 +- dlls/webservices/webservices_private.h | 37 +++++++++ dlls/webservices/writer.c | 143 +++++++++++++++++++++++++++++++++ 5 files changed, 185 insertions(+), 23 deletions(-) diff --git a/dlls/webservices/Makefile.in b/dlls/webservices/Makefile.in index e11a2e7..c3fea85 100644 --- a/dlls/webservices/Makefile.in +++ b/dlls/webservices/Makefile.in @@ -3,4 +3,5 @@ IMPORTLIB = webservices C_SRCS = \ main.c \ - reader.c + reader.c \ + writer.c diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index f85b5e7..ac61890 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -25,6 +25,7 @@ #include "wine/debug.h" #include "wine/list.h" +#include "webservices_private.h" WINE_DEFAULT_DEBUG_CHANNEL(webservices); @@ -34,26 +35,6 @@ static const char *debugstr_xmlstr( const WS_XML_STRING *str ) return debugstr_an( (const char *)str->bytes, str->length ); } -static inline void *heap_alloc( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), 0, size ); -} - -static inline void *heap_alloc_zero( SIZE_T size ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); -} - -static inline void *heap_realloc( void *mem, SIZE_T size ) -{ - return HeapReAlloc( GetProcessHeap(), 0, mem, size ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - static const struct { ULONG size; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 85014bf..a8e82ec 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -34,7 +34,7 @@ @ stub WsCreateServiceHost @ stub WsCreateServiceProxy @ stub WsCreateServiceProxyFromTemplate -@ stub WsCreateWriter +@ stdcall WsCreateWriter(ptr long ptr ptr) @ stub WsCreateXmlBuffer @ stub WsCreateXmlSecurityToken @ stub WsDateTimeToFileTime @@ -58,7 +58,7 @@ @ stub WsFreeSecurityToken @ stub WsFreeServiceHost @ stub WsFreeServiceProxy -@ stub WsFreeWriter +@ stdcall WsFreeWriter(ptr) @ stub WsGetChannelProperty @ stub WsGetCustomHeader @ stub WsGetDictionary diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h new file mode 100644 index 0000000..20d3f0b --- /dev/null +++ b/dlls/webservices/webservices_private.h @@ -0,0 +1,37 @@ +/* + * Copyright 2015 Hans Leidekker 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 + */ + +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline void *heap_alloc_zero( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); +} + +static inline void *heap_realloc( void *mem, SIZE_T size ) +{ + return HeapReAlloc( GetProcessHeap(), 0, mem, size ); +} + +static inline BOOL heap_free( void *mem ) +{ + return HeapFree( GetProcessHeap(), 0, mem ); +} diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c new file mode 100644 index 0000000..e9147fc --- /dev/null +++ b/dlls/webservices/writer.c @@ -0,0 +1,143 @@ +/* + * Copyright 2015 Hans Leidekker 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 + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "webservices.h" + +#include "wine/debug.h" +#include "webservices_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(webservices); + +static const struct +{ + ULONG size; + BOOL readonly; +} +writer_props[] = +{ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_MAX_DEPTH */ + { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT */ + { sizeof(ULONG), FALSE }, /* WS_XML_READER_PROPERTY_MAX_ATTRIBUTES */ + { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_WRITE_DECLARATION */ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_INDENT */ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE */ + { sizeof(WS_CHARSET), FALSE }, /* WS_XML_WRITER_PROPERTY_CHARSET */ + { sizeof(WS_BUFFERS), FALSE }, /* WS_XML_WRITER_PROPERTY_BUFFERS */ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE */ + { sizeof(WS_BYTES), FALSE }, /* WS_XML_WRITER_PROPERTY_BYTES */ + { sizeof(BOOL), TRUE }, /* WS_XML_WRITER_PROPERTY_IN_ATTRIBUTE */ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_MAX_MIME_PARTS_BUFFER_SIZE */ + { sizeof(WS_BYTES), FALSE }, /* WS_XML_WRITER_PROPERTY_INITIAL_BUFFER */ + { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_ALLOW_INVALID_CHARACTER_REFERENCES */ + { sizeof(ULONG), FALSE }, /* WS_XML_WRITER_PROPERTY_MAX_NAMESPACES */ + { sizeof(ULONG), TRUE }, /* WS_XML_WRITER_PROPERTY_BYTES_WRITTEN */ + { sizeof(ULONG), TRUE }, /* WS_XML_WRITER_PROPERTY_BYTES_TO_CLOSE */ + { sizeof(BOOL), FALSE }, /* WS_XML_WRITER_PROPERTY_COMPRESS_EMPTY_ELEMENTS */ + { sizeof(BOOL), FALSE } /* WS_XML_WRITER_PROPERTY_EMIT_UNCOMPRESSED_EMPTY_ELEMENTS */ +}; + +struct writer +{ + ULONG prop_count; + WS_XML_WRITER_PROPERTY prop[sizeof(writer_props)/sizeof(writer_props[0])]; +}; + +static struct writer *alloc_writer(void) +{ + static const ULONG count = sizeof(writer_props)/sizeof(writer_props[0]); + struct writer *ret; + ULONG i, size = sizeof(*ret) + count * sizeof(WS_XML_WRITER_PROPERTY); + char *ptr; + + for (i = 0; i < count; i++) size += writer_props[i].size; + if (!(ret = heap_alloc_zero( size ))) return NULL; + + ptr = (char *)&ret->prop[count]; + for (i = 0; i < count; i++) + { + ret->prop[i].value = ptr; + ret->prop[i].valueSize = writer_props[i].size; + ptr += ret->prop[i].valueSize; + } + ret->prop_count = count; + return ret; +} + +static HRESULT set_writer_prop( struct writer *writer, WS_XML_WRITER_PROPERTY_ID id, const void *value, + ULONG size ) +{ + if (id >= writer->prop_count || size != writer_props[id].size || writer_props[id].readonly) + return E_INVALIDARG; + + memcpy( writer->prop[id].value, value, size ); + return S_OK; +} + +/************************************************************************** + * WsCreateWriter [webservices.@] + */ +HRESULT WINAPI WsCreateWriter( const WS_XML_WRITER_PROPERTY *properties, ULONG count, + WS_XML_WRITER **handle, WS_ERROR *error ) +{ + struct writer *writer; + ULONG i, max_depth = 32, max_attrs = 128, trim_size = 4096, max_size = 65536, max_ns = 32; + WS_CHARSET charset = WS_CHARSET_UTF8; + HRESULT hr; + + TRACE( "%p %u %p %p\n", properties, count, handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle) return E_INVALIDARG; + if (!(writer = alloc_writer())) return E_OUTOFMEMORY; + + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, sizeof(max_depth) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_MAX_ATTRIBUTES, &max_attrs, sizeof(max_attrs) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE, &trim_size, sizeof(trim_size) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_CHARSET, &charset, sizeof(charset) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, &max_size, sizeof(max_size) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_MAX_MIME_PARTS_BUFFER_SIZE, &max_size, sizeof(max_size) ); + set_writer_prop( writer, WS_XML_WRITER_PROPERTY_MAX_NAMESPACES, &max_ns, sizeof(max_ns) ); + + for (i = 0; i < count; i++) + { + hr = set_writer_prop( writer, properties[i].id, properties[i].value, properties[i].valueSize ); + if (hr != S_OK) + { + heap_free( writer ); + return hr; + } + } + + *handle = (WS_XML_WRITER *)writer; + return S_OK; +} + +/************************************************************************** + * WsFreeWriter [webservices.@] + */ +void WINAPI WsFreeWriter( WS_XML_WRITER *handle ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p\n", handle ); + heap_free( writer ); +}

1 0

Hans Leidekker : webservices: Implement WsGetWriterProperty.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 9dfe9ec8bb3a6a26e5d2bcc8e0553b1d27707eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dfe9ec8bb3a6a26e5d2bcc8e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:06 2015 +0200 webservices: Implement WsGetWriterProperty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index a8e82ec..0a77d45 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -88,7 +88,7 @@ @ stub WsGetServiceHostProperty @ stub WsGetServiceProxyProperty @ stub WsGetWriterPosition -@ stub WsGetWriterProperty +@ stdcall WsGetWriterProperty(ptr long ptr long ptr) @ stub WsGetXmlAttribute @ stub WsInitializeMessage @ stub WsMarkHeaderAsUnderstood diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index e9147fc..51711e4 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -92,6 +92,15 @@ static HRESULT set_writer_prop( struct writer *writer, WS_XML_WRITER_PROPERTY_ID return S_OK; } +static HRESULT get_writer_prop( struct writer *writer, WS_XML_WRITER_PROPERTY_ID id, void *buf, ULONG size ) +{ + if (id >= writer->prop_count || size != writer_props[id].size) + return E_INVALIDARG; + + memcpy( buf, writer->prop[id].value, writer->prop[id].valueSize ); + return S_OK; +} + /************************************************************************** * WsCreateWriter [webservices.@] */ @@ -141,3 +150,17 @@ void WINAPI WsFreeWriter( WS_XML_WRITER *handle ) TRACE( "%p\n", handle ); heap_free( writer ); } + +/************************************************************************** + * WsGetWriterProperty [webservices.@] + */ +HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERTY_ID id, + void *buf, ULONG size, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + return get_writer_prop( writer, id, buf, size ); +}

1 0

Hans Leidekker : webservices: Implement WsSetOutput.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 8c3bf0e95e8a9ab2f4b3396f0d3d97524098dfd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3bf0e95e8a9ab2f4b3396f0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:07 2015 +0200 webservices: Implement WsSetOutput. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 53 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 0a77d45..15c2c89 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -154,7 +154,7 @@ @ stub WsSetInputToBuffer @ stub WsSetListenerProperty @ stub WsSetMessageProperty -@ stub WsSetOutput +@ stdcall WsSetOutput(ptr ptr ptr ptr long ptr) @ stub WsSetOutputToBuffer @ stub WsSetReaderPosition @ stub WsSetWriterPosition diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 51711e4..620cc46 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -57,6 +57,7 @@ writer_props[] = struct writer { + WS_XML_WRITER_OUTPUT_TYPE output_type; ULONG prop_count; WS_XML_WRITER_PROPERTY prop[sizeof(writer_props)/sizeof(writer_props[0])]; }; @@ -162,5 +163,57 @@ HRESULT WINAPI WsGetWriterProperty( WS_XML_WRITER *handle, WS_XML_WRITER_PROPERT TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); + if (!writer->output_type) return WS_E_INVALID_OPERATION; return get_writer_prop( writer, id, buf, size ); } + +/************************************************************************** + * WsSetOutput [webservices.@] + */ +HRESULT WINAPI WsSetOutput( WS_XML_WRITER *handle, const WS_XML_WRITER_ENCODING *encoding, + const WS_XML_WRITER_OUTPUT *output, const WS_XML_WRITER_PROPERTY *properties, + ULONG count, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + ULONG i; + + TRACE( "%p %p %p %p %u %p\n", handle, encoding, output, properties, count, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + switch (encoding->encodingType) + { + case WS_XML_WRITER_ENCODING_TYPE_TEXT: + { + WS_XML_WRITER_TEXT_ENCODING *text = (WS_XML_WRITER_TEXT_ENCODING *)encoding; + if (text->charSet != WS_CHARSET_UTF8) + { + FIXME( "charset %u not supported\n", text->charSet ); + return E_NOTIMPL; + } + break; + } + default: + FIXME( "encoding type %u not supported\n", encoding->encodingType ); + return E_NOTIMPL; + } + switch (output->outputType) + { + case WS_XML_WRITER_OUTPUT_TYPE_BUFFER: + writer->output_type = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; + break; + default: + FIXME( "output type %u not supported\n", output->outputType ); + return E_NOTIMPL; + } + + 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; + } + + return S_OK; +}

1 0

Hans Leidekker : webservices/tests: Add tests.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 7894033af570d3568973675216e934f004cbf69a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7894033af570d356897367521… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:08 2015 +0200 webservices/tests: Add tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 3 +- dlls/webservices/tests/writer.c | 244 +++++++++++++++++++++++++++++++++++++ 2 files changed, 246 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index d19fdc2..1456b44 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -2,4 +2,5 @@ TESTDLL = webservices.dll IMPORTS = webservices C_SRCS = \ - reader.c + reader.c \ + writer.c diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c new file mode 100644 index 0000000..b1c9062 --- /dev/null +++ b/dlls/webservices/tests/writer.c @@ -0,0 +1,244 @@ +/* + * Copyright 2015 Hans Leidekker 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 + */ + +#include <stdio.h> +#include "windows.h" +#include "webservices.h" +#include "wine/test.h" + +static HRESULT set_output( WS_XML_WRITER *writer ) +{ + WS_XML_WRITER_TEXT_ENCODING encoding; + WS_XML_WRITER_BUFFER_OUTPUT output; + + encoding.encoding.encodingType = WS_XML_WRITER_ENCODING_TYPE_TEXT; + encoding.charSet = WS_CHARSET_UTF8; + + output.output.outputType = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; + + return WsSetOutput( writer, (const WS_XML_WRITER_ENCODING *)&encoding, + (const WS_XML_WRITER_OUTPUT *)&output, NULL, 0, NULL ); +} + +static void test_WsCreateWriter(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_WRITER_PROPERTY prop; + ULONG size, max_depth, max_attrs, indent, trim_size, max_size, max_ns; + BOOL allow_fragment, write_decl, in_attr; + WS_CHARSET charset; + WS_BUFFERS buffers; + WS_BYTES bytes; + + hr = WsCreateWriter( NULL, 0, NULL, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + writer = NULL; + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + ok( writer != NULL, "writer not set\n" ); + + /* can't retrieve properties before output is set */ + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + ok( max_depth == 0xdeadbeef, "max_depth set\n" ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* check some defaults */ + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_depth == 32, "got %u\n", max_depth ); + + allow_fragment = TRUE; + size = sizeof(allow_fragment); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT, &allow_fragment, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !allow_fragment, "got %d\n", allow_fragment ); + + max_attrs = 0xdeadbeef; + size = sizeof(max_attrs); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_ATTRIBUTES, &max_attrs, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_attrs == 128, "got %u\n", max_attrs ); + + write_decl = TRUE; + size = sizeof(write_decl); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_WRITE_DECLARATION, &write_decl, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !write_decl, "got %d\n", write_decl ); + + indent = 0xdeadbeef; + size = sizeof(indent); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_INDENT, &indent, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !indent, "got %u\n", indent ); + + trim_size = 0xdeadbeef; + size = sizeof(trim_size); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE, &trim_size, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( trim_size == 4096, "got %u\n", trim_size ); + + charset = 0xdeadbeef; + size = sizeof(charset); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_CHARSET, &charset, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( charset == WS_CHARSET_UTF8, "got %u\n", charset ); + + buffers.bufferCount = 0xdeadbeef; + buffers.buffers = (WS_BYTES *)0xdeadbeef; + size = sizeof(buffers); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFERS, &buffers, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !buffers.bufferCount, "got %u\n", buffers.bufferCount ); + ok( !buffers.buffers, "got %p\n", buffers.buffers ); + + max_size = 0xdeadbeef; + size = sizeof(max_size); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, &max_size, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_size == 65536, "got %u\n", max_size ); + + buffers.bufferCount = 0xdeadbeef; + buffers.buffers = (WS_BYTES *)0xdeadbeef; + size = sizeof(buffers); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_BYTES, &buffers, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !buffers.bufferCount, "got %u\n", buffers.bufferCount ); + todo_wine ok( buffers.buffers != NULL, "got %p\n", buffers.buffers ); + + max_size = 0xdeadbeef; + size = sizeof(max_size); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_MIME_PARTS_BUFFER_SIZE, &max_size, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_size == 65536, "got %u\n", max_size ); + + bytes.length = 0xdeadbeef; + bytes.bytes = (BYTE *)0xdeadbeef; + size = sizeof(bytes); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_INITIAL_BUFFER, &bytes, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !bytes.length, "got %u\n", bytes.length ); + ok( !bytes.bytes, "got %p\n", bytes.bytes ); + + max_ns = 0xdeadbeef; + size = sizeof(max_ns); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_NAMESPACES, &max_ns, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_ns == 32, "got %u\n", max_ns ); + WsFreeWriter( writer ); + + /* change a property */ + max_depth = 16; + prop.id = WS_XML_WRITER_PROPERTY_MAX_DEPTH; + prop.value = &max_depth; + prop.valueSize = sizeof(max_depth); + hr = WsCreateWriter( &prop, 1, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_depth == 16, "got %u\n", max_depth ); + WsFreeWriter( writer ); + + /* show that some properties are read-only */ + in_attr = TRUE; + prop.id = WS_XML_WRITER_PROPERTY_IN_ATTRIBUTE; + prop.value = &in_attr; + prop.valueSize = sizeof(in_attr); + hr = WsCreateWriter( &prop, 1, &writer, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + size = 1; + prop.id = WS_XML_WRITER_PROPERTY_BYTES_WRITTEN; + prop.value = &size; + prop.valueSize = sizeof(size); + hr = WsCreateWriter( &prop, 1, &writer, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + size = 1; + prop.id = WS_XML_WRITER_PROPERTY_BYTES_TO_CLOSE; + prop.value = &size; + prop.valueSize = sizeof(size); + hr = WsCreateWriter( &prop, 1, &writer, NULL ) ; + ok( hr == E_INVALIDARG, "got %08x\n", hr ); +} + +static void test_WsSetOutput(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_WRITER_PROPERTY prop; + WS_XML_WRITER_TEXT_ENCODING encoding; + WS_XML_WRITER_BUFFER_OUTPUT output; + ULONG size, max_depth; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutput( NULL, NULL, NULL, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + encoding.encoding.encodingType = WS_XML_WRITER_ENCODING_TYPE_TEXT; + encoding.charSet = WS_CHARSET_UTF8; + + output.output.outputType = WS_XML_WRITER_OUTPUT_TYPE_BUFFER; + + hr = WsSetOutput( writer, (const WS_XML_WRITER_ENCODING *)&encoding, + (const WS_XML_WRITER_OUTPUT *)&output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* multiple calls are allowed */ + hr = WsSetOutput( writer, (const WS_XML_WRITER_ENCODING *)&encoding, + (const WS_XML_WRITER_OUTPUT *)&output, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* writer properties can be set with WsSetOutput */ + max_depth = 16; + prop.id = WS_XML_WRITER_PROPERTY_MAX_DEPTH; + prop.value = &max_depth; + prop.valueSize = sizeof(max_depth); + hr = WsSetOutput( writer, (const WS_XML_WRITER_ENCODING *)&encoding, + (const WS_XML_WRITER_OUTPUT *)&output, &prop, 1, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + max_depth = 0xdeadbeef; + size = sizeof(max_depth); + hr = WsGetWriterProperty( writer, WS_XML_WRITER_PROPERTY_MAX_DEPTH, &max_depth, size, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( max_depth == 16, "got %u\n", max_depth ); + WsFreeWriter( writer ); +} + +START_TEST(writer) +{ + test_WsCreateWriter(); + test_WsSetOutput(); +}

1 0

Huw Davies : ole32: Hold a reference to the stub manager throughout an incoming call.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 35571a725455a1592ba5b761c00fd3733931b148 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35571a725455a1592ba5b761c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 14:49:14 2015 +0100 ole32: Hold a reference to the stub manager throughout an incoming call. This will enable us to defer deleting the manager until the call has finished. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 3 ++- dlls/ole32/rpc.c | 6 ++++-- dlls/ole32/stubmanager.c | 6 +++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 857943a..b2cf92e 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -195,7 +195,8 @@ struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, IUnknown *obje BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) DECLSPEC_HIDDEN; -HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; +HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, + IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; HRESULT start_apartment_remote_unknown(void) DECLSPEC_HIDDEN; HRESULT marshal_object(APARTMENT *apt, STDOBJREF *stdobjref, REFIID riid, IUnknown *obj, DWORD dest_context, void *dest_context_data, MSHLFLAGS mshlflags) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 2455464..0797784 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -682,7 +682,7 @@ static HRESULT WINAPI ClientRpcChannelBuffer_GetBuffer(LPRPCCHANNELBUFFER iface, } RpcBindingInqObject(message_state->binding_handle, &ipid); - hr = ipid_get_dispatch_params(&ipid, &apt, &message_state->params.stub, + hr = ipid_get_dispatch_params(&ipid, &apt, NULL, &message_state->params.stub, &message_state->params.chan, &message_state->params.iid, &message_state->params.iface); @@ -1441,6 +1441,7 @@ exit: static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) { struct dispatch_params *params; + struct stub_manager *stub_manager; APARTMENT *apt; IPID ipid; HRESULT hr; @@ -1456,7 +1457,7 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) return; } - hr = ipid_get_dispatch_params(&ipid, &apt, &params->stub, &params->chan, + hr = ipid_get_dispatch_params(&ipid, &apt, &stub_manager, &params->stub, &params->chan, &params->iid, &params->iface); if (hr != S_OK) { @@ -1514,6 +1515,7 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) IRpcStubBuffer_Release(params->stub); HeapFree(GetProcessHeap(), 0, params); + stub_manager_int_release(stub_manager); apartment_release(apt); /* if IRpcStubBuffer_Invoke fails, we should raise an exception to tell diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 30e2054..fa9a704 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -506,6 +506,7 @@ static HRESULT ipid_to_stub_manager(const IPID *ipid, APARTMENT **stub_apt, stru * release the references to all objects (except iface) if the function * returned success, otherwise no references are returned. */ HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, + struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) { @@ -528,7 +529,10 @@ HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, *iid = ifstub->iid; *iface = ifstub->iface; - stub_manager_int_release(stubmgr); + if (manager) + *manager = stubmgr; + else + stub_manager_int_release(stubmgr); return S_OK; } else

1 0

Huw Davies : ole32: Don't block inside CoDisconnectObject.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 327100fef98b2259842e8df4a7a1ebbd7e61ce01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=327100fef98b2259842e8df4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 14:49:15 2015 +0100 ole32: Don't block inside CoDisconnectObject. This may be called inside a COM call to the object. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 1 + dlls/ole32/compobj_private.h | 4 +++- dlls/ole32/rpc.c | 4 ++-- dlls/ole32/stubmanager.c | 19 ++++++++++++++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 0d0459a..82904a8 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2042,6 +2042,7 @@ HRESULT WINAPI CoDisconnectObject( LPUNKNOWN lpUnk, DWORD reserved ) manager = get_stub_manager_from_object(apt, lpUnk, FALSE); if (manager) { + stub_manager_disconnect(manager); /* Release stub manager twice, to remove the apartment reference. */ stub_manager_int_release(manager); stub_manager_int_release(manager); diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index b2cf92e..7ceee2c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -107,6 +107,7 @@ struct stub_manager */ ULONG norm_refs; /* refcount of normal marshals (CS lock) */ + BOOL disconnected; /* CoDisconnectObject has been called (CS lock) */ }; /* imported interface proxy */ @@ -195,6 +196,7 @@ struct stub_manager *get_stub_manager_from_object(APARTMENT *apt, IUnknown *obje BOOL stub_manager_notify_unmarshal(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; BOOL stub_manager_is_table_marshaled(struct stub_manager *m, const IPID *ipid) DECLSPEC_HIDDEN; void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const IPID *ipid, BOOL tableweak) DECLSPEC_HIDDEN; +void stub_manager_disconnect(struct stub_manager *m) DECLSPEC_HIDDEN; HRESULT ipid_get_dispatch_params(const IPID *ipid, APARTMENT **stub_apt, struct stub_manager **manager, IRpcStubBuffer **stub, IRpcChannelBuffer **chan, IID *iid, IUnknown **iface) DECLSPEC_HIDDEN; HRESULT start_apartment_remote_unknown(void) DECLSPEC_HIDDEN; @@ -213,7 +215,7 @@ HRESULT RPC_CreateClientChannel(const OXID *oxid, const IPID *ipid, HRESULT RPC_CreateServerChannel(DWORD dest_context, void *dest_context_data, IRpcChannelBuffer **chan) DECLSPEC_HIDDEN; void RPC_ExecuteCall(struct dispatch_params *params) DECLSPEC_HIDDEN; HRESULT RPC_RegisterInterface(REFIID riid) DECLSPEC_HIDDEN; -void RPC_UnregisterInterface(REFIID riid) DECLSPEC_HIDDEN; +void RPC_UnregisterInterface(REFIID riid, BOOL wait) DECLSPEC_HIDDEN; HRESULT RPC_StartLocalServer(REFCLSID clsid, IStream *stream, BOOL multi_use, void **registration) DECLSPEC_HIDDEN; void RPC_StopLocalServer(void *registration) DECLSPEC_HIDDEN; HRESULT RPC_GetLocalClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) DECLSPEC_HIDDEN; diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 0797784..e8bf9bf 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1581,7 +1581,7 @@ HRESULT RPC_RegisterInterface(REFIID riid) } /* stub unregistration */ -void RPC_UnregisterInterface(REFIID riid) +void RPC_UnregisterInterface(REFIID riid, BOOL wait) { struct registered_if *rif; EnterCriticalSection(&csRegIf); @@ -1591,7 +1591,7 @@ void RPC_UnregisterInterface(REFIID riid) { if (!--rif->refs) { - RpcServerUnregisterIf((RPC_IF_HANDLE)&rif->If, NULL, TRUE); + RpcServerUnregisterIf((RPC_IF_HANDLE)&rif->If, NULL, wait); list_remove(&rif->entry); HeapFree(GetProcessHeap(), 0, rif); } diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index fa9a704..a7d00c5 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -123,7 +123,8 @@ static void stub_manager_delete_ifstub(struct stub_manager *m, struct ifstub *if list_remove(&ifstub->entry); - RPC_UnregisterInterface(&ifstub->iid); + if (!m->disconnected) + RPC_UnregisterInterface(&ifstub->iid, TRUE); if (ifstub->stubbuffer) IRpcStubBuffer_Release(ifstub->stubbuffer); IUnknown_Release(ifstub->iface); @@ -223,6 +224,7 @@ static struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) * the marshalled ifptr. */ sm->extrefs = 0; + sm->disconnected = FALSE; hres = IUnknown_QueryInterface(object, &IID_IExternalConnection, (void**)&sm->extern_conn); if(FAILED(hres)) @@ -238,6 +240,21 @@ static struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object) return sm; } +void stub_manager_disconnect(struct stub_manager *m) +{ + struct ifstub *ifstub; + + EnterCriticalSection(&m->lock); + if (!m->disconnected) + { + LIST_FOR_EACH_ENTRY(ifstub, &m->ifstubs, struct ifstub, entry) + RPC_UnregisterInterface(&ifstub->iid, FALSE); + + m->disconnected = TRUE; + } + LeaveCriticalSection(&m->lock); +} + /* caller must remove stub manager from apartment prior to calling this function */ static void stub_manager_delete(struct stub_manager *m) {

1 0

Huw Davies : ole32/tests: Test calling CoDisconnectObject from within a COM call to the object.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: 1dcf3f8e0a7969ffcc99b025aa1ec30837e0adba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dcf3f8e0a7969ffcc99b025a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 14:49:16 2015 +0100 ole32/tests: Test calling CoDisconnectObject from within a COM call to the object. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/marshal.c | 117 ++++++++++++++++++++++++++++++++++++++------- 1 file changed, 100 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 55c32d6..afa58a5 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2927,6 +2927,63 @@ static void UnlockModuleOOP(void) static HWND hwnd_app; +struct local_server +{ + IPersist IPersist_iface; /* a nice short interface */ +}; + +static HRESULT WINAPI local_server_QueryInterface(IPersist *iface, REFIID iid, void **obj) +{ + *obj = NULL; + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IPersist)) + *obj = iface; + + if (*obj) + { + IPersist_AddRef(iface); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI local_server_AddRef(IPersist *iface) +{ + return 2; +} + +static ULONG WINAPI local_server_Release(IPersist *iface) +{ + return 1; +} + +static HRESULT WINAPI local_server_GetClassID(IPersist *iface, CLSID *clsid) +{ + HRESULT hr; + + *clsid = IID_IUnknown; + + /* Test calling CoDisconnectObject within a COM call */ + hr = CoDisconnectObject((IUnknown *)iface, 0); + ok(hr == S_OK, "got %08x\n", hr); + + return S_OK; +} + +static const IPersistVtbl local_server_persist_vtbl = +{ + local_server_QueryInterface, + local_server_AddRef, + local_server_Release, + local_server_GetClassID +}; + +struct local_server local_server_class = +{ + {&local_server_persist_vtbl} +}; + static HRESULT WINAPI TestOOP_IClassFactory_QueryInterface( LPCLASSFACTORY iface, REFIID riid, @@ -2961,12 +3018,12 @@ static HRESULT WINAPI TestOOP_IClassFactory_CreateInstance( REFIID riid, LPVOID *ppvObj) { - if (IsEqualIID(riid, &IID_IClassFactory) || IsEqualIID(riid, &IID_IUnknown)) - { - *ppvObj = iface; - return S_OK; - } - return CLASS_E_CLASSNOTAVAILABLE; + IPersist *persist = &local_server_class.IPersist_iface; + HRESULT hr; + IPersist_AddRef( persist ); + hr = IPersist_QueryInterface( persist, riid, ppvObj ); + IPersist_Release( persist ); + return hr; } static HRESULT WINAPI TestOOP_IClassFactory_LockServer( @@ -2996,24 +3053,25 @@ static void test_register_local_server(void) DWORD cookie; HRESULT hr; HANDLE ready_event; - HANDLE quit_event; DWORD wait; + HANDLE handles[2]; heventShutdown = CreateEventA(NULL, TRUE, FALSE, NULL); + ready_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Ready Event"); + handles[0] = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); + handles[1] = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Repeat Event"); +again: hr = CoRegisterClassObject(&CLSID_WineOOPTest, (IUnknown *)&TestOOP_ClassFactory, CLSCTX_LOCAL_SERVER, REGCLS_SINGLEUSE, &cookie); ok_ole_success(hr, CoRegisterClassObject); - ready_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Ready Event"); SetEvent(ready_event); - quit_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); - do { - wait = MsgWaitForMultipleObjects(1, &quit_event, FALSE, 30000, QS_ALLINPUT); - if (wait == WAIT_OBJECT_0+1) + wait = MsgWaitForMultipleObjects(2, handles, FALSE, 30000, QS_ALLINPUT); + if (wait == WAIT_OBJECT_0+2) { MSG msg; @@ -3024,12 +3082,20 @@ static void test_register_local_server(void) DispatchMessageA(&msg); } } + else if (wait == WAIT_OBJECT_0+1) + { + hr = CoRevokeClassObject(cookie); + ok_ole_success(hr, CoRevokeClassObject); + goto again; + } } - while (wait == WAIT_OBJECT_0+1); + while (wait == WAIT_OBJECT_0+2); ok( wait == WAIT_OBJECT_0, "quit event wait timed out\n" ); hr = CoRevokeClassObject(cookie); ok_ole_success(hr, CoRevokeClassObject); + CloseHandle(handles[0]); + CloseHandle(handles[1]); } static HANDLE create_target_process(const char *arg) @@ -3057,10 +3123,13 @@ static void test_local_server(void) DWORD cookie; HRESULT hr; IClassFactory * cf; + IPersist *persist; DWORD ret; HANDLE process; HANDLE quit_event; HANDLE ready_event; + HANDLE repeat_event; + CLSID clsid; heventShutdown = CreateEventA(NULL, TRUE, FALSE, NULL); @@ -3127,16 +3196,30 @@ static void test_local_server(void) ready_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Ready Event"); ok( !WaitForSingleObject(ready_event, 10000), "wait timed out\n" ); - CloseHandle(ready_event); - hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IClassFactory, (void **)&cf); + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IPersist, (void **)&persist); ok_ole_success(hr, CoCreateInstance); - IClassFactory_Release(cf); + IPersist_Release(persist); - hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IClassFactory, (void **)&cf); + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IPersist, (void **)&persist); ok(hr == REGDB_E_CLASSNOTREG, "Second CoCreateInstance on REGCLS_SINGLEUSE object should have failed\n"); + /* Re-register the class and try calling CoDisconnectObject from within a call to that object */ + repeat_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Repeat Event"); + SetEvent(repeat_event); + CloseHandle(repeat_event); + + ok( !WaitForSingleObject(ready_event, 10000), "wait timed out\n" ); + CloseHandle(ready_event); + + hr = CoCreateInstance(&CLSID_WineOOPTest, NULL, CLSCTX_LOCAL_SERVER, &IID_IPersist, (void **)&persist); + ok_ole_success(hr, CoCreateInstance); + + /* GetClassID will call CoDisconnectObject */ + IPersist_GetClassID(persist, &clsid); + IPersist_Release(persist); + quit_event = CreateEventA(NULL, FALSE, FALSE, "Wine COM Test Quit Event"); SetEvent(quit_event);

1 0

Huw Davies : ole32: Silence an incorrect fixme.
by Alexandre Julliard 14 Oct '15

14 Oct '15

Module: wine Branch: master Commit: afbb4afc6cb373038ec103d423db74839978d892 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afbb4afc6cb373038ec103d42… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 13 14:49:17 2015 +0100 ole32: Silence an incorrect fixme. The remote unknown object should not implement IExternalConnection. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stubmanager.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index a7d00c5..57048c6 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -667,7 +667,8 @@ static HRESULT WINAPI RemUnknown_QueryInterface(IRemUnknown *iface, REFIID riid, return S_OK; } - FIXME("No interface for iid %s\n", debugstr_guid(riid)); + if (!IsEqualIID(riid, &IID_IExternalConnection)) + FIXME("No interface for iid %s\n", debugstr_guid(riid)); *ppv = NULL; return E_NOINTERFACE;

1 0