[PATCH 1/3] oledb32: Add DataConvert support of DBTYPE_VARIANT(NULL) to DBTYPE_DBDATE
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Tue Sep 15 04:54:36 CDT 2015
---
dlls/oledb32/convert.c | 6 ++++++
dlls/oledb32/tests/convert.c | 7 +++++++
2 files changed, 13 insertions(+)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 11d153c..c6f4da0 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -467,6 +467,12 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
d->month = st.wMonth;
d->day = st.wDay;
}
+ else if( V_VT((VARIANT*)src) == VT_NULL)
+ {
+ *dst_status = DBSTATUS_S_ISNULL;
+ *dst_len = 0;
+ return S_OK;
+ }
else
{
FIXME("Unimplemented variant type %d -> DBDATE\n", V_VT((VARIANT*)src));
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index f679b5c..69252fc 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2633,6 +2633,13 @@ static void test_converttodbdate(void)
ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len);
ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n");
+ V_VT(&var) = VT_NULL;
+ dst_len = 0;
+ hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBDATE, sizeof(var), &dst_len, &var, &dst, 2, 0, &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);
+
dst_len = 0;
bstr = SysAllocString(strW);
hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_DBDATE, 0, &dst_len, &bstr, &dst, 2, 0, &dst_status, 0, 0, 0);
--
2.5.1
More information about the wine-patches
mailing list