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

Kenneth Haley : v4 resend: Riched20: allow setting background text color.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: fc1b2e0473d26ecb37575edae139e3a684e3d1c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc1b2e0473d26ecb37575edae… Author: Kenneth Haley <haleykd(a)users.sf.net> Date: Mon Aug 15 13:03:07 2016 -0600 v4 resend: Riched20: allow setting background text color. Signed-off-by: Kenneth Haley <haleykd(a)users.sf.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 +- dlls/riched20/paint.c | 43 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index fb77a67..9c54623 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -489,7 +489,7 @@ void ME_RTFCharAttrHook(RTF_Info *info) { RTFColor *c = RTFGetColor(info, info->rtfParam); if (c && c->rtfCBlue >= 0) - fmt.crTextColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); + fmt.crBackColor = (c->rtfCBlue<<16)|(c->rtfCGreen<<8)|(c->rtfCRed); else fmt.dwEffects = CFE_AUTOBACKCOLOR; } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 42434b9..736080a 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -201,6 +201,21 @@ static COLORREF get_text_color( ME_Context *c, ME_Style *style, BOOL highlight ) return color; } +static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) +{ + COLORREF color; + + if (highlight) + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ); + else if ( (style->fmt.dwMask & CFM_BACKCOLOR) + && !(style->fmt.dwEffects & CFE_AUTOBACKCOLOR) ) + color = style->fmt.crBackColor; + else + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_WINDOW ); + + return color; +} + static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) { *pen = NULL; @@ -314,14 +329,17 @@ static void get_selection_rect( ME_Context *c, ME_Run *run, int from, int to, in return; } - static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, RECT *sel_rect ) { COLORREF text_color = get_text_color( c, run->style, selected ); - COLORREF back_color = selected ? ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ) : 0; + COLORREF back_color = get_back_color( c, run->style, selected ); COLORREF old_text, old_back = 0; const WCHAR *text = get_text( run, 0 ); ME_String *masked = NULL; + const BOOL paint_bg = ( selected + || ( ( run->style->fmt.dwMask & CFM_BACKCOLOR ) + && !(CFE_AUTOBACKCOLOR & run->style->fmt.dwEffects) ) + ); if (c->editor->cPasswordMask) { @@ -330,16 +348,16 @@ static void draw_text( ME_Context *c, ME_Run *run, int x, int y, BOOL selected, } old_text = SetTextColor( c->hDC, text_color ); - if (selected) old_back = SetBkColor( c->hDC, back_color ); + if (paint_bg) old_back = SetBkColor( c->hDC, back_color ); if (run->para->nFlags & MEPF_COMPLEX) - ScriptTextOut( c->hDC, &run->style->script_cache, x, y, selected ? ETO_OPAQUE : 0, sel_rect, + ScriptTextOut( c->hDC, &run->style->script_cache, x, y, paint_bg ? ETO_OPAQUE : 0, sel_rect, &run->script_analysis, NULL, 0, run->glyphs, run->num_glyphs, run->advances, NULL, run->offsets ); else - ExtTextOutW( c->hDC, x, y, selected ? ETO_OPAQUE : 0, sel_rect, text, run->len, NULL ); + ExtTextOutW( c->hDC, x, y, paint_bg ? ETO_OPAQUE : 0, sel_rect, text, run->len, NULL ); - if (selected) SetBkColor( c->hDC, old_back ); + if (paint_bg) SetBkColor( c->hDC, old_back ); SetTextColor( c->hDC, old_text ); draw_underline( c, run, x, y, text_color ); @@ -389,7 +407,18 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, hOldFont = ME_SelectStyleFont( c, run->style ); if (sel_rgn) ExtSelectClipRgn( hDC, sel_rgn, RGN_DIFF ); - draw_text( c, run, x, y - yOffset, FALSE, NULL ); + + if (!(run->style->fmt.dwEffects & CFE_AUTOBACKCOLOR) + && (run->style->fmt.dwMask & CFM_BACKCOLOR) ) + { + RECT tmp_rect; + get_selection_rect( c, run, 0, run->len, cy, &tmp_rect ); + OffsetRect( &tmp_rect, x, ymin ); + draw_text( c, run, x, y - yOffset, FALSE, &tmp_rect ); + } + else + draw_text( c, run, x, y - yOffset, FALSE, NULL ); + if (sel_rgn) { ExtSelectClipRgn( hDC, clip, RGN_COPY );

1 0

Mingcong Bai : po: Update Simplified Chinese translation.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: e248f530f3848b34989e217f94e780e923f107cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e248f530f3848b34989e217f9… Author: Mingcong Bai <jeffbaichina(a)gmail.com> Date: Tue Aug 16 14:28:28 2016 +0800 po: Update Simplified Chinese translation. Signed-off-by: Mingcong Bai <jeffbai(a)aosc.xyz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 342 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 171 insertions(+), 171 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e248f530f3848b34989e2…

1 0

Michael Stefaniuc : msvcirt/tests: Simplify generating a pointer to address 0x1.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: ac2ad35d4dab8ac83966f53a6a196005202790e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2ad35d4dab8ac83966f53a6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 16 09:43:37 2016 +0200 msvcirt/tests: Simplify generating a pointer to address 0x1. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 4940669..9750d88 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -4509,7 +4509,7 @@ static void test_istream(void) ok(ret == EOF, "expected -1 got %d\n", ret); ok(is1.count == 0, "expected 0 got %d\n", is1.count); ok(is1.base_ios.state == IOSTATE_eofbit, "expected %d got %d\n", IOSTATE_eofbit, is1.base_ios.state); - ok(fb1.base.gptr == (char*) NULL + 1, "wrong get pointer, expected %p got %p\n", (char*) NULL + 1, fb1.base.gptr); + ok(fb1.base.gptr == (char*) 1, "wrong get pointer, expected %p got %p\n", (char*) 1, fb1.base.gptr); /* get_char */ is1.count = 0xabababab; @@ -4552,14 +4552,14 @@ static void test_istream(void) ok(is1.count == 0, "expected 0 got %d\n", is1.count); ok(is1.base_ios.state == (IOSTATE_eofbit|IOSTATE_failbit), "expected %d got %d\n", IOSTATE_eofbit|IOSTATE_failbit, is1.base_ios.state); - ok(fb1.base.gptr == (char*) NULL + 1, "wrong get pointer, expected %p got %p\n", (char*) NULL + 1, fb1.base.gptr); + ok(fb1.base.gptr == (char*) 1, "wrong get pointer, expected %p got %p\n", (char*) 1, fb1.base.gptr); ok(c == EOF, "expected -1 got %d\n", c); is1.base_ios.state = IOSTATE_failbit; pis = call_func2(p_istream_get_char, &is1, NULL); ok(pis == &is1, "wrong return, expected %p got %p\n", &is1, pis); ok(is1.count == 0, "expected 0 got %d\n", is1.count); ok(is1.base_ios.state == IOSTATE_failbit, "expected %d got %d\n", IOSTATE_failbit, is1.base_ios.state); - ok(fb1.base.gptr == (char*) NULL + 1, "wrong get pointer, expected %p got %p\n", (char*) NULL + 1, fb1.base.gptr); + ok(fb1.base.gptr == (char*) 1, "wrong get pointer, expected %p got %p\n", (char*) 1, fb1.base.gptr); /* get_sb */ is1.count = 0xabababab;

1 0

Hans Leidekker : winhttp: Set required buffer length for all components in WinHttpCrackUrl.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: 1d07f8987993fb0cb5398e9a45f2435eb771a471 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d07f8987993fb0cb5398e9a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:01 2016 +0200 winhttp: Set required buffer length for all components in WinHttpCrackUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/url.c | 49 ++++++++++++----- dlls/winhttp/url.c | 139 ++++++++++++++++++++++++++++++----------------- 2 files changed, 124 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d07f8987993fb0cb5398…

1 0

Hans Leidekker : winhttp: Validate the port number in WinHttpCrackUrl.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: 17b4abf47f369a056401abc3b9e60f9c94e4eb5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b4abf47f369a056401abc3b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:02 2016 +0200 winhttp: Validate the port number in WinHttpCrackUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/url.c | 22 ++++++++++++++++++++++ dlls/winhttp/url.c | 19 ++++++++++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index ec6dbd0..27979f6 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -69,6 +69,9 @@ static const WCHAR url12[] = static const WCHAR url13[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o',' ','g','/','p','a','t','h',' ','w','i','t','h',' ','s','p','a','c','e','s',0}; static const WCHAR url14[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','t','e','s','t',0}; +static const WCHAR url15[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':','6','5','5','3','6',0}; +static const WCHAR url16[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':','0',0}; +static const WCHAR url17[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',':',0}; static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -718,6 +721,25 @@ static void WinHttpCrackUrl_test( void ) ok( uc.dwUrlPathLength == 0, "unexpected length %u\n", uc.dwUrlPathLength ); ok( !uc.lpszExtraInfo, "unexpected extra info %s\n", wine_dbgstr_w(uc.lpszExtraInfo) ); ok( uc.dwExtraInfoLength == 0, "unexpected length %u\n", uc.dwExtraInfoLength ); + + reset_url_components( &uc ); + SetLastError( 0xdeadbeef ); + ret = WinHttpCrackUrl( url15, 0, 0, &uc ); + error = GetLastError(); + ok( !ret, "WinHttpCrackUrl succeeded\n" ); + ok( error == ERROR_WINHTTP_INVALID_URL, "got %u\n", error ); + + reset_url_components( &uc ); + uc.nPort = 1; + ret = WinHttpCrackUrl( url16, 0, 0, &uc ); + ok( ret, "got %u\n", GetLastError() ); + ok( !uc.nPort, "got %u\n", uc.nPort ); + + reset_url_components( &uc ); + uc.nPort = 1; + ret = WinHttpCrackUrl( url17, 0, 0, &uc ); + ok( ret, "got %u\n", GetLastError() ); + todo_wine ok( uc.nPort == 80, "got %u\n", uc.nPort ); } START_TEST(url) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 2b479a9..8888b8f 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -163,6 +163,19 @@ static WCHAR *escape_url( LPCWSTR url, DWORD *len ) return ret; } +static DWORD parse_port( const WCHAR *str, DWORD len, INTERNET_PORT *ret ) +{ + const WCHAR *p = str; + DWORD port = 0; + while (len && isdigitW( *p )) + { + if ((port = port * 10 + *p - '0') > 65535) return ERROR_WINHTTP_INVALID_URL; + p++; len--; + } + *ret = port; + return ERROR_SUCCESS; +} + /*********************************************************************** * WinHttpCrackUrl (winhttp.@) */ @@ -172,7 +185,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN DWORD err, scheme_len, user_len, passwd_len, host_len, path_len, extra_len; INTERNET_SCHEME scheme = 0; - TRACE("%s, %d, %x, %p\n", debugstr_w(url), len, flags, uc); + TRACE("%s, %d, %x, %p\n", debugstr_wn(url, len), len, flags, uc); if (!url || !uc || uc->dwStructSize != sizeof(URL_COMPONENTS)) { @@ -258,7 +271,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN { if ((err = set_component( &uc->lpszHostName, &host_len, p, r - p, flags ))) goto exit; r++; - uc->nPort = atoiW( r ); + if ((err = parse_port( r, q - r, &uc->nPort ))) goto exit; } else { @@ -284,7 +297,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN { if ((err = set_component( &uc->lpszHostName, &host_len, p, r - p, flags ))) goto exit; r++; - uc->nPort = atoiW( r ); + if ((err = parse_port( r, len - (r - url), &uc->nPort ))) goto exit; } else {

1 0

Hans Leidekker : webservices: Write the envelope in WsInitializeMessage.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: 202bc2a77fcdc75a57260c15d0f36511c7f97833 URL: http://source.winehq.org/git/wine.git/?a=commit;h=202bc2a77fcdc75a57260c15d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:32 2016 +0200 webservices: Write the envelope in WsInitializeMessage. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index ecbc31d..904d490 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -198,30 +198,6 @@ HRESULT WINAPI WsCreateMessageForChannel( WS_CHANNEL *channel_handle, const WS_M } /************************************************************************** - * WsInitializeMessage [webservices.@] - */ -HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATION init, - WS_MESSAGE *src_handle, WS_ERROR *error ) -{ - struct msg *msg = (struct msg *)handle; - - TRACE( "%p %u %p %p\n", handle, init, src_handle, error ); - if (error) FIXME( "ignoring error parameter\n" ); - if (src_handle) - { - FIXME( "src message not supported\n" ); - return E_NOTIMPL; - } - - if (!handle || init > WS_FAULT_MESSAGE) return E_INVALIDARG; - if (msg->state >= WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; - - msg->init = init; - msg->state = WS_MESSAGE_STATE_INITIALIZED; - return S_OK; -} - -/************************************************************************** * WsFreeMessage [webservices.@] */ void WINAPI WsFreeMessage( WS_MESSAGE *handle ) @@ -555,6 +531,30 @@ HRESULT WINAPI WsWriteBody( WS_MESSAGE *handle, const WS_ELEMENT_DESCRIPTION *de return hr; } +/************************************************************************** + * WsInitializeMessage [webservices.@] + */ +HRESULT WINAPI WsInitializeMessage( WS_MESSAGE *handle, WS_MESSAGE_INITIALIZATION init, + WS_MESSAGE *src_handle, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + + TRACE( "%p %u %p %p\n", handle, init, src_handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + if (src_handle) + { + FIXME( "src message not supported\n" ); + return E_NOTIMPL; + } + + if (!handle || init > WS_FAULT_MESSAGE) return E_INVALIDARG; + if (msg->state >= WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + + msg->init = init; + msg->state = WS_MESSAGE_STATE_INITIALIZED; + return write_envelope( msg ); +} + static inline void set_utf8_text( WS_XML_UTF8_TEXT *text, BYTE *bytes, ULONG len ) { text->text.textType = WS_XML_TEXT_TYPE_UTF8;

1 0

Hans Leidekker : webservices: Support WS_STRING values in WsSetHeader.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: b89f7d944382f4d398759482fcbbb69dd0f3e6ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=b89f7d944382f4d398759482f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:33 2016 +0200 webservices: Support WS_STRING values in WsSetHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 904d490..487222e 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -598,6 +598,24 @@ static HRESULT alloc_header( WS_HEADER_TYPE type, WS_TYPE value_type, WS_WRITE_O memcpy( header->text.value.bytes, str->bytes, str->length ); break; } + case WS_STRING_TYPE: + { + int len; + const WS_STRING *str = value; + + if (option != WS_WRITE_REQUIRED_VALUE) + { + FIXME( "unhandled write option %u\n", option ); + return E_NOTIMPL; + } + 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; + 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 ); + break; + } default: FIXME( "unhandled type %u\n", value_type ); return E_NOTIMPL;

1 0

Hans Leidekker : webservices: Implement WsRemoveHeader.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: b2829c4b66d49ce72abe69e07b08908635e236d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2829c4b66d49ce72abe69e07… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:34 2016 +0200 webservices: Implement WsRemoveHeader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 32 ++++++++++++++++++++ dlls/webservices/tests/msg.c | 62 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 487222e..2bac6e0 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -671,3 +671,35 @@ HRESULT WINAPI WsSetHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_TYPE val msg->header[i] = header; return write_envelope( msg ); } + +/************************************************************************** + * WsRemoveHeader [webservices.@] + */ +HRESULT WINAPI WsRemoveHeader( WS_MESSAGE *handle, WS_HEADER_TYPE type, WS_ERROR *error ) +{ + struct msg *msg = (struct msg *)handle; + BOOL removed = FALSE; + ULONG i; + + TRACE( "%p %u %p\n", handle, type, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle) return E_INVALIDARG; + if (msg->state < WS_MESSAGE_STATE_INITIALIZED) return WS_E_INVALID_OPERATION; + if (type < WS_ACTION_HEADER || type > WS_FAULT_TO_HEADER) return E_INVALIDARG; + + for (i = 0; i < msg->header_count; i++) + { + if (msg->header[i]->type == type) + { + heap_free( msg->header[i] ); + memmove( &msg->header[i], &msg->header[i + 1], (msg->header_count - i) * sizeof(struct header *) ); + msg->header_count--; + removed = TRUE; + break; + } + } + + if (removed) return write_envelope( msg ); + return S_OK; +} diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index ea44c07..a42d369 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -591,6 +591,67 @@ static void test_WsSetHeader(void) WsFreeWriter( writer ); } +static void test_WsRemoveHeader(void) +{ + static const char expected[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "<a:Action s:mustUnderstand=\"1\">action</a:Action></s:Header>" + "<s:Body/></s:Envelope>"; + static const char expected2[] = + "<s:Envelope xmlns:a=\"http://www.w3.org/2005/08/addressing\" " + "xmlns:s=\"http://www.w3.org/2003/05/soap-envelope\"><s:Header>" + "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" + "</s:Header><s:Body/></s:Envelope>"; + static const WS_XML_STRING action = {6, (BYTE *)"action"}; + HRESULT hr; + WS_MESSAGE *msg; + + hr = WsSetHeader( NULL, 0, 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 = WsRemoveHeader( NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsRemoveHeader( msg, 0, NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = WsRemoveHeader( msg, WS_ACTION_HEADER, 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 ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + hr = WsRemoveHeader( msg, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsRemoveHeader( msg, WS_ACTION_HEADER, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + hr = WsSetHeader( msg, WS_ACTION_HEADER, WS_XML_STRING_TYPE, WS_WRITE_REQUIRED_VALUE, &action, + sizeof(action), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected, -1, strstr(expected, "urn:uuid:") - expected, 46, __LINE__ ); + + hr = WsRemoveHeader( msg, WS_ACTION_HEADER, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + /* again */ + hr = WsRemoveHeader( msg, WS_ACTION_HEADER, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected2, -1, strstr(expected2, "urn:uuid:") - expected2, 46, __LINE__ ); + + WsFreeMessage( msg ); +} + START_TEST(msg) { test_WsCreateMessage(); @@ -601,4 +662,5 @@ START_TEST(msg) test_WsWriteEnvelopeEnd(); test_WsWriteBody(); test_WsSetHeader(); + test_WsRemoveHeader(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 477f236..59f9856 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -128,7 +128,7 @@ @ stub WsReceiveMessage @ stub WsRegisterOperationForCancel @ stub WsRemoveCustomHeader -@ stub WsRemoveHeader +@ stdcall WsRemoveHeader(ptr long ptr) @ stub WsRemoveMappedHeader @ stub WsRemoveNode @ stub WsRequestReply diff --git a/include/webservices.h b/include/webservices.h index c227a17..cd30e4fc 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -1420,6 +1420,7 @@ HRESULT WINAPI WsReadValue(WS_XML_READER*, WS_VALUE_TYPE, void*, ULONG, WS_ERROR HRESULT WINAPI WsReceiveMessage(WS_CHANNEL*, WS_MESSAGE*, const WS_MESSAGE_DESCRIPTION**, ULONG, WS_RECEIVE_OPTION, WS_READ_OPTION, WS_HEAP*, void*, ULONG, ULONG*, const WS_ASYNC_CONTEXT*, WS_ERROR*); +HRESULT WINAPI WsRemoveHeader(WS_MESSAGE*, WS_HEADER_TYPE, 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

Hans Leidekker : webservices: Add missing channel properties.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: ac42d70121023b7ddaa47ff65e460f2dd4e85fbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac42d70121023b7ddaa47ff65… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:35 2016 +0200 webservices: Add missing channel properties. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/channel.c | 60 +++++++++++++++++++++++++++++----- dlls/webservices/webservices_private.h | 2 +- 2 files changed, 52 insertions(+), 10 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 9081d95..aba87c0 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -21,6 +21,7 @@ #include "windef.h" #include "winbase.h" #include "winuser.h" +#include "winsock2.h" #include "webservices.h" #include "wine/debug.h" @@ -31,15 +32,56 @@ WINE_DEFAULT_DEBUG_CHANNEL(webservices); static const struct prop_desc channel_props[] = { - { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE */ - { sizeof(UINT64), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_MESSAGE_SIZE */ - { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_START_SIZE */ - { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_FLUSH_SIZE */ - { sizeof(WS_ENCODING), FALSE }, /* WS_CHANNEL_PROPERTY_ENCODING */ - { sizeof(WS_ENVELOPE_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ENVELOPE_VERSION */ - { sizeof(WS_ADDRESSING_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ADDRESSING_VERSION */ - { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE */ - { sizeof(WS_CHANNEL_STATE), TRUE }, /* WS_CHANNEL_PROPERTY_STATE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_BUFFERED_MESSAGE_SIZE */ + { sizeof(UINT64), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_MESSAGE_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_START_SIZE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_STREAMED_FLUSH_SIZE */ + { sizeof(WS_ENCODING), FALSE }, /* WS_CHANNEL_PROPERTY_ENCODING */ + { sizeof(WS_ENVELOPE_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ENVELOPE_VERSION */ + { sizeof(WS_ADDRESSING_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_ADDRESSING_VERSION */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_SESSION_DICTIONARY_SIZE */ + { sizeof(WS_CHANNEL_STATE), TRUE }, /* WS_CHANNEL_PROPERTY_STATE */ + { sizeof(WS_CALLBACK_MODEL), FALSE }, /* WS_CHANNEL_PROPERTY_ASYNC_CALLBACK_MODEL */ + { sizeof(WS_IP_VERSION), FALSE }, /* WS_CHANNEL_PROPERTY_IP_VERSION */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_RESOLVE_TIMEOUT */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_CONNECT_TIMEOUT */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_SEND_TIMEOUT */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_RECEIVE_RESPONSE_TIMEOUT */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_RECEIVE_TIMEOUT */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_CLOSE_TIMEOUT */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_ENABLE_TIMEOUTS */ + { sizeof(WS_TRANSFER_MODE), FALSE }, /* WS_CHANNEL_PROPERTY_TRANSFER_MODE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MULTICAST_INTERFACE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MULTICAST_HOPS */ + { sizeof(WS_ENDPOINT_ADDRESS), TRUE }, /* WS_CHANNEL_PROPERTY_REMOTE_ADDRESS */ + { sizeof(SOCKADDR_STORAGE), TRUE }, /* WS_CHANNEL_PROPERTY_REMOTE_IP_ADDRESS */ + { sizeof(ULONGLONG), TRUE }, /* WS_CHANNEL_PROPERTY_HTTP_CONNECTION_ID */ + { sizeof(WS_CUSTOM_CHANNEL_CALLBACKS), FALSE }, /* WS_CHANNEL_PROPERTY_CUSTOM_CHANNEL_CALLBACKS */ + { 0, FALSE }, /* WS_CHANNEL_PROPERTY_CUSTOM_CHANNEL_PARAMETERS */ + { sizeof(void *), FALSE }, /* WS_CHANNEL_PROPERTY_CUSTOM_CHANNEL_INSTANCE */ + { sizeof(WS_STRING), TRUE }, /* WS_CHANNEL_PROPERTY_TRANSPORT_URL */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_NO_DELAY */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_SEND_KEEP_ALIVES */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_KEEP_ALIVE_TIME */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_KEEP_ALIVE_INTERVAL */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_MAX_HTTP_SERVER_CONNECTIONS */ + { sizeof(BOOL), TRUE }, /* WS_CHANNEL_PROPERTY_IS_SESSION_SHUT_DOWN */ + { sizeof(WS_CHANNEL_TYPE), TRUE }, /* WS_CHANNEL_PROPERTY_CHANNEL_TYPE */ + { sizeof(ULONG), FALSE }, /* WS_CHANNEL_PROPERTY_TRIM_BUFFERED_MESSAGE_SIZE */ + { sizeof(WS_CHANNEL_ENCODER), FALSE }, /* WS_CHANNEL_PROPERTY_ENCODER */ + { sizeof(WS_CHANNEL_DECODER), FALSE }, /* WS_CHANNEL_PROPERTY_DECODER */ + { sizeof(WS_PROTECTION_LEVEL), TRUE }, /* WS_CHANNEL_PROPERTY_PROTECTION_LEVEL */ + { sizeof(WS_COOKIE_MODE), FALSE }, /* WS_CHANNEL_PROPERTY_COOKIE_MODE */ + { sizeof(WS_HTTP_PROXY_SETTING_MODE), FALSE }, /* WS_CHANNEL_PROPERTY_HTTP_PROXY_SETTING_MODE */ + { sizeof(WS_CUSTOM_HTTP_PROXY), FALSE }, /* WS_CHANNEL_PROPERTY_CUSTOM_HTTP_PROXY */ + { sizeof(WS_HTTP_MESSAGE_MAPPING), FALSE }, /* WS_CHANNEL_PROPERTY_HTTP_MESSAGE_MAPPING */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_ENABLE_HTTP_REDIRECT */ + { sizeof(WS_HTTP_REDIRECT_CALLBACK_CONTEXT), FALSE }, /* WS_CHANNEL_PROPERTY_HTTP_REDIRECT_CALLBACK_CONTEXT */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_FAULTS_AS_ERRORS */ + { sizeof(BOOL), FALSE }, /* WS_CHANNEL_PROPERTY_ALLOW_UNSECURED_FAULTS */ + { sizeof(WCHAR *), TRUE }, /* WS_CHANNEL_PROPERTY_HTTP_SERVER_SPN */ + { sizeof(WCHAR *), TRUE }, /* WS_CHANNEL_PROPERTY_HTTP_PROXY_SPN */ + { sizeof(ULONG), FALSE } /* WS_CHANNEL_PROPERTY_MAX_HTTP_REQUEST_HEADERS_BUFFER_SIZE */ }; static struct channel *alloc_channel(void) diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 26cba38..fee0015 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -95,7 +95,7 @@ struct channel WS_CHANNEL_BINDING binding; WS_CHANNEL_STATE state; ULONG prop_count; - struct prop prop[9]; + struct prop prop[50]; }; HRESULT create_channel( WS_CHANNEL_TYPE, WS_CHANNEL_BINDING, const WS_CHANNEL_PROPERTY *,

1 0

Hans Leidekker : webservices: Implement WS_ADDRESSING_VERSION_TRANSPORT.
by Alexandre Julliard 16 Aug '16

16 Aug '16

Module: wine Branch: master Commit: 0f227b2244fa1b83d95f18ab4d6ee81da178c7b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f227b2244fa1b83d95f18ab4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Aug 16 12:30:36 2016 +0200 webservices: Implement WS_ADDRESSING_VERSION_TRANSPORT. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/msg.c | 21 +++++++++++++++------ dlls/webservices/tests/msg.c | 17 +++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/webservices/msg.c b/dlls/webservices/msg.c index 2bac6e0..9a19622 100644 --- a/dlls/webservices/msg.c +++ b/dlls/webservices/msg.c @@ -349,6 +349,11 @@ static HRESULT get_addr_namespace( WS_ADDRESSING_VERSION ver, WS_XML_STRING *str str->length = sizeof(ns_addr_1_0)/sizeof(ns_addr_1_0[0]) - 1; return S_OK; + case WS_ADDRESSING_VERSION_TRANSPORT: + str->bytes = NULL; + str->length = 0; + return S_OK; + default: ERR( "unhandled addressing version %u\n", ver ); return E_NOTIMPL; @@ -409,14 +414,18 @@ static HRESULT write_envelope_start( struct msg *msg, WS_XML_WRITER *writer ) if ((hr = get_addr_namespace( msg->version_addr, &ns_addr )) != S_OK) return hr; if ((hr = WsWriteStartElement( writer, &prefix_s, &envelope, &ns_env, NULL )) != S_OK) return hr; - if ((hr = WsWriteXmlnsAttribute( writer, &prefix_a, &ns_addr, FALSE, 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 ((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> */ + } for (i = 0; i < msg->header_count; i++) { diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index a42d369..5a0e8b2 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -339,6 +339,8 @@ static void test_WsWriteEnvelopeStart(void) "<a:MessageID>urn:uuid:00000000-0000-0000-0000-000000000000</a:MessageID>" "<a:ReplyTo><a:Address>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</a:Address>" "</a:ReplyTo></s:Header><s:Body/></s:Envelope>"; + static const char expected3[] = + "<s:Envelope xmlns:s=\"http://schemas.xmlsoap.org/soap/envelope/\"><s:Header/><s:Body/></s:Envelope>"; HRESULT hr; WS_MESSAGE *msg; WS_XML_WRITER *writer; @@ -375,6 +377,21 @@ static void test_WsWriteEnvelopeStart(void) hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_STATE, &state, sizeof(state), NULL ); ok( hr == S_OK, "got %08x\n", hr ); ok( state == WS_MESSAGE_STATE_WRITING, "got %u\n", state ); + WsFreeMessage( msg ); + + hr = WsCreateMessage( WS_ENVELOPE_VERSION_SOAP_1_1, WS_ADDRESSING_VERSION_TRANSPORT, NULL, 0, &msg, + NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsInitializeMessage( msg, WS_REQUEST_MESSAGE, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEnvelopeStart( msg, writer, NULL, NULL, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output_header( msg, expected3, -1, 0, 0, __LINE__ ); WsFreeMessage( msg ); WsFreeWriter( writer );

1 0