November 2019 - Wine-Commits

Hans Leidekker : winhttp/tests: Fix some test failures.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: f6a0f02970f3ffbf6e0263601688531a7163d1df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6a0f02970f3ffbf6e026360… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:43:35 2019 +0200 winhttp/tests: Fix some test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 310620c07295d8a76826c21ef24603ef1056516f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 91a9d539aa..5ee8b1fa89 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1123,7 +1123,7 @@ static void test_secure_connection(void) ret = WinHttpSendRequest(req, NULL, 0, NULL, 0, 0, 0); err = GetLastError(); if (!ret && (err == ERROR_WINHTTP_SECURE_FAILURE || err == ERROR_WINHTTP_CANNOT_CONNECT || - err == ERROR_WINHTTP_TIMEOUT)) + err == ERROR_WINHTTP_TIMEOUT || err == SEC_E_ILLEGAL_MESSAGE)) { skip("secure connection failed, skipping remaining secure tests\n"); goto cleanup; @@ -1156,6 +1156,11 @@ static void test_secure_connection(void) } ret = WinHttpReceiveResponse(req, NULL); + if (!ret && GetLastError() == ERROR_WINHTTP_CONNECTION_ERROR) + { + skip("connection error, skipping remaining secure tests\n"); + goto cleanup; + } ok(ret, "failed to receive response %u\n", GetLastError()); available_size = 0; @@ -3687,9 +3692,9 @@ static void test_IWinHttpRequest(int port) V_VT( &data ) = VT_BSTR; V_BSTR( &data ) = SysAllocString( test_dataW ); hr = IWinHttpRequest_Send( req, data ); - ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32(ERROR_WINHTTP_INVALID_SERVER_RESPONSE)), - "got %08x\n", hr ); + ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ), "got %08x\n", hr ); SysFreeString( V_BSTR( &data ) ); + if (hr != S_OK) goto done; hr = IWinHttpRequest_Open( req, NULL, NULL, empty ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); @@ -4157,14 +4162,14 @@ static void test_IWinHttpRequest(int port) SysFreeString( url ); hr = IWinHttpRequest_Send( req, empty ); - ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE )), "got %08x\n", hr ); - if (hr == S_OK) - { - hr = IWinHttpRequest_get_ResponseText( req, &response ); - ok( hr == S_OK, "got %08x\n", hr ); - ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); - SysFreeString( response ); - } + ok( hr == S_OK || hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_INVALID_SERVER_RESPONSE ) || + hr == SEC_E_ILLEGAL_MESSAGE /* winxp */, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = IWinHttpRequest_get_ResponseText( req, &response ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( !memcmp(response, data_start, sizeof(data_start)), "got %s\n", wine_dbgstr_wn(response, 32) ); + SysFreeString( response ); IWinHttpRequest_Release( req ); @@ -4201,8 +4206,8 @@ static void test_IWinHttpRequest(int port) ok( hr == S_OK, "got %08x\n", hr ); ok( status == HTTP_STATUS_DENIED, "got %d\n", status ); +done: IWinHttpRequest_Release( req ); - CoUninitialize(); }

1 0

Hans Leidekker : wininet/tests: Fix FTP test failures.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: e9ee9a9149f08751cbd0f53281ac71dd36680a73 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9ee9a9149f08751cbd0f532… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Oct 18 16:46:23 2019 +0200 wininet/tests: Fix FTP test failures. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit bbf74ea22a5310978c9aecbdc648c562c26fa0fb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/tests/ftp.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 6f50104f3b..317b291495 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -71,7 +71,7 @@ static void test_connect(HINTERNET hInternet) */ SetLastError(0xdeadbeef); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); if (hFtp) /* some servers accept an empty password */ { ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); @@ -701,7 +701,7 @@ static void test_renamefile(HINTERNET hFtp, HINTERNET hConnect) "Expected ERROR_INTERNET_INCORRECT_HANDLE_TYPE, got %d\n", GetLastError()); } -static void test_command(HINTERNET hFtp, HINTERNET hConnect) +static void test_command(HINTERNET hFtp) { BOOL ret; DWORD error; @@ -716,17 +716,18 @@ static void test_command(HINTERNET hFtp, HINTERNET hConnect) { { FALSE, ERROR_INVALID_PARAMETER, NULL }, { FALSE, ERROR_INVALID_PARAMETER, "" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "HELO" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " SIZE" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE " }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "SIZE /welcome.msg " }, - { TRUE, ERROR_SUCCESS, "SIZE\t/welcome.msg" }, - { TRUE, ERROR_SUCCESS, "SIZE /welcome.msg" }, - { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "PWD /welcome.msg" }, - { TRUE, ERROR_SUCCESS, "PWD" } + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "invalid" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size" }, + { TRUE, ERROR_SUCCESS, "type i" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, " size" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size " }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "size welcome.msg " }, + { TRUE, ERROR_SUCCESS, "size welcome.msg" }, + { FALSE, ERROR_INTERNET_EXTENDED_ERROR, "pwd welcome.msg" }, + { TRUE, ERROR_SUCCESS, "pwd" } }; if (!pFtpCommandA) @@ -964,7 +965,7 @@ static void test_status_callbacks(HINTERNET hInternet) cb = pInternetSetStatusCallbackA(hInternet, status_callback); ok(cb == NULL, "expected NULL got %p\n", cb); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 1); if (!hFtp) { @@ -998,7 +999,7 @@ START_TEST(ftp) hInternet = InternetOpenA("winetest", 0, NULL, NULL, 0); ok(hInternet != NULL, "InternetOpen failed: %u\n", GetLastError()); - hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", NULL, INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); + hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "anonymous", "IEUser@", INTERNET_SERVICE_FTP, INTERNET_FLAG_PASSIVE, 0); if (!hFtp) { InternetCloseHandle(hInternet); @@ -1031,7 +1032,7 @@ START_TEST(ftp) test_putfile(hFtp, hHttp); test_removedir(hFtp, hHttp); test_renamefile(hFtp, hHttp); - test_command(hFtp, hHttp); + test_command(hFtp); test_find_first_file(hFtp, hHttp); test_get_current_dir(hFtp, hHttp); test_status_callbacks(hInternet);

1 0

Nikolay Sivov : kernel32/nls: Add locale data for positive and negative infinity.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

1 0

Nikolay Sivov : kernel32/nls: Add percent formatting values.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

1 0

Enol Puente : kernel32: Add Asturian locale.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 01d16cc01ab6034e04c473a99640b1225cadff4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=01d16cc01ab6034e04c473a9… Author: Enol Puente <enolp(a)softastur.org> Date: Mon Apr 29 20:38:35 2019 -0600 kernel32: Add Asturian locale. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ff8dcba46648364fa6b342969c66de6007451e69) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/locale_rc.rc | 2 + dlls/kernel32/nls/ast.nls | 171 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 173 insertions(+) diff --git a/dlls/kernel32/locale_rc.rc b/dlls/kernel32/locale_rc.rc index 3f9cfd46d4..c6bb407b1c 100644 --- a/dlls/kernel32/locale_rc.rc +++ b/dlls/kernel32/locale_rc.rc @@ -256,4 +256,6 @@ #include "nls/gdv.nls" /* 0x0494 LANG_MANX_GAELIC, SUBLANG_MANX_GAELIC */ +#include "nls/ast.nls" /* 0x04a5 LANG_ASTURIAN, SUBLANG_DEFAULT */ + #include "nls/ivl.nls" /* 0x047f LANG_INVARIANT, SUBLANG_NEUTRAL */ diff --git a/dlls/kernel32/nls/ast.nls b/dlls/kernel32/nls/ast.nls new file mode 100644 index 0000000000..a990295f6c --- /dev/null +++ b/dlls/kernel32/nls/ast.nls @@ -0,0 +1,171 @@ +/* + * Locale definitions for Asturian + * + * Copyright 2019 Enol Puente for Softastur + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma code_page(65001) /* UTF-8 */ + +STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x002f\x8000\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "34" + LOCALE_ICURRDIGITS "2" + LOCALE_ICURRENCY "3" + LOCALE_IDATE "1" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "1252" + LOCALE_IDEFAULTCODEPAGE "850" + LOCALE_IDEFAULTCOUNTRY "34" + LOCALE_IDEFAULTEBCDICCODEPAGE "500" + LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTMACCODEPAGE "10000" + LOCALE_IDEFAULTUNIXCODEPAGE "28605" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "0" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "04a5" + LOCALE_ILDATE "1" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "8" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "1" + LOCALE_INEGSIGNPOSN "1" + LOCALE_INEGSYMPRECEDES "0" + LOCALE_INEUTRAL "0" + LOCALE_IOPTIONALCALENDAR "0" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "1" + LOCALE_IPOSSIGNPOSN "1" + LOCALE_IPOSSYMPRECEDES "0" + LOCALE_IREADINGLAYOUT "0" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "" + LOCALE_S2359 "" + LOCALE_SABBREVCTRYNAME "ESP" + LOCALE_SABBREVDAYNAME1 "Llu" + LOCALE_SABBREVDAYNAME2 "Mar" + LOCALE_SABBREVDAYNAME3 "Mie" + LOCALE_SABBREVDAYNAME4 "Xue" + LOCALE_SABBREVDAYNAME5 "Vie" + LOCALE_SABBREVDAYNAME6 "Sáb" + LOCALE_SABBREVDAYNAME7 "Dom" + LOCALE_SABBREVLANGNAME "AST" + LOCALE_SABBREVMONTHNAME1 "Xin" + LOCALE_SABBREVMONTHNAME2 "Feb" + LOCALE_SABBREVMONTHNAME3 "Mar" + LOCALE_SABBREVMONTHNAME4 "Abr" + LOCALE_SABBREVMONTHNAME5 "May" + LOCALE_SABBREVMONTHNAME6 "Xun" + LOCALE_SABBREVMONTHNAME7 "Xnt" + LOCALE_SABBREVMONTHNAME8 "Ago" + LOCALE_SABBREVMONTHNAME9 "Set" + LOCALE_SABBREVMONTHNAME10 "Och" + LOCALE_SABBREVMONTHNAME11 "Pay" + LOCALE_SABBREVMONTHNAME12 "Avi" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Spain" + LOCALE_SCURRENCY "€" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "Llunes" + LOCALE_SDAYNAME2 "Martes" + LOCALE_SDAYNAME3 "Miércoles" + LOCALE_SDAYNAME4 "Xueves" + LOCALE_SDAYNAME5 "Vienres" + LOCALE_SDAYNAME6 "Sábadu" + LOCALE_SDAYNAME7 "Domingu" + LOCALE_SDECIMAL "," + LOCALE_SENGCOUNTRY "Spain" + LOCALE_SENGCURRNAME "Euro" + LOCALE_SENGLANGUAGE "Asturian" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "EUR" + LOCALE_SISO3166CTRYNAME "ES" + LOCALE_SISO639LANGNAME "ast" + LOCALE_SLANGUAGE "Asturian" + LOCALE_SLIST ";" + LOCALE_SLONGDATE "dddd, d' / 'MMMM' / 'yyyy" + LOCALE_SMONDECIMALSEP "," + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHDAY "dd MMMM" + LOCALE_SMONTHNAME1 "Xineru" + LOCALE_SMONTHNAME2 "Febreru" + LOCALE_SMONTHNAME3 "Marzu" + LOCALE_SMONTHNAME4 "Abril" + LOCALE_SMONTHNAME5 "Mayu" + LOCALE_SMONTHNAME6 "Xunu" + LOCALE_SMONTHNAME7 "Xunetu" + LOCALE_SMONTHNAME8 "Agostu" + LOCALE_SMONTHNAME9 "Setiembre" + LOCALE_SMONTHNAME10 "Ochobre" + LOCALE_SMONTHNAME11 "Payares" + LOCALE_SMONTHNAME12 "Avientu" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "." + LOCALE_SNAME "ast-ES" + LOCALE_SNAN "NaN" + LOCALE_SNATIVECTRYNAME "España" + LOCALE_SNATIVECURRNAME "Euru" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVEDISPLAYNAME "Asturianu" + LOCALE_SNATIVELANGNAME "Asturianu" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SOPENTYPELANGUAGETAG "AST " + LOCALE_SPOSITIVESIGN "" + LOCALE_SSCRIPTS "Latn;" + LOCALE_SPARENT "ast" + LOCALE_SSHORTDATE "dd/MM/yyyy" + LOCALE_SSHORTESTDAYNAME1 "Ll" + LOCALE_SSHORTESTDAYNAME2 "Ma" + LOCALE_SSHORTESTDAYNAME3 "Mi" + LOCALE_SSHORTESTDAYNAME4 "Xu" + LOCALE_SSHORTESTDAYNAME5 "Vi" + LOCALE_SSHORTESTDAYNAME6 "Sá" + LOCALE_SSHORTESTDAYNAME7 "Do" + LOCALE_SSHORTTIME "HH:mm" + LOCALE_SSORTNAME "Default" + LOCALE_STHOUSAND "." + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "HH:mm:ss" + LOCALE_SYEARMONTH "MMMM' / 'yyyy" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +}

1 0

Enol Puente : wmc: Support Asturian.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 62edbf66246a3a0bd259fd21266b996190ce3ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62edbf66246a3a0bd259fd21… Author: Enol Puente <enolp(a)softastur.org> Date: Mon Apr 29 20:38:34 2019 -0600 wmc: Support Asturian. Signed-off-by: Enol Puente <enolp(a)softastur.org> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit af5f7a8785ccde66b628c683406c78cbbf83a065) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/wmc/po.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/wmc/po.c b/tools/wmc/po.c index 6986bc9cee..bd12a285ef 100644 --- a/tools/wmc/po.c +++ b/tools/wmc/po.c @@ -82,6 +82,8 @@ static const struct { LANG_ARMENIAN, SUBLANG_ARMENIAN_ARMENIA, "hy_AM" }, { LANG_ASSAMESE, SUBLANG_NEUTRAL, "as" }, { LANG_ASSAMESE, SUBLANG_ASSAMESE_INDIA, "as_IN" }, + { LANG_ASTURIAN, SUBLANG_NEUTRAL, "ast" }, + { LANG_ASTURIAN, SUBLANG_DEFAULT, "ast_ES" }, { LANG_AZERBAIJANI, SUBLANG_NEUTRAL, "az" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_LATIN,"az_AZ(a)latin" }, { LANG_AZERBAIJANI, SUBLANG_AZERBAIJANI_AZERBAIJAN_CYRILLIC, "az_AZ(a)cyrillic" },

1 0

Hans Leidekker : winhttp: Propagate request errors in request_wait.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 249ee6f2782055906c89517f6afd50ad1eac1dd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=249ee6f2782055906c89517f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 2 16:43:36 2019 +0200 winhttp: Propagate request errors in request_wait. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8de2369dcfcc6888772ad7b3fb730a780e92df87) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/request.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 1a03f5c800..e4be2387a7 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3734,7 +3734,9 @@ static void CALLBACK wait_status_callback( HINTERNET handle, DWORD_PTR context, request->error = result->dwError; break; } - default: break; + default: + request->error = ERROR_SUCCESS; + break; } SetEvent( request->wait ); } @@ -3947,18 +3949,17 @@ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) switch (err) { case WAIT_OBJECT_0: - ret = ERROR_SUCCESS; + ret = request->error; break; case WAIT_TIMEOUT: ret = ERROR_TIMEOUT; break; - case WAIT_FAILED: default: ret = GetLastError(); break; } EnterCriticalSection( &request->cs ); - if (!ret) request->proc_running = FALSE; + if (err == WAIT_OBJECT_0) request->proc_running = FALSE; return ret; } @@ -4482,11 +4483,9 @@ static HRESULT WINAPI winhttp_request_WaitForResponse( err = ERROR_SUCCESS; break; - case ERROR_SUCCESS: + default: if (succeeded) *succeeded = VARIANT_TRUE; break; - - default: break; } LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( err );

1 0

Owen Rudge : wininet/tests: Fix http tests to reflect current state of winehq test server.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 00fd2319ff3db96adadca905fc6851eb142119ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=00fd2319ff3db96adadca905… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Oct 3 23:00:16 2019 +0100 wininet/tests: Fix http tests to reflect current state of winehq test server. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5b406e1446a7727ccc2a6efeceeb811a3da48ee1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/tests/http.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 990e0e880a..9e67caff0f 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5617,12 +5617,15 @@ static const cert_struct_test_t test_winehq_com_cert = { "Minnesota\r\n" "Saint Paul\r\n" "WineHQ\r\n" + "IT\r\n" "test.winehq.com\r\n" "webmaster(a)winehq.org", "US\r\n" "Minnesota\r\n" + "Saint Paul\r\n" "WineHQ\r\n" + "IT\r\n" "test.winehq.com\r\n" "webmaster(a)winehq.org" }; @@ -5857,7 +5860,7 @@ static void test_security_flags(void) ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); WaitForSingleObject(complete_event, INFINITE); - ok(req_error == ERROR_INTERNET_SEC_CERT_REV_FAILED || broken(req_error == ERROR_INTERNET_SEC_CERT_ERRORS), + ok(req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); size = 0; @@ -5892,7 +5895,7 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_COOKIE_SENT); CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); - if(req_error != ERROR_INTERNET_SEC_CERT_REV_FAILED) { + if(req_error != ERROR_INTERNET_SEC_CERT_ERRORS) { win_skip("Unexpected cert errors %u, skipping security flags tests\n", req_error); close_async_handle(ses, 3); @@ -5906,10 +5909,10 @@ static void test_security_flags(void) test_request_flags(req, 8); /* IE11 finds both rev failure and invalid CA. Previous versions required rev failure to be ignored before invalid CA was reported. */ - test_secflags_option(req, _SECURITY_FLAG_CERT_REV_FAILED, _SECURITY_FLAG_CERT_INVALID_CA); + test_secflags_option(req, _SECURITY_FLAG_CERT_INVALID_CA, _SECURITY_FLAG_CERT_REV_FAILED); set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_REVOCATION); - test_secflags_option(req, _SECURITY_FLAG_CERT_REV_FAILED|SECURITY_FLAG_IGNORE_REVOCATION, _SECURITY_FLAG_CERT_INVALID_CA); + test_secflags_option(req, _SECURITY_FLAG_CERT_INVALID_CA|SECURITY_FLAG_IGNORE_REVOCATION, _SECURITY_FLAG_CERT_REV_FAILED); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); SET_EXPECT(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -5923,7 +5926,7 @@ static void test_security_flags(void) ok(!res && GetLastError() == ERROR_IO_PENDING, "HttpSendRequest failed: %u\n", GetLastError()); WaitForSingleObject(complete_event, INFINITE); - ok(req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); + ok(req_error == ERROR_INTERNET_INVALID_CA || req_error == ERROR_INTERNET_SEC_CERT_ERRORS, "req_error = %d\n", req_error); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CHECK_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); @@ -5934,11 +5937,11 @@ static void test_security_flags(void) CLEAR_NOTIFIED(INTERNET_STATUS_DETECTING_PROXY); test_request_flags(req, INTERNET_REQFLAG_NO_HEADERS); - test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); + test_secflags_option(req, SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_INVALID_CA, 0); test_security_info("https://test.winehq.com/data/some_file.html?q", ERROR_INTERNET_ITEM_NOT_FOUND, 0); set_secflags(req, FALSE, SECURITY_FLAG_IGNORE_UNKNOWN_CA); - test_secflags_option(req, _SECURITY_FLAG_CERT_INVALID_CA|_SECURITY_FLAG_CERT_REV_FAILED + test_secflags_option(req, _SECURITY_FLAG_CERT_INVALID_CA |SECURITY_FLAG_IGNORE_REVOCATION|SECURITY_FLAG_IGNORE_UNKNOWN_CA, 0); test_http_version(req); @@ -5976,11 +5979,11 @@ static void test_security_flags(void) test_request_flags(req, 0); test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_IGNORE_REVOCATION - |SECURITY_FLAG_STRENGTH_STRONG|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); + |SECURITY_FLAG_STRENGTH_STRONG|_SECURITY_FLAG_CERT_INVALID_CA, 0); test_cert_struct(req, &test_winehq_com_cert); test_security_info("https://test.winehq.com/data/some_file.html?q", 0, - _SECURITY_FLAG_CERT_INVALID_CA|_SECURITY_FLAG_CERT_REV_FAILED); + _SECURITY_FLAG_CERT_INVALID_CA); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError()); @@ -6013,7 +6016,7 @@ static void test_security_flags(void) CHECK_NOTIFIED(INTERNET_STATUS_HANDLE_CREATED); test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG - |SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); + |SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_INVALID_CA, 0); test_http_version(req); SET_EXPECT(INTERNET_STATUS_CONNECTING_TO_SERVER); @@ -6048,7 +6051,7 @@ static void test_security_flags(void) test_request_flags(req, 0); test_secflags_option(req, SECURITY_FLAG_SECURE|SECURITY_FLAG_IGNORE_UNKNOWN_CA|SECURITY_FLAG_STRENGTH_STRONG - |SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_REV_FAILED|_SECURITY_FLAG_CERT_INVALID_CA, 0); + |SECURITY_FLAG_IGNORE_REVOCATION|_SECURITY_FLAG_CERT_INVALID_CA, 0); res = InternetReadFile(req, buf, sizeof(buf), &size); ok(res, "InternetReadFile failed: %u\n", GetLastError());

1 0

Zebediah Figura : d3d8/tests: Flush events after sending SC_MAXIMIZE.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 21734aa3c07af9a4bb5adbb587de7b38500afebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=21734aa3c07af9a4bb5adbb5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 1 10:52:03 2019 -0500 d3d8/tests: Flush events after sending SC_MAXIMIZE. For some reason, on fvwm2 sometimes focus_window will be restored and activated between the subsequent call to SetForegroundWindow() and the next call to ShowWindow(SW_RESTORE), causing the next test to fail. Flushing first seems to reliably work around this. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2b29d02aa5ba65465b4adc017cdca9a8932b0dbe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d8/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index d0e840a912..1a72485719 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -3055,6 +3055,7 @@ static void test_wndproc(void) ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it.\n", expect_messages->message, expect_messages->window); expect_messages = NULL; + flush_events(); SetForegroundWindow(GetDesktopWindow()); flush_events();

1 0

Zebediah Figura : d3d9/tests: Add another flush to work around an intermittent test failure on fvwm2.
by Alexandre Julliard Nov. 25, 2019

Nov. 25, 2019

Module: wine Branch: stable Commit: 6df7d78f518205102605bb7676869e79174c399a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6df7d78f518205102605bb76… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 6 10:20:20 2019 -0600 d3d9/tests: Add another flush to work around an intermittent test failure on fvwm2. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit eb13c3286f76788770131955861d8cce2800da09) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 82acaf4d6a..92ee7286f9 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3078,6 +3078,7 @@ static void test_wndproc(void) "Expected IsIconic %u, got %u, i=%u.\n", tests[i].iconic, IsIconic(focus_window), i); ShowWindow(focus_window, SW_SHOWNOACTIVATE); + flush_events(); ShowWindow(focus_window, SW_SHOWMINNOACTIVE); flush_events();

1 0