Jacek Caban : mshtml/tests: Fixed remaining xmlhttprequest test failures.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Mar 23 11:21:02 CDT 2016


Module: wine
Branch: master
Commit: f24526e79f1c57e559c3a35ab69b85dabc57d59a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f24526e79f1c57e559c3a35ab69b85dabc57d59a

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Mar 23 10:31:14 2016 +0100

mshtml/tests: Fixed remaining xmlhttprequest test failures.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mshtml/tests/xmlhttprequest.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/tests/xmlhttprequest.c b/dlls/mshtml/tests/xmlhttprequest.c
index 3153804..7e75b79 100644
--- a/dlls/mshtml/tests/xmlhttprequest.c
+++ b/dlls/mshtml/tests/xmlhttprequest.c
@@ -566,7 +566,7 @@ static void test_responseXML(const char *expect_text)
     ok(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) ||
        supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */,
         "Expected supported: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got %08x\n", supported);
-    ok(enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER),
+    ok(enabled == ((INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) & supported),
         "Expected enabled: (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), got 0x%08x\n", enabled);
     IObjectSafety_Release(safety);
 
@@ -585,9 +585,9 @@ static void test_sync_xhr(IHTMLDocument2 *doc, const char *xml_url, const char *
     LONG val;
     HRESULT hres;
     static const struct HEADER_TYPE expect_headers[] = {
-        {"Accept-Ranges", "bytes"},
+        {"Accept-Ranges", "bytes", TRUE},
         {"Content-Length", "51"},
-        {"Content-Type", "application/xml", TRUE}
+        {"Content-Type", "application/xml"}
     };
 
     trace("test_sync_xhr\n");




More information about the wine-cvs mailing list