September 2016 - Wine-Commits

Hans Leidekker : webservices: Fix corner cases in write option handling.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: e4fd90596d50ea436cf57548423f2a8cdb9723a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fd90596d50ea436cf575484… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 28 12:38:00 2016 +0200 webservices: Fix corner cases in write option handling. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 113 +++++++++++ dlls/webservices/writer.c | 401 ++++++++++++++++++++++------------------ 2 files changed, 339 insertions(+), 175 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e4fd90596d50ea436cf57…

1 0

Michael Stefaniuc : quartz: Avoid using CopyRect().
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: 3685d3d90dbc693c893dccff0cf30f7f50c48bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3685d3d90dbc693c893dccff0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Sep 28 09:24:54 2016 +0200 quartz: Avoid using CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 7c7b244..fb6745d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1318,7 +1318,7 @@ static BOOL CALLBACK get_available_monitors_proc(HMONITOR hmon, HDC hdc, LPRECT else info->guid.pGUID = NULL; - CopyRect(&info->rcMonitor, &mi.rcMonitor); + info->rcMonitor = mi.rcMonitor; info->hMon = hmon; info->dwFlags = mi.dwFlags; @@ -1335,7 +1335,7 @@ static BOOL CALLBACK get_available_monitors_proc(HMONITOR hmon, HDC hdc, LPRECT memset(info, 0, sizeof(*info)); info->uDevID = 0; /* FIXME */ - CopyRect(&info->rcMonitor, &mi.rcMonitor); + info->rcMonitor = mi.rcMonitor; info->hMon = hmon; info->dwFlags = mi.dwFlags;

1 0

Piotr Caban : msvcp140: Fix time_put structure layout.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: a347f041d6b412d7ef590dca59fe4746d551ee23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a347f041d6b412d7ef590dca5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 28 12:36:39 2016 +0200 msvcp140: Fix time_put structure layout. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index b9abe8b..f5b13db 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -158,7 +158,9 @@ typedef struct { typedef struct { locale_facet facet; _Timevec time; +#if _MSVCP_VER <= 100 _Cvtvec cvt; +#endif } time_put; typedef struct { @@ -8973,7 +8975,9 @@ void __thiscall time_put_char__Init(time_put *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); _Locinfo__Gettnames(locinfo, &this->time); +#if _MSVCP_VER <= 100 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$time_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -9286,7 +9290,9 @@ void __thiscall time_put_wchar__Init(time_put *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); _Locinfo__Gettnames(locinfo, &this->time); +#if _MSVCP_VER <= 100 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$time_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -9546,6 +9552,7 @@ ostreambuf_iterator_wchar* __thiscall time_put_wchar_do_put(const time_put *this { char buf[64], fmt[4], *p = fmt; MSVCP_size_t i, len; + const _Cvtvec *cvt; wchar_t c; TRACE("(%p %p %p %c %p %c %c)\n", this, ret, base, fill, t, spec, mod); @@ -9556,9 +9563,15 @@ ostreambuf_iterator_wchar* __thiscall time_put_wchar_do_put(const time_put *this *p++ = spec; *p++ = 0; +#if _MSVCP_VER <= 100 + cvt = &this->cvt; +#else + cvt = &ctype_wchar_use_facet(base->loc)->cvt; +#endif + len = _Strftime(buf, sizeof(buf), fmt, t, this->time.timeptr); for(i=0; i<len; i++) { - c = mb_to_wc(buf[i], &this->cvt); + c = mb_to_wc(buf[i], cvt); ostreambuf_iterator_wchar_put(&dest, c); } @@ -9596,23 +9609,31 @@ ostreambuf_iterator_wchar* __thiscall time_put_wchar_put_format(const time_put * ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, const struct tm *t, const wchar_t *pat, const wchar_t *pat_end) { - wchar_t percent = mb_to_wc('%', &this->cvt); + wchar_t percent; char c[MB_LEN_MAX]; + const _Cvtvec *cvt; TRACE("(%p %p %p %c %p %s)\n", this, ret, base, fill, t, debugstr_wn(pat, pat_end-pat)); +#if _MSVCP_VER <= 100 + cvt = &this->cvt; +#else + cvt = &ctype_wchar_use_facet(base->loc)->cvt; +#endif + + percent = mb_to_wc('%', cvt); while(pat < pat_end) { if(*pat != percent) { ostreambuf_iterator_wchar_put(&dest, *pat++); }else if(++pat == pat_end) { ostreambuf_iterator_wchar_put(&dest, percent); - }else if(_Wcrtomb(c, *pat, NULL, &this->cvt)!=1 || (*c=='#' && pat+1==pat_end)) { + }else if(_Wcrtomb(c, *pat, NULL, cvt)!=1 || (*c=='#' && pat+1==pat_end)) { ostreambuf_iterator_wchar_put(&dest, percent); ostreambuf_iterator_wchar_put(&dest, *pat++); }else { pat++; if(*c == '#') { - if(_Wcrtomb(c, *pat++, NULL, &this->cvt) != 1) { + if(_Wcrtomb(c, *pat++, NULL, cvt) != 1) { ostreambuf_iterator_wchar_put(&dest, percent); ostreambuf_iterator_wchar_put(&dest, *(pat-2)); ostreambuf_iterator_wchar_put(&dest, *(pat-1));

1 0

Hans Leidekker : webservices: Don' t write an empty header element for messages that have an action.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: efcf63cc7188b6b08e9ad4d8172eb399c9167631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efcf63cc7188b6b08e9ad4d81… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 28 12:38:03 2016 +0200 webservices: Don't write an empty header element for messages that have an action. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 87 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 59 insertions(+), 28 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 52f4c0e..d6cae08 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -71,6 +71,7 @@ struct msg WS_ADDRESSING_VERSION version_addr; BOOL is_addressed; WS_STRING addr; + WS_STRING action; WS_HEAP *heap; WS_XML_BUFFER *buf; WS_XML_WRITER *writer; @@ -118,6 +119,7 @@ static void free_msg( struct msg *msg ) WsFreeWriter( msg->writer ); WsFreeHeap( msg->heap ); heap_free( msg->addr.chars ); + heap_free( msg->action.chars ); for (i = 0; i < msg->header_count; i++) free_header( msg->header[i] ); heap_free( msg->header ); heap_free( msg ); @@ -404,33 +406,37 @@ static const WS_XML_STRING *get_header_name( WS_HEADER_TYPE type ) } } -static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) +static HRESULT write_headers( struct msg *msg, const WS_XML_STRING *ns_env, const WS_XML_STRING *ns_addr, + WS_XML_WRITER *writer ) { static const char anonymous[] = "http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous"; static const WS_XML_STRING prefix_s = {1, (BYTE *)"s"}, prefix_a = {1, (BYTE *)"a"}; - static const WS_XML_STRING envelope = {8, (BYTE *)"Envelope"}, header = {6, (BYTE *)"Header"}; static const WS_XML_STRING msgid = {9, (BYTE *)"MessageID"}, replyto = {7, (BYTE *)"ReplyTo"}; - static const WS_XML_STRING address = {7, (BYTE *)"Address"}, body = {4, (BYTE *)"Body"}; - WS_XML_STRING ns_env, ns_addr; + static const WS_XML_STRING address = {7, (BYTE *)"Address"}, header = {6, (BYTE *)"Header"}; WS_XML_UTF8_TEXT urn, addr; HRESULT hr; ULONG i; - if ((hr = get_env_namespace( msg->version_env, &ns_env )) != S_OK) return hr; - if ((hr = get_addr_namespace( msg->version_addr, &ns_addr )) != S_OK) return hr; + if ((hr = WsWriteXmlnsAttribute( writer, &prefix_a, ns_addr, FALSE, NULL )) != S_OK) return hr; + if ((hr = WsWriteStartElement( writer, &prefix_s, &header, ns_env, NULL )) != S_OK) return hr; - if ((hr = WsWriteStartElement( writer, &prefix_s, &envelope, &ns_env, NULL )) != S_OK) return hr; - if (msg->version_addr < WS_ADDRESSING_VERSION_TRANSPORT && - (hr = WsWriteXmlnsAttribute( writer, &prefix_a, &ns_addr, FALSE, NULL )) != S_OK) return hr; - if ((hr = WsWriteStartElement( writer, &prefix_s, &header, &ns_env, NULL )) != S_OK) return hr; + if ((hr = WsWriteStartElement( writer, &prefix_a, &msgid, ns_addr, NULL )) != S_OK) return hr; + urn.text.textType = WS_XML_TEXT_TYPE_UNIQUE_ID; + memcpy( &urn.value, &msg->id, sizeof(msg->id) ); + if ((hr = WsWriteText( writer, &urn.text, NULL )) != S_OK) return hr; + if ((hr = WsWriteEndElement( writer, NULL )) != S_OK) return hr; /* </a:MessageID> */ - if (msg->version_addr < WS_ADDRESSING_VERSION_TRANSPORT) + if (msg->version_addr == WS_ADDRESSING_VERSION_0_9) { - if ((hr = WsWriteStartElement( writer, &prefix_a, &msgid, &ns_addr, NULL )) != S_OK) return hr; - urn.text.textType = WS_XML_TEXT_TYPE_UNIQUE_ID; - memcpy( &urn.value, &msg->id, sizeof(msg->id) ); - if ((hr = WsWriteText( writer, &urn.text, NULL )) != S_OK) return hr; - if ((hr = WsWriteEndElement( writer, NULL )) != S_OK) return hr; /* </a:MessageID> */ + if ((hr = WsWriteStartElement( writer, &prefix_a, &replyto, ns_addr, NULL )) != S_OK) return hr; + if ((hr = WsWriteStartElement( writer, &prefix_a, &address, ns_addr, NULL )) != S_OK) return hr; + + addr.text.textType = WS_XML_TEXT_TYPE_UTF8; + addr.value.bytes = (BYTE *)anonymous; + addr.value.length = sizeof(anonymous) - 1; + if ((hr = WsWriteText( writer, &addr.text, NULL )) != S_OK) return hr; + if ((hr = WsWriteEndElement( writer, NULL )) != S_OK) return hr; /* </a:Address> */ + if ((hr = WsWriteEndElement( writer, NULL )) != S_OK) return hr; /* </a:ReplyTo> */ } for (i = 0; i < msg->header_count; i++) @@ -439,21 +445,46 @@ static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) if ((hr = WsWriteXmlBuffer( writer, msg->header[i]->u.buf, NULL )) != S_OK) return hr; } - if (msg->version_addr == WS_ADDRESSING_VERSION_0_9) - { - if ((hr = WsWriteStartElement( writer, &prefix_a, &replyto, &ns_addr, NULL )) != S_OK) return hr; - if ((hr = WsWriteStartElement( writer, &prefix_a, &address, &ns_addr, NULL )) != S_OK) return hr; + return WsWriteEndElement( writer, NULL ); /* </s:Header> */ +} - addr.text.textType = WS_XML_TEXT_TYPE_UTF8; - addr.value.bytes = (BYTE *)anonymous; - addr.value.length = sizeof(anonymous) - 1; - if ((hr = WsWriteText( writer, &addr.text, NULL )) != S_OK) return hr; - if ((hr = WsWriteEndElement( writer, NULL )) != S_OK) return hr; /* </a:Address> */ - if ((hr = WsWriteEndElement( writer, NULL )) != S_OK) return hr; /* </a:ReplyTo> */ +static HRESULT write_headers_transport( struct msg *msg, const WS_XML_STRING *ns_env, WS_XML_WRITER *writer ) +{ + static const WS_XML_STRING prefix = {1, (BYTE *)"s"}, header = {6, (BYTE *)"Header"}; + HRESULT hr; + ULONG i; + + if ((msg->header_count || !msg->action.length) && + (hr = WsWriteStartElement( writer, &prefix, &header, ns_env, NULL )) != S_OK) return hr; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->mapped) continue; + if ((hr = WsWriteXmlBuffer( writer, msg->header[i]->u.buf, NULL )) != S_OK) return hr; } - if ((hr = WsWriteEndElement( writer, NULL )) != S_OK) return hr; /* </s:Header> */ - return WsWriteStartElement( writer, &prefix_s, &body, &ns_env, NULL ); /* <s:Body> */ + if (msg->header_count || !msg->action.length) hr = WsWriteEndElement( writer, NULL ); /* </s:Header> */ + return hr; +} + +static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) +{ + static const WS_XML_STRING envelope = {8, (BYTE *)"Envelope"}, body = {4, (BYTE *)"Body"}; + static const WS_XML_STRING prefix = {1, (BYTE *)"s"}; + WS_XML_STRING ns_env, ns_addr; + HRESULT hr; + + if ((hr = get_env_namespace( msg->version_env, &ns_env )) != S_OK) return hr; + if ((hr = get_addr_namespace( msg->version_addr, &ns_addr )) != S_OK) return hr; + if ((hr = WsWriteStartElement( writer, &prefix, &envelope, &ns_env, NULL )) != S_OK) return hr; + + if (msg->version_addr == WS_ADDRESSING_VERSION_TRANSPORT) + hr = write_headers_transport( msg, &ns_env, writer ); + else + hr = write_headers( msg, &ns_env, &ns_addr, writer ); + if (hr != S_OK) return hr; + + return WsWriteStartElement( writer, &prefix, &body, &ns_env, NULL ); /* <s:Body> */ } static HRESULT write_envelope_end( WS_XML_WRITER *writer )

