Huw Davies : ole32/tests: win9x and winnt don't include the trailing '\0'.

[Alexandre Julliard]

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

Author: Huw Davies 
Date:   Thu Feb 26 12:48:11 2009 +0000

ole32/tests: win9x and winnt don't include the trailing '\0'.

---

dlls/ole32/tests/usrmarshal.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c
index 03ced75..b36fdf6 100644
--- a/dlls/ole32/tests/usrmarshal.c
+++ b/dlls/ole32/tests/usrmarshal.c
@@ -100,14 +100,16 @@ static void test_marshal_CLIPFORMAT(void)

init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE);
     size = CLIPFORMAT_UserSize(&umcb.Flags, 0, &cf);
-    ok(size == 8 + sizeof(cf_marshaled), "CLIPFORMAT: Wrong size %d\n", size);
+    ok(size == 8 + sizeof(cf_marshaled) ||
+       broken(size == 8 + sizeof(cf_marshaled) - 2), /* win9x and winnt don't include the '\0' */
+              "CLIPFORMAT: Wrong size %d\n", size);

buffer = HeapAlloc(GetProcessHeap(), 0, size);
     init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE);
     CLIPFORMAT_UserMarshal(&umcb.Flags, buffer, &cf);
     ok(*(LONG *)(buffer + 0) == WDT_REMOTE_CALL, "CLIPFORMAT: Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(LONG *)(buffer + 0));
     ok(*(DWORD *)(buffer + 4) == cf, "CLIPFORMAT: Marshaled value should be 0x%04x instead of 0x%04x\n", cf, *(DWORD *)(buffer + 4));
-    ok(!memcmp(buffer + 8, cf_marshaled, sizeof(cf_marshaled)), "Marshaled data differs\n");
+    ok(!memcmp(buffer + 8, cf_marshaled, size - 8), "Marshaled data differs\n");

init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE);
     CLIPFORMAT_UserUnmarshal(&umcb.Flags, buffer, &cf2);