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

oledb32: Implement DataConvert DBTYPE_BYTES->VARIANT.

This commit is contained in:
Alistair Leslie-Hughes 2013-05-14 13:47:18 +10:00 committed by Alexandre Julliard
parent e5261f03e6
commit cb4cef1231
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/oledb32/convert.c
View File

@ -790,6 +790,32 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
V_CY(v) = *(CY*)src;
hr = S_OK;
break;
case DBTYPE_BYTES:
{
LONG i;
LONG size;
SAFEARRAY *psa = NULL;
SAFEARRAYBOUND rgsabound[1];
unsigned char *p = src;
size = min(src_len, dst_max_len);
rgsabound[0].lLbound = 0;
rgsabound[0].cElements = size;
psa = SafeArrayCreate(VT_UI1,1,rgsabound);
for(i =0; i < size; i++,p++)
{
hr = SafeArrayPutElement(psa, &i, &p);
if(FAILED(hr))
return hr;
}
V_VT(v) = VT_ARRAY|VT_UI1;
V_ARRAY(v) = psa;
hr = S_OK;
break;
}
default: FIXME("Unimplemented conversion %04x -> VARIANT\n", src_type); return E_NOTIMPL;
}
break;

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

@ -2450,6 +2450,7 @@ static void test_converttobytes(void)
static void test_converttovar(void)
{
static WCHAR strW[] = {'t','e','s','t',0};
BYTE byte_src[5] = {1, 2, 3, 4, 5};
double dvalue = 123.56;
DBSTATUS dst_status;
DBLENGTH dst_len;
@ -2548,6 +2549,14 @@ static void test_converttovar(void)
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);
dst_len = 0x1234;
hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_VARIANT, 0, &dst_len, &byte_src, &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_ARRAY|VT_UI1), "got %d\n", V_VT(&dst));
VariantClear(&dst);
}
START_TEST(convert)