Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_R4-> DBTYPE_VARIANT.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4f2aefd8d52f76b731b2487b3145f30c8e6eb1ae
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4f2aefd8d52f76b731b2487b31...

Author: Alistair Leslie-Hughes 
Date:   Wed May 29 08:30:57 2013 +1000

oledb32: Implement DataConvert DBTYPE_R4->DBTYPE_VARIANT.

---

dlls/oledb32/convert.c       |    5 +++++
 dlls/oledb32/tests/convert.c |   11 +++++++++++
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index abbc76b..811a165 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -884,6 +884,11 @@ 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;
+            hr = S_OK;
+            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);