Commit 9d4284cc authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard

oledb32: Implement GetConversionSize DBTYPE_STR->DBTYPE_WSTR.

parent aeb7362e
...@@ -1108,6 +1108,12 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, ...@@ -1108,6 +1108,12 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface,
{ {
switch (src_type) switch (src_type)
{ {
case DBTYPE_STR:
if(src_len)
*dst_len = (*src_len + 1) * sizeof(WCHAR);
else
*dst_len = (strlen(src) + 1) * sizeof(WCHAR);
break;
case DBTYPE_WSTR: case DBTYPE_WSTR:
if(src_len) if(src_len)
*dst_len = (*src_len) + sizeof(WCHAR); *dst_len = (*src_len) + sizeof(WCHAR);
......
...@@ -2484,6 +2484,7 @@ static void test_getconversionsize(void) ...@@ -2484,6 +2484,7 @@ static void test_getconversionsize(void)
HRESULT hr; HRESULT hr;
BSTR str; BSTR str;
static WCHAR strW[] = {'t','e','s','t',0}; static WCHAR strW[] = {'t','e','s','t',0};
static char strTest[] = "test";
hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert); hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert);
if(FAILED(hr)) if(FAILED(hr))
...@@ -2530,6 +2531,23 @@ static void test_getconversionsize(void) ...@@ -2530,6 +2531,23 @@ static void test_getconversionsize(void)
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
ok(dst_len == 22, "%ld\n", dst_len); ok(dst_len == 22, "%ld\n", dst_len);
dst_len = 0;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, NULL, &dst_len, strTest);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(dst_len == 10 || broken(dst_len == 12), "%ld\n", dst_len);
dst_len = 0;
src_len = 2;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, &src_len, &dst_len, strTest);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(dst_len == 6, "%ld\n", dst_len);
dst_len = 0;
src_len = 20;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, &src_len, &dst_len, strTest);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(dst_len == 42, "%ld\n", dst_len);
IDataConvert_Release(convert); IDataConvert_Release(convert);
} }
......
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