Jeremy White : oleaut32/tests: Adjust new tests to pass on win9x platforms.

[Alexandre Julliard]

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

Author: Jeremy White 
Date:   Thu Dec 17 14:54:00 2009 -0600

oleaut32/tests: Adjust new tests to pass on win9x platforms.

---

dlls/oleaut32/tests/usrmarshal.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c
index e9c53e9..b5cdc1e 100644
--- a/dlls/oleaut32/tests/usrmarshal.c
+++ b/dlls/oleaut32/tests/usrmarshal.c
@@ -306,7 +306,8 @@ static void test_marshal_LPSAFEARRAY(void)
     buffer = HeapAlloc(GetProcessHeap(), 0, size);
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE);
     next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa);
-    ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected);
+    ok(next - buffer == expected || broken(next - buffer + sizeof(DWORD) == expected),
+            "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected);

check_safearray(buffer, lpsa);

@@ -335,7 +336,8 @@ static void test_marshal_LPSAFEARRAY(void)
     buffer = HeapAlloc(GetProcessHeap(), 0, size);
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE);
     next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa);
-    ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected);
+    ok(next - buffer == expected || broken(next - buffer + sizeof(DWORD) == expected),
+            "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected);
     check_safearray(buffer, lpsa);
     HeapFree(GetProcessHeap(), 0, buffer);
     SafeArrayDestroyData(lpsa);
@@ -445,7 +447,8 @@ static void test_marshal_LPSAFEARRAY(void)
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE);
     next = LPSAFEARRAY_UserMarshal(&umcb.Flags, buffer, &lpsa);
     todo_wine
-    ok(next - buffer == expected, "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected);
+    ok(next - buffer == expected || broken(next - buffer + sizeof(DWORD) == expected),
+            "Marshaled %u bytes, expected %u\n", (ULONG) (next - buffer), expected);
     lpsa->cbElements = 16;  /* VARIANT wire size */
     check_safearray(buffer, lpsa);
     HeapFree(GetProcessHeap(), 0, buffer);