Module: wine Branch: master Commit: e59b2579b976efcfc8f71813c890def41d8f3589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e59b2579b976efcfc8f71813c...
Author: Sven Baars sven.wine@gmail.com Date: Fri Nov 22 12:23:41 2019 +0100
urlmon/tests: Expect BINDSTRING_SAMESITE_COOKIE_LEVEL on newer IE11.
Signed-off-by: Sven Baars sven.wine@gmail.com Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/urlmon/tests/protocol.c | 13 +++++++++++-- include/urlmon.idl | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 85ef7d05c2..5788ff9160 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); @@ -662,8 +663,10 @@ static void call_continue(PROTOCOLDATA *protocol_data) todo_wine CHECK_CALLED(ReportProgress_SENDINGREQUEST); else if (tested_protocol != HTTPS_TEST) CHECK_CALLED(ReportProgress_SENDINGREQUEST); - if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) + if(test_redirect && !(bindinfo_options & BINDINFO_OPTIONS_DISABLEAUTOREDIRECTS)) { CHECK_CALLED(ReportProgress_REDIRECTING); + CLEAR_CALLED(GetBindString_SAMESITE_COOKIE_LEVEL); /* New in IE11 */ + } state = test_async_req ? STATE_SENDINGREQUEST : STATE_STARTDOWNLOADING; }
@@ -1508,6 +1511,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 +3382,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); 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(