Alex Villacís Lasso : oleaut32: Support for VT_DISPATCH in VarFix.

[Alexandre Julliard]

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

Author: Alex Villacís Lasso 
Date:   Mon Jun  4 13:04:45 2007 -0500

oleaut32: Support for VT_DISPATCH in VarFix.

---

dlls/oleaut32/variant.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c
index bdc4e93..a36a1b5 100644
--- a/dlls/oleaut32/variant.c
+++ b/dlls/oleaut32/variant.c
@@ -4377,10 +4377,20 @@ VarAbs_Exit:
 HRESULT WINAPI VarFix(LPVARIANT pVarIn, LPVARIANT pVarOut)
 {
     HRESULT hRet = S_OK;
+    VARIANT temp;
+
+    VariantInit(&temp);

TRACE("(%p->(%s%s),%p)\n", pVarIn, debugstr_VT(pVarIn),
           debugstr_VF(pVarIn), pVarOut);

+    /* Handle VT_DISPATCH by storing and taking address of returned value */
+    if ((V_VT(pVarIn) & VT_TYPEMASK) == VT_DISPATCH && ((V_VT(pVarIn) & ~VT_TYPEMASK) == 0))
+    {
+        hRet = VARIANT_FetchDispatchValue(pVarIn, &temp);
+        if (FAILED(hRet)) goto VarFix_Exit;
+        pVarIn = &temp;
+    }
     V_VT(pVarOut) = V_VT(pVarIn);

switch (V_VT(pVarIn))
@@ -4438,8 +4448,10 @@ HRESULT WINAPI VarFix(LPVARIANT pVarIn, LPVARIANT pVarOut)
         else
             hRet = DISP_E_TYPEMISMATCH;
     }
+VarFix_Exit:
     if (FAILED(hRet))
       V_VT(pVarOut) = VT_EMPTY;
+    VariantClear(&temp);

return hRet;
 }