marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhttp/tests: Fix some test failures. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
(cherry picked from commit 310620c072)
Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
oldstable
Hans Leidekker 2019-10-02 16:43:35 +02:00 committed by Michael Stefaniuc
parent b8ce8e48ab
commit f6a0f02970
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/winhttp/tests/winhttp.c
View File

@ -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();
}