From 4e286e01e6cc8ff80ea18cdd44cff0deade4c7e2 Mon Sep 17 00:00:00 2001 From: winesync Date: Tue, 8 Dec 2020 18:00:50 +0100 Subject: [PATCH] [WINESYNC] wininet/tests: Don't test that the URL cache is used for persistent cookies. This seems to be an implementation detail, which is no longer true in Windows 1709+. Signed-off-by: Zebediah Figura Signed-off-by: Alexandre Julliard wine commit id 4928c623dc7f3b7f2355cf61c9f97784ff2380fe by Zebediah Figura --- modules/rostests/winetests/wininet/internet.c | 20 +++++-------------- sdk/tools/winesync/wininet.cfg | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/modules/rostests/winetests/wininet/internet.c b/modules/rostests/winetests/wininet/internet.c index 13b29309888..b94c0647e20 100644 --- a/modules/rostests/winetests/wininet/internet.c +++ b/modules/rostests/winetests/wininet/internet.c @@ -376,7 +376,6 @@ static void test_complicated_cookie(void) BOOL ret; CHAR buffer[1024]; - CHAR user[256]; WCHAR wbuf[1024]; static const WCHAR testing_example_comW[] = @@ -530,25 +529,16 @@ static void test_complicated_cookie(void) ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B; expires=Fri, 01-Jan-2038 00:00:00 GMT"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); - len = sizeof(user); - ret = GetUserNameA(user, &len); - ok(ret, "GetUserName failed with error %d\n", GetLastError()); - for(; len>0; len--) - user[len-1] = tolower(user[len-1]); - - sprintf(buffer, "Cookie:%s@testing.example.com/", user); - ret = GetUrlCacheEntryInfoA(buffer, NULL, &len); - ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); - ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetLastError() = %d\n", GetLastError()); + len = sizeof(buffer); + ret = InternetGetCookieA("http://testing.example.com/foobar", NULL, buffer, &len); + ok(ret, "got error %u\n", GetLastError()); + ok(len == 24, "got len %u\n", len); + ok(!!strstr(buffer, "A=B"), "cookie is not present\n"); /* remove persistent cookie */ ret = InternetSetCookieA("http://testing.example.com", NULL, "A=B"); ok(ret, "InternetSetCookie failed with error %d\n", GetLastError()); - ret = GetUrlCacheEntryInfoA(buffer, NULL, &len); - ok(!ret, "GetUrlCacheEntryInfo succeeded\n"); - ok(GetLastError() == ERROR_FILE_NOT_FOUND, "GetLastError() = %d\n", GetLastError()); - /* try setting cookie for different domain */ ret = InternetSetCookieA("http://www.aaa.example.com/bar",NULL,"E=F; domain=different.com"); ok(!ret, "InternetSetCookie succeeded\n"); diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg index 94e2e098198..4080112d70f 100644 --- a/sdk/tools/winesync/wininet.cfg +++ b/sdk/tools/winesync/wininet.cfg @@ -5,4 +5,4 @@ files: include/wininet.h: sdk/include/psdk/wininet.h include/winineti.h: sdk/include/psdk/winineti.h tags: - wine: 4335be346271072f440419b9234883aef187d857 + wine: 4928c623dc7f3b7f2355cf61c9f97784ff2380fe