Skip to content

W
wine-winehq
Commit b257f294 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard
Browse files
Options

oledb32: Supply a default dst len in GetConversionSize.

Signed-off-by: 's avatarAlistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: 's avatarHuw Davies <huw@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent f629e979
Show whitespace changes
Inline Side-by-side
Showing with 49 additions and 47 deletions
dlls/oledb32/convert.c
View file @ b257f294
......@@ -1371,6 +1371,8 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface,
if ((*dst_len = get_length(dst_type)))
return S_OK;
*dst_len = 110;
if(src_type == DBTYPE_VARIANT && V_VT((VARIANT*)src) == VT_NULL)
return S_OK;
......
dlls/oledb32/tests/convert.c
View file @ b257f294
......@@ -2853,18 +2853,18 @@ static void test_getconversionsize(void)
V_VT(&var) = VT_NULL;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_STR, NULL, &dst_len, &var);
ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
V_VT(&var) = VT_NULL;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, NULL, &dst_len, &var);
ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
src_len = 20;
V_VT(&var) = VT_NULL;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_BYTES, &src_len, &dst_len, &var);
ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
VariantClear(&var);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_NUMERIC, DBTYPE_NUMERIC, NULL, &dst_len, NULL);
......@@ -2875,243 +2875,243 @@ static void test_getconversionsize(void)
src_len = sizeof(i4);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I4, DBTYPE_WSTR, &src_len, &dst_len, &i4);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I4, DBTYPE_WSTR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i4);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI4, DBTYPE_WSTR, &src_len, &dst_len, &i4);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI4, DBTYPE_WSTR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i2);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_WSTR, &src_len, &dst_len, &i2);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_WSTR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i2);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI2, DBTYPE_WSTR, &src_len, &dst_len, &i2);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i1);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I1, DBTYPE_WSTR, &src_len, &dst_len, &i1);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I1, DBTYPE_WSTR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i2);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI2, DBTYPE_WSTR, &src_len, &dst_len, &i2);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI2, DBTYPE_WSTR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(f4);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_R4, DBTYPE_WSTR, &src_len, &dst_len, &f4);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_R4, DBTYPE_WSTR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i8);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI8, DBTYPE_WSTR, &src_len, &dst_len, &i8);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI8, DBTYPE_WSTR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i8);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I8, DBTYPE_WSTR, &src_len, &dst_len, &i8);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I8, DBTYPE_WSTR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(dbdate);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_DATE, DBTYPE_WSTR, &src_len, &dst_len, &dbdate);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_DATE, DBTYPE_WSTR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(dec);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_DECIMAL, DBTYPE_WSTR, &src_len, &dst_len, &dec);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_DECIMAL, DBTYPE_WSTR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_EMPTY, DBTYPE_WSTR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i4);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I4, DBTYPE_STR, &src_len, &dst_len, &i4);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I4, DBTYPE_STR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i4);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI4, DBTYPE_STR, &src_len, &dst_len, &i4);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI4, DBTYPE_STR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i2);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_STR, &src_len, &dst_len, &i2);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I2, DBTYPE_STR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i2);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI2, DBTYPE_STR, &src_len, &dst_len, &i2);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i1);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I1, DBTYPE_STR, &src_len, &dst_len, &i1);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I1, DBTYPE_STR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i2);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI2, DBTYPE_STR, &src_len, &dst_len, &i2);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI2, DBTYPE_STR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(f4);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_R4, DBTYPE_STR, &src_len, &dst_len, &f4);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_R4, DBTYPE_STR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i8);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI8, DBTYPE_STR, &src_len, &dst_len, &i8);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_UI8, DBTYPE_STR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(i8);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I8, DBTYPE_STR, &src_len, &dst_len, &i8);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_I8, DBTYPE_STR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(dbdate);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_DATE, DBTYPE_STR, &src_len, &dst_len, &dbdate);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_DATE, DBTYPE_STR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
src_len = sizeof(dec);
hr = IDataConvert_GetConversionSize(convert, DBTYPE_DECIMAL, DBTYPE_STR, &src_len, &dst_len, &dec);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_DECIMAL, DBTYPE_STR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_EMPTY, DBTYPE_STR, NULL, &dst_len, NULL);
todo_wine ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
ok(dst_len == 110, "%ld\n", dst_len);
}
static void test_converttobytes(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment