[ITSS_WINETEST] Sync with Wine Staging 3.17. CORE-15127

This commit is contained in:
Amine Khaldi 2018-10-01 12:57:42 +01:00
parent 0ccdd32f50
commit 50ae3dd409

View file

@ -504,18 +504,18 @@ static void test_its_protocol_info(IInternetProtocol *protocol)
for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) { for(i = PARSE_CANONICALIZE; i <= PARSE_UNESCAPE; i++) {
if(i != PARSE_CANONICALIZE && i != PARSE_SECURITY_URL) { if(i != PARSE_CANONICALIZE && i != PARSE_SECURITY_URL) {
hres = IInternetProtocolInfo_ParseUrl(info, blank_url1, i, 0, buf, hres = IInternetProtocolInfo_ParseUrl(info, blank_url1, i, 0, buf,
sizeof(buf)/sizeof(buf[0]), &size, 0); ARRAY_SIZE(buf), &size, 0);
ok(hres == INET_E_DEFAULT_ACTION, ok(hres == INET_E_DEFAULT_ACTION,
"[%d] failed: %08x, expected INET_E_DEFAULT_ACTION\n", i, hres); "[%d] failed: %08x, expected INET_E_DEFAULT_ACTION\n", i, hres);
} }
} }
for(i=0; i < sizeof(combine_tests)/sizeof(combine_tests[0]); i++) { for(i=0; i < ARRAY_SIZE(combine_tests); i++) {
size = 0xdeadbeef; size = 0xdeadbeef;
memset(buf, 0xfe, sizeof(buf)); memset(buf, 0xfe, sizeof(buf));
hres = IInternetProtocolInfo_CombineUrl(info, a2w(combine_tests[i].base_url), hres = IInternetProtocolInfo_CombineUrl(info, a2w(combine_tests[i].base_url),
a2w(combine_tests[i].rel_url), combine_tests[i].flags, buf, a2w(combine_tests[i].rel_url), combine_tests[i].flags, buf,
sizeof(buf)/sizeof(WCHAR), &size, 0); ARRAY_SIZE(buf), &size, 0);
ok(hres == combine_tests[i].hres, "[%d] CombineUrl returned %08x, expected %08x\n", ok(hres == combine_tests[i].hres, "[%d] CombineUrl returned %08x, expected %08x\n",
i, hres, combine_tests[i].hres); i, hres, combine_tests[i].hres);
ok(size == (combine_tests[i].combined_url ? strlen(combine_tests[i].combined_url)+1 ok(size == (combine_tests[i].combined_url ? strlen(combine_tests[i].combined_url)+1