[5/5] oledb32: GetConversionSize only returns a valid size of BSTR

[Alistair Leslie-Hughes]

Hi,


Changelog:
     oledb32: GetConversionSize only returns a valid size of BSTR


Best Regards
  Alistair Leslie-Hughes
-------------- next part --------------
>From bb863a4a4fd3dfca2ee33d68ed8172515ed64680 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Thu, 23 May 2013 16:25:18 +1000
Subject: [PATCH] GetConversionSize only returns a valid size of BSTR
To: wine-patches <wine-patches at winehq.org>

---
 dlls/oledb32/convert.c       | 14 +++++---------
 dlls/oledb32/tests/convert.c | 10 +++++++++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 0961464..7f04229 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -1330,16 +1330,12 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface,
         {
         case DBTYPE_VARIANT:
         {
-            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);
-            }
+            if(V_VT((VARIANT*)src) != VT_BSTR)
+                *dst_len = 110;
             else
-                return hr;
+                *dst_len = (SysStringLen(V_BSTR((VARIANT*)src)) + 1) * sizeof(WCHAR);
+
+            return S_OK;
         }
         break;
         case DBTYPE_STR:
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index dcc20a1..45eac52 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2442,7 +2442,15 @@ static void test_getconversionsize(void)
     V_I4(&var) = 4;
     hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var);
     ok(hr == S_OK, "got 0x%08x\n", hr);
-    todo_wine ok(dst_len == 110, "%ld\n", dst_len);
+    ok(dst_len == 110, "%ld\n", dst_len);
+    VariantClear(&var);
+
+    dst_len = 10;
+    src_len = sizeof(VARIANT);
+    V_VT(&var) = VT_NULL;
+    hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(dst_len == 110, "%ld\n", dst_len);
     VariantClear(&var);
 
 }
-- 
1.8.1.2