Huw Davies : oledb32: Add some conversions to DBTYPE_CY.
Alexandre Julliard
julliard at winehq.org
Wed Oct 28 10:12:28 CDT 2009
Module: wine
Branch: master
Commit: 21bbdb7157fabd5313abeb964b807d95582b0df7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bbdb7157fabd5313abeb964b807d95582b0df7
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Oct 28 12:13:20 2009 +0000
oledb32: Add some conversions to DBTYPE_CY.
---
dlls/oledb32/convert.c | 28 +++++++++++++++++++++++
dlls/oledb32/tests/convert.c | 50 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 78 insertions(+), 0 deletions(-)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 6f2ddd4..7992819 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -127,6 +127,8 @@ static int get_length(DBTYPE type)
case DBTYPE_I8:
case DBTYPE_UI8:
return 8;
+ case DBTYPE_CY:
+ return sizeof(CY);
case DBTYPE_BSTR:
return sizeof(BSTR);
case DBTYPE_FILETIME:
@@ -286,6 +288,32 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
break;
}
+ case DBTYPE_CY:
+ {
+ CY *d = dst;
+ switch(src_type)
+ {
+ case DBTYPE_EMPTY: d->int64 = 0; hr = S_OK; break;
+ case DBTYPE_I2: hr = VarCyFromI2(*(signed short*)src, d); break;
+ case DBTYPE_I4: hr = VarCyFromI4(*(signed int*)src, d); break;
+ case DBTYPE_R4: hr = VarCyFromR4(*(FLOAT*)src, d); break;
+ case DBTYPE_R8: hr = VarCyFromR8(*(double*)src, d); break;
+ case DBTYPE_CY: *d = *(CY*)src; hr = S_OK; break;
+ case DBTYPE_DATE: hr = VarCyFromDate(*(DATE*)src, d); break;
+ case DBTYPE_BSTR: hr = VarCyFromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break;
+ case DBTYPE_BOOL: hr = VarCyFromBool(*(VARIANT_BOOL*)src, d); break;
+ case DBTYPE_DECIMAL: hr = VarCyFromDec((DECIMAL*)src, d); break;
+ case DBTYPE_I1: hr = VarCyFromI1(*(signed char*)src, d); break;
+ case DBTYPE_UI1: hr = VarCyFromUI1(*(BYTE*)src, d); break;
+ case DBTYPE_UI2: hr = VarCyFromUI2(*(WORD*)src, d); break;
+ case DBTYPE_UI4: hr = VarCyFromUI4(*(DWORD*)src, d); break;
+ case DBTYPE_I8: hr = VarCyFromI8(*(LONGLONG*)src, d); break;
+ case DBTYPE_UI8: hr = VarCyFromUI8(*(ULONGLONG*)src, d); break;
+ default: FIXME("Unimplemented conversion %04x -> CY\n", src_type); return E_NOTIMPL;
+ }
+ break;
+ }
+
case DBTYPE_BSTR:
{
BSTR *d = dst;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index 7166cfb..7290a9d 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -1339,6 +1339,55 @@ static void test_converttor4(void)
IDataConvert_Release(convert);
}
+static void test_converttocy(void)
+{
+ IDataConvert *convert;
+ HRESULT hr;
+ CY dst;
+ BYTE src[20];
+ DBSTATUS dst_status;
+ DBLENGTH dst_len;
+
+ hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert);
+ if(FAILED(hr))
+ {
+ win_skip("Unable to load oledb conversion library\n");
+ return;
+ }
+
+ dst.int64 = 0xcc;
+ hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_CY, 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(CY), "got %d\n", dst_len);
+ ok(dst.int64 == 0, "didn't get 0\n");
+
+ dst.int64 = 0xcc;
+ hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_CY, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
+ ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr);
+ ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status);
+ ok(dst_len == sizeof(CY), "got %d\n", dst_len);
+ ok(dst.int64 == 0xcc, "dst changed\n");
+
+ dst.int64 = 0xcc;
+ *(int*)src = 1234;
+ hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_CY, 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(CY), "got %d\n", dst_len);
+ ok(dst.int64 == 12340000, "got %d\n", dst.s.Lo);
+
+ dst.int64 = 0xcc;
+ ((CY*)src)->int64 = 1234;
+ hr = IDataConvert_DataConvert(convert, DBTYPE_CY, DBTYPE_CY, 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(CY), "got %d\n", dst_len);
+ ok(dst.int64 == 1234, "got %d\n", dst.s.Lo);
+
+ IDataConvert_Release(convert);
+}
+
START_TEST(convert)
{
OleInitialize(NULL);
@@ -1354,5 +1403,6 @@ START_TEST(convert)
test_converttoui4();
test_converttor4();
test_converttofiletime();
+ test_converttocy();
OleUninitialize();
}
More information about the wine-cvs
mailing list