From b4b45471ca988fa6a75967a1ffbef71cc8cf70ef Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 18 Apr 2013 14:36:34 +1000 Subject: [PATCH] oledb32: Implement DataConvert DBTYPE_BOOL->VARIANT. --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index f2c4c29bad5..07b93429182 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -752,6 +752,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, switch(src_type) { + case DBTYPE_BOOL: + V_VT(v) = VT_BOOL; + V_BOOL(v) = *(VARIANT_BOOL*)src; + hr = S_OK; + break; case DBTYPE_I4: V_VT(v) = VT_I4; V_I4(v) = *(signed int*)src; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 51dc0f6e132..58b696599da 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2564,6 +2564,7 @@ static void test_converttovar(void) DATE date; INT i4; LARGE_INTEGER i8; + VARIANT_BOOL boolean = VARIANT_TRUE; hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); if(FAILED(hr)) @@ -2617,6 +2618,16 @@ static void test_converttovar(void) 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; + dst_len = 0; + dst_status = DBSTATUS_S_DEFAULT; i4 = 123; hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); -- 2.11.4.GIT