marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

oledb32: Support DBSTATUS_S_ISNULL when converting to VARIANT.

oldstable
Alistair Leslie-Hughes 2013-05-20 15:33:22 +10:00 committed by Alexandre Julliard
parent 70af1dd025
commit 89312f9d49
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/oledb32/convert.c
View File

@ -789,6 +789,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
{
VARIANT *v = dst;
if(src_status == DBSTATUS_S_ISNULL)
{
*dst_status = DBSTATUS_S_ISNULL;
*dst_len = 0;
return S_OK;
}
switch(src_type)
{
case DBTYPE_BOOL:

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

@ -2601,6 +2601,14 @@ static void test_converttovar(void)
ok(dst_len == sizeof(dst), "got %ld\n", dst_len);
ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst));
ok( (float)V_DATE(&dst) == 41409.0, "got %f\n", V_DATE(&dst));
/* src_status = DBSTATUS_S_ISNULL */
i4 = 123;
hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), DBSTATUS_S_ISNULL, &dst_status, 0, 0, 0);
ok(hr == S_OK, "got %08x\n", hr);
ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status);
ok(dst_len == 0, "got %ld\n", dst_len);
}
static void test_converttotimestamp(void)