reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-16 19:10:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oledb32: Implement DataConvert DBTYPE_R4->DBTYPE_VARIANT.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2013-05-29 08:30:57 +10:00 committed by Alexandre Julliard
parent 97ac6943c3
commit 4f2aefd8d5
2 changed files with 16 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

@ -884,6 +884,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
V_VT(v) = VT_DECIMAL;
hr = VarDecFromI8( *(LONGLONG*)src, &V_DECIMAL(v));
break;
case DBTYPE_R4:
V_VT(v) = VT_R4;
V_R4(v) = *(FLOAT*)src;
hr = S_OK;
break;
case DBTYPE_R8:
V_VT(v) = VT_R8;
V_R8(v) = *(double*)src;

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

@ -2575,6 +2575,7 @@ static void test_converttovar(void)
INT i4;
LARGE_INTEGER i8;
VARIANT_BOOL boolean = VARIANT_TRUE;
FLOAT fvalue = 543.21f;
V_VT(&dst) = VT_EMPTY;
dst_len = 0;
@ -2608,6 +2609,16 @@ static void test_converttovar(void)
ok(S(U(V_DECIMAL(&dst))).scale == 0 && S(U(V_DECIMAL(&dst))).sign == 0 &&
V_DECIMAL(&dst).Hi32 == 0 && U1(V_DECIMAL(&dst)).Lo64 == 12345, "Not Equal\n");
V_VT(&dst) = VT_EMPTY;
dst_len = 0;
dst_status = DBSTATUS_S_DEFAULT;
hr = IDataConvert_DataConvert(convert, DBTYPE_R4, DBTYPE_VARIANT, sizeof(fvalue), &dst_len, &fvalue, &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_R4, "got %d\n", V_VT(&dst));
ok(V_R4(&dst) == 543.21f, "got %f\n", V_R4(&dst));
V_VT(&dst) = VT_EMPTY;
dst_len = 0;
dst_status = DBSTATUS_S_DEFAULT;