system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 18:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

oledb32: Implement DataConvert DBTYPE_I2 -> VARIANT.

Browse source
This commit is contained in:
Alistair Leslie-Hughes 2013-08-19 09:22:57 +10:00 committed by Alexandre Julliard
parent cdcea0e8af
commit 368cff7a59
2 changed files with 17 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

@ -878,6 +878,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
V_BOOL(v) = *(VARIANT_BOOL*)src;
hr = S_OK;
break;
case DBTYPE_I2:
V_VT(v) = VT_I2;
V_I2(v) = *(signed short*)src;
hr = S_OK;
break;
case DBTYPE_I4:
V_VT(v) = VT_I4;
V_I4(v) = *(signed int*)src;

12
dlls/oledb32/tests/convert.c
View file

@ -2666,6 +2666,7 @@ static void test_converttovar(void)
CY cy, cy2;
DATE date;
INT i4;
signed short i2;
LARGE_INTEGER i8;
VARIANT_BOOL boolean = VARIANT_TRUE;
FLOAT fvalue = 543.21f;
@ -2743,6 +2744,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;
i2 = 123;
hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_VARIANT, sizeof(i2), &dst_len, &i2, &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_I2, "got %d\n", V_VT(&dst));
ok(V_I2(&dst) == 123, "got %d\n", V_I2(&dst));
V_VT(&dst) = VT_EMPTY;
dst_len = 0;
dst_status = DBSTATUS_S_DEFAULT;