oledb32: Implement DataConvert DBTYPE_I2 -> VARIANT
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Mon Aug 19 05:27:12 CDT 2013
Hi,
Changelog:
oledb32: Implement DataConvert DBTYPE_I2 -> VARIANT
Best Regards
Alistair Leslie-Hughes
-------------- next part --------------
>From afceaba612fa23829e286e2664dea98eb6097162 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Mon, 19 Aug 2013 09:22:57 +1000
Subject: [PATCH] Implement DataConvert DBTYPE_I2 -> VARIANT
To: wine-patches <wine-patches at winehq.org>
---
dlls/oledb32/convert.c | 5 +++++
dlls/oledb32/tests/convert.c | 12 ++++++++++++
2 files changed, 17 insertions(+)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index fba9025..b418d11 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -878,6 +878,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
V_BOOL(v) = *(VARIANT_BOOL*)src;
hr = S_OK;
break;
+ case DBTYPE_I2:
+ V_VT(v) = VT_I2;
+ V_I4(v) = *(signed short*)src;
+ hr = S_OK;
+ break;
case DBTYPE_I4:
V_VT(v) = VT_I4;
V_I4(v) = *(signed int*)src;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index 61607a9..b42b4df 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2666,6 +2666,7 @@ static void test_converttovar(void)
CY cy, cy2;
DATE date;
INT i4;
+ signed short i2;
LARGE_INTEGER i8;
VARIANT_BOOL boolean = VARIANT_TRUE;
FLOAT fvalue = 543.21f;
@@ -2746,6 +2747,17 @@ static void test_converttovar(void)
V_VT(&dst) = VT_EMPTY;
dst_len = 0;
dst_status = DBSTATUS_S_DEFAULT;
+ i2 = 123;
+ hr = IDataConvert_DataConvert(convert, DBTYPE_I2, DBTYPE_VARIANT, sizeof(i2), &dst_len, &i2, &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(V_VT(&dst) == VT_I2, "got %d\n", V_VT(&dst));
+ ok(V_I2(&dst) == 123, "got %d\n", V_I2(&dst));
+
+ V_VT(&dst) = VT_EMPTY;
+ dst_len = 0;
+ dst_status = DBSTATUS_S_DEFAULT;
date = 123.123;
hr = IDataConvert_DataConvert(convert, DBTYPE_DATE, DBTYPE_VARIANT, sizeof(date), &dst_len, &date, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
ok(hr == S_OK, "got %08x\n", hr);
--
1.8.1.2
More information about the wine-patches
mailing list