From 7a762fee023cc2585348308945d16b0b114b7e01 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 23 May 2013 14:57:39 +1000
Subject: [PATCH] oledb32: DataConvert only variant length types can have a
 null dst.

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

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 7e09016a56c..9d418600fd6 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -191,6 +191,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
         return S_OK;
     }
 
+    if(dst == NULL && get_length(dst_type) != 0)
+    {
+        *dst_len = get_length(src_type);
+        *dst_status = DBSTATUS_S_OK;
+        return S_OK;
+    }
+
     if(src_type == DBTYPE_STR)
     {
         BSTR b;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index bb8183518f6..ee2a39b0c76 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -892,6 +892,13 @@ todo_wine
     ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status);
     ok(dst_len == 0, "got %ld\n", dst_len);
 
+    /* dst = NULL */
+    *(int *)src = 0x4321cafe;
+    dst_len = 0x1234;
+    hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_I4, 0, &dst_len, src, NULL, 0, 0, NULL, 0, 0, 0);
+    ok(hr == S_OK, "got %08x\n", hr);
+    ok(dst_len == sizeof(i4), "got %ld\n", dst_len);
+
 }
 
 static void test_converttoi8(void)