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

oledb32: GetConversionSize only returns a valid size of BSTR.

This commit is contained in:
Alistair Leslie-Hughes 2013-05-24 15:12:24 +10:00 committed by Alexandre Julliard
parent 0fe64ce339
commit 338cb2e5dd
2 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/oledb32/convert.c
View File

@ -1305,7 +1305,6 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface,
switch (dst_type) switch (dst_type)
{ {
case DBTYPE_STR: case DBTYPE_STR:
{
switch (src_type) switch (src_type)
{ {
case DBTYPE_VARIANT: case DBTYPE_VARIANT:
@ -1326,25 +1325,15 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface,
FIXME("unimplemented for %04x -> DBTYPE_STR\n", src_type); FIXME("unimplemented for %04x -> DBTYPE_STR\n", src_type);
return E_NOTIMPL; return E_NOTIMPL;
} }
}
break; break;
case DBTYPE_WSTR: case DBTYPE_WSTR:
{
switch (src_type) switch (src_type)
{ {
case DBTYPE_VARIANT: case DBTYPE_VARIANT:
{ if(V_VT((VARIANT*)src) == VT_BSTR)
VARIANT v; *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))+1) * sizeof(WCHAR);
VariantInit(&v);
if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK)
{
*dst_len = (SysStringLen(V_BSTR(&v)) + 1) * sizeof(WCHAR);
VariantClear(&v);
}
else else
return hr; WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src));
}
break; break;
case DBTYPE_STR: case DBTYPE_STR:
if(src_len) if(src_len)
@ -1362,27 +1351,20 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface,
FIXME("unimplemented for %04x -> DBTYPE_WSTR\n", src_type); FIXME("unimplemented for %04x -> DBTYPE_WSTR\n", src_type);
return E_NOTIMPL; return E_NOTIMPL;
} }
}
break; break;
case DBTYPE_BYTES: case DBTYPE_BYTES:
{
switch (src_type) switch (src_type)
{ {
case DBTYPE_VARIANT: case DBTYPE_VARIANT:
{
if(V_VT((VARIANT*)src) == VT_BSTR) if(V_VT((VARIANT*)src) == VT_BSTR)
*dst_len = (SysStringLen(V_BSTR((VARIANT*)src))) / sizeof(WCHAR); *dst_len = (SysStringLen(V_BSTR((VARIANT*)src))) / sizeof(WCHAR);
else else
WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src)); WARN("DBTYPE_BYTES->DBTYPE_VARIANT(%d) unimplemented\n", V_VT((VARIANT*)src));
return S_OK;
}
break; break;
default: default:
FIXME("unimplemented for %04x -> DBTYPE_BYTES\n", src_type); FIXME("unimplemented for %04x -> DBTYPE_BYTES\n", src_type);
return E_NOTIMPL; return E_NOTIMPL;
} }
}
break; break;
default: default:
FIXME("unimplemented for conversion %d->%d\n", src_type, dst_type); FIXME("unimplemented for conversion %d->%d\n", src_type, dst_type);

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

@ -2461,7 +2461,6 @@ static void test_getconversionsize(void)
V_I4(&var) = 4; V_I4(&var) = 4;
hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var); hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok(dst_len == 110, "%ld\n", dst_len);
VariantClear(&var); VariantClear(&var);
dst_len = 0; dst_len = 0;