June 2016 - Wine-commits - list.winehq.org

Hans Leidekker : webservices: Accept zero write option in WsWriteType.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: b0077f06f091c661138ef39550ca66bada1ee56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0077f06f091c661138ef3955… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:43 2016 +0200 webservices: Accept zero write option in WsWriteType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 9779870..ebe9b9d 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1424,55 +1424,55 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY case WS_BOOL_TYPE: { const BOOL *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_bool( writer, mapping, desc, ptr ); } case WS_INT8_TYPE: { const INT8 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int8( writer, mapping, desc, ptr ); } case WS_INT16_TYPE: { const INT16 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int16( writer, mapping, desc, ptr ); } case WS_INT32_TYPE: { const INT32 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int32( writer, mapping, desc, ptr ); } case WS_INT64_TYPE: { const INT64 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_int64( writer, mapping, desc, ptr ); } case WS_UINT8_TYPE: { const UINT8 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint8( writer, mapping, desc, ptr ); } case WS_UINT16_TYPE: { const UINT16 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint16( writer, mapping, desc, ptr ); } case WS_UINT32_TYPE: { const UINT32 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint32( writer, mapping, desc, ptr ); } case WS_UINT64_TYPE: { const UINT64 *ptr = value; - if (option != WS_WRITE_REQUIRED_VALUE || size != sizeof(*ptr)) return E_INVALIDARG; + if ((option && option != WS_WRITE_REQUIRED_VALUE) || size != sizeof(*ptr)) return E_INVALIDARG; return write_type_uint64( writer, mapping, desc, ptr ); } case WS_WSZ_TYPE:

1 0

Hans Leidekker : webservices: Validate parent nodes in the writer.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 13ef81e4c08bb8f4d032496591e34027d6d5942d URL: http://source.winehq.org/git/wine.git/?a=commit;h=13ef81e4c08bb8f4d03249659… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:44 2016 +0200 webservices: Validate parent nodes in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 11 +++++------ dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 11 +++++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index ca8f1bd..8f2d8fb 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1100,9 +1100,8 @@ static inline BOOL is_valid_parent( const struct node *node ) return node_type( node ) == WS_XML_NODE_TYPE_ELEMENT || node_type( node ) == WS_XML_NODE_TYPE_BOF; } -static struct node *read_find_parent( struct reader *reader ) +struct node *find_parent( struct node *node ) { - struct node *node = reader->current; if (node_type( node ) == WS_XML_NODE_TYPE_END_ELEMENT) { if (!node->parent || !is_valid_parent( node->parent->parent )) return NULL; @@ -1168,7 +1167,7 @@ static HRESULT read_element( struct reader *reader ) } if (!len) goto error; - if (!(parent = read_find_parent( reader ))) goto error; + if (!(parent = find_parent( reader->current ))) goto error; hr = E_OUTOFMEMORY; if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) goto error; @@ -1217,7 +1216,7 @@ static HRESULT read_text( struct reader *reader ) len += skip; } - if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; text = (WS_XML_TEXT_NODE *)node; @@ -1386,7 +1385,7 @@ static HRESULT read_comment( struct reader *reader ) len += skip; } - if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_COMMENT ))) return E_OUTOFMEMORY; comment = (WS_XML_COMMENT_NODE *)node; @@ -1410,7 +1409,7 @@ static HRESULT read_startcdata( struct reader *reader ) if (read_cmp( reader, "<![CDATA[", 9 )) return WS_E_INVALID_FORMAT; read_skip( reader, 9 ); - if (!(parent = read_find_parent( reader ))) return WS_E_INVALID_FORMAT; + if (!(parent = find_parent( reader->current ))) return WS_E_INVALID_FORMAT; if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; read_insert_node( reader, parent, node ); diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 363f164..fc888ee 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -45,6 +45,7 @@ struct node struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN; void free_node( struct node * ) DECLSPEC_HIDDEN; void destroy_nodes( struct node * ) DECLSPEC_HIDDEN; +struct node *find_parent( struct node * ) DECLSPEC_HIDDEN; static inline WS_XML_NODE_TYPE node_type( const struct node *node ) { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index ebe9b9d..bf4c61b 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -880,10 +880,11 @@ static HRESULT write_flush( struct writer *writer ) static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRING *prefix, const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { - struct node *node; + struct node *node, *parent; WS_XML_ELEMENT_NODE *elem; HRESULT hr; + if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; if ((hr = write_flush( writer )) != S_OK) return hr; if (!prefix && node_type( writer->current ) == WS_XML_NODE_TYPE_ELEMENT) @@ -907,7 +908,7 @@ static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRIN free_node( node ); return E_OUTOFMEMORY; } - write_insert_node( writer, writer->current, node ); + write_insert_node( writer, parent, node ); writer->state = WRITER_STATE_STARTELEMENT; return S_OK; } @@ -938,14 +939,16 @@ static inline void write_set_attribute_value( struct writer *writer, WS_XML_TEXT static HRESULT write_add_text_node( struct writer *writer, WS_XML_TEXT *value ) { - struct node *node; + struct node *node, *parent; WS_XML_TEXT_NODE *text; + if (!(parent = find_parent( writer->current ))) return WS_E_INVALID_FORMAT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return E_OUTOFMEMORY; text = (WS_XML_TEXT_NODE *)node; text->text = value; - write_insert_node( writer, writer->current, node ); + write_insert_node( writer, parent, node ); writer->state = WRITER_STATE_TEXT; return S_OK; }

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: f5c8f697250e0956257fdf66cb35990481e3fdbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c8f697250e0956257fdf66c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:45 2016 +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 | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index 451cfad..a5ffd51 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -73,6 +73,7 @@ typedef struct _WS_CUSTOM_HTTP_PROXY WS_CUSTOM_HTTP_PROXY; typedef struct _WS_HTTP_MESSAGE_MAPPING WS_HTTP_MESSAGE_MAPPING; typedef struct _WS_HTTP_HEADER_MAPPING WS_HTTP_HEADER_MAPPING; typedef struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT WS_HTTP_REDIRECT_CALLBACK_CONTEXT; +typedef struct _WS_XML_NODE_POSITION WS_XML_NODE_POSITION; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -1266,6 +1267,16 @@ struct _WS_HTTP_REDIRECT_CALLBACK_CONTEXT void *state; }; +typedef enum +{ + WS_RECEIVE_REQUIRED_MESSAGE = 1, + WS_RECEIVE_OPTIONAL_MESSAGE = 2 +} WS_RECEIVE_OPTION; + +typedef void (CALLBACK *WS_MESSAGE_DONE_CALLBACK) + (void*); + +HRESULT WINAPI WsAddressMessage(WS_MESSAGE*, const WS_ENDPOINT_ADDRESS*, WS_ERROR*); HRESULT WINAPI WsAlloc(WS_HEAP*, SIZE_T, void**, WS_ERROR*); HRESULT WINAPI WsCall(WS_SERVICE_PROXY*, const WS_OPERATION_DESCRIPTION*, const void**, WS_HEAP*, const WS_CALL_PROPERTY*, const ULONG, const WS_ASYNC_CONTEXT*, @@ -1273,6 +1284,7 @@ HRESULT WINAPI WsCall(WS_SERVICE_PROXY*, const WS_OPERATION_DESCRIPTION*, const HRESULT WINAPI WsCloseChannel(WS_CHANNEL*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsCloseServiceProxy(WS_SERVICE_PROXY*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsCombineUrl(const WS_STRING*, const WS_STRING*, ULONG, WS_HEAP*, WS_STRING*, WS_ERROR*); +HRESULT WINAPI WsCopyNode(WS_XML_WRITER*, WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsCreateChannel(WS_CHANNEL_TYPE, WS_CHANNEL_BINDING, const WS_CHANNEL_PROPERTY*, ULONG, const WS_SECURITY_DESCRIPTION*, WS_CHANNEL**, WS_ERROR*); HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY*, ULONG, WS_ERROR**); @@ -1321,6 +1333,7 @@ HRESULT WINAPI WsGetReaderPosition(WS_XML_READER*, WS_XML_NODE_POSITION*, WS_ERR HRESULT WINAPI WsGetReaderProperty(WS_XML_READER*, WS_XML_READER_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetServiceProxyProperty(WS_SERVICE_PROXY*, const WS_PROXY_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetWriterPosition(WS_XML_WRITER*, WS_XML_NODE_POSITION*, 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*); @@ -1344,10 +1357,20 @@ HRESULT WINAPI WsReadToStartElement(WS_XML_READER*, const WS_XML_STRING*, const HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION**, ULONG, + WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, + const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*); HRESULT WINAPI WsResetHeap(WS_HEAP*, WS_ERROR*); +HRESULT WINAPI WsRequestReply(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, + const void*, ULONG, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, + WS_READ_OPTION, WS_HEAP*, void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsSendMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsSendReplyMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION*, + WS_WRITE_OPTION, const void*, ULONG, WS_MESSAGE*, + const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsSetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, const void*, ULONG, WS_ERROR*); 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*, @@ -1359,15 +1382,21 @@ HRESULT WINAPI WsSetOutput(WS_XML_WRITER*, const WS_XML_WRITER_ENCODING*, const const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); +HRESULT WINAPI WsSetReaderPosition(WS_XML_READER*, const WS_XML_NODE_POSITION*, WS_ERROR*); +HRESULT WINAPI WsSetWriterPosition(WS_XML_WRITER*, const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsSkipNode(WS_XML_READER*, WS_ERROR*); HRESULT WINAPI WsWriteAttribute(WS_XML_WRITER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteBody(WS_MESSAGE*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, + ULONG, WS_ERROR*); HRESULT WINAPI WsWriteElement(WS_XML_WRITER*, const WS_ELEMENT_DESCRIPTION*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndCData(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndElement(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndStartElement(WS_XML_WRITER*, WS_ERROR*); +HRESULT WINAPI WsWriteEnvelopeEnd(WS_MESSAGE*, WS_ERROR*); +HRESULT WINAPI WsWriteEnvelopeStart(WS_MESSAGE*, WS_XML_WRITER*, WS_MESSAGE_DONE_CALLBACK, void*, WS_ERROR*); HRESULT WINAPI WsWriteMessageStart(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsWriteMessageEnd(WS_CHANNEL*, WS_MESSAGE*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsWriteStartAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*,

1 0

Hans Leidekker : webservices: Implement WsMoveWriter.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 768197795df9b4c24e7252cfc91e36e527d84799 URL: http://source.winehq.org/git/wine.git/?a=commit;h=768197795df9b4c24e7252cfc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:46 2016 +0200 webservices: Implement WsMoveWriter. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 151 +++++++++++++++++++-------------- dlls/webservices/tests/writer.c | 71 ++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 13 +++ dlls/webservices/writer.c | 87 +++++++++++++++++++ 5 files changed, 258 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=768197795df9b4c24e725…

1 0

Hans Leidekker : webservices: Implement WsGetWriterPosition.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 600e2e53c858beb553f97855c56031d8d6beb64c URL: http://source.winehq.org/git/wine.git/?a=commit;h=600e2e53c858beb553f97855c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:47 2016 +0200 webservices: Implement WsGetWriterPosition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 47 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 18 +++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index b223544..f425664 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1486,6 +1486,52 @@ static void test_WsMoveWriter(void) WsFreeHeap( heap ); } +static void test_WsGetWriterPosition(void) +{ + WS_HEAP *heap; + WS_XML_WRITER *writer; + WS_XML_BUFFER *buffer; + WS_XML_NODE_POSITION pos; + HRESULT hr; + + hr = WsGetWriterPosition( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* writer must be set to an XML buffer */ + hr = WsGetWriterPosition( writer, &pos, NULL ); + todo_wine ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsCreateXmlBuffer( heap, NULL, 0, &buffer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, buffer, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetWriterPosition( writer, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + pos.buffer = pos.node = NULL; + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos.buffer != NULL, "buffer not set\n" ); + ok( pos.node != NULL, "node not set\n" ); + + WsFreeWriter( writer ); + WsFreeHeap( heap ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -1505,4 +1551,5 @@ START_TEST(writer) test_WsGetPrefixFromNamespace(); test_complex_struct_type(); test_WsMoveWriter(); + test_WsGetWriterPosition(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 5754c61..618d6ee 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -87,7 +87,7 @@ @ stub WsGetSecurityTokenProperty @ stub WsGetServiceHostProperty @ stdcall WsGetServiceProxyProperty(ptr long ptr long ptr) -@ stub WsGetWriterPosition +@ stdcall WsGetWriterPosition(ptr ptr ptr) @ stdcall WsGetWriterProperty(ptr long ptr long ptr) @ stdcall WsGetXmlAttribute(ptr ptr ptr ptr ptr ptr) @ stub WsInitializeMessage diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 583e7fa..f9c9ca9 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1801,3 +1801,21 @@ HRESULT WINAPI WsMoveWriter( WS_XML_WRITER *handle, WS_MOVE_TO move, BOOL *found return write_move_to( writer, move, found ); } + +/************************************************************************** + * WsGetWriterPosition [webservices.@] + */ +HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION *pos, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p %p %p\n", handle, pos, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !pos) return E_INVALIDARG; + if (!writer->output_type) return WS_E_INVALID_OPERATION; + + pos->buffer = (WS_XML_BUFFER *)writer->output_buf; + pos->node = writer->current; + return S_OK; +}

1 0

Hans Leidekker : webservices: Implement WsSetWriterPosition.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 511c21d30977cb15c03bd193a7aa2fb3982a6c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=511c21d30977cb15c03bd193a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 21 14:04:48 2016 +0200 webservices: Implement WsSetWriterPosition. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 48 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 17 ++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index f425664..5314bc8 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1532,6 +1532,53 @@ static void test_WsGetWriterPosition(void) WsFreeHeap( heap ); } +static void test_WsSetWriterPosition(void) +{ + WS_HEAP *heap; + WS_XML_WRITER *writer; + WS_XML_BUFFER *buf1, *buf2; + WS_XML_NODE_POSITION pos; + HRESULT hr; + + hr = WsCreateHeap( 1 << 16, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetWriterPosition( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateXmlBuffer( heap, NULL, 0, &buf1, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetOutputToBuffer( writer, buf1, NULL, 0, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsSetWriterPosition( writer, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + pos.buffer = pos.node = NULL; + hr = WsGetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( pos.buffer == buf1, "wrong buffer\n" ); + ok( pos.node != NULL, "node not set\n" ); + + hr = WsSetWriterPosition( writer, &pos, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* different buffer */ + hr = WsCreateXmlBuffer( heap, NULL, 0, &buf2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + pos.buffer = buf2; + hr = WsSetWriterPosition( writer, &pos, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + WsFreeWriter( writer ); + WsFreeHeap( heap ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -1552,4 +1599,5 @@ START_TEST(writer) test_complex_struct_type(); test_WsMoveWriter(); test_WsGetWriterPosition(); + test_WsSetWriterPosition(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 618d6ee..3a69302 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -157,7 +157,7 @@ @ stdcall WsSetOutput(ptr ptr ptr ptr long ptr) @ stdcall WsSetOutputToBuffer(ptr ptr ptr long ptr) @ stub WsSetReaderPosition -@ stub WsSetWriterPosition +@ stdcall WsSetWriterPosition(ptr ptr ptr) @ stub WsShutdownSessionChannel @ stub WsSkipNode @ stub WsStartReaderCanonicalization diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f9c9ca9..8c9e202 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1819,3 +1819,20 @@ HRESULT WINAPI WsGetWriterPosition( WS_XML_WRITER *handle, WS_XML_NODE_POSITION pos->node = writer->current; return S_OK; } + +/************************************************************************** + * WsSetWriterPosition [webservices.@] + */ +HRESULT WINAPI WsSetWriterPosition( WS_XML_WRITER *handle, const WS_XML_NODE_POSITION *pos, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + + TRACE( "%p %p %p\n", handle, pos, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !pos || (struct xmlbuf *)pos->buffer != writer->output_buf) return E_INVALIDARG; + if (!writer->output_type) return WS_E_INVALID_OPERATION; + + writer->current = pos->node; + return S_OK; +}

1 0

Piotr Caban : ucrtbase: Add _set_thread_local_invalid_parameter_handler implementation.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: c35d07fcd146826d05203a5746f2918d5b3d0bc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35d07fcd146826d05203a574… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 20 17:48:19 2016 +0200 ucrtbase: Add _set_thread_local_invalid_parameter_handler implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/errno.c | 25 ++++++++++-- dlls/msvcrt/msvcrt.h | 3 ++ dlls/ucrtbase/tests/misc.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 75e211e..641ca35 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -433,6 +433,16 @@ void CDECL _seterrormode(int mode) void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_wchar_t *func, const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg) { +#if _MSVCR_VER >= 140 + thread_data_t *data = msvcrt_get_thread_data(); + + if (data->invalid_parameter_handler) + { + data->invalid_parameter_handler( expr, func, file, line, arg ); + return; + } +#endif + if (invalid_parameter_handler) invalid_parameter_handler( expr, func, file, line, arg ); else { @@ -474,13 +484,14 @@ MSVCRT_invalid_parameter_handler CDECL _set_invalid_parameter_handler( return old; } +#if _MSVCR_VER >= 140 /********************************************************************* * _get_thread_local_invalid_parameter_handler (UCRTBASE.@) */ MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handler(void) { - FIXME(" stub\n"); - return NULL; + TRACE("\n"); + return msvcrt_get_thread_data()->invalid_parameter_handler; } /********************************************************************* @@ -489,6 +500,12 @@ MSVCRT_invalid_parameter_handler CDECL _get_thread_local_invalid_parameter_handl MSVCRT_invalid_parameter_handler CDECL _set_thread_local_invalid_parameter_handler( MSVCRT_invalid_parameter_handler handler) { - FIXME("(%p) stub\n", handler); - return NULL; + thread_data_t *data = msvcrt_get_thread_data(); + MSVCRT_invalid_parameter_handler old = data->invalid_parameter_handler; + + TRACE("(%p)\n", handler); + + data->invalid_parameter_handler = handler; + return old; } +#endif diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 2d3fc94..6c2ab42 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -266,6 +266,9 @@ struct __thread_data { DWORD cached_cp; char cached_locale[131]; void *unk10[100]; +#if _MSVCR_VER >= 140 + MSVCRT_invalid_parameter_handler invalid_parameter_handler; +#endif }; typedef struct __thread_data thread_data_t; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index d427bb5..0111d2b 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -27,6 +27,33 @@ #include <winbase.h> #include "wine/test.h" +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + expect_ ## func = TRUE + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +DEFINE_EXPECT(global_invalid_parameter_handler); +DEFINE_EXPECT(thread_invalid_parameter_handler); + typedef int (CDECL *MSVCRT__onexit_t)(void); typedef struct MSVCRT__onexit_table_t @@ -41,6 +68,11 @@ static int (CDECL *p_register_onexit_function)(MSVCRT__onexit_table_t *table, MS static int (CDECL *p_execute_onexit_table)(MSVCRT__onexit_table_t *table); static int (CDECL *p___fpe_flt_rounds)(void); static unsigned int (CDECL *p__controlfp)(unsigned int, unsigned int); +static _invalid_parameter_handler (CDECL *p__set_invalid_parameter_handler)(_invalid_parameter_handler); +static _invalid_parameter_handler (CDECL *p__get_invalid_parameter_handler)(void); +static _invalid_parameter_handler (CDECL *p__set_thread_local_invalid_parameter_handler)(_invalid_parameter_handler); +static _invalid_parameter_handler (CDECL *p__get_thread_local_invalid_parameter_handler)(void); +static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static void test__initialize_onexit_table(void) { @@ -223,6 +255,63 @@ static void test___fpe_flt_rounds(void) ok(ret == 0, "__fpe_flt_rounds returned %d\n", ret); } +static void __cdecl global_invalid_parameter_handler( + const wchar_t *expression, const wchar_t *function, + const wchar_t *file, unsigned line, uintptr_t arg) +{ + CHECK_EXPECT(global_invalid_parameter_handler); +} + +static void __cdecl thread_invalid_parameter_handler( + const wchar_t *expression, const wchar_t *function, + const wchar_t *file, unsigned line, uintptr_t arg) +{ + CHECK_EXPECT(thread_invalid_parameter_handler); +} + +static void test_invalid_parameter_handler(void) +{ + _invalid_parameter_handler ret; + + ret = p__get_invalid_parameter_handler(); + ok(!ret, "ret != NULL\n"); + + ret = p__get_thread_local_invalid_parameter_handler(); + ok(!ret, "ret != NULL\n"); + + ret = p__set_thread_local_invalid_parameter_handler(thread_invalid_parameter_handler); + ok(!ret, "ret != NULL\n"); + + ret = p__get_thread_local_invalid_parameter_handler(); + ok(ret == thread_invalid_parameter_handler, "ret = %p\n", ret); + + ret = p__get_invalid_parameter_handler(); + ok(!ret, "ret != NULL\n"); + + ret = p__set_invalid_parameter_handler(global_invalid_parameter_handler); + ok(!ret, "ret != NULL\n"); + + ret = p__get_invalid_parameter_handler(); + ok(ret == global_invalid_parameter_handler, "ret = %p\n", ret); + + ret = p__get_thread_local_invalid_parameter_handler(); + ok(ret == thread_invalid_parameter_handler, "ret = %p\n", ret); + + SET_EXPECT(thread_invalid_parameter_handler); + p__ltoa_s(0, NULL, 0, 0); + CHECK_CALLED(thread_invalid_parameter_handler); + + ret = p__set_thread_local_invalid_parameter_handler(NULL); + ok(ret == thread_invalid_parameter_handler, "ret = %p\n", ret); + + SET_EXPECT(global_invalid_parameter_handler); + p__ltoa_s(0, NULL, 0, 0); + CHECK_CALLED(global_invalid_parameter_handler); + + ret = p__set_invalid_parameter_handler(NULL); + ok(ret == global_invalid_parameter_handler, "ret = %p\n", ret); +} + static BOOL init(void) { HMODULE module = LoadLibraryA("ucrtbase.dll"); @@ -237,6 +326,11 @@ static BOOL init(void) p_execute_onexit_table = (void*)GetProcAddress(module, "_execute_onexit_table"); p___fpe_flt_rounds = (void*)GetProcAddress(module, "__fpe_flt_rounds"); p__controlfp = (void*)GetProcAddress(module, "_controlfp"); + p__set_invalid_parameter_handler = (void*)GetProcAddress(module, "_set_invalid_parameter_handler"); + p__get_invalid_parameter_handler = (void*)GetProcAddress(module, "_get_invalid_parameter_handler"); + p__set_thread_local_invalid_parameter_handler = (void*)GetProcAddress(module, "_set_thread_local_invalid_parameter_handler"); + p__get_thread_local_invalid_parameter_handler = (void*)GetProcAddress(module, "_get_thread_local_invalid_parameter_handler"); + p__ltoa_s = (void*)GetProcAddress(module, "_ltoa_s"); return TRUE; } @@ -246,6 +340,7 @@ START_TEST(misc) if(!init()) return; + test_invalid_parameter_handler(); test__initialize_onexit_table(); test__register_onexit_function(); test__execute_onexit_table();

1 0

Michael Stefaniuc : comctl32/tests: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: cbca4b3f511b5fbc5380a61b433890b5af082327 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbca4b3f511b5fbc5380a61b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 20 13:42:15 2016 +0200 comctl32/tests: Use EqualRect() instead of memcmp() to compare RECTs. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 2 +- dlls/comctl32/tests/toolbar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ed5d9f9..1444a9f 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -908,7 +908,7 @@ static void test_images(void) r = SendMessageA(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r2); expect(1, r); - ok(!memcmp(&r1, &r2, sizeof r1), "rectangle should be the same\n"); + ok(EqualRect(&r1, &r2), "rectangle should be the same\n"); DestroyWindow(hwnd); } diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index d825e18..efad00a 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1232,7 +1232,7 @@ static DWORD tbsize_alt_numtests = 0; for (i=0; i<min(buttonCount, res->nButtons); i++) { \ ok(SendMessageA(hToolbar, TB_GETITEMRECT, i, (LPARAM)&rc) == 1, "TB_GETITEMRECT\n"); \ if (broken(tbsize_alt_numtests < sizeof(tbsize_alt_results)/sizeof(tbsize_alt_results[0]) && \ - memcmp(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton, sizeof(RECT)) == 0)) { \ + EqualRect(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton))) { \ win_skip("Alternate rect found\n"); \ tbsize_alt_numtests++; \ } else if (!(mask&1)) { \

1 0

Jacek Caban : jscript: Properly handle arguments in Object constructor.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 68dddd8d8963bb7551abfbe8601d82138063feb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68dddd8d8963bb7551abfbe86… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 20:54:48 2016 +0200 jscript: Properly handle arguments in Object constructor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/object.c | 6 +++--- dlls/jscript/tests/api.js | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 71bed7b..827040b 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -261,6 +261,9 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags switch(flags) { case DISPATCH_METHOD: + case DISPATCH_CONSTRUCT: { + jsdisp_t *obj; + if(argc) { if(!is_undefined(argv[0]) && !is_null(argv[0]) && (!is_object_instance(argv[0]) || get_object(argv[0]))) { IDispatch *disp; @@ -276,9 +279,6 @@ static HRESULT ObjectConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } } - /* fall through */ - case DISPATCH_CONSTRUCT: { - jsdisp_t *obj; hres = create_object(ctx, NULL, &obj); if(FAILED(hres)) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index ca6131b..1ca974d 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -350,12 +350,27 @@ ok(Object(1) instanceof Number, "Object(1) is not instance of Number"); ok(Object("") instanceof String, "Object('') is not instance of String"); ok(Object(false) instanceof Boolean, "Object(false) is not instance of Boolean"); +ok(new Object(1) instanceof Number, "Object(1) is not instance of Number"); +ok(new Object("") instanceof String, "Object('') is not instance of String"); +ok(new Object(false) instanceof Boolean, "Object(false) is not instance of Boolean"); + obj = new Object(); ok(Object(obj) === obj, "Object(obj) !== obj"); ok(typeof(Object()) === "object", "typeof(Object()) !== 'object'"); ok(typeof(Object(undefined)) === "object", "typeof(Object(undefined)) !== 'object'"); ok(typeof(Object(null)) === "object", "typeof(Object(null)) !== 'object'"); +ok(typeof(Object(nullDisp)) === "object", "typeof(Object(nullDisp)) !== 'object'"); + +ok(Object(nullDisp) != nullDisp, "Object(nullDisp) == nullDisp"); +ok(new Object(nullDisp) != nullDisp, "new Object(nullDisp) == nullDisp"); + +ok(Object(testObj) === testObj, "Object(testObj) != testObj\n"); +ok(new Object(testObj) === testObj, "new Object(testObj) != testObj\n"); + +tmp = new Object(); +ok(Object(tmp) === tmp, "Object(tmp) != tmp"); +ok(new Object(tmp) === tmp, "new Object(tmp) != tmp"); var obj = new Object(); obj.toString = function (x) {

1 0

Jacek Caban : wininet: Fixed tests on win10.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 3a7bd03da0428ec4d005bff041d532182a077bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7bd03da0428ec4d005bff04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 20 21:32:22 2016 +0200 wininet: Fixed tests on win10. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/internet.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index d762768..db662a2 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1067,7 +1067,8 @@ static void test_IsDomainLegalCookieDomainW(void) static void test_PrivacyGetSetZonePreferenceW(void) { - DWORD ret, zone, type, template, old_template; + DWORD ret, zone, type, template, old_template, pref_size = 0; + WCHAR pref[256]; zone = 3; type = 0; @@ -1078,6 +1079,14 @@ static void test_PrivacyGetSetZonePreferenceW(void) ret = pPrivacyGetZonePreferenceW(zone, type, &old_template, NULL, NULL); ok(ret == 0, "expected ret == 0, got %u\n", ret); + trace("template %u\n", old_template); + + if(old_template == PRIVACY_TEMPLATE_ADVANCED) { + pref_size = sizeof(pref)/sizeof(WCHAR); + ret = pPrivacyGetZonePreferenceW(zone, type, &old_template, pref, &pref_size); + ok(ret == 0, "expected ret == 0, got %u\n", ret); + } + template = 5; ret = pPrivacySetZonePreferenceW(zone, type, template, NULL); ok(ret == 0, "expected ret == 0, got %u\n", ret); @@ -1088,7 +1097,7 @@ static void test_PrivacyGetSetZonePreferenceW(void) ok(template == 5, "expected template == 5, got %u\n", template); template = 5; - ret = pPrivacySetZonePreferenceW(zone, type, old_template, NULL); + ret = pPrivacySetZonePreferenceW(zone, type, old_template, pref_size ? pref : NULL); ok(ret == 0, "expected ret == 0, got %u\n", ret); }

1 0