[PATCH] msxml3/tests: Fix the domdoc IObjectSafety tests for msxml3 SP8+. [try 2]

Reece Dunn msclrhd at googlemail.com
Fri Feb 26 16:07:20 CST 2010


Hi,

This fixes the failing msxml3:domdoc tests on Windows platforms that
have msxml3 SP8 or later installed.

try 2: mark the < SP8 results as broken and add a todo_wine as these
tests now fail on Wine.

- Reece
-------------- next part --------------
From 1ed1d97055d4089c81de796057f302e9a3f39d85 Mon Sep 17 00:00:00 2001
From: Reece Dunn <msclrhd at gmail.com>
Date: Fri, 26 Feb 2010 22:03:43 +0000
Subject: [PATCH] msxml3/tests: Fix the domdoc IObjectSafety tests for msxml3 SP8+.

---
 dlls/msxml3/tests/domdoc.c |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 929a35f..a376f46 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -5314,8 +5314,11 @@ static void test_document_IObjectSafety(void)
 
     hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
     ok(hr == S_OK, "ret %08x\n", hr );
-    ok(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA),
-        "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA),"
+    todo_wine
+    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 (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA) "
+        "or (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), "
              "got %08x\n", supported);
     ok(enabled == 0, "Expected 0, got %08x\n", enabled);
     /* set */
@@ -5335,7 +5338,9 @@ static void test_document_IObjectSafety(void)
     ok(hr == S_OK, "ret %08x\n", hr );
     hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
     ok(hr == S_OK, "ret %08x\n", hr );
-    ok(enabled == 0, "Expected 0, got %08x\n", enabled);
+    todo_wine
+    ok(broken(enabled == 0) || enabled == INTERFACE_USES_SECURITY_MANAGER /* msxml3 SP8+ */,
+       "Expected 0 or INTERFACE_USES_SECURITY_MANAGER, got %08x\n", enabled);
 
     hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL,
                                                          INTERFACESAFE_FOR_UNTRUSTED_CALLER,
@@ -5347,8 +5352,12 @@ static void test_document_IObjectSafety(void)
     ok(hr == S_OK, "ret %08x\n", hr );
     hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled);
     ok(hr == S_OK, "ret %08x\n", hr );
-    ok(enabled == INTERFACESAFE_FOR_UNTRUSTED_DATA,
-        "Expected INTERFACESAFE_FOR_UNTRUSTED_DATA, got %08x\n", enabled);
+    todo_wine
+    ok(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_DATA) ||
+       enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */,
+        "Expected INTERFACESAFE_FOR_UNTRUSTED_DATA "
+        "or (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), "
+        "got %08x\n", enabled);
 
     IObjectSafety_Release(safety);
 
-- 
1.6.3.3


More information about the wine-patches mailing list