oledb32: Convert to a BSTR to work out it size.

This makes code for handling variants with DBTYPE_STR and DBTYPE_WSTR types consistent. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

oledb32: Convert to a BSTR to work out it size.
9c700260 · Alistair Leslie-Hughes · Alexandre Julliard · bb72548f · 9c700260
Commit 9c700260 authored Dec 22, 2015 by Alistair Leslie-Hughes Committed by Alexandre Julliard Dec 22, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 4 deletions

convert.c dlls/oledb32/convert.c +10 -4

No files found.
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -1372,10 +1372,16 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface,
        switch (src_type)
        {
        case DBTYPE_VARIANT:
-            if(V_VT((VARIANT*)src) == VT_BSTR)
-                *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR);
-            else
-                WARN("DBTYPE_VARIANT(%d)->DBTYPE_WSTR unimplemented\n", V_VT((VARIANT*)src));
+        {
+            VARIANT v;
+
+            VariantInit(&v);
+            if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK)
+            {
+                *dst_len = (SysStringLen(V_BSTR(&v))+1) * sizeof(WCHAR);
+                VariantClear(&v);
+            }
+        }
            break;
        case DBTYPE_STR:
            if(src_len)