oledb32: Implement DataConvert DBTYPE_R4->DBTYPE_VARIANT
Alistair Leslie-Hughes
leslie_alistair at hotmail.com
Wed May 29 02:04:55 CDT 2013
Hi,
Changelog:
oledb32: Implement DataConvert DBTYPE_R4->DBTYPE_VARIANT
Best Regards
Alistair Leslie-Hughes
-------------- next part --------------
>From 8ea0426ad2ddb3eaf6a206e2f87ba859cc438d58 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Wed, 29 May 2013 08:30:57 +1000
Subject: [PATCH] Implement DataConvert DBTYPE_R4->DBTYPE_VARIANT
To: wine-patches <wine-patches at winehq.org>
---
dlls/oledb32/convert.c | 4 ++++
dlls/oledb32/tests/convert.c | 11 +++++++++++
2 files changed, 15 insertions(+)
diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index abbc76b..1800caf 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -884,6 +884,10 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
V_VT(v) = VT_DECIMAL;
hr = VarDecFromI8( *(LONGLONG*)src, &V_DECIMAL(v));
break;
+ case DBTYPE_R4:
+ V_VT(v) = VT_R4;
+ V_R4(v) = *(FLOAT*)src;
+ break;
case DBTYPE_R8:
V_VT(v) = VT_R8;
V_R8(v) = *(double*)src;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index ff44e0a..49d8be0 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2575,6 +2575,7 @@ static void test_converttovar(void)
INT i4;
LARGE_INTEGER i8;
VARIANT_BOOL boolean = VARIANT_TRUE;
+ FLOAT fvalue = 543.21f;
V_VT(&dst) = VT_EMPTY;
dst_len = 0;
@@ -2611,6 +2612,16 @@ static void test_converttovar(void)
V_VT(&dst) = VT_EMPTY;
dst_len = 0;
dst_status = DBSTATUS_S_DEFAULT;
+ hr = IDataConvert_DataConvert(convert, DBTYPE_R4, DBTYPE_VARIANT, sizeof(fvalue), &dst_len, &fvalue, &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_R4, "got %d\n", V_VT(&dst));
+ ok(V_R4(&dst) == 543.21f, "got %f\n", V_R4(&dst));
+
+ V_VT(&dst) = VT_EMPTY;
+ dst_len = 0;
+ dst_status = DBSTATUS_S_DEFAULT;
hr = IDataConvert_DataConvert(convert, DBTYPE_R8, DBTYPE_VARIANT, sizeof(dvalue), &dst_len, &dvalue, &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);
--
1.8.1.2
More information about the wine-patches
mailing list