Alexandre Julliard : ole32/tests: Fix marshalling data layout for Win64.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8377b2464b25085ddd57f3c00556ef5a20a57f3c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8377b2464b25085ddd57f3c005...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sat Jan 10 21:06:09 2009 +0100

ole32/tests: Fix marshalling data layout for Win64.

---

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

diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c
index 9dc7632..ddac36f 100644
--- a/dlls/ole32/tests/marshal.c
+++ b/dlls/ole32/tests/marshal.c
@@ -2056,15 +2056,18 @@ static void test_freethreadedmarshaldata(IStream *pStream, MSHCTX mshctx, void *
 
     if (mshctx == MSHCTX_INPROC)
     {
-        DWORD expected_size = sizeof(DWORD) + sizeof(void *) + sizeof(DWORD) + sizeof(GUID);
+        DWORD expected_size = 3*sizeof(DWORD) + sizeof(GUID);
         ok(size == expected_size, "size should have been %d instead of %d\n", expected_size, size);
 
         ok(*(DWORD *)marshal_data == mshlflags, "expected 0x%x, but got 0x%x for mshctx\n", mshlflags, *(DWORD *)marshal_data);
         marshal_data += sizeof(DWORD);
         ok(*(void **)marshal_data == ptr, "expected %p, but got %p for mshctx\n", ptr, *(void **)marshal_data);
         marshal_data += sizeof(void *);
-        ok(*(DWORD *)marshal_data == 0, "expected 0x0, but got 0x%x\n", *(DWORD *)marshal_data);
-        marshal_data += sizeof(DWORD);
+        if (sizeof(void*) == 4)
+        {
+            ok(*(DWORD *)marshal_data == 0, "expected 0x0, but got 0x%x\n", *(DWORD *)marshal_data);
+            marshal_data += sizeof(DWORD);
+        }
         trace("got guid data: {%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n",
             ((GUID *)marshal_data)->Data1, ((GUID *)marshal_data)->Data2, ((GUID *)marshal_data)->Data3,
             ((GUID *)marshal_data)->Data4[0], ((GUID *)marshal_data)->Data4[1], ((GUID *)marshal_data)->Data4[2], ((GUID *)marshal_data)->Data4[3],