Alistair Leslie-Hughes : oledb32: Support DBSTATUS_S_ISNULL when converting to VARIANT.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 89312f9d4925dd45b8346ce2999fe866e8119709
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=89312f9d4925dd45b8346ce299...

Author: Alistair Leslie-Hughes 
Date:   Mon May 20 15:33:22 2013 +1000

oledb32: Support DBSTATUS_S_ISNULL when converting to VARIANT.

---

dlls/oledb32/convert.c       |    7 +++++++
 dlls/oledb32/tests/convert.c |    8 ++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 6ae9a06..fe7ba8c 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -789,6 +789,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
     {
         VARIANT *v = dst;

+        if(src_status == DBSTATUS_S_ISNULL)
+        {
+            *dst_status = DBSTATUS_S_ISNULL;
+            *dst_len = 0;
+            return S_OK;
+        }
+
         switch(src_type)
         {
         case DBTYPE_BOOL:
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index 39f96d2..68df732 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2601,6 +2601,14 @@ static void test_converttovar(void)
     ok(dst_len == sizeof(dst), "got %ld\n", dst_len);
     ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst));
     ok( (float)V_DATE(&dst) == 41409.0, "got %f\n", V_DATE(&dst));
+
+    /* src_status = DBSTATUS_S_ISNULL */
+    i4 = 123;
+    hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), DBSTATUS_S_ISNULL, &dst_status, 0, 0, 0);
+    ok(hr == S_OK, "got %08x\n", hr);
+    ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status);
+    ok(dst_len == 0, "got %ld\n", dst_len);
+
 }

static void test_converttotimestamp(void)