marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oledb32: Implement DataConvert DBTYPE_DBTIMESTAMP->DBTYPE_VARIANT.

oldstable
Alistair Leslie-Hughes 2013-05-14 14:48:04 +10:00 committed by Alexandre Julliard
parent 46cbc36041
commit e08a1d5bc1
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/oledb32/convert.c
View File

@ -785,6 +785,23 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
V_DATE(v) = *(DATE*)src;
hr = S_OK;
break;
case DBTYPE_DBTIMESTAMP:
{
SYSTEMTIME st;
DBTIMESTAMP *ts = (DBTIMESTAMP *)src;
V_VT(v) = VT_DATE;
st.wYear = ts->year;
st.wMonth = ts->month;
st.wDay = ts->day;
st.wHour = ts->hour;
st.wMinute = ts->minute;
st.wSecond = ts->second;
st.wMilliseconds = ts->fraction/1000000;
hr = SystemTimeToVariantTime(&st, &V_DATE(v)) ? S_OK : E_FAIL;
break;
}
case DBTYPE_CY:
V_VT(v) = VT_CY;
V_CY(v) = *(CY*)src;

9
dlls/oledb32/tests/convert.c
View File

@ -2451,6 +2451,7 @@ static void test_converttovar(void)
{
static WCHAR strW[] = {'t','e','s','t',0};
BYTE byte_src[5] = {1, 2, 3, 4, 5};
DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0};
double dvalue = 123.56;
DBSTATUS dst_status;
DBLENGTH dst_len;
@ -2557,6 +2558,14 @@ static void test_converttovar(void)
ok(dst_len == sizeof(dst), "got %ld\n", dst_len);
ok(V_VT(&dst) == (VT_ARRAY|VT_UI1), "got %d\n", V_VT(&dst));
VariantClear(&dst);
dst_len = 0x1234;
hr = IDataConvert_DataConvert(convert, DBTYPE_DBTIMESTAMP, DBTYPE_VARIANT, 0, &dst_len, &ts, &dst, sizeof(ts), 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( (float)V_DATE(&dst) == 41408.086250f, "got %f\n", V_DATE(&dst));
}
START_TEST(convert)