From 726f50b506fa0440cf1e3c4b3a6ae61841939969 Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Wed, 17 Apr 2013 08:11:25 +0400 Subject: [PATCH] oledb32: Implement DBTYPE_DATE -> DBTYPE_VARIANT conversion. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index d23c944a9d9..1710e76e4b7 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -766,6 +766,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, hr = V_BSTR(v) ? S_OK : E_OUTOFMEMORY; break; } + case DBTYPE_DATE: + V_VT(v) = VT_DATE; + V_DATE(v) = *(DATE*)src; + hr = S_OK; + break; default: FIXME("Unimplemented conversion %04x -> VARIANT\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index a2b13662c9c..caba9c4ce69 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2522,6 +2522,7 @@ static void test_converttovar(void) DBLENGTH dst_len; VARIANT dst; HRESULT hr; + DATE date; INT i4; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); @@ -2561,6 +2562,17 @@ static void test_converttovar(void) ok(V_VT(&dst) == VT_I4, "got %d\n", V_VT(&dst)); ok(V_I4(&dst) == 123, "got %d\n", V_I4(&dst)); + V_VT(&dst) = VT_EMPTY; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; + date = 123.123; + hr = IDataConvert_DataConvert(convert, DBTYPE_DATE, DBTYPE_VARIANT, sizeof(date), &dst_len, &date, &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); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst)); + ok(V_DATE(&dst) == 123.123, "got %f\n", V_DATE(&dst)); + IDataConvert_Release(convert); } -- 2.11.4.GIT