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

oledb32: DBTYPE_BYTES->DBTYPE_VARIANT only uses the source length.

This commit is contained in:
Alistair Leslie-Hughes 2013-05-30 12:16:13 +10:00 committed by Alexandre Julliard
parent 471bdafa3b
commit 5faa69d3e3
2 changed files with 42 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/oledb32/convert.c
View File

@ -950,18 +950,15 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
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;
rgsabound[0].cElements = src_len;
psa = SafeArrayCreate(VT_UI1,1,rgsabound);
for(i =0; i < size; i++,p++)
for(i =0; i < src_len; i++,p++)
{
hr = SafeArrayPutElement(psa, &i, &p);
if(FAILED(hr)) {

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

@ -2715,12 +2715,52 @@ 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, sizeof(byte_src), &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));
if(V_VT(&dst) == (VT_ARRAY|VT_UI1))
{
LONG l;
hr = SafeArrayGetUBound(V_ARRAY(&dst), 1, &l);
ok(hr == S_OK, "got %08x\n", hr);
ok(l == 4, "got %d\n", l); /* 5 elements */
}
VariantClear(&dst);
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));
if(V_VT(&dst) == (VT_ARRAY|VT_UI1))
{
LONG l;
hr = SafeArrayGetUBound(V_ARRAY(&dst), 1, &l);
ok(hr == S_OK, "got %08x\n", hr);
ok(l == -1, "got %d\n", l); /* 0 elements */
}
VariantClear(&dst);
dst_len = 0x1234;
hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_VARIANT, 2, &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));
if(V_VT(&dst) == (VT_ARRAY|VT_UI1))
{
LONG l;
hr = SafeArrayGetUBound(V_ARRAY(&dst), 1, &l);
ok(hr == S_OK, "got %08x\n", hr);
ok(l == 1, "got %d\n", l); /* 2 elements */
}
VariantClear(&dst);
dst_len = 0x1234;