[PATCH 1/2] oledb32: Support VARIANT(VT_NULL)->DBTYPE_WSTR in GetConversionSize

[Alistair Leslie-Hughes]

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
---
 dlls/oledb32/convert.c       | 2 ++
 dlls/oledb32/tests/convert.c | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index a92369f..21938aa 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -1416,6 +1416,8 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface,
         case DBTYPE_VARIANT:
             if(V_VT((VARIANT*)src) == VT_BSTR)
                 *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR);
+            else if(V_VT((VARIANT*)src) == VT_NULL)
+                *dst_len = 110;
             else
                 WARN("DBTYPE_VARIANT(%d)->DBTYPE_WSTR unimplemented\n", V_VT((VARIANT*)src));
             break;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index ec344b4..0cfabc9 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2501,6 +2501,12 @@ static void test_getconversionsize(void)
     ok(dst_len == 10, "%ld\n", dst_len);
     VariantClear(&var);
 
+    dst_len = 78;
+    V_VT(&var) = VT_NULL;
+    hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, NULL, &dst_len, &var);
+    ok(hr == S_OK, "got 0x%08x\n", hr);
+    ok(dst_len == 110, "%ld\n", dst_len);
+
     dst_len = 0;
     src_len = 20;
     V_VT(&var) = VT_BSTR;
-- 
2.5.1