August 2016 - Wine-Commits - list.winehq.org

Hans Leidekker : webservices: Implement WsAddMappedHeader.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: ecd1fa8f0f28a2d507bd35b380e61a3b123f625b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecd1fa8f0f28a2d507bd35b38… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:24:01 2016 +0200 webservices: Implement WsAddMappedHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 96 +++++++++++++++++++++++++++++++++------ dlls/webservices/tests/msg.c | 35 ++++++++++++++ dlls/webservices/webservices.spec | 2 +- 3 files changed, 117 insertions(+), 16 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 9a19622..e55e861 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -51,6 +51,8 @@ static const struct prop_desc msg_props[] = struct header { WS_HEADER_TYPE type; + WS_XML_STRING name; + BOOL mapped; WS_XML_UTF8_TEXT text; }; @@ -94,19 +96,20 @@ static struct msg *alloc_msg(void) return ret; } -static void free_headers( struct header **header, ULONG count ) +static void free_header( struct header *header ) { - ULONG i; - for (i = 0; i < count; i++) heap_free( header[i] ); + heap_free( header->name.bytes ); + heap_free( header ); } static void free_msg( struct msg *msg ) { + ULONG i; if (!msg) return; WsFreeWriter( msg->writer ); WsFreeHeap( msg->heap ); heap_free( msg->addr.chars ); - free_headers( msg->header, msg->header_count ); + for (i = 0; i < msg->header_count; i++) free_header( msg->header[i] ); heap_free( msg->header ); heap_free( msg ); } @@ -429,7 +432,7 @@ static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) for (i = 0; i < msg->header_count; i++) { - if ((hr = write_header( writer, msg->header[i] )) != S_OK) return hr; + if (!msg->header[i]->mapped && (hr = write_header( writer, msg->header[i] )) != S_OK) return hr; } if (msg->version_addr == WS_ADDRESSING_VERSION_0_9) @@ -571,8 +574,8 @@ static inline void set_utf8_text( WS_XML_UTF8_TEXT *text, BYTE *bytes, ULONG len text->value.length = len; } -static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_OPTION option, - const void *value, ULONG size, struct header **ret ) +static HRESULT alloc_header( WS_HEADER_TYPE type, const WS_XML_STRING *name, BOOL mapped, WS_TYPE value_type, + WS_WRITE_OPTION option, const void *value, ULONG size, struct header **ret ) { struct header *header; @@ -587,7 +590,7 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O src = *(const WCHAR **)value; len = WideCharToMultiByte( CP_UTF8, 0, src, -1, NULL, 0, NULL, NULL ) - 1; - if (!(header = heap_alloc( sizeof(*header) + len ))) return E_OUTOFMEMORY; + if (!(header = heap_alloc_zero( sizeof(*header) + len ))) return E_OUTOFMEMORY; set_utf8_text( &header->text, (BYTE *)(header + 1), len ); WideCharToMultiByte( CP_UTF8, 0, src, -1, (char *)header->text.value.bytes, len, NULL, NULL ); break; @@ -602,7 +605,7 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O return E_NOTIMPL; } if (size != sizeof(*str)) return E_INVALIDARG; - if (!(header = heap_alloc( sizeof(*header) + str->length ))) return E_OUTOFMEMORY; + if (!(header = heap_alloc_zero( sizeof(*header) + str->length ))) return E_OUTOFMEMORY; set_utf8_text( &header->text, (BYTE *)(header + 1), str->length ); memcpy( header->text.value.bytes, str->bytes, str->length ); break; @@ -619,7 +622,7 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O } if (size != sizeof(*str)) return E_INVALIDARG; len = WideCharToMultiByte( CP_UTF8, 0, str->chars, str->length, NULL, 0, NULL, NULL ); - if (!(header = heap_alloc( sizeof(*header) + len ))) return E_OUTOFMEMORY; + if (!(header = heap_alloc_zero( sizeof(*header) + len ))) return E_OUTOFMEMORY; set_utf8_text( &header->text, (BYTE *)(header + 1), len ); WideCharToMultiByte( CP_UTF8, 0, str->chars, str->length, (char *)header->text.value.bytes, len, NULL, NULL ); @@ -630,7 +633,19 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O return E_NOTIMPL; } - header->type = type; + if (name && name->length) + { + if (!(header->name.bytes = heap_alloc( name->length ))) + { + heap_free( header ); + return E_OUTOFMEMORY; + } + memcpy( header->name.bytes, name->bytes, name->length ); + header->name.length = name->length; + } + header->type = type; + header->mapped = mapped; + *ret = header; return S_OK; } @@ -662,8 +677,7 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val } } - if (found) heap_free( msg->header[i] ); - else + if (!found) { if (msg->header_count == msg->header_size) { @@ -676,7 +690,10 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val i = msg->header_count++; } - if ((hr = alloc_header( type, value_type, option, value, size, &header )) != S_OK) return hr; + if ((hr = alloc_header( type, NULL, FALSE, value_type, option, value, size, &header )) != S_OK) + return hr; + + if (found) free_header( msg->header[i] ); msg->header[i] = header; return write_envelope( msg ); } @@ -701,7 +718,7 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR { if (msg->header[i]->type == type) { - heap_free( msg->header[i] ); + free_header( msg->header[i] ); memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i) * sizeof(struct header *) ); msg->header_count--; removed = TRUE; @@ -712,3 +729,52 @@ HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR if (removed) return write_envelope( msg ); return S_OK; } + +/************************************************************************** + * WsAddMappedHeader [webservices.@] + */ +HRESULT WINAPI WsAddMappedHeader( WS_MESSAGE *handle, const WS_XML_STRING *name, WS_TYPE type, + WS_WRITE_OPTION option, const void *value, ULONG size , WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + struct header *header; + BOOL found = FALSE; + HRESULT hr; + ULONG i; + + TRACE( "%p %s %u %08x %p %u %p\n", handle, debugstr_xmlstr(name), type, option, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !name) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type || !msg->header[i]->mapped) continue; + if (WsXmlStringEquals( name, &msg->header[i]->name, NULL ) == S_OK) + { + found = TRUE; + break; + } + } + + if (!found) + { + if (msg->header_count == msg->header_size) + { + struct header **tmp; + if (!(tmp = heap_realloc( msg->header, 2 * msg->header_size * sizeof(struct header *) ))) + return E_OUTOFMEMORY; + msg->header = tmp; + msg->header_size *= 2; + } + i = msg->header_count++; + } + + if ((hr = alloc_header( 0, name, TRUE, WS_XML_STRING_TYPE, option, value, size, &header )) != S_OK) + return hr; + + if (found) free_header( msg->header[i] ); + msg->header[i] = header; + return S_OK; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 5a0e8b2..1458488 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -669,6 +669,40 @@ static void test_WsRemoveHeader(void) WsFreeMessage( msg ); } +static void test_WsAddMappedHeader(void) +{ + static const WS_XML_STRING header = {6, (BYTE *)"Header"}, value = {5, (BYTE *)"value"}; + WS_MESSAGE *msg; + HRESULT hr; + + hr = WsAddMappedHeader( NULL, NULL, 0, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsCreateMessage( WS_ADDRESSING_VERSION_1_0, WS_ENVELOPE_VERSION_SOAP_1_2, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, NULL, 0, 0, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, &header, 0, 0, NULL, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* again */ + hr = WsAddMappedHeader( msg, &header, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &value, sizeof(value), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -680,4 +714,5 @@ START_TEST(msg) test_WsWriteBody(); test_WsSetHeader(); test_WsRemoveHeader(); + test_WsAddMappedHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 59f9856..bdf6c3f 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -7,7 +7,7 @@ @ stub WsAcceptChannel @ stub WsAddCustomHeader @ stub WsAddErrorString -@ stub WsAddMappedHeader +@ stdcall WsAddMappedHeader(ptr ptr long long ptr long ptr) @ stdcall WsAddressMessage(ptr ptr ptr) @ stdcall WsAlloc(ptr long ptr ptr) @ stub WsAsyncExecute

1 0

Hans Leidekker : webservices: Add support for writing GUID values.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: c06f2d4f5b03ab4866ebc7ceef05d9905a99bf33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c06f2d4f5b03ab4866ebc7cee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:23:59 2016 +0200 webservices: Add support for writing GUID values. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 16 ++++++++++++++++ dlls/webservices/writer.c | 38 +++++++++++++++++++++++++++++++------- 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 65828a4..58a4544 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -580,6 +580,7 @@ static void test_basic_type(void) HRESULT hr; WS_XML_WRITER *writer; WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + GUID guid; ULONG i; static const struct { @@ -671,6 +672,21 @@ static void test_basic_type(void) check_output( writer, tests[i].result2, __LINE__ ); } + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &guid, 0, sizeof(guid) ); + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_GUID_TYPE, NULL, WS_WRITE_REQUIRED_VALUE, + &guid, sizeof(guid), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t>00000000-0000-0000-0000-000000000000</t>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 452ee46..1fb5489 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1497,6 +1497,23 @@ static HRESULT write_type_uint64( struct writer *writer, WS_TYPE_MAPPING mapping return write_type_text( writer, mapping, &utf8.text ); } +static HRESULT write_type_guid( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_GUID_DESCRIPTION *desc, const GUID *value ) +{ + WS_XML_UTF8_TEXT utf8; + unsigned char buf[37]; /* "00000000-0000-0000-0000-000000000000" */ + + if (desc) + { + FIXME( "description not supported\n" ); + return E_NOTIMPL; + } + utf8.text.textType = WS_XML_TEXT_TYPE_UTF8; + utf8.value.bytes = buf; + utf8.value.length = format_guid( value, buf ); + return write_type_text( writer, mapping, &utf8.text ); +} + static HRESULT write_type_wsz( struct writer *writer, WS_TYPE_MAPPING mapping, const WS_WSZ_DESCRIPTION *desc, const WCHAR *value ) { @@ -1664,14 +1681,14 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY } case WS_INT8_TYPE: { - const INT8 *ptr = value; + const INT8 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_int8( writer, mapping, desc, ptr ); } case WS_INT16_TYPE: { - const INT16 *ptr = value; + const INT16 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_int16( writer, mapping, desc, ptr ); @@ -1685,39 +1702,46 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY } case WS_INT64_TYPE: { - const INT64 *ptr = value; + const INT64 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_int64( writer, mapping, desc, ptr ); } case WS_UINT8_TYPE: { - const UINT8 *ptr = value; + const UINT8 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint8( writer, mapping, desc, ptr ); } case WS_UINT16_TYPE: { - const UINT16 *ptr = value; + const UINT16 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint16( writer, mapping, desc, ptr ); } case WS_UINT32_TYPE: { - const UINT32 *ptr = value; + const UINT32 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint32( writer, mapping, desc, ptr ); } case WS_UINT64_TYPE: { - const UINT64 *ptr = value; + const UINT64 *ptr; if (!option) option = WS_WRITE_REQUIRED_VALUE; if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; return write_type_uint64( writer, mapping, desc, ptr ); } + case WS_GUID_TYPE: + { + const GUID *ptr; + if (!option) option = WS_WRITE_REQUIRED_VALUE; + if ((hr = get_value_ptr( option, value, size, (const void **)&ptr )) != S_OK) return hr; + return write_type_guid( writer, mapping, desc, ptr ); + } case WS_WSZ_TYPE: { const WCHAR *ptr;

1 0

Huw Davies : ntdll/tests: Dump the handle table on failure.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: cf22192b288dfc84991390684bcba6c3d75f6793 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf22192b288dfc84991390684… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 17 13:45:18 2016 +0100 ntdll/tests: Dump the handle table on failure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 19c7d66..ea1f3ef 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -521,7 +521,11 @@ static void test_query_handle(void) for (i = 0, found = FALSE; i < shi->Count && !found; i++) found = (shi->Handle[i].OwnerPid == GetCurrentProcessId()) && ((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle); - ok( found, "Expected to find event handle in handle list\n" ); + ok( found, "Expected to find event handle %p (pid %x) in handle list\n", EventHandle, GetCurrentProcessId() ); + + if (!found) + for (i = 0; i < shi->Count; i++) + trace( "%d: handle %x pid %x\n", i, shi->Handle[i].HandleValue, shi->Handle[i].OwnerPid ); CloseHandle(EventHandle);

1 0

Hans Leidekker : webservices: Validate the handle in channel functions.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 41da198a6eef85d20477e4d77c7f989f172e0fdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=41da198a6eef85d20477e4d77… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:24:00 2016 +0200 webservices: Validate the handle in channel functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 5 ++++- dlls/webservices/tests/channel.c | 15 +++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index aba87c0..0277d51 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -188,6 +188,7 @@ HRESULT WINAPI WsGetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID TRACE( "%p %u %p %u %p\n", handle, id, buf, size, error ); if (error) FIXME( "ignoring error parameter\n" ); + if (!handle) return E_INVALIDARG; return prop_get( channel->prop, channel->prop_count, id, buf, size ); } @@ -202,6 +203,7 @@ HRESULT WINAPI WsSetChannelProperty( WS_CHANNEL *handle, WS_CHANNEL_PROPERTY_ID TRACE( "%p %u %p %u\n", handle, id, value, size ); if (error) FIXME( "ignoring error parameter\n" ); + if (!handle) return E_INVALIDARG; return prop_set( channel->prop, channel->prop_count, id, value, size ); } @@ -223,7 +225,7 @@ HRESULT WINAPI WsOpenChannel( WS_CHANNEL *handle, const WS_ENDPOINT_ADDRESS *end if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); - if (!endpoint) return E_INVALIDARG; + if (!handle || !endpoint) return E_INVALIDARG; if (channel->state != WS_CHANNEL_STATE_CREATED) return WS_E_INVALID_OPERATION; return open_channel( channel, endpoint ); @@ -246,5 +248,6 @@ HRESULT WINAPI WsCloseChannel( WS_CHANNEL *handle, const WS_ASYNC_CONTEXT *ctx, if (error) FIXME( "ignoring error parameter\n" ); if (ctx) FIXME( "ignoring ctx parameter\n" ); + if (!handle) return E_INVALIDARG; return close_channel( channel ); } diff --git a/dlls/webservices/tests/channel.c b/dlls/webservices/tests/channel.c index d85a151..f053c15 100644 --- a/dlls/webservices/tests/channel.c +++ b/dlls/webservices/tests/channel.c @@ -28,11 +28,11 @@ static void test_WsCreateChannel(void) WS_CHANNEL_STATE state; ULONG size, value; - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); channel = NULL; - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( channel != NULL, "channel not set\n" ); @@ -64,14 +64,14 @@ static void test_WsOpenChannel(void) WS_CHANNEL *channel; WS_ENDPOINT_ADDRESS addr; - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); WsFreeChannel( channel ); - hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ) ; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsOpenChannel( channel, NULL, NULL, NULL ); @@ -82,6 +82,9 @@ static void test_WsOpenChannel(void) addr.headers = NULL; addr.extensions = NULL; addr.identity = NULL; + hr = WsOpenChannel( NULL, &addr, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + hr = WsOpenChannel( channel, &addr, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -93,6 +96,10 @@ static void test_WsOpenChannel(void) hr = WsCloseChannel( channel, NULL, NULL ); ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseChannel( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + WsFreeChannel( channel ); }

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 5ab0cecaca52d079a699e37bf72175f8aa45e008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab0cecaca52d079a699e37bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Aug 17 14:23:58 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index cd30e4fc..53f851f 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -60,6 +60,7 @@ typedef struct _WS_DOUBLE_DESCRIPTION WS_DOUBLE_DESCRIPTION; typedef struct _WS_DATETIME WS_DATETIME; typedef struct _WS_DATETIME_DESCRIPTION WS_DATETIME_DESCRIPTION; typedef struct _WS_GUID_DESCRIPTION WS_GUID_DESCRIPTION; +typedef struct _WS_UNIQUE_ID_DESCRIPTION WS_UNIQUE_ID_DESCRIPTION; typedef struct _WS_URL WS_URL; typedef struct _WS_HTTP_URL WS_HTTP_URL; typedef struct _WS_HTTPS_URL WS_HTTPS_URL; @@ -404,6 +405,15 @@ struct _WS_DOUBLE_DESCRIPTION { double maxValue; }; +struct _WS_GUID_DESCRIPTION { + GUID value; +}; + +struct _WS_UNIQUE_ID_DESCRIPTION { + ULONG minCharCount; + ULONG maxCharCount; +}; + typedef enum { WS_TYPE_ATTRIBUTE_FIELD_MAPPING, WS_ATTRIBUTE_FIELD_MAPPING, @@ -1336,6 +1346,8 @@ typedef enum typedef void (CALLBACK *WS_MESSAGE_DONE_CALLBACK) (void*); +HRESULT WINAPI WsAddMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_TYPE, WS_WRITE_OPTION, + const void*, ULONG, WS_ERROR*); 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**, @@ -1421,6 +1433,7 @@ HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCR WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsRemoveHeader(WS_MESSAGE*, WS_HEADER_TYPE, WS_ERROR*); +HRESULT WINAPI WsRemoveMappedHeader(WS_MESSAGE*, const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsRemoveNode(const WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsResetChannel(WS_CHANNEL*, WS_ERROR*); HRESULT WINAPI WsResetError(WS_ERROR*);

1 0

Piotr Caban : msvcrt: Add _wcreate_locale.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: dd4c9358f672f878610f1dc11e3114c07d6b2385 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd4c9358f672f878610f1dc11… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 17 13:17:17 2016 +0200 msvcrt: Add _wcreate_locale. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-locale-l1-1-0.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120/tests/msvcr120.c | 49 ++++++++++++++++++++++ dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/locale.c | 25 +++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 7 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index c7e5aae..60c588b 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -14,7 +14,7 @@ @ cdecl _lock_locales() ucrtbase._lock_locales @ cdecl _setmbcp(long) ucrtbase._setmbcp @ cdecl _unlock_locales() ucrtbase._unlock_locales -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) ucrtbase._wcreate_locale @ cdecl _wsetlocale(long wstr) ucrtbase._wsetlocale @ cdecl localeconv() ucrtbase.localeconv @ cdecl setlocale(long str) ucrtbase.setlocale diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 5f33acf..1890a13 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1844,7 +1844,7 @@ @ cdecl _wchmod(wstr long) MSVCRT__wchmod @ extern _wcmdln MSVCRT__wcmdln @ cdecl _wcreat(wstr long) MSVCRT__wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 953cdba..66334d8 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1862,7 +1862,7 @@ @ cdecl _wchmod(wstr long) MSVCRT__wchmod @ extern _wcmdln MSVCRT__wcmdln @ cdecl _wcreat(wstr long) MSVCRT__wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 25330f1..4ecea51 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -170,6 +170,8 @@ static double (CDECL *p_remainder)(double, double); static int* (CDECL *p_errno)(void); static int (CDECL *p_fegetenv)(fenv_t*); static int (CDECL *p__clearfp)(void); +static _locale_t (__cdecl *p_wcreate_locale)(int, const wchar_t *); +static void (__cdecl *p_free_locale)(_locale_t); /* make sure we use the correct errno */ #undef errno @@ -215,6 +217,8 @@ static BOOL init(void) p_wcstof = (void*)GetProcAddress(module, "wcstof"); p_remainder = (void*)GetProcAddress(module, "remainder"); p_errno = (void*)GetProcAddress(module, "_errno"); + p_wcreate_locale = (void*)GetProcAddress(module, "_wcreate_locale"); + p_free_locale = (void*)GetProcAddress(module, "_free_locale"); SET(p_fegetenv, "fegetenv"); SET(p__clearfp, "_clearfp"); if(sizeof(void*) == 8) { /* 64-bit initialization */ @@ -710,6 +714,50 @@ static void test_fegetenv(void) ok(!env.status, "env.status = %x\n", env.status); } +static void test__wcreate_locale(void) +{ + static const wchar_t c_locale[] = {'C',0}; + static const wchar_t bogus[] = {'b','o','g','u','s',0}; + static const wchar_t empty[] = {0}; + _locale_t lcl; + errno_t e; + + /* simple success */ + errno = -1; + lcl = p_wcreate_locale(LC_ALL, c_locale); + e = errno; + ok(!!lcl, "expected success, but got NULL\n"); + ok(errno == -1, "expected errno -1, but got %i\n", e); + p_free_locale(lcl); + + errno = -1; + lcl = p_wcreate_locale(LC_ALL, empty); + e = errno; + ok(!!lcl, "expected success, but got NULL\n"); + ok(errno == -1, "expected errno -1, but got %i\n", e); + p_free_locale(lcl); + + /* bogus category */ + errno = -1; + lcl = p_wcreate_locale(-1, c_locale); + e = errno; + ok(!lcl, "expected failure, but got %p\n", lcl); + ok(errno == -1, "expected errno -1, but got %i\n", e); + + /* bogus names */ + errno = -1; + lcl = p_wcreate_locale(LC_ALL, bogus); + e = errno; + ok(!lcl, "expected failure, but got %p\n", lcl); + ok(errno == -1, "expected errno -1, but got %i\n", e); + + errno = -1; + lcl = p_wcreate_locale(LC_ALL, NULL); + e = errno; + ok(!lcl, "expected failure, but got %p\n", lcl); + ok(errno == -1, "expected errno -1, but got %i\n", e); +} + START_TEST(msvcr120) { if (!init()) return; @@ -724,4 +772,5 @@ START_TEST(msvcr120) test_remainder(); test_critical_section(); test_fegetenv(); + test__wcreate_locale(); } diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c88cde0..6f0daca 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1555,7 +1555,7 @@ @ cdecl _wchmod(wstr long) msvcr120._wchmod @ extern _wcmdln msvcr120._wcmdln @ cdecl _wcreat(wstr long) msvcr120._wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) msvcr120._wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) msvcr120._wcscoll_l @ cdecl _wcsdup(wstr) msvcr120._wcsdup @ cdecl _wcserror(long) msvcr120._wcserror diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 024ec99..c3e5630 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1634,6 +1634,31 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } /********************************************************************* + * _wcreate_locale (MSVCRT.@) + */ +MSVCRT__locale_t CDECL MSVCRT__wcreate_locale(int category, const MSVCRT_wchar_t *locale) +{ + MSVCRT__locale_t loc; + MSVCRT_size_t len; + char *str; + + if(category<MSVCRT_LC_MIN || category>MSVCRT_LC_MAX || !locale) + return NULL; + + len = MSVCRT_wcstombs(NULL, locale, 0); + if(len == -1) + return NULL; + if(!(str = MSVCRT_malloc(++len))) + return NULL; + MSVCRT_wcstombs(str, locale, len); + + loc = MSVCRT__create_locale(category, str); + + MSVCRT_free(str); + return loc; +} + +/********************************************************************* * setlocale (MSVCRT.@) */ char* CDECL MSVCRT_setlocale(int category, const char* locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1adc80a..0e1faa1 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2011,7 +2011,7 @@ @ cdecl _wchdir(wstr) MSVCRT__wchdir @ cdecl _wchmod(wstr long) MSVCRT__wchmod @ cdecl _wcreat(wstr long) MSVCRT__wcreat -@ stub _wcreate_locale +@ cdecl _wcreate_locale(long wstr) MSVCRT__wcreate_locale @ cdecl _wcscoll_l(wstr wstr ptr) MSVCRT__wcscoll_l @ cdecl _wcsdup(wstr) MSVCRT__wcsdup @ cdecl _wcserror(long) MSVCRT__wcserror

1 0

Alistair Leslie-Hughes : inetcomm: Add MimeOleObjectFromMoniker stub.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: c40001cdc44aad5d31ae2b3bd28c1d58f2234393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c40001cdc44aad5d31ae2b3bd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 15 20:53:45 2016 +0000 inetcomm: Add MimeOleObjectFromMoniker stub. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/inetcomm.spec | 2 +- dlls/inetcomm/mimeole.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/inetcomm.spec b/dlls/inetcomm/inetcomm.spec index bfd115c..439a409 100644 --- a/dlls/inetcomm/inetcomm.spec +++ b/dlls/inetcomm/inetcomm.spec @@ -82,7 +82,7 @@ @ stdcall MimeOleGetPropertySchema(ptr) @ stub MimeOleGetRelatedSection @ stub MimeOleInetDateToFileTime -@ stub MimeOleObjectFromMoniker +@ stdcall MimeOleObjectFromMoniker(long ptr ptr ptr ptr ptr) @ stub MimeOleOpenFileStream @ stub MimeOleParseMhtmlUrl @ stub MimeOleParseRfc822Address diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6046c74..e1e10bd 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -3436,3 +3436,11 @@ HRESULT WINAPI MimeGetAddressFormatW(REFIID riid, void *object, DWORD addr_type, return E_NOTIMPL; } + +HRESULT WINAPI MimeOleObjectFromMoniker(BINDF bindf, IMoniker *moniker, IBindCtx *binding, + REFIID riid, void **out, IMoniker **moniker_new) +{ + FIXME("(0x%08x, %p, %p, %s, %p, %p) stub\n", bindf, moniker, binding, debugstr_guid(riid), out, moniker_new); + + return E_NOTIMPL; +}

1 0

Sebastian Lackner : advapi32: Hold lock while handling service thread shutdown.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 13bb213aeb65b657a57adbf486ddb73da78dffbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=13bb213aeb65b657a57adbf48… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:36:59 2016 +0200 advapi32: Hold lock while handling service thread shutdown. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/service.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 11186c5..d6bd14c 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -625,8 +625,11 @@ static BOOL service_run_main_thread(void) } else if (ret < n) { - services[wait_services[ret]]->thread = 0; - CloseHandle( wait_handles[ret] ); + i = wait_services[ret]; + EnterCriticalSection( &service_cs ); + CloseHandle( services[i]->thread ); + services[i]->thread = NULL; + LeaveCriticalSection( &service_cs ); } else return FALSE; }

1 0

Sebastian Lackner : services: Add a grab_service function.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 46a974856fee148a1006478df1978a82153fb9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46a974856fee148a1006478df… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Aug 17 09:12:27 2016 +0200 services: Add a grab_service function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 4 +--- programs/services/services.c | 13 +++++++++---- programs/services/services.h | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 45366fb..eb8f4ff 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -373,9 +373,7 @@ DWORD __cdecl svcctl_OpenServiceW( return ERROR_INVALID_NAME; scmdatabase_lock(manager->db); - entry = scmdatabase_find_service(manager->db, lpServiceName); - if (entry != NULL) - InterlockedIncrement(&entry->ref_count); + entry = grab_service(scmdatabase_find_service(manager->db, lpServiceName)); scmdatabase_unlock(manager->db); if (entry == NULL) diff --git a/programs/services/services.c b/programs/services/services.c index f7a2725..9be9bb8 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -346,15 +346,13 @@ static void scmdatabase_autostart_services(struct scmdatabase *db) break; services_list = slist_new; } - services_list[i] = service; - InterlockedIncrement(&service->ref_count); - i++; + services_list[i++] = grab_service(service); } } + size = i; scmdatabase_unlock(db); - size = i; for (i = 0; i < size; i++) { DWORD err; @@ -494,6 +492,13 @@ void release_process(struct process_entry *process) scmdatabase_unlock(db); } +struct service_entry *grab_service(struct service_entry *service) +{ + if (service) + InterlockedIncrement(&service->ref_count); + return service; +} + void release_service(struct service_entry *service) { struct scmdatabase *db = service->db; diff --git a/programs/services/services.h b/programs/services/services.h index 16f99f89..59d8d00 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -84,6 +84,7 @@ BOOL validate_service_name(LPCWSTR name); BOOL validate_service_config(struct service_entry *entry); DWORD save_service_config(struct service_entry *entry); void free_service_entry(struct service_entry *entry); +struct service_entry *grab_service(struct service_entry *service); void release_service(struct service_entry *service); void service_lock(struct service_entry *service); void service_unlock(struct service_entry *service);

1 0

Alexandre Julliard : winex11: Don' t crash when getting an invalid window in SelectionRequest.
by Alexandre Julliard Aug. 17, 2016

Aug. 17, 2016

Module: wine Branch: master Commit: 6da991c75bb4140e0922a76b5db0de3637e3f52f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6da991c75bb4140e0922a76b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 17 17:23:31 2016 +0900 winex11: Don't crash when getting an invalid window in SelectionRequest. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 5dc5e3c..9b6c749 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2298,6 +2298,11 @@ static int is_atom_error( Display *display, XErrorEvent *event, void *arg ) return (event->error_code == BadAtom); } +static int is_window_error( Display *display, XErrorEvent *event, void *arg ) +{ + return (event->error_code == BadWindow); +} + /************************************************************************** * X11DRV_CLIPBOARD_InsertSelectionProperties * @@ -3439,6 +3444,8 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev TRACE("\n"); + X11DRV_expect_error( display, is_window_error, NULL ); + /* * We can only handle the selection request if : * The selection is PRIMARY or CLIPBOARD, AND we can successfully open the clipboard. @@ -3527,6 +3534,8 @@ END: TRACE("Sending SelectionNotify event...\n"); XSendEvent(display,event->requestor,False,NoEventMask,(XEvent*)&result); } + XSync( display, False ); + if (X11DRV_check_error()) WARN( "requestor %lx is no longer valid\n", event->requestor ); }

1 0