[1/2] oledb32: Implement DataConvert DBTYPE_VARIANT(V_DATE)->DBTYPE_DBDATE (try 2)

[Alistair Leslie-Hughes]

Hi,
With a patch this time.


Changelog:
     oledb32: Implement DataConvert DBTYPE_VARIANT(V_DATE)->DBTYPE_DBDATE


Best Regards
  Alistair Leslie-Hughes
-------------- next part --------------
>From ca929260147efe6a5231520ed25e9cd3df9fd2e0 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Mon, 20 May 2013 16:29:22 +1000
Subject: [PATCH] Implement DataConvert DBTYPE_VARIANT(V_DATE)->DBTYPE_DBDATE
To: wine-patches <wine-patches at winehq.org>

---
 dlls/oledb32/convert.c       | 14 ++++++++++++++
 dlls/oledb32/tests/convert.c | 10 ++++++++++
 2 files changed, 24 insertions(+)

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index fe7ba8c..a5cdde3 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -421,6 +421,20 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
         switch (src_type)
         {
         case DBTYPE_DBDATE: memcpy(d, src, sizeof(DBDATE));  hr = S_OK; break;
+        case DBTYPE_VARIANT:
+        {
+            if( V_VT((VARIANT*)src) == VT_DATE)
+            {
+                SYSTEMTIME st;
+                hr = (VariantTimeToSystemTime( V_DATE((VARIANT*)src), &st) ? S_OK : E_FAIL);
+                d->year = st.wYear;
+                d->month = st.wMonth;
+                d->day = st.wDay;
+                break;
+            }
+            else
+                FIXME("Unimplemented variant type %d -> DBDATE\n", V_VT((VARIANT*)src));
+        }
         default: FIXME("Unimplemented conversion %04x -> DBDATE\n", src_type); return  E_NOTIMPL;
         }
         break;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index 68df732..305433a 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2462,6 +2462,7 @@ static void test_converttodbdate(void)
     DBDATE ts = {2013, 5, 14};
     DBDATE dst;
     DBSTATUS dst_status;
+    VARIANT var;
 
     dst_len = 0;
     hr = IDataConvert_DataConvert(convert, DBTYPE_DBDATE, DBTYPE_DBDATE, sizeof(ts), &dst_len, &ts, &dst, 2, 0, &dst_status, 0, 0, 0);
@@ -2470,6 +2471,15 @@ static void test_converttodbdate(void)
     ok(dst_len == sizeof(DBDATE), "got %ld\n", dst_len);
     ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n");
 
+    VariantInit(&var);
+    V_VT(&var) = VT_DATE;
+    V_DATE(&var) = 41408.086250;
+    dst_len = 0;
+    hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBDATE, sizeof(var), &dst_len, &var, &dst, 2, 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(DBDATE), "got %ld\n", dst_len);
+    ok(!memcmp(&ts, &dst, sizeof(DBDATE) ), "bytes differ\n");
 }
 
 
-- 
1.8.1.2