1 0

Hans Leidekker : webservices: Add support for WS_MESSAGE_PROPERTY_BODY_READER/ WRITER in WsGetMessageProperty.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: c7b606ea9c0227b52f0e8b65a6008f6bc1c84cba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b606ea9c0227b52f0e8b65a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 28 12:38:02 2016 +0200 webservices: Add support for WS_MESSAGE_PROPERTY_BODY_READER/WRITER in WsGetMessageProperty. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index e7da06f..52f4c0e 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -260,6 +260,16 @@ HRESULT WINAPI WsGetMessageProperty( WS_MESSAGE *handle, WS_MESSAGE_PROPERTY_ID *(WS_XML_BUFFER **)buf = msg->buf; return S_OK; + case WS_MESSAGE_PROPERTY_BODY_READER: + if (!buf || size != sizeof(msg->reader_body)) return E_INVALIDARG; + *(WS_XML_READER **)buf = msg->reader_body; + return S_OK; + + case WS_MESSAGE_PROPERTY_BODY_WRITER: + if (!buf || size != sizeof(msg->writer_body)) return E_INVALIDARG; + *(WS_XML_WRITER **)buf = msg->writer_body; + return S_OK; + case WS_MESSAGE_PROPERTY_IS_ADDRESSED: if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; *(BOOL *)buf = msg->is_addressed;

1 0

Hans Leidekker : webservices: Escape XML special characters where needed.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: 517638695eeeff660a33bd2bc8c47b67805171de URL: http://source.winehq.org/git/wine.git/?a=commit;h=517638695eeeff660a33bd2bc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 28 12:37:59 2016 +0200 webservices: Escape XML special characters where needed. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 175 ++++++++++++++++++++++++++++++++++------ dlls/webservices/writer.c | 67 +++++++++++++-- 2 files changed, 213 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=517638695eeeff660a33b…

1 0

Hans Leidekker : webservices: Implement WsReceiveMessage.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: dc014df696f7a6d68e251270774e9baf6c0642fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc014df696f7a6d68e2512707… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 28 12:38:06 2016 +0200 webservices: Implement WsReceiveMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 122 +++++++++++++++++++++++++++++++++ dlls/webservices/tests/proxy.c | 60 ++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/webservices_private.h | 2 + 4 files changed, 185 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 9431ad0..e7fb52b 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -92,6 +92,7 @@ struct channel WS_CHANNEL_STATE state; WS_ENDPOINT_ADDRESS addr; WS_XML_WRITER *writer; + WS_XML_READER *reader; HINTERNET http_session; HINTERNET http_connect; HINTERNET http_request; @@ -115,6 +116,7 @@ static void free_channel( struct channel *channel ) { if (!channel) return; WsFreeWriter( channel->writer ); + WsFreeReader( channel->reader ); WinHttpCloseHandle( channel->http_request ); WinHttpCloseHandle( channel->http_connect ); WinHttpCloseHandle( channel->http_session ); @@ -475,3 +477,123 @@ HRESULT WINAPI WsSendMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESS return channel_send_message( handle, msg ); } + +#define INITIAL_READ_BUFFER_SIZE 4096 +static HRESULT receive_message( struct channel *channel, ULONG max_len, char **ret, ULONG *ret_len ) +{ + DWORD len, bytes_read, offset = 0, size = INITIAL_READ_BUFFER_SIZE; + char *buf; + + if (!(buf = heap_alloc( size ))) return E_OUTOFMEMORY; + *ret_len = 0; + for (;;) + { + if (!WinHttpQueryDataAvailable( channel->http_request, &len )) + { + heap_free( buf ); + return HRESULT_FROM_WIN32( GetLastError() ); + } + if (!len) break; + if (*ret_len + len > max_len) + { + heap_free( buf ); + return WS_E_QUOTA_EXCEEDED; + } + if (*ret_len + len > size) + { + char *tmp; + DWORD new_size = max( len, size * 2 ); + if (!(tmp = heap_realloc( buf, new_size ))) + { + heap_free( buf ); + return E_OUTOFMEMORY; + } + buf = tmp; + size = new_size; + } + if (!WinHttpReadData( channel->http_request, buf + offset, len, &bytes_read )) + { + heap_free( buf ); + return HRESULT_FROM_WIN32( GetLastError() ); + } + if (!bytes_read) break; + *ret_len += bytes_read; + offset += bytes_read; + } + + *ret = buf; + return S_OK; +} + +HRESULT channel_receive_message( WS_CHANNEL *handle, char **buf, ULONG *len ) +{ + struct channel *channel = (struct channel *)handle; + ULONG max_len; + + WsGetChannelProperty( handle, WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE, &max_len, sizeof(max_len), NULL ); + return receive_message( channel, max_len, buf, len ); +} + +HRESULT set_input( WS_XML_READER *reader, char *data, ULONG size ) +{ + WS_XML_READER_TEXT_ENCODING text = {{WS_XML_READER_ENCODING_TYPE_TEXT}, WS_CHARSET_UTF8}; + WS_XML_READER_BUFFER_INPUT buf; + + buf.input.inputType = WS_XML_READER_INPUT_TYPE_BUFFER; + buf.encodedData = data; + buf.encodedDataSize = size; + return WsSetInput( reader, &text.encoding, &buf.input, NULL, 0, NULL ); +} + +static HRESULT read_message( WS_MESSAGE *handle, WS_XML_READER *reader, const WS_ELEMENT_DESCRIPTION *desc, + WS_READ_OPTION option, WS_HEAP *heap, void *body, ULONG size ) +{ + HRESULT hr; + if ((hr = WsReadEnvelopeStart( handle, reader, NULL, NULL, NULL )) != S_OK) return hr; + if ((hr = WsReadBody( handle, desc, option, heap, body, size, NULL )) != S_OK) return hr; + return WsReadEnvelopeEnd( handle, NULL ); +} + +/************************************************************************** + * WsReceiveMessage [webservices.@] + */ +HRESULT WINAPI WsReceiveMessage( WS_CHANNEL *handle, WS_MESSAGE *msg, const WS_MESSAGE_DESCRIPTION **desc, + ULONG count, WS_RECEIVE_OPTION option, WS_READ_OPTION read_option, WS_HEAP *heap, + void *value, ULONG size, ULONG *index, const WS_ASYNC_CONTEXT *ctx, WS_ERROR *error ) +{ + struct channel *channel = (struct channel *)handle; + char *buf = NULL; + ULONG len; + HRESULT hr; + + TRACE( "%p %p %p %u %08x %08x %p %p %u %p %p %p\n", handle, msg, desc, count, option, read_option, heap, + value, size, index, ctx, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (ctx) FIXME( "ignoring ctx parameter\n" ); + if (index) + { + FIXME( "index parameter not supported\n" ); + return E_NOTIMPL; + } + if (count != 1) + { + FIXME( "no support for multiple descriptions\n" ); + return E_NOTIMPL; + } + if (option != WS_RECEIVE_REQUIRED_MESSAGE) + { + FIXME( "receive option %08x not supported\n", option ); + return E_NOTIMPL; + } + + if (!handle || !msg || !desc || !count) return E_INVALIDARG; + + if ((hr = channel_receive_message( handle, &buf, &len )) != S_OK) return hr; + if (!channel->reader && (hr = WsCreateReader( NULL, 0, &channel->reader, NULL )) != S_OK) goto done; + if ((hr = set_input( channel->reader, buf, len )) != S_OK) goto done; + hr = read_message( msg, channel->reader, desc[0]->bodyElementDescription, read_option, heap, value, size ); + +done: + heap_free( buf ); + return hr; +} diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index ef64faf..fa4348a 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -191,6 +191,64 @@ static void test_WsSendMessage( int port, WS_XML_STRING *action ) WsFreeMessage( msg ); } +static void test_WsReceiveMessage( int port ) +{ + WS_XML_STRING req = {9, (BYTE *)"req_test1"}, resp = {10, (BYTE *)"resp_test1"}, ns = {2, (BYTE *)"ns"}; + WS_CHANNEL *channel; + WS_MESSAGE *msg; + WS_ELEMENT_DESCRIPTION body; + WS_MESSAGE_DESCRIPTION desc_req, desc_resp; + const WS_MESSAGE_DESCRIPTION *desc[1]; + INT32 val = -1; + HRESULT hr; + + hr = create_channel( port, &channel ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + body.elementLocalName = &req; + body.elementNs = &ns; + body.type = WS_INT32_TYPE; + body.typeDescription = NULL; + desc_req.action = &req; + desc_req.bodyElementDescription = &body; + hr = WsSendMessage( channel, msg, &desc_req, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + WsFreeMessage( msg ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + body.elementLocalName = &resp; + desc_resp.action = &resp; + desc_resp.bodyElementDescription = &body; + desc[0] = &desc_resp; + hr = WsReceiveMessage( NULL, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReceiveMessage( channel, NULL, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReceiveMessage( channel, msg, NULL, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsReceiveMessage( channel, msg, desc, 1, WS_RECEIVE_REQUIRED_MESSAGE, WS_READ_REQUIRED_VALUE, + NULL, &val, sizeof(val), NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( val == -2, "got %d\n", val ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeChannel( channel ); + WsFreeMessage( msg ); +} + static const struct { const char *req_action; @@ -324,6 +382,8 @@ START_TEST(proxy) if (ret != WAIT_OBJECT_0) return; test_WsSendMessage( info.port, &test1 ); + test_WsReceiveMessage( info.port ); + test_WsSendMessage( info.port, &quit ); WaitForSingleObject( thread, 3000 ); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 27853b2..a03b7bd 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -125,7 +125,7 @@ @ stdcall WsReadValue(ptr long ptr long ptr) @ stub WsReadXmlBuffer @ stub WsReadXmlBufferFromBytes -@ stub WsReceiveMessage +@ stdcall WsReceiveMessage(ptr ptr ptr long long long ptr ptr long ptr ptr ptr) @ stub WsRegisterOperationForCancel @ stdcall WsRemoveCustomHeader(ptr ptr ptr ptr) @ stdcall WsRemoveHeader(ptr long ptr) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index ffbf77a..f72d2b9 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -38,6 +38,7 @@ WS_TYPE map_value_type( WS_VALUE_TYPE ) DECLSPEC_HIDDEN; BOOL set_fp_rounding( unsigned short * ) DECLSPEC_HIDDEN; void restore_fp_rounding( unsigned short ) DECLSPEC_HIDDEN; HRESULT set_output( WS_XML_WRITER * ) DECLSPEC_HIDDEN; +HRESULT set_input( WS_XML_READER *, char *, ULONG ) DECLSPEC_HIDDEN; ULONG get_type_size( WS_TYPE, const WS_STRUCT_DESCRIPTION * ) DECLSPEC_HIDDEN; struct node @@ -97,6 +98,7 @@ HRESULT message_set_action( WS_MESSAGE *, const WS_XML_STRING * ) DECLSPEC_HIDDE HRESULT message_insert_http_headers( WS_MESSAGE *, HINTERNET ) DECLSPEC_HIDDEN; HRESULT channel_send_message( WS_CHANNEL *, WS_MESSAGE * ) DECLSPEC_HIDDEN; +HRESULT channel_receive_message( WS_CHANNEL *, char **, ULONG * ) DECLSPEC_HIDDEN; static inline BOOL is_nil_value( const char *value, ULONG size ) {

1 0

Hans Leidekker : webservices/tests: Add tests for WsSendMessage.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: e9a2505276fbd08e30c7a95ea052916e236d8ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9a2505276fbd08e30c7a95ea… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 28 12:38:05 2016 +0200 webservices/tests: Add tests for WsSendMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/Makefile.in | 2 +- dlls/webservices/tests/proxy.c | 221 ++++++++++++++++++++++++++++++++++++- 2 files changed, 220 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/tests/Makefile.in b/dlls/webservices/tests/Makefile.in index afff870..e63952c 100644 --- a/dlls/webservices/tests/Makefile.in +++ b/dlls/webservices/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = webservices.dll -IMPORTS = webservices +IMPORTS = webservices user32 ws2_32 C_SRCS = \ channel.c \ diff --git a/dlls/webservices/tests/proxy.c b/dlls/webservices/tests/proxy.c index ba0ecd3..ef64faf 100644 --- a/dlls/webservices/tests/proxy.c +++ b/dlls/webservices/tests/proxy.c @@ -18,6 +18,7 @@ #include <stdio.h> #include "windows.h" +#include "winsock2.h" #include "webservices.h" #include "wine/test.h" @@ -29,12 +30,12 @@ static void test_WsCreateServiceProxy(void) ULONG size, value; hr = WsCreateServiceProxy( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, NULL, - 0, NULL, 0, NULL, NULL ) ; + 0, NULL, 0, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); proxy = NULL; hr = WsCreateServiceProxy( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, NULL, - 0, NULL, 0, &proxy, NULL ) ; + 0, NULL, 0, &proxy, NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( proxy != NULL, "proxy not set\n" ); @@ -104,9 +105,225 @@ static void test_WsOpenServiceProxy(void) WsFreeServiceProxy( proxy ); } +static HRESULT create_channel( int port, WS_CHANNEL **ret ) +{ + static const WCHAR fmt[] = + {'h','t','t','p',':','/','/','1','2','7','.','0','.','0','.','1',':','%','u',0}; + WS_CHANNEL_PROPERTY prop[2]; + WS_ENVELOPE_VERSION env_version = WS_ENVELOPE_VERSION_SOAP_1_1; + WS_ADDRESSING_VERSION addr_version = WS_ADDRESSING_VERSION_TRANSPORT; + WS_CHANNEL *channel; + WS_ENDPOINT_ADDRESS addr; + WCHAR buf[64]; + HRESULT hr; + + prop[0].id = WS_CHANNEL_PROPERTY_ENVELOPE_VERSION; + prop[0].value = &env_version; + prop[0].valueSize = sizeof(env_version); + + prop[1].id = WS_CHANNEL_PROPERTY_ADDRESSING_VERSION; + prop[1].value = &addr_version; + prop[1].valueSize = sizeof(addr_version); + + *ret = NULL; + hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, prop, 2, NULL, &channel, NULL ); + if (hr != S_OK) return hr; + + addr.url.length = wsprintfW( buf, fmt, port ); + addr.url.chars = buf; + addr.headers = NULL; + addr.extensions = NULL; + addr.identity = NULL; + hr = WsOpenChannel( channel, &addr, NULL, NULL ); + if (hr == S_OK) *ret = channel; + else WsFreeChannel( channel ); + return hr; +} + +static const char req_test1[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" + "<req_test1 xmlns=\"ns\">-1</req_test1>" + "</s:Body></s:Envelope>"; + +static const char resp_test1[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Body>" + "<resp_test1 xmlns=\"ns\">-2</resp_test1>" + "</s:Body></s:Envelope>"; + +static void test_WsSendMessage( int port, WS_XML_STRING *action ) +{ + WS_XML_STRING req = {9, (BYTE *)"req_test1"}, ns = {2, (BYTE *)"ns"}; + WS_CHANNEL *channel; + WS_MESSAGE *msg; + WS_ELEMENT_DESCRIPTION body; + WS_MESSAGE_DESCRIPTION desc; + INT32 val = -1; + HRESULT hr; + + hr = create_channel( port, &channel ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + body.elementLocalName = &req; + body.elementNs = &ns; + body.type = WS_INT32_TYPE; + body.typeDescription = NULL; + desc.action = action; + desc.bodyElementDescription = &body; + hr = WsSendMessage( NULL, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsSendMessage( channel, NULL, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsSendMessage( channel, msg, NULL, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsSendMessage( channel, msg, &desc, WS_WRITE_REQUIRED_VALUE, &val, sizeof(val), NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCloseChannel( channel, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + WsFreeChannel( channel ); + WsFreeMessage( msg ); +} + +static const struct +{ + const char *req_action; + const char *req_data; + unsigned int req_len; + const char *resp_action; + const char *resp_data; + unsigned int resp_len; +} +tests[] = +{ + { "req_test1", req_test1, sizeof(req_test1)-1, "resp_test1", resp_test1, sizeof(resp_test1)-1 }, +}; + +static void send_response( int c, const char *action, const char *data, unsigned int len ) +{ + static const char headers[] = + "HTTP/1.1 200 OK\r\nContent-Type: text/xml; charset=utf-8\r\nConnection: close\r\n"; + static const char fmt[] = + "SOAPAction: \"%s\"\r\nContent-Length: %u\r\n\r\n"; + char buf[128]; + + send( c, headers, sizeof(headers) - 1, 0 ); + sprintf( buf, fmt, action, len ); + send( c, buf, strlen(buf), 0 ); + send( c, data, len, 0 ); +} + +struct server_info +{ + HANDLE event; + int port; +}; + +static DWORD CALLBACK server_proc( void *arg ) +{ + struct server_info *info = arg; + int len, res, c = -1, i, j, on = 1, quit; + WSADATA wsa; + SOCKET s; + struct sockaddr_in sa; + char buf[1024]; + const char *p; + + WSAStartup( MAKEWORD(1,1), &wsa ); + if ((s = socket( AF_INET, SOCK_STREAM, 0 )) == INVALID_SOCKET) return 1; + setsockopt( s, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on) ); + + memset( &sa, 0, sizeof(sa) ); + sa.sin_family = AF_INET; + sa.sin_port = htons( info->port ); + sa.sin_addr.S_un.S_addr = inet_addr( "127.0.0.1" ); + if (bind( s, (struct sockaddr *)&sa, sizeof(sa) ) < 0) return 1; + + listen( s, 0 ); + SetEvent( info->event ); + for (;;) + { + c = accept( s, NULL, NULL ); + + buf[0] = 0; + for (i = 0; i < sizeof(buf) - 1; i++) + { + if ((res = recv( c, &buf[i], 1, 0 )) != 1) break; + if (i < 4) continue; + if (buf[i - 2] == '\n' && buf[i] == '\n' && buf[i - 3] == '\r' && buf[i - 1] == '\r') + break; + } + buf[i] = 0; + quit = strstr( buf, "SOAPAction: \"quit\"" ) != NULL; + + len = 0; + if ((p = strstr( buf, "Content-Length: " ))) + { + p += strlen( "Content-Length: " ); + while (isdigit( *p )) + { + len *= 10; + len += *p++ - '0'; + } + } + for (i = 0; i < len; i++) + { + if ((res = recv( c, &buf[i], 1, 0 )) != 1) break; + } + buf[i] = 0; + + for (j = 0; j < sizeof(tests)/sizeof(tests[0]); j++) + { + if (strstr( buf, tests[j].req_action )) + { + if (tests[j].req_data) + { + int data_len = strlen( buf ); + ok( tests[j].req_len == data_len, "%u: unexpected data length %u %u\n", + j, data_len, tests[j].req_len ); + if (tests[j].req_len == data_len) + ok( !memcmp( tests[j].req_data, buf, tests[j].req_len ), "%u: unexpected data\n", j ); + } + send_response( c, tests[j].resp_action, tests[j].resp_data, tests[j].resp_len ); + } + } + + shutdown( c, 2 ); + closesocket( c ); + if (quit) break; + } + + return 0; +} + START_TEST(proxy) { + WS_XML_STRING test1 = {9, (BYTE *)"req_test1"}; + WS_XML_STRING quit = {4, (BYTE *)"quit"}; + struct server_info info; + HANDLE thread; + DWORD ret; + test_WsCreateServiceProxy(); test_WsCreateServiceProxyFromTemplate(); test_WsOpenServiceProxy(); + + info.port = 7533; + info.event = CreateEventW( NULL, 0, 0, NULL ); + thread = CreateThread( NULL, 0, server_proc, &info, 0, NULL ); + ok( thread != NULL, "failed to create server thread %u\n", GetLastError() ); + + ret = WaitForSingleObject( info.event, 3000 ); + ok(ret == WAIT_OBJECT_0, "failed to start test server %u\n", GetLastError()); + if (ret != WAIT_OBJECT_0) return; + + test_WsSendMessage( info.port, &test1 ); + test_WsSendMessage( info.port, &quit ); + WaitForSingleObject( thread, 3000 ); }

1 0

Piotr Caban : msvcp140: Add more missing exports.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: a401bb7f6a98d26a8d141829711878618778857c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a401bb7f6a98d26a8d1418297… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 28 07:24:52 2016 +0200 msvcp140: Add more missing exports. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 180 ++++++++++++++++++++++---------------------- 1 file changed, 90 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a401bb7f6a98d26a8d141…

1 0

Filip Frąckiewicz : wined3d: Add AMD Radeon HD 6480G IGP.
by Alexandre Julliard Sept. 28, 2016

Sept. 28, 2016

Module: wine Branch: master Commit: 1fdfe82663e329a8138313888cd4d3f870d07061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdfe82663e329a8138313888… Author: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Date: Wed Sep 28 03:16:16 2016 +0200 wined3d: Add AMD Radeon HD 6480G IGP. Signed-off-by: Filip Frąckiewicz <fjfrackiewicz(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 05e04e8..254026b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1346,6 +1346,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6300, "AMD Radeon HD 6300 series Graphics", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6400, "AMD Radeon HD 6400 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6410D, "AMD Radeon HD 6410D", DRIVER_AMD_R600, 1024}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6480G, "AMD Radeon HD 6480G", DRIVER_AMD_R600, 512 }, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6550D, "AMD Radeon HD 6550D", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600, "AMD Radeon HD 6600 Series", DRIVER_AMD_R600, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_HD6600M, "AMD Radeon HD 6600M Series", DRIVER_AMD_R600, 512 }, @@ -1951,6 +1952,7 @@ cards_amd_binary[] = {"HD 6570", CARD_AMD_RADEON_HD6600}, {"HD 6500M", CARD_AMD_RADEON_HD6600M}, {"HD 6500", CARD_AMD_RADEON_HD6600}, + {"HD 6480G", CARD_AMD_RADEON_HD6480G}, {"HD 6400", CARD_AMD_RADEON_HD6400}, {"HD 6300", CARD_AMD_RADEON_HD6300}, {"HD 6200", CARD_AMD_RADEON_HD6300}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 83d5248..eb7b18e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1821,6 +1821,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_HD6300 = 0x9803, CARD_AMD_RADEON_HD6400 = 0x6770, CARD_AMD_RADEON_HD6410D = 0x9644, + CARD_AMD_RADEON_HD6480G = 0x9648, CARD_AMD_RADEON_HD6550D = 0x9640, CARD_AMD_RADEON_HD6600 = 0x6758, CARD_AMD_RADEON_HD6600M = 0x6741,

1 0