From: Rémi Bernon rbernon@codeweavers.com
Instead of the 4 bytes array wire size returned by get_type_size, which will truncate the pointer on 64-bit.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54562 --- dlls/oleaut32/tests/usrmarshal.c | 1 - dlls/oleaut32/usrmarshal.c | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index d4ffdbde82f..6559cdcd865 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -1514,7 +1514,6 @@ static void test_marshal_VARIANT(void) SafeArrayGetVartype(*V_ARRAYREF(&v2), &vt2); ok(vt == vt2, "array vts differ %x %x\n", vt, vt2); size = IMalloc_GetSize(allocator, V_BYREF(&v2)); - todo_wine_if(sizeof(void *) == 8) ok(size == sizeof(V_ARRAY(&v2)), "got size %#Ix\n", size); VARIANT_UserFree(&umcb.Flags, &v2); HeapFree(GetProcessHeap(), 0, oldbuffer); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index aa54a2b092b..4a874a23413 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -506,7 +506,10 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe ULONG mem_size; Pos += 4;
- switch (header->vt & ~VT_BYREF) + /* byref array needs to allocate a SAFEARRAY pointer */ + if (header->vt & VT_ARRAY) + mem_size = sizeof(void *); + else switch (header->vt & ~VT_BYREF) { /* these types have a different memory size compared to wire size */ case VT_UNKNOWN: