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

[Alexandre Julliard]

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

Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>
Date:   Thu Apr 18 09:54:09 2013 +1000

oledb32: Implement DataConvert DBTYPE_I8->DBTYPE_VARIANT.

---

 dlls/oledb32/convert.c       |    4 ++++
 dlls/oledb32/tests/convert.c |   14 ++++++++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index b55c0d9..37ae25e 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -757,6 +757,10 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
             V_I4(v) = *(signed int*)src;
             hr = S_OK;
             break;
+        case DBTYPE_I8:
+            V_VT(v) = VT_DECIMAL;
+            hr = VarDecFromI8( *(LONGLONG*)src,  &V_DECIMAL(v));
+            break;
         case DBTYPE_BSTR:
         {
             BSTR s = *(WCHAR**)src;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index 65bd075..2a4caf2 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2544,6 +2544,7 @@ static void test_converttovar(void)
     CY cy, cy2;
     DATE date;
     INT i4;
+    LARGE_INTEGER i8;
 
     hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert);
     if(FAILED(hr))
@@ -2574,6 +2575,19 @@ static void test_converttovar(void)
     V_VT(&dst) = VT_EMPTY;
     dst_len = 0;
     dst_status = DBSTATUS_S_DEFAULT;
+    i8.QuadPart = 12345;
+    dst_len = 0x1234;
+    hr = IDataConvert_DataConvert(convert, DBTYPE_I8, DBTYPE_VARIANT, sizeof(i8), &dst_len, &i8, &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_DECIMAL, "got %d\n", V_VT(&dst));
+    ok(S(U(V_DECIMAL(&dst))).scale == 0 && S(U(V_DECIMAL(&dst))).sign == 0 &&
+       V_DECIMAL(&dst).Hi32 == 0 && U1(V_DECIMAL(&dst)).Lo64 == 12345, "Not Equal\n");
+
+    V_VT(&dst) = VT_EMPTY;
+    dst_len = 0;
+    dst_status = DBSTATUS_S_DEFAULT;
     i4 = 123;
     hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
     ok(hr == S_OK, "got %08x\n", hr);