oledb32: Implement DataConvert DBTYPE_BOOL->VARIANT.

This commit is contained in:
Alistair Leslie-Hughes 2013-04-18 14:36:34 +10:00 committed by Alexandre Julliard
parent 103693e43b
commit b4b45471ca
2 changed files with 16 additions and 0 deletions

View File

@ -752,6 +752,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
switch(src_type) switch(src_type)
{ {
case DBTYPE_BOOL:
V_VT(v) = VT_BOOL;
V_BOOL(v) = *(VARIANT_BOOL*)src;
hr = S_OK;
break;
case DBTYPE_I4: case DBTYPE_I4:
V_VT(v) = VT_I4; V_VT(v) = VT_I4;
V_I4(v) = *(signed int*)src; V_I4(v) = *(signed int*)src;

View File

@ -2564,6 +2564,7 @@ static void test_converttovar(void)
DATE date; DATE date;
INT i4; INT i4;
LARGE_INTEGER i8; LARGE_INTEGER i8;
VARIANT_BOOL boolean = VARIANT_TRUE;
hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert);
if(FAILED(hr)) if(FAILED(hr))
@ -2614,6 +2615,16 @@ static void test_converttovar(void)
ok(V_VT(&dst) == VT_R8, "got %d\n", V_VT(&dst)); ok(V_VT(&dst) == VT_R8, "got %d\n", V_VT(&dst));
ok(V_R8(&dst) == 123.56, "got %f\n", V_R8(&dst)); ok(V_R8(&dst) == 123.56, "got %f\n", V_R8(&dst));
V_VT(&dst) = VT_EMPTY;
dst_len = 0;
dst_status = DBSTATUS_S_DEFAULT;
hr = IDataConvert_DataConvert(convert, DBTYPE_BOOL, DBTYPE_VARIANT, sizeof(boolean), &dst_len, &boolean, &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_BOOL, "got %d\n", V_VT(&dst));
ok(V_BOOL(&dst) == VARIANT_TRUE, "got %d\n", V_BOOL(&dst));
V_VT(&dst) = VT_EMPTY; V_VT(&dst) = VT_EMPTY;
dst_len = 0; dst_len = 0;
dst_status = DBSTATUS_S_DEFAULT; dst_status = DBSTATUS_S_DEFAULT;