oledb32: Check for DBSTATUS_S_ISNULL first.
This commit is contained in:
parent
a1baa22d47
commit
5b8a375ab9
|
@ -179,11 +179,6 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
|
||||||
|
|
||||||
*dst_status = DBSTATUS_E_BADACCESSOR;
|
*dst_status = DBSTATUS_E_BADACCESSOR;
|
||||||
|
|
||||||
if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK)
|
|
||||||
{
|
|
||||||
return DB_E_UNSUPPORTEDCONVERSION;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(src_status == DBSTATUS_S_ISNULL)
|
if(src_status == DBSTATUS_S_ISNULL)
|
||||||
{
|
{
|
||||||
*dst_status = DBSTATUS_S_ISNULL;
|
*dst_status = DBSTATUS_S_ISNULL;
|
||||||
|
@ -191,6 +186,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK)
|
||||||
|
{
|
||||||
|
return DB_E_UNSUPPORTEDCONVERSION;
|
||||||
|
}
|
||||||
|
|
||||||
if(dst == NULL && get_length(dst_type) != 0)
|
if(dst == NULL && get_length(dst_type) != 0)
|
||||||
{
|
{
|
||||||
*dst_len = get_length(src_type);
|
*dst_len = get_length(src_type);
|
||||||
|
|
|
@ -2714,6 +2714,21 @@ static void test_converttotimestamp(void)
|
||||||
SysFreeString(bstr);
|
SysFreeString(bstr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void test_converttoiunknown(void)
|
||||||
|
{
|
||||||
|
HRESULT hr;
|
||||||
|
DBSTATUS dst_status;
|
||||||
|
DBLENGTH dst_len;
|
||||||
|
IUnknown *dst = NULL;
|
||||||
|
static WCHAR strW[] = {'t','e','s','t',0};
|
||||||
|
|
||||||
|
dst_len = 0x1234;
|
||||||
|
hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_IUNKNOWN, sizeof(strW), &dst_len, strW, 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);
|
||||||
|
}
|
||||||
|
|
||||||
START_TEST(convert)
|
START_TEST(convert)
|
||||||
{
|
{
|
||||||
HRESULT hr;
|
HRESULT hr;
|
||||||
|
@ -2751,6 +2766,7 @@ START_TEST(convert)
|
||||||
test_converttodbdate();
|
test_converttodbdate();
|
||||||
test_getconversionsize();
|
test_getconversionsize();
|
||||||
test_converttotimestamp();
|
test_converttotimestamp();
|
||||||
|
test_converttoiunknown();
|
||||||
|
|
||||||
IDataConvert_Release(convert);
|
IDataConvert_Release(convert);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue