oleaut32: Support values being passed into VT_VARIANT|VT_BYREF typed parameters…

oleaut32: Support values being passed into VT_VARIANT|VT_BYREF typed parameters in ITypeInfo::Invoke.

oleaut32: Support values being passed into VT_VARIANT|VT_BYREF typed parameters…
5e8c877f · Robert Shearman · Alexandre Julliard · 693da8c4 · 5e8c877f
Commit 5e8c877f authored May 03, 2006 by Robert Shearman Committed by Alexandre Julliard May 05, 2006
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

typelib.c dlls/oleaut32/typelib.c +12 -0

No files found.
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -5240,6 +5240,18 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
                    if (rgvt[i] == VT_VARIANT)
                        VariantCopy(&rgvarg[i], src_arg);
+                    else if (rgvt[i] == (VT_VARIANT | VT_BYREF))
+                    {
+                        if (rgvt[i] == V_VT(src_arg))
+                            V_VARIANTREF(&rgvarg[i]) = V_VARIANTREF(src_arg);
+                        else
+                        {
+                            VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams);
+                            hres = VariantCopy(&missing_arg[i], src_arg);
+                            V_VARIANTREF(&rgvarg[i]) = &missing_arg[i];
+                        }
+                        V_VT(&rgvarg[i]) = rgvt[i];
+                    }
                    else if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg))
                    {
                        VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams);