Nikolay Sivov : oledb32: Implement DBTYPE_CY -> DBTYPE_VARIANT conversion.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Apr 17 08:23:30 2013 +0400

oledb32: Implement DBTYPE_CY -> DBTYPE_VARIANT conversion.

---

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

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 1710e76..3b3f9df 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -771,6 +771,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
             V_DATE(v) = *(DATE*)src;
             hr = S_OK;
             break;
+        case DBTYPE_CY:
+            V_VT(v) = VT_CY;
+            V_CY(v) = *(CY*)src;
+            hr = S_OK;
+            break;
         default: FIXME("Unimplemented conversion %04x -> VARIANT\n", src_type); return E_NOTIMPL;
         }
         break;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index caba9c4..4f50a77 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2522,6 +2522,7 @@ static void test_converttovar(void)
     DBLENGTH dst_len;
     VARIANT dst;
     HRESULT hr;
+    CY cy, cy2;
     DATE date;
     INT i4;
 
@@ -2573,6 +2574,20 @@ static void test_converttovar(void)
     ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst));
     ok(V_DATE(&dst) == 123.123, "got %f\n", V_DATE(&dst));
 
+    V_VT(&dst) = VT_EMPTY;
+    dst_len = 0;
+    dst_status = DBSTATUS_S_DEFAULT;
+    S(cy).Lo = 1;
+    S(cy).Hi = 2;
+    hr = IDataConvert_DataConvert(convert, DBTYPE_CY, DBTYPE_VARIANT, sizeof(cy), &dst_len, &cy, &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_CY, "got %d\n", V_VT(&dst));
+
+    cy2 = V_CY(&dst);
+    ok(S(cy2).Lo == S(cy).Lo && S(cy2).Hi == S(cy).Hi, "got %d,%d\n", S(cy2).Lo, S(cy2).Hi);
+
     IDataConvert_Release(convert);
 }