Huw Davies : ole32/tests: Make the size tests for the WdtpInterfacePointer marshaller more restrictive .
Alexandre Julliard
julliard at winehq.org
Tue May 12 09:08:47 CDT 2009
Module: wine
Branch: master
Commit: 782ec11a0df59dc8a6f4088d12e7ec9b681ead79
URL: http://source.winehq.org/git/wine.git/?a=commit;h=782ec11a0df59dc8a6f4088d12e7ec9b681ead79
Author: Huw Davies <huw at codeweavers.com>
Date: Tue May 12 11:31:10 2009 +0100
ole32/tests: Make the size tests for the WdtpInterfacePointer marshaller more restrictive.
---
dlls/ole32/tests/usrmarshal.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c
index 3411cc2..51223e5 100644
--- a/dlls/ole32/tests/usrmarshal.c
+++ b/dlls/ole32/tests/usrmarshal.c
@@ -530,14 +530,15 @@ static void test_marshal_WdtpInterfacePointer(void)
init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC);
size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown);
todo_wine
- ok(size > 28, "size should be > 28 bytes, not %d\n", size);
+ ok(size >= 0x4c, "size should be >= 0x4c bytes, not %d\n", size);
trace("WdtpInterfacePointer_UserSize returned %d\n", size);
buffer = HeapAlloc(GetProcessHeap(), 0, size);
init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC);
buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, buffer, unk, &IID_IUnknown);
wireip = buffer;
- if (size >= 28)
+ if (size >= 0x4c)
{
+ ok(buffer_end == buffer + 0x4c, "buffer_end %p buffer %p\n", buffer_end, buffer);
ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip);
wireip += sizeof(DWORD);
ok(*(DWORD *)wireip == 0x44, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip);
More information about the wine-cvs
mailing list