oleaut32: Avoid converting variants if it is not needed.

25d6e9ae · Alessandro Pignotti · Alexandre Julliard · a1af8395 · 25d6e9ae
Commit 25d6e9ae authored Feb 02, 2012 by Alessandro Pignotti Committed by Alexandre Julliard Mar 16, 2012
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

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

No files found.
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -6427,6 +6427,8 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
                {
                    dump_Variant(src_arg);

+                    if(rgvt[i]!=V_VT(src_arg))
+                    {
                        if (rgvt[i] == VT_VARIANT)
                            hres = VariantCopy(&rgvarg[i], src_arg);
                        else if (rgvt[i] == (VT_VARIANT | VT_BYREF))
@@ -6505,6 +6507,11 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
                        }
                        prgpvarg[i] = &rgvarg[i];
                    }
+                    else
+                    {
+                        prgpvarg[i] = src_arg;
+                    }
+                }
                else if (wParamFlags & PARAMFLAG_FOPT)
                {
                    VARIANTARG *arg;