Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] wininet/tests: Fix some test failures on Windows.

Browse source 
Signed-off-by: Sven Baars <sven.wine@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 8b2d3857136c50d56c706a7f880fc605b325e334 by Sven Baars <sven.wine@gmail.com>
This commit is contained in:
winesync 2020-12-08 17:46:15 +01:00 committed by Jérôme Gardou
parent 4a3f32ff30
commit d9efda8225
2 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
modules/rostests/winetests/wininet/urlcache.c
View file

@ -877,9 +877,8 @@ static void test_urlcacheW(void)
"", {0}, {0} "", {0}, {0}
}, },
{ {
0, {'C','o','o','k','i','e',':',' ','u','s','e','r','@','h','t','t','p', 0, {'C','o','o','k','i','e',':',' ','u','s','e','r','@','t','e','s','t','.','o','r','g','/',0},
':','/','/','t',0x15b,0x107,'.','o','r','g','/',0}, "Cookie: user@test.org/", {0}, {0}
"Cookie: user@http://t\xc5\x9b\xc4\x87.org/", {0}, {0}
} }
}; };
static const FILETIME filetime_zero; static const FILETIME filetime_zero;
@ -893,24 +892,11 @@ static void test_urlcacheW(void)
return; return;
} }
if(ie10_cache) {
if(!MultiByteToWideChar(CP_ACP, 0, urls[6].encoded_url, -1,
urls[6].url, ARRAY_SIZE(urls[6].url)))
urls[6].url[0] = 0;
trace("converted url in test 6: %s\n", wine_dbgstr_w(urls[6].url));
}
for(i=0; i<ARRAY_SIZE(urls); i++) { for(i=0; i<ARRAY_SIZE(urls); i++) {
INTERNET_CACHE_ENTRY_INFOA *entry_infoA; INTERNET_CACHE_ENTRY_INFOA *entry_infoA;
INTERNET_CACHE_ENTRY_INFOW *entry_infoW; INTERNET_CACHE_ENTRY_INFOW *entry_infoW;
DWORD size; DWORD size;
if(!urls[i].url[0]) {
win_skip("No UTF16 version of url (%d)\n", i);
continue;
}
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = CreateUrlCacheEntryW(urls[i].url, 0, NULL, bufW, 0); ret = CreateUrlCacheEntryW(urls[i].url, 0, NULL, bufW, 0);
if(urls[i].err != 0) { if(urls[i].err != 0) {
@ -937,10 +923,6 @@ static void test_urlcacheW(void)
ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, NULL, &size); ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, NULL, &size);
ok(!ret && GetLastError()==ERROR_INSUFFICIENT_BUFFER, ok(!ret && GetLastError()==ERROR_INSUFFICIENT_BUFFER,
"%d) GetLastError() = %d\n", i, GetLastError()); "%d) GetLastError() = %d\n", i, GetLastError());
if(!ret && GetLastError()!=ERROR_INSUFFICIENT_BUFFER) {
win_skip("ANSI version of url is incorrect\n");
continue;
}
entry_infoA = HeapAlloc(GetProcessHeap(), 0, size); entry_infoA = HeapAlloc(GetProcessHeap(), 0, size);
ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, entry_infoA, &size); ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, entry_infoA, &size);
ok(ret, "%d) GetUrlCacheEntryInfoA failed: %d\n", i, GetLastError()); ok(ret, "%d) GetUrlCacheEntryInfoA failed: %d\n", i, GetLastError());

2
sdk/tools/winesync/wininet.cfg
View file

@ -5,4 +5,4 @@ files:
include/wininet.h: sdk/include/psdk/wininet.h include/wininet.h: sdk/include/psdk/wininet.h
include/winineti.h: sdk/include/psdk/winineti.h include/winineti.h: sdk/include/psdk/winineti.h
tags: tags:
wine: wine-4.18 wine: 8b2d3857136c50d56c706a7f880fc605b325e334