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

oledb32: Destination status and length are optional.

Browse Source
This commit is contained in:
Nikolay Sivov 2013-04-11 18:42:56 +04:00 committed by Alexandre Julliard
parent 8985e968d4
commit 1d462aabea
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/oledb32/convert.c
View File

@ -163,12 +163,17 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
DBDATACONVERT flags) DBDATACONVERT flags)
{ {
convert *This = impl_from_IDataConvert(iface); convert *This = impl_from_IDataConvert(iface);
DBLENGTH dst_len_loc;
DBSTATUS dst_status_loc;
HRESULT hr; HRESULT hr;
TRACE("(%p)->(%d, %d, %ld, %p, %p, %p, %ld, %d, %p, %d, %d, %x)\n", This, TRACE("(%p)->(%d, %d, %ld, %p, %p, %p, %ld, %d, %p, %d, %d, %x)\n", This,
src_type, dst_type, src_len, dst_len, src, dst, dst_max_len, src_type, dst_type, src_len, dst_len, src, dst, dst_max_len,
src_status, dst_status, precision, scale, flags); src_status, dst_status, precision, scale, flags);
if (!dst_len) dst_len = &dst_len_loc;
if (!dst_status) dst_status = &dst_status_loc;
*dst_status = DBSTATUS_E_BADACCESSOR; *dst_status = DBSTATUS_E_BADACCESSOR;
if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK) if(IDataConvert_CanConvert(iface, src_type, dst_type) != S_OK)
@ -752,7 +757,6 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
default: default:
FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type); FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type);
return E_NOTIMPL; return E_NOTIMPL;
} }
if(hr == DISP_E_OVERFLOW) if(hr == DISP_E_OVERFLOW)

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

@ -2491,6 +2491,7 @@ static void test_converttovar(void)
V_VT(&dst) = VT_EMPTY; V_VT(&dst) = VT_EMPTY;
dst_len = 0; dst_len = 0;
dst_status = DBSTATUS_S_DEFAULT;
hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_VARIANT, sizeof(strW), &dst_len, strW, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_VARIANT, sizeof(strW), &dst_len, strW, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);
@ -2499,6 +2500,14 @@ static void test_converttovar(void)
ok(!lstrcmpW(V_BSTR(&dst), strW), "got %s\n", wine_dbgstr_w(V_BSTR(&dst))); ok(!lstrcmpW(V_BSTR(&dst), strW), "got %s\n", wine_dbgstr_w(V_BSTR(&dst)));
VariantClear(&dst); VariantClear(&dst);
/* with null dest length and status */
V_VT(&dst) = VT_EMPTY;
hr = IDataConvert_DataConvert(convert, DBTYPE_WSTR, DBTYPE_VARIANT, sizeof(strW), NULL, strW, &dst, sizeof(dst), 0, NULL, 0, 0, 0);
ok(hr == S_OK, "got %08x\n", hr);
ok(V_VT(&dst) == VT_BSTR, "got %d\n", V_VT(&dst));
ok(!lstrcmpW(V_BSTR(&dst), strW), "got %s\n", wine_dbgstr_w(V_BSTR(&dst)));
VariantClear(&dst);
IDataConvert_Release(convert); IDataConvert_Release(convert);
} }