winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
August 2016
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
777 discussions
Start a n
N
ew thread
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
0
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
0
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
0
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
0
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
0
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
0
0
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
0
0
Józef Kucia : wined3d: Do not switch display mode when windowed is TRUE.
by Alexandre Julliard
16 Aug '16
16 Aug '16
Module: wine Branch: master Commit: 910fc594d9e483143863e27eb7498dd26ccdd3d4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=910fc594d9e483143863e27eb…
Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Aug 15 16:00:15 2016 +0200 wined3d: Do not switch display mode when windowed is TRUE. Fixes a regression introduced by commit cad279449c62a965a70a712a91b11ba52c4ff4f7. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 406dca9..c2a8c55 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4648,6 +4648,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_rendertarget_view_desc view_desc; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; + BOOL backbuffer_resized; HRESULT hr = WINED3D_OK; unsigned int i; @@ -4737,10 +4738,12 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_swapchain_set_window(swapchain, NULL); } + backbuffer_resized = swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width + || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height; + if (!swapchain_desc->windowed != !swapchain->desc.windowed || swapchain->reapply_mode || mode - || swapchain_desc->backbuffer_width != swapchain->desc.backbuffer_width - || swapchain_desc->backbuffer_height != swapchain->desc.backbuffer_height) + || (!swapchain_desc->windowed && backbuffer_resized)) { if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain, swapchain_desc, mode))) return hr;
1
0
0
0
André Hentschel : kernel32/tests: Fill in the delay IAT to succeed on Win10.
by Alexandre Julliard
16 Aug '16
16 Aug '16
Module: wine Branch: master Commit: bdd7be374723bb92b7f2f735c5ed91827acd4cb2 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=bdd7be374723bb92b7f2f735c…
Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 15 17:52:53 2016 +0200 kernel32/tests: Fill in the delay IAT to succeed on Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 7585b9b..28449ac 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2608,7 +2608,7 @@ static PVOID WINAPI failuredllhook(ULONG ul, DELAYLOAD_INFO* pd) ok(!!pd->ThunkAddress, "no ThunkAddress supplied\n"); if (pd->ThunkAddress) - ok(pd->ThunkAddress->u1.Ordinal == 0, "expected 0, got %x\n", (UINT)pd->ThunkAddress->u1.Ordinal); + ok(pd->ThunkAddress->u1.Ordinal, "no ThunkAddress value supplied\n"); ok(!!pd->TargetDllName, "no TargetDllName supplied\n"); if (pd->TargetDllName) @@ -2782,9 +2782,20 @@ static void test_ResolveDelayLoadedAPI(void) ret = WriteFile(hfile, test_func, sizeof(test_func), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); - file_size = GetFileSize(hfile, NULL); + SetFilePointer( hfile, idd.ImportAddressTableRVA, NULL, SEEK_SET ); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + /* 0x1a00 is an empty space between delay data and extended delay data, real thunks are not necessary */ + itd32.u1.Function = nt_header.OptionalHeader.ImageBase + 0x1a00 + i * 0x20; + SetLastError(0xdeadbeef); + ret = WriteFile(hfile, &itd32, sizeof(itd32), &dummy, NULL); + ok(ret, "WriteFile error %d\n", GetLastError()); + } + + itd32.u1.Function = 0; SetLastError(0xdeadbeef); - ret = WriteFile(hfile, filler, idd.ImportNameTableRVA - file_size, &dummy, NULL); + ret = WriteFile(hfile, &itd32, sizeof(itd32), &dummy, NULL); ok(ret, "WriteFile error %d\n", GetLastError()); for (i = 0; i < sizeof(td)/sizeof(td[0]); i++)
1
0
0
0
Bruno Jesus : winmm/tests: Enumerate all joystick devices during the test.
by Alexandre Julliard
16 Aug '16
16 Aug '16
Module: wine Branch: master Commit: f2fa2448aa946e79431a965b3a9608a35ce48f10 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=f2fa2448aa946e79431a965b3…
Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Aug 15 19:11:38 2016 -0300 winmm/tests: Enumerate all joystick devices during the test. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/joystick.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/joystick.c b/dlls/winmm/tests/joystick.c index 2f230f5..5714001 100644 --- a/dlls/winmm/tests/joystick.c +++ b/dlls/winmm/tests/joystick.c @@ -82,7 +82,9 @@ static void test_api(void) ret = joyGetDevCapsA(JOYSTICKID1 + i, &jc, sizeof(jc)); if (ret == JOYERR_NOERROR) { - joyid = JOYSTICKID1 + i; + if (joyid == -1) /* Cache the first found joystick to run advanced tests below */ + joyid = JOYSTICKID1 + i; + trace("Joystick[%d] - name: '%s', axes: %d, buttons: %d, period range: %d - %d\n", JOYSTICKID1 + i, jc.szPname, jc.wNumAxes, jc.wNumButtons, jc.wPeriodMin, jc.wPeriodMax); ret = joyGetDevCapsW(JOYSTICKID1 + i, &jcw, sizeof(jcw)); @@ -93,7 +95,6 @@ static void test_api(void) ok(jc.wNumButtons == jcw.wNumButtons, "Expected %d == %d\n", jc.wNumButtons, jcw.wNumButtons); } else win98++; - break; } else {
1
0
0
0
← Newer
1
...
38
39
40
41
42
43
44
...
78
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
Results per page:
10
25
50
100
200