[ros-diffs] [reactos] 03/39: [WINESYNC] wininet/tests: Fix some test failures on Windows.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d9efda8225a519b6a02b6…

commit d9efda8225a519b6a02b66a605547b22a8c0a7fc
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Tue Dec 8 17:46:15 2020 +0100
Commit:     Jérôme Gardou <zefklop(a)users.noreply.github.com>
CommitDate: Tue Jan 5 11:03:13 2021 +0100

    [WINESYNC] wininet/tests: Fix some test failures on Windows.
    
    Signed-off-by: Sven Baars <sven.wine(a)gmail.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 8b2d3857136c50d56c706a7f880fc605b325e334 by Sven Baars
<sven.wine(a)gmail.com>
---
 modules/rostests/winetests/wininet/urlcache.c | 22 ++--------------------
 sdk/tools/winesync/wininet.cfg                |  2 +-
 2 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/modules/rostests/winetests/wininet/urlcache.c
b/modules/rostests/winetests/wininet/urlcache.c
index f7a5cef0bb1..f8ba90f7ab0 100644
--- a/modules/rostests/winetests/wininet/urlcache.c
+++ b/modules/rostests/winetests/wininet/urlcache.c
@@ -877,9 +877,8 @@ static void test_urlcacheW(void)
             "", {0}, {0}
         },
         {
-            0,
{'C','o','o','k','i','e',':','
','u','s','e','r','@','h','t','t','p',
-               
':','/','/','t',0x15b,0x107,'.','o','r','g','/',0},
-            "Cookie: user@http://t\xc5\x9b\xc4\x87.org/", {0}, {0}
+            0,
{'C','o','o','k','i','e',':','
','u','s','e','r','(a)','t','e','s','t','.','o','r','g','/',0}','t','e','s','t','.','o','r','g','/',0},
+            "Cookie: user(a)test.org/"quot;, {0}, {0}
         }
     };
     static const FILETIME filetime_zero;
@@ -893,24 +892,11 @@ static void test_urlcacheW(void)
         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++) {
         INTERNET_CACHE_ENTRY_INFOA *entry_infoA;
         INTERNET_CACHE_ENTRY_INFOW *entry_infoW;
         DWORD size;
 
-        if(!urls[i].url[0]) {
-            win_skip("No UTF16 version of url (%d)\n", i);
-            continue;
-        }
-
         SetLastError(0xdeadbeef);
         ret = CreateUrlCacheEntryW(urls[i].url, 0, NULL, bufW, 0);
         if(urls[i].err != 0) {
@@ -937,10 +923,6 @@ static void test_urlcacheW(void)
         ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, NULL, &size);
         ok(!ret && GetLastError()==ERROR_INSUFFICIENT_BUFFER,
                 "%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);
         ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, entry_infoA, &size);
         ok(ret, "%d) GetUrlCacheEntryInfoA failed: %d\n", i, GetLastError());
diff --git a/sdk/tools/winesync/wininet.cfg b/sdk/tools/winesync/wininet.cfg
index 41556140139..56da4b2c261 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: wine-4.18
+  wine: 8b2d3857136c50d56c706a7f880fc605b325e334