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

oledb32: Implement DataConvert DBTYPE_BSTR->DBTYPE_I8.

parent 975f1dcd
...@@ -292,6 +292,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, ...@@ -292,6 +292,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
LONGLONG *d = dst; LONGLONG *d = dst;
switch(src_type) switch(src_type)
{ {
case DBTYPE_BSTR: hr = VarI8FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break;
case DBTYPE_I8: *d = *(LONGLONG*)src; hr = S_OK; break; case DBTYPE_I8: *d = *(LONGLONG*)src; hr = S_OK; break;
default: FIXME("Unimplemented conversion %04x -> I8\n", src_type); return E_NOTIMPL; default: FIXME("Unimplemented conversion %04x -> I8\n", src_type); return E_NOTIMPL;
} }
......
...@@ -925,6 +925,8 @@ static void test_converttoi8(void) ...@@ -925,6 +925,8 @@ static void test_converttoi8(void)
BYTE src[20]; BYTE src[20];
DBSTATUS dst_status; DBSTATUS dst_status;
DBLENGTH dst_len; DBLENGTH dst_len;
static const WCHAR ten[] = {'1','0',0};
BSTR b;
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))
...@@ -942,6 +944,17 @@ static void test_converttoi8(void) ...@@ -942,6 +944,17 @@ static void test_converttoi8(void)
ok(dst_len == sizeof(dst), "got %ld\n", dst_len); ok(dst_len == sizeof(dst), "got %ld\n", dst_len);
ok(dst.QuadPart == 1234, "got %d\n", (int)dst.QuadPart); ok(dst.QuadPart == 1234, "got %d\n", (int)dst.QuadPart);
dst.QuadPart = 0xcc;
((ULARGE_INTEGER*)src)->QuadPart = 1234;
b = SysAllocString(ten);
*(BSTR *)src = b;
hr = IDataConvert_DataConvert(convert, DBTYPE_BSTR, DBTYPE_I8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
ok(hr == S_OK, "got %08x\n", hr);
ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status);
ok(dst_len == sizeof(dst), "got %ld\n", dst_len);
ok(dst.QuadPart == 10, "got %d\n", (int)dst.QuadPart);
SysFreeString(b);
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