ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wininet: Skip more problematic tests on IE6. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2016-05-29 19:37:02 +02:00 committed by Alexandre Julliard
parent 0fdba71bed
commit 5eca697aba
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/wininet/tests/http.c
View File

@ -111,6 +111,7 @@ static const char *status_string[MAX_INTERNET_STATUS];
static HANDLE hCompleteEvent, conn_close_event, conn_wait_event, server_req_rec_event; static HANDLE hCompleteEvent, conn_close_event, conn_wait_event, server_req_rec_event;
static DWORD req_error; static DWORD req_error;
static BOOL is_ie7plus = TRUE;
#define TESTF_REDIRECT 0x01 #define TESTF_REDIRECT 0x01
#define TESTF_COMPRESSED 0x02 #define TESTF_COMPRESSED 0x02
@ -1079,10 +1080,12 @@ static void InternetReadFileExA_test(int flags)
CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTING_TO_SERVER);
CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER); CLEAR_NOTIFIED(INTERNET_STATUS_CONNECTED_TO_SERVER);
rc = InternetReadFileExW(hor, NULL, 0, 0xdeadcafe); if(is_ie7plus) {
ok(!rc && (GetLastError() == ERROR_INVALID_PARAMETER), rc = InternetReadFileExW(hor, NULL, 0, 0xdeadcafe);
"InternetReadFileEx should have failed with ERROR_INVALID_PARAMETER instead of %s, %u\n", ok(!rc && (GetLastError() == ERROR_INVALID_PARAMETER),
rc ? "TRUE" : "FALSE", GetLastError()); "InternetReadFileEx should have failed with ERROR_INVALID_PARAMETER instead of %s, %u\n",
rc ? "TRUE" : "FALSE", GetLastError());
}
/* tests invalid dwStructSize */ /* tests invalid dwStructSize */
inetbuffers.dwStructSize = sizeof(inetbuffers)+1; inetbuffers.dwStructSize = sizeof(inetbuffers)+1;
@ -4681,6 +4684,9 @@ static void test_http_read(int port)
test_request_t req; test_request_t req;
char buf[4096]; char buf[4096];
if(!is_ie7plus)
return;
hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL);
server_req_rec_event = CreateEventW(NULL, FALSE, FALSE, NULL); server_req_rec_event = CreateEventW(NULL, FALSE, FALSE, NULL);
@ -4725,6 +4731,9 @@ static void test_long_url(int port)
DWORD size, len; DWORD size, len;
BOOL ret; BOOL ret;
if(!is_ie7plus)
return;
memset(long_path+strlen(long_path), 'x', sizeof(long_path)-strlen(long_path)); memset(long_path+strlen(long_path), 'x', sizeof(long_path)-strlen(long_path));
long_path[sizeof(long_path)-1] = 0; long_path[sizeof(long_path)-1] = 0;
open_simple_request(&req, "localhost", port, NULL, long_path); open_simple_request(&req, "localhost", port, NULL, long_path);
@ -5567,10 +5576,8 @@ static void test_open_url_async(void)
* other versions never do. They also hang of following tests. We disable it for everything older * other versions never do. They also hang of following tests. We disable it for everything older
* than IE7. * than IE7.
*/ */
if(!pInternetGetSecurityInfoByURLA) { if(!is_ie7plus)
win_skip("Skipping async open on too old wininet version.\n");
return; return;
}
ctx.req = NULL; ctx.req = NULL;
ctx.event = CreateEventA(NULL, TRUE, FALSE, "Z:_home_hans_jaman-installer.exe_ev1"); ctx.event = CreateEventA(NULL, TRUE, FALSE, "Z:_home_hans_jaman-installer.exe_ev1");
@ -6055,6 +6062,9 @@ static void test_default_service_port(void)
char buffer[128]; char buffer[128];
BOOL ret; BOOL ret;
if(!is_ie7plus)
return;
session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); session = InternetOpenA("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0);
ok(session != NULL, "InternetOpen failed\n"); ok(session != NULL, "InternetOpen failed\n");
@ -6231,6 +6241,11 @@ START_TEST(http)
pInternetSetStatusCallbackW = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackW"); pInternetSetStatusCallbackW = (void*)GetProcAddress(hdll, "InternetSetStatusCallbackW");
pInternetGetSecurityInfoByURLA = (void*)GetProcAddress(hdll, "InternetGetSecurityInfoByURLA"); pInternetGetSecurityInfoByURLA = (void*)GetProcAddress(hdll, "InternetGetSecurityInfoByURLA");
if(!pInternetGetSecurityInfoByURLA) {
is_ie7plus = FALSE;
win_skip("IE6 found. It's too old for some tests.\n");
}
init_status_tests(); init_status_tests();
test_InternetCloseHandle(); test_InternetCloseHandle();
InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]); InternetReadFile_test(INTERNET_FLAG_ASYNC, &test_data[0]);