Nikolay Sivov : oledb32: Destination status and length are optional.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Thu Apr 11 18:42:56 2013 +0400

oledb32: Destination status and length are optional.

---

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

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 0e31e4a..381210a 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -163,12 +163,17 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
                                           DBDATACONVERT flags)
 {
     convert *This = impl_from_IDataConvert(iface);
+    DBLENGTH dst_len_loc;
+    DBSTATUS dst_status_loc;
     HRESULT hr;
 
     TRACE("(%p)->(%d, %d, %ld, %p, %p, %p, %ld, %d, %p, %d, %d, %x)\n", This,
           src_type, dst_type, src_len, dst_len, src, dst, dst_max_len,
           src_status, dst_status, precision, scale, flags);
 
+    if (!dst_len) dst_len = &dst_len_loc;
+    if (!dst_status) dst_status = &dst_status_loc;
+
     *dst_status = DBSTATUS_E_BADACCESSOR;
 
     if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK)
@@ -752,7 +757,6 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
     default:
         FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type);
         return E_NOTIMPL;
-
     }
 
     if(hr == DISP_E_OVERFLOW)
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index 3c2f661..8c68154 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2491,6 +2491,7 @@ static void test_converttovar(void)
 
     V_VT(&dst) = VT_EMPTY;
     dst_len = 0;
+    dst_status = DBSTATUS_S_DEFAULT;
     hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_VARIANT, sizeof(strW), &dst_len, strW, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
     ok(hr == S_OK, "got %08x\n", hr);
     ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);
@@ -2499,6 +2500,14 @@ static void test_converttovar(void)
     ok(!lstrcmpW(V_BSTR(&dst), strW), "got %s\n", wine_dbgstr_w(V_BSTR(&dst)));
     VariantClear(&dst);
 
+    /* with null dest length and status */
+    V_VT(&dst) = VT_EMPTY;
+    hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_VARIANT, sizeof(strW), NULL, strW, &dst, sizeof(dst), 0, NULL, 0, 0, 0);
+    ok(hr == S_OK, "got %08x\n", hr);
+    ok(V_VT(&dst) == VT_BSTR, "got %d\n", V_VT(&dst));
+    ok(!lstrcmpW(V_BSTR(&dst), strW), "got %s\n", wine_dbgstr_w(V_BSTR(&dst)));
+    VariantClear(&dst);
+
     IDataConvert_Release(convert);
 }