October 2018 - Wine-commits

Alexander Morozov : cryptui: Partially implement CryptUIDlgSelectCertificate.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 3056f9beb95f66e598ab51d5d37b21a548b3e5f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3056f9beb95f66e598ab51d5… Author: Alexander Morozov <amorozov(a)etersoft.ru> Date: Wed Oct 24 11:18:36 2018 +0300 cryptui: Partially implement CryptUIDlgSelectCertificate. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/cryptui.rc | 17 ++ dlls/cryptui/cryptuires.h | 12 + dlls/cryptui/main.c | 593 ++++++++++++++++++++++++++++++++++++++++++++-- po/ar.po | 221 +++++++++-------- po/bg.po | 220 +++++++++-------- po/ca.po | 221 +++++++++-------- po/cs.po | 221 +++++++++-------- po/da.po | 221 +++++++++-------- po/de.po | 221 +++++++++-------- po/el.po | 217 +++++++++-------- po/en.po | 213 +++++++++-------- po/en_US.po | 213 +++++++++-------- po/eo.po | 217 +++++++++-------- po/es.po | 221 +++++++++-------- po/fa.po | 217 +++++++++-------- po/fi.po | 221 +++++++++-------- po/fr.po | 221 +++++++++-------- po/he.po | 217 +++++++++-------- po/hi.po | 215 +++++++++-------- po/hr.po | 221 +++++++++-------- po/hu.po | 221 +++++++++-------- po/it.po | 221 +++++++++-------- po/ja.po | 221 +++++++++-------- po/ko.po | 221 +++++++++-------- po/lt.po | 221 +++++++++-------- po/ml.po | 215 +++++++++-------- po/nb_NO.po | 221 +++++++++-------- po/nl.po | 221 +++++++++-------- po/or.po | 215 +++++++++-------- po/pa.po | 215 +++++++++-------- po/pl.po | 221 +++++++++-------- po/pt_BR.po | 221 +++++++++-------- po/pt_PT.po | 221 +++++++++-------- po/rm.po | 217 +++++++++-------- po/ro.po | 221 +++++++++-------- po/ru.po | 221 +++++++++-------- po/sk.po | 220 +++++++++-------- po/sl.po | 221 +++++++++-------- po/sr_RS(a)cyrillic.po | 215 +++++++++-------- po/sr_RS(a)latin.po | 218 +++++++++-------- po/sv.po | 221 +++++++++-------- po/te.po | 215 +++++++++-------- po/th.po | 217 +++++++++-------- po/tr.po | 221 +++++++++-------- po/uk.po | 221 +++++++++-------- po/wa.po | 217 +++++++++-------- po/wine.pot | 213 +++++++++-------- po/zh_CN.po | 221 +++++++++-------- po/zh_TW.po | 221 +++++++++-------- 49 files changed, 6158 insertions(+), 4537 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3056f9beb95f66e598ab…

1 0

Nikolay Sivov : dwrite: Release file streams when building collections.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: d19e34d8f072514cb903bda89767996ba078bae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d19e34d8f072514cb903bda8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 31 15:34:11 2018 +0300 dwrite: Release file streams when building collections. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5fc0de7..6666249 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3883,6 +3883,8 @@ HRESULT create_font_collection(IDWriteFactory5 *factory, IDWriteFontFileEnumerat if (FAILED(hr)) break; } + + IDWriteFontFileStream_Release(stream); } LIST_FOR_EACH_ENTRY_SAFE(fileenum, fileenum2, &scannedfiles, struct fontfile_enum, entry) {

1 0

Nikolay Sivov : comctl32/edit: Add missing message macros.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: aa601fdf0ccd394dfb099e5bbf52e0f208473f25 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa601fdf0ccd394dfb099e5b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 31 15:57:49 2018 +0300 comctl32/edit: Add missing message macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 2 -- include/commctrl.h | 7 +++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index aeba9f7..249e08b 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -23,9 +23,7 @@ * * TODO: * - EDITBALLOONTIP structure - * - EM_GETCUEBANNER/Edit_GetCueBannerText * - EM_HIDEBALLOONTIP/Edit_HideBalloonTip - * - EM_SETCUEBANNER/Edit_SetCueBannerText * - EM_SHOWBALLOONTIP/Edit_ShowBalloonTip * - EM_GETIMESTATUS, EM_SETIMESTATUS * - EN_ALIGN_LTR_EC diff --git a/include/commctrl.h b/include/commctrl.h index 77f460a..73bb9fa 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5259,6 +5259,13 @@ typedef struct _tagEDITBALLOONTIP #define EM_NOSETFOCUS (ECM_FIRST + 7) #define EM_TAKEFOCUS (ECM_FIRST + 8) +#define Edit_SetCueBannerText(hwnd, text) \ + (BOOL)SNDMSG((hwnd), EM_SETCUEBANNER, 0, (LPARAM)(text)) +#define Edit_SetCueBannerTextFocused(hwnd, text, drawfocused) \ + (BOOL)SNDMSG((hwnd), EM_SETCUEBANNER, (WPARAM)(drawfocused), (LPARAM)(text)) +#define Edit_GetCueBannerText(hwnd, buff, buff_size) \ + (BOOL)SNDMSG((hwnd), EM_GETCUEBANNER, (WPARAM)(buff), (LPARAM)(buff_size)) + /************************************************************************** * Listbox control */

1 0

Nikolay Sivov : comctl32/edit: Handle focused cue text.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 8bd48fd6d90fbf8e1f0e92a5ab0d6dab09faf439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8bd48fd6d90fbf8e1f0e92a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 31 15:57:50 2018 +0300 comctl32/edit: Handle focused cue text. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 249e08b..06e1f49 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -129,7 +129,9 @@ typedef struct should be sent to the first parent. */ HWND hwndListBox; /* handle of ComboBox's listbox or NULL */ INT wheelDeltaRemainder; /* scroll wheel delta left over after scrolling whole lines */ - WCHAR *cue_banner_text; + WCHAR *cue_banner_text; + BOOL cue_banner_draw_focused; + /* * only for multi line controls */ @@ -2181,7 +2183,7 @@ static void EDIT_PaintLine(EDITSTATE *es, HDC dc, INT line, BOOL rev) } else x += EDIT_PaintText(es, dc, x, y, line, 0, ll, FALSE); - if (es->cue_banner_text && es->text_length == 0 && !(es->flags & EF_FOCUSED)) + if (es->cue_banner_text && es->text_length == 0 && (!(es->flags & EF_FOCUSED) || es->cue_banner_draw_focused)) { SetTextColor(dc, GetSysColor(COLOR_GRAYTEXT)); TextOutW(dc, x, y, es->cue_banner_text, strlenW(es->cue_banner_text)); @@ -4170,16 +4172,14 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) * EM_SETCUEBANNER * */ -static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL focus, const WCHAR *cue_text) +static BOOL EDIT_EM_SetCueBanner(EDITSTATE *es, BOOL draw_focused, const WCHAR *cue_text) { if (es->style & ES_MULTILINE || !cue_text) return FALSE; - if (focus) - FIXME("cue banner for focused control not implemented.\n"); - heap_free(es->cue_banner_text); es->cue_banner_text = heap_strdupW(cue_text); + es->cue_banner_draw_focused = draw_focused; return TRUE; }

1 0

Hans Leidekker : webservices: Also trace return values in the URL functions.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: bd7c86bb4ff15b4fa706dbfe697d61b378c99004 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd7c86bb4ff15b4fa706dbfe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 31 14:21:26 2018 +0100 webservices: Also trace return values in the URL functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/url.c | 67 ++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index 731b74e..fd8d33a 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -192,22 +192,22 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS return E_NOTIMPL; } if (!(decoded = url_decode( str->chars, str->length, heap, &len_decoded )) || - !(url = ws_alloc( heap, sizeof(*url) ))) goto error; + !(url = ws_alloc( heap, sizeof(*url) ))) goto done; hr = WS_E_INVALID_FORMAT; p = q = decoded; len = len_decoded; while (len && *q != ':') { q++; len--; }; - if (*q != ':') goto error; - if ((url->url.scheme = scheme_type( p, q - p )) == ~0u) goto error; + if (*q != ':') goto done; + if ((url->url.scheme = scheme_type( p, q - p )) == ~0u) goto done; - if (!--len || *++q != '/') goto error; - if (!--len || *++q != '/') goto error; + if (!--len || *++q != '/') goto done; + if (!--len || *++q != '/') goto done; p = ++q; len--; while (len && *q != '/' && *q != ':' && *q != '?' && *q != '#') { q++; len--; }; - if (q == p) goto error; + if (q == p) goto done; url->host.length = q - p; url->host.chars = p; @@ -216,7 +216,7 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS p = ++q; len--; while (len && isdigitW( *q )) { - if ((port = port * 10 + *q - '0') > 65535) goto error; + if ((port = port * 10 + *q - '0') > 65535) goto done; q++; len--; }; url->port = port; @@ -258,11 +258,15 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS else url->fragment.length = 0; *ret = (WS_URL *)url; - return S_OK; + hr = S_OK; -error: - if (decoded != str->chars) ws_free( heap, decoded, len_decoded ); - ws_free( heap, url, sizeof(*url) ); +done: + if (hr != S_OK) + { + if (decoded != str->chars) ws_free( heap, decoded, len_decoded ); + ws_free( heap, url, sizeof(*url) ); + } + TRACE( "returning %08x\n", hr ); return hr; } @@ -420,12 +424,12 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S WS_ERROR *error ) { static const WCHAR fmtW[] = {':','%','u',0}; - ULONG len = 0, len_scheme, len_enc, ret_size; + ULONG len = 0, len_scheme, len_enc, ret_size = 0; const WS_HTTP_URL *url = (const WS_HTTP_URL *)base; const WCHAR *scheme; - WCHAR *str, *p, *q; + WCHAR *str = NULL, *p, *q; ULONG port = 0; - HRESULT hr; + HRESULT hr = WS_E_INVALID_FORMAT; TRACE( "%p %08x %p %p %p\n", base, flags, heap, ret, error ); if (error) FIXME( "ignoring error parameter\n" ); @@ -436,28 +440,32 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S FIXME( "unimplemented flags %08x\n", flags ); return E_NOTIMPL; } - if (!(scheme = scheme_str( url->url.scheme, &len_scheme ))) return WS_E_INVALID_FORMAT; + if (!(scheme = scheme_str( url->url.scheme, &len_scheme ))) goto done; len = len_scheme + 3; /* '://' */ len += 6; /* ':65535' */ if ((hr = url_encode_size( url->host.chars, url->host.length, "", &len_enc )) != S_OK) - return hr; + goto done; len += len_enc; if ((hr = url_encode_size( url->path.chars, url->path.length, "/", &len_enc )) != S_OK) - return hr; + goto done; len += len_enc; if ((hr = url_encode_size( url->query.chars, url->query.length, "/?", &len_enc )) != S_OK) - return hr; + goto done; len += len_enc + 1; /* '?' */ if ((hr = url_encode_size( url->fragment.chars, url->fragment.length, "/?", &len_enc )) != S_OK) - return hr; + goto done; len += len_enc + 1; /* '#' */ ret_size = len * sizeof(WCHAR); - if (!(str = ws_alloc( heap, ret_size ))) return WS_E_QUOTA_EXCEEDED; + if (!(str = ws_alloc( heap, ret_size ))) + { + hr = WS_E_QUOTA_EXCEEDED; + goto done; + } memcpy( str, scheme, len_scheme * sizeof(WCHAR) ); p = str + len_scheme; @@ -466,7 +474,7 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S p += 3; if ((hr = url_encode( url->host.chars, url->host.length, p, "", &len_enc )) != S_OK) - goto error; + goto done; p += len_enc; if (url->portAsString.length) @@ -478,14 +486,14 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S if ((port = port * 10 + *q - '0') > 65535) { hr = WS_E_INVALID_FORMAT; - goto error; + goto done; } q++; len--; } if (url->port && port != url->port) { hr = E_INVALIDARG; - goto error; + goto done; } } else port = url->port; @@ -499,14 +507,14 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S } if ((hr = url_encode( url->path.chars, url->path.length, p, "/", &len_enc )) != S_OK) - goto error; + goto done; p += len_enc; if (url->query.length) { *p++ = '?'; if ((hr = url_encode( url->query.chars, url->query.length, p, "/?", &len_enc )) != S_OK) - goto error; + goto done; p += len_enc; } @@ -514,15 +522,16 @@ HRESULT WINAPI WsEncodeUrl( const WS_URL *base, ULONG flags, WS_HEAP *heap, WS_S { *p++ = '#'; if ((hr = url_encode( url->fragment.chars, url->fragment.length, p, "/?", &len_enc )) != S_OK) - goto error; + goto done; p += len_enc; } ret->length = p - str; ret->chars = str; - return S_OK; + hr = S_OK; -error: - ws_free( heap, str, ret_size ); +done: + if (hr != S_OK) ws_free( heap, str, ret_size ); + TRACE( "returning %08x\n", hr ); return hr; }

1 0

Hans Leidekker : webservices: Try to receive the whole message at once.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 26008a7b8229710249bddb3611a9ade54168336f URL: https://source.winehq.org/git/wine.git/?a=commit;h=26008a7b8229710249bddb36… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 31 14:21:27 2018 +0100 webservices: Try to receive the whole message at once. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 464645b..91ffe5b 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1137,9 +1137,39 @@ done: return hr; } +static void set_blocking( SOCKET socket, BOOL blocking ) +{ + ULONG state = !blocking; + ioctlsocket( socket, FIONBIO, &state ); +} + +static int sock_peek( SOCKET socket ) +{ + int ret; + char byte; + + set_blocking( socket, FALSE ); + ret = recv( socket, &byte, 1, MSG_PEEK ); + set_blocking( socket, TRUE ); + return ret; +} + +static int sock_recv( SOCKET socket, char *buf, int len ) +{ + int count, ret = 0; + for (;;) + { + if ((count = recv( socket, buf + ret, len, 0 )) <= 0) break; + ret += count; + len -= count; + if (sock_peek( socket ) != 1) break; + } + return ret; +} + static HRESULT receive_bytes( struct channel *channel, unsigned char *bytes, int len ) { - int count = recv( channel->u.tcp.socket, (char *)bytes, len, 0 ); + int count = sock_recv( channel->u.tcp.socket, (char *)bytes, len ); if (count < 0) return HRESULT_FROM_WIN32( WSAGetLastError() ); if (count != len) return WS_E_INVALID_FORMAT; return S_OK; @@ -1494,7 +1524,7 @@ static HRESULT receive_message_unsized( struct channel *channel, SOCKET socket ) if ((hr = resize_read_buffer( channel, max_len )) != S_OK) return hr; channel->read_size = 0; - if ((bytes_read = recv( socket, channel->read_buf, max_len, 0 )) < 0) + if ((bytes_read = sock_recv( socket, channel->read_buf, max_len )) < 0) { return HRESULT_FROM_WIN32( WSAGetLastError() ); } @@ -1513,7 +1543,7 @@ static HRESULT receive_message_sized( struct channel *channel, unsigned int size channel->read_size = 0; while (channel->read_size < size) { - if ((bytes_read = recv( channel->u.tcp.socket, channel->read_buf + offset, to_read, 0 )) < 0) + if ((bytes_read = sock_recv( channel->u.tcp.socket, channel->read_buf + offset, to_read )) < 0) { return HRESULT_FROM_WIN32( WSAGetLastError() ); }

1 0

Hans Leidekker : webservices: Add traces.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 3b7fd4ffed6de134c5c0c4b7797fe0469f67ea0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b7fd4ffed6de134c5c0c4b7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 31 14:21:28 2018 +0100 webservices: Add traces. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 91ffe5b..b995a86 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -395,6 +395,11 @@ static HRESULT create_channel( WS_CHANNEL_TYPE type, WS_CHANNEL_BINDING binding, for (i = 0; i < count; i++) { + TRACE( "property id %u value ptr %p size %u\n", properties[i].id, properties[i].value, + properties[i].valueSize ); + if (properties[i].valueSize == sizeof(ULONG) && properties[i].value) + TRACE( " value %08x\n", *(ULONG *)properties[i].value ); + switch (properties[i].id) { case WS_CHANNEL_PROPERTY_ENCODING: @@ -623,6 +628,8 @@ static HRESULT open_channel( struct channel *channel, const WS_ENDPOINT_ADDRESS return E_NOTIMPL; } + TRACE( "endpoint %s\n", debugstr_wn(endpoint->url.chars, endpoint->url.length) ); + if (!(channel->addr.url.chars = heap_alloc( endpoint->url.length * sizeof(WCHAR) ))) return E_OUTOFMEMORY; memcpy( channel->addr.url.chars, endpoint->url.chars, endpoint->url.length * sizeof(WCHAR) ); channel->addr.url.length = endpoint->url.length;

1 0

Hans Leidekker : webservices: Increase the maximum size of the channel writer buffer.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: ec2ea93bbbca1f6a6de66cbec17a83173fb84ced URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec2ea93bbbca1f6a6de66cbe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 31 14:21:29 2018 +0100 webservices: Increase the maximum size of the channel writer buffer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index b995a86..de84b0e 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1316,9 +1316,14 @@ static HRESULT init_writer( struct channel *channel ) WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; WS_XML_WRITER_TEXT_ENCODING text = {{WS_XML_WRITER_ENCODING_TYPE_TEXT}, WS_CHARSET_UTF8}; WS_XML_WRITER_BINARY_ENCODING bin = {{WS_XML_WRITER_ENCODING_TYPE_BINARY}}; + WS_XML_WRITER_PROPERTY prop; + ULONG max_size = (1 << 17); HRESULT hr; - if (!channel->writer && (hr = WsCreateWriter( NULL, 0, &channel->writer, NULL )) != S_OK) return hr; + prop.id = WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE; + prop.value = &max_size; + prop.valueSize = sizeof(max_size); + if (!channel->writer && (hr = WsCreateWriter( &prop, 1, &channel->writer, NULL )) != S_OK) return hr; switch (channel->encoding) {

1 0

Hans Leidekker : webservices: Add support for UTF-8 encoded text in read_message_id.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 57db798965e974d43fec84a1dbc9cf7f78f67cd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57db798965e974d43fec84a1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 31 14:21:30 2018 +0100 webservices: Add support for UTF-8 encoded text in read_message_id. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 22 +++++++++++++++++----- dlls/webservices/reader.c | 2 +- dlls/webservices/webservices_private.h | 1 + 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 4ccf82e..a53fd92 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -846,21 +846,33 @@ static HRESULT read_message_id( WS_XML_READER *reader, GUID *ret ) { const WS_XML_NODE *node; const WS_XML_TEXT_NODE *text; - const WS_XML_UNIQUE_ID_TEXT *id; HRESULT hr; if ((hr = WsReadNode( reader, NULL )) != S_OK) return hr; if ((hr = WsGetReaderNode( reader, &node, NULL )) != S_OK) return hr; if (node->nodeType != WS_XML_NODE_TYPE_TEXT) return WS_E_INVALID_FORMAT; text = (const WS_XML_TEXT_NODE *)node; - if (text->text->textType != WS_XML_TEXT_TYPE_UNIQUE_ID) + + switch (text->text->textType) + { + case WS_XML_TEXT_TYPE_UTF8: + { + const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text->text; + if (utf8->value.length != 45 || memcmp( utf8->value.bytes, "urn:uuid:", 9 )) + return WS_E_INVALID_FORMAT; + + return str_to_guid( utf8->value.bytes + 9, utf8->value.length - 9, ret ); + } + case WS_XML_TEXT_TYPE_UNIQUE_ID: { + const WS_XML_UNIQUE_ID_TEXT *id = (const WS_XML_UNIQUE_ID_TEXT *)text->text; + *ret = id->value; + return S_OK; + } + default: FIXME( "unhandled text type %u\n", text->text->textType ); return E_NOTIMPL; } - id = (const WS_XML_UNIQUE_ID_TEXT *)text->text; - *ret = id->value; - return S_OK; } static HRESULT read_envelope_start( struct msg *msg, WS_XML_READER *reader ) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a5ff59a..8cf3f24 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -3841,7 +3841,7 @@ static HRESULT str_to_float( const unsigned char *str, ULONG len, float *ret ) return S_OK; } -static HRESULT str_to_guid( const unsigned char *str, ULONG len, GUID *ret ) +HRESULT str_to_guid( const unsigned char *str, ULONG len, GUID *ret ) { static const unsigned char hex[] = { diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index d981527..b482b5b 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -71,6 +71,7 @@ HRESULT read_header( WS_XML_READER *, const WS_XML_STRING *, const WS_XML_STRING HRESULT create_header_buffer( WS_XML_READER *, WS_HEAP *, WS_XML_BUFFER ** ) DECLSPEC_HIDDEN; HRESULT text_to_text( const WS_XML_TEXT *, const WS_XML_TEXT *, ULONG *, WS_XML_TEXT ** ) DECLSPEC_HIDDEN; HRESULT text_to_utf8text( const WS_XML_TEXT *, const WS_XML_UTF8_TEXT *, ULONG *, WS_XML_UTF8_TEXT ** ) DECLSPEC_HIDDEN; +HRESULT str_to_guid( const unsigned char *, ULONG, GUID * ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF16_TEXT *alloc_utf16_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_BASE64_TEXT *alloc_base64_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : webservices: Implement WsRequestReply.
by Alexandre Julliard 31 Oct '18

31 Oct '18

Module: wine Branch: master Commit: 5a58080a66b245edcccfc18ebd03162d7877f3af URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a58080a66b245edcccfc18e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 31 14:21:31 2018 +0100 webservices: Implement WsRequestReply. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 115 +++++++++++++++++++++ dlls/webservices/tests/channel.c | 205 ++++++++++++++++++++++++++------------ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 3 + 4 files changed, 262 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a58080a66b245edcccf…

1 0