From 9227902714c2b2111ca311375c47d485427e66cc Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Thu, 12 Jan 2006 11:53:47 +0100
Subject: [PATCH] oleaut: Support conversion of VT_SAFEARRAY into
 VT_ARRAY|type. Typelib variant types that cannot be converted should return
 DISP_E_BADVARTYPE. Don't call DispCallFunc if conversion of one of the
 arguments failed.

---
 dlls/oleaut32/typelib.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index b8082430f2d..31f5badfaac 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -5008,7 +5008,7 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc,
     HRESULT hr = S_OK;
 
     /* enforce only one level of pointer indirection */
-    if (!(*vt & VT_BYREF) && (tdesc->vt == VT_PTR))
+    if (!(*vt & VT_BYREF) && !(*vt & VT_ARRAY) && (tdesc->vt == VT_PTR))
     {
         tdesc = tdesc->u.lptdesc;
 
@@ -5045,9 +5045,17 @@ static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc,
     case VT_USERDEFINED:
         hr = userdefined_to_variantvt(tinfo, tdesc, vt);
         break;
+    case VT_VOID:
+    case VT_CARRAY:
     case VT_PTR:
-        ERR("cannot convert VT_PTR into variant VT\n");
-        hr = E_FAIL;
+    case VT_LPSTR:
+    case VT_LPWSTR:
+        ERR("cannot convert type %d into variant VT\n", tdesc->vt);
+        hr = DISP_E_BADVARTYPE;
+        break;
+    case VT_SAFEARRAY:
+        *vt |= VT_ARRAY;
+        hr = typedescvt_to_variantvt(tinfo, tdesc->u.lptdesc, vt);
         break;
     default:
         *vt |= tdesc->vt;
@@ -5288,6 +5296,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke(
                     break;
                 }
             }
+            if (FAILED(hres)) goto func_fail; /* FIXME: we don't free changed types here */
             if (func_desc->cParamsOpt < 0)
             {
                 FIXME("Does not support safearray optional parameters\n");