oleaut32: Allocate a full pointer when unmarshalling byref arrays.

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

oleaut32: Allocate a full pointer when unmarshalling byref arrays.
76e7f030 · Rémi Bernon · Alexandre Julliard · 3e82dc30 · 76e7f030 · 76e7f030
Commit 76e7f030 authored Feb 23, 2023 by Rémi Bernon Committed by Alexandre Julliard Feb 27, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

usrmarshal.c dlls/oleaut32/tests/usrmarshal.c +0 -1

usrmarshal.c dlls/oleaut32/usrmarshal.c +4 -1

No files found.
--- 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);

--- 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: