[PATCH] wininet: Pass correct server name when retrieving username information
szServer is never set, so retrieving user information always failed. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/dialogs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/dialogs.c b/dlls/wininet/dialogs.c index b4aa49c0eb..5e26c8b7b4 100644 --- a/dlls/wininet/dialogs.c +++ b/dlls/wininet/dialogs.c @@ -216,7 +216,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( { HWND hitem; struct WININET_ErrorDlgParams *params; - WCHAR szRealm[0x80], szServer[0x80]; + WCHAR szRealm[0x80]; if( uMsg == WM_INITDIALOG ) { @@ -237,7 +237,7 @@ static INT_PTR WINAPI WININET_ProxyPasswordDialog( hitem = GetDlgItem( hdlg, IDC_PROXY ); SetWindowTextW( hitem, params->req->session->appInfo->proxy ); - WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE ); + WININET_GetSetPassword( hdlg, params->req->session->appInfo->proxy, szRealm, FALSE ); return TRUE; } @@ -291,7 +291,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( { HWND hitem; struct WININET_ErrorDlgParams *params; - WCHAR szRealm[0x80], szServer[0x80]; + WCHAR szRealm[0x80]; if( uMsg == WM_INITDIALOG ) { @@ -312,7 +312,7 @@ static INT_PTR WINAPI WININET_PasswordDialog( hitem = GetDlgItem( hdlg, IDC_SERVER ); SetWindowTextW( hitem, params->req->session->hostName ); - WININET_GetSetPassword( hdlg, szServer, szRealm, FALSE ); + WININET_GetSetPassword( hdlg, params->req->session->hostName, szRealm, FALSE ); return TRUE; } -- 2.17.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=56569 Your paranoid android. === debian10 (32 bit report) === wininet: ftp: Timeout http.c:5994: Test failed: req_error = 12038 http.c:6033: Test failed: Unexpected cert errors 12038, skipping security flags tests === debian10 (32 bit Chinese:China report) === wininet: ftp.c:81: Test failed: Expected ERROR_INTERNET_LOGIN_FAILURE, got 12110 ftp.c:112: Test failed: InternetConnect failed : 12110 ftp.c:113: Test failed: ERROR_SUCCESS, got 12110 ftp.c:122: Test failed: Expected ERROR_INTERNET_LOGIN_FAILURE, got 12110 ftp: Timeout http.c:355: Test failed: unexpected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) http.c:5960: Test failed: InternetReadFile failed: 997 http.c:5961: Test failed: size = 0 http.c:355: Test failed: unexpected status 41 (INTERNET_STATUS_RESPONSE_RECEIVED) http.c:5994: Test failed: req_error = 0 http.c:5999: Test failed: InternetQueryOption failed: 12016 http.c:6000: Test failed: size = 0 http.c:6009: Test failed: InternetQueryOption failed: 12016 http.c:6024: Test failed: expected status 20 (INTERNET_STATUS_CONNECTING_TO_SERVER) 2 times, received 0 times http.c:6025: Test failed: expected status 21 (INTERNET_STATUS_CONNECTED_TO_SERVER) 2 times, received 0 times http.c:6026: Test failed: expected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) 2 times, received 0 times http.c:6027: Test failed: expected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) 2 times, received 0 times http.c:6033: Test failed: Unexpected cert errors 0, skipping security flags tests http.c:355: Test failed: unexpected status 20 (INTERNET_STATUS_CONNECTING_TO_SERVER) http.c:355: Test failed: unexpected status 21 (INTERNET_STATUS_CONNECTED_TO_SERVER) http.c:355: Test failed: unexpected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) http.c:355: Test failed: unexpected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) http.c:355: Test failed: unexpected status 100 (INTERNET_STATUS_REQUEST_COMPLETE) Unhandled exception: page fault on read access to 0xdeadbeff in 32-bit code (0x7dc3541e). Report errors: wininet:http crashed (c0000005) === debian10 (32 bit WoW report) === wininet: ftp: Timeout http.c:355: Test failed: unexpected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) http.c:355: Test failed: unexpected status 41 (INTERNET_STATUS_RESPONSE_RECEIVED) http.c:5994: Test failed: req_error = 12038 http.c:6033: Test failed: Unexpected cert errors 12038, skipping security flags tests http.c:708: Test failed: expected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) 1 times, received 2 times http.c:709: Test failed: expected status 41 (INTERNET_STATUS_RESPONSE_RECEIVED) 1 times, received 2 times === debian10 (64 bit WoW report) === wininet: ftp: Timeout http.c:355: Test failed: unexpected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) http.c:5960: Test failed: InternetReadFile failed: 997 http.c:5961: Test failed: size = 0 http.c:355: Test failed: unexpected status 41 (INTERNET_STATUS_RESPONSE_RECEIVED) http.c:5994: Test failed: req_error = 0 http.c:5999: Test failed: InternetQueryOption failed: 12016 http.c:6000: Test failed: size = 0 http.c:6009: Test failed: InternetQueryOption failed: 12016 http.c:6024: Test failed: expected status 20 (INTERNET_STATUS_CONNECTING_TO_SERVER) 2 times, received 0 times http.c:6025: Test failed: expected status 21 (INTERNET_STATUS_CONNECTED_TO_SERVER) 2 times, received 0 times http.c:6026: Test failed: expected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) 2 times, received 0 times http.c:6027: Test failed: expected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) 2 times, received 0 times http.c:6033: Test failed: Unexpected cert errors 0, skipping security flags tests http.c:355: Test failed: unexpected status 20 (INTERNET_STATUS_CONNECTING_TO_SERVER) http.c:355: Test failed: unexpected status 21 (INTERNET_STATUS_CONNECTED_TO_SERVER) http.c:355: Test failed: unexpected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) http.c:355: Test failed: unexpected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) http.c:355: Test failed: unexpected status 100 (INTERNET_STATUS_REQUEST_COMPLETE) http.c:708: Test failed: expected status 40 (INTERNET_STATUS_RECEIVING_RESPONSE) 1 times, received 2 times http.c:709: Test failed: expected status 41 (INTERNET_STATUS_RESPONSE_RECEIVED) 1 times, received 2 times http.c:1134: Test failed: expected status 50 (INTERNET_STATUS_CLOSING_CONNECTION) 2 times, received 1 times http.c:1135: Test failed: expected status 51 (INTERNET_STATUS_CONNECTION_CLOSED) 2 times, received 1 times http.c:1138: Test failed: expected status 100 (INTERNET_STATUS_REQUEST_COMPLETE) 1 times, received 2 times
participants (2)
-
Alistair Leslie-Hughes -
Marvin