ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oledb32: Implement DBTYPE_CY -> DBTYPE_VARIANT conversion.

This commit is contained in:
Nikolay Sivov 2013-04-17 08:23:30 +04:00 committed by Alexandre Julliard
parent 726f50b506
commit d6c6a73738
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/oledb32/convert.c
View File

@ -771,6 +771,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
V_DATE(v) = *(DATE*)src;
hr = S_OK;
break;
case DBTYPE_CY:
V_VT(v) = VT_CY;
V_CY(v) = *(CY*)src;
hr = S_OK;
break;
default: FIXME("Unimplemented conversion %04x -> VARIANT\n", src_type); return E_NOTIMPL;
}
break;

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

@ -2522,6 +2522,7 @@ static void test_converttovar(void)
DBLENGTH dst_len;
VARIANT dst;
HRESULT hr;
CY cy, cy2;
DATE date;
INT i4;
@ -2573,6 +2574,20 @@ static void test_converttovar(void)
ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst));
ok(V_DATE(&dst) == 123.123, "got %f\n", V_DATE(&dst));
V_VT(&dst) = VT_EMPTY;
dst_len = 0;
dst_status = DBSTATUS_S_DEFAULT;
S(cy).Lo = 1;
S(cy).Hi = 2;
hr = IDataConvert_DataConvert(convert, DBTYPE_CY, DBTYPE_VARIANT, sizeof(cy), &dst_len, &cy, &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_CY, "got %d\n", V_VT(&dst));
cy2 = V_CY(&dst);
ok(S(cy2).Lo == S(cy).Lo && S(cy2).Hi == S(cy).Hi, "got %d,%d\n", S(cy2).Lo, S(cy2).Hi);
IDataConvert_Release(convert);
}