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

[Reece Dunn]

Hi,

As the following table shows, the msxml3 behaviour for IObjectSafety
changed from SP7 (8.70.*) to SP8 (8.80.*):

fail?   Windows         MSXML           MSXML Service Pack
==========================================================
NO      Win2003 SP1     8.70.1104.0     3.0 SP7
YES     Win2003 SP2     8.80.1185.0     3.0 Post SP8
NO      WinXP SP2       8.50.2162.0     3.0 SP5
YES     WinXP SP3       8.100.1048.0    3.0 SP10
YES     WinXP + IE8     8.100.1048.0    3.0 SP10

This patch fixes the tests on these failing platforms.

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

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

diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 929a35f..6c4aae1 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -5314,8 +5314,10 @@ 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),"
+    ok(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 +5337,8 @@ 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);
+    ok(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 +5350,11 @@ 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);
+    ok(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