[PATCH] urlmon/tests: Expect BINDSTRING_SAMESITE_COOKIE_LEVEL on newer IE11.

[Sven Baars]

Signed-off-by: Sven Baars <sven.wine(a)gmail.com>
---
 dlls/urlmon/tests/protocol.c | 10 +++++++++-
 include/urlmon.idl           |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c
index 85ef7d05c2..6ca13a1eff 100644
--- a/dlls/urlmon/tests/protocol.c
+++ b/dlls/urlmon/tests/protocol.c
@@ -92,6 +92,7 @@ DEFINE_EXPECT(GetBindString_USER_AGENT);
 DEFINE_EXPECT(GetBindString_POST_COOKIE);
 DEFINE_EXPECT(GetBindString_URL);
 DEFINE_EXPECT(GetBindString_ROOTDOC_URL);
+DEFINE_EXPECT(GetBindString_SAMESITE_COOKIE_LEVEL);
 DEFINE_EXPECT(QueryService_HttpNegotiate);
 DEFINE_EXPECT(QueryService_InternetProtocol);
 DEFINE_EXPECT(QueryService_HttpSecurity);
@@ -1508,6 +1509,10 @@ static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, ULONG ulS
     case BINDSTRING_ENTERPRISE_ID:
         ok(cEl == 1, "cEl=%d, expected 1\n", cEl);
         return E_NOTIMPL;
+    case BINDSTRING_SAMESITE_COOKIE_LEVEL:
+        CHECK_EXPECT(GetBindString_SAMESITE_COOKIE_LEVEL);
+        ok(cEl == 1, "cEl=%d, expected 1\n", cEl);
+        return E_NOTIMPL;
     default:
         ok(0, "unexpected ulStringType %d\n", ulStringType);
     }
@@ -3375,8 +3380,10 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym
             SET_EXPECT(ReportProgress_CONNECTING);
         }
         SET_EXPECT(ReportProgress_SENDINGREQUEST);
-        if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS))
+        if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) {
             SET_EXPECT(ReportProgress_REDIRECTING);
+            SET_EXPECT(GetBindString_SAMESITE_COOKIE_LEVEL); /* New in IE11 */
+        }
         SET_EXPECT(ReportProgress_PROXYDETECTING);
         if(prot == HTTP_TEST)
             SET_EXPECT(ReportProgress_CACHEFILENAMEAVAILABLE);
@@ -3439,6 +3446,7 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym
                 CHECK_CALLED(ReportData);
             if(prot == HTTPS_TEST)
                 CLEAR_CALLED(QueryService_HttpSecurity);
+            CLEAR_CALLED(GetBindString_SAMESITE_COOKIE_LEVEL); /* New in IE11 */
 
             while(1) {
                 if(bindf & BINDF_FROMURLMON)
diff --git a/include/urlmon.idl b/include/urlmon.idl
index f1088e7c99..fd8d6ce7bc 100644
--- a/include/urlmon.idl
+++ b/include/urlmon.idl
@@ -766,7 +766,9 @@ interface IInternetBindInfo : IUnknown
         BINDSTRING_INITIAL_FILENAME,
         BINDSTRING_PROXY_USERNAME,
         BINDSTRING_PROXY_PASSWORD,
-        BINDSTRING_ENTERPRISE_ID
+        BINDSTRING_ENTERPRISE_ID,
+        BINDSTRING_DOC_URL,
+        BINDSTRING_SAMESITE_COOKIE_LEVEL
     } BINDSTRING;
 
     HRESULT GetBindInfo(
-- 
2.17.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=59773

Your paranoid android.


=== w2003std (task log) ===

Task errors:
The task timed out

=== w2008s64 (64 bit report) ===

urlmon:
protocol.c:3504: Test failed: Abort failed: 800c0200
protocol.c:3507: Test failed: ref=3

=== debian10 (32 bit report) ===

urlmon:
protocol.c:3664: Test failed: wait timed out
protocol: Timeout

=== debian10 (32 bit French report) ===

urlmon:
protocol.c:3664: Test failed: wait timed out
protocol: Timeout

=== debian10 (32 bit Japanese:Japan report) ===

urlmon:
protocol.c:3664: Test failed: wait timed out
protocol: Timeout

[Sven Baars]

On 09-11-19 22:03, Marvin wrote:
> Hi,
>
> While running your changed tests, I think I found new failures.
> Being a bot and all I'm not very good at pattern recognition, so I might be
> wrong, but could you please double-check?
>
> Full results can be found at:
> https://testbot.winehq.org/JobDetails.pl?Key=59773
>
> Your paranoid android.
>
> === w2003std (task log) ===
>
> Task errors:
> The task timed out
>
> === w2008s64 (64 bit report) ===
>
> urlmon:
> protocol.c:3504: Test failed: Abort failed: 800c0200
> protocol.c:3507: Test failed: ref=3
>
> === debian10 (32 bit report) ===
>
> urlmon:
> protocol.c:3664: Test failed: wait timed out
> protocol: Timeout
>
> === debian10 (32 bit French report) ===
>
> urlmon:
> protocol.c:3664: Test failed: wait timed out
> protocol: Timeout
>
> === debian10 (32 bit Japanese:Japan report) ===
>
> urlmon:
> protocol.c:3664: Test failed: wait timed out
> protocol: Timeout

These appear to be some of the "worrisome" failures Francois was talking
about in the other thread, and are not caused by this patch.