oledb32: Implement DataConvert DBTYPE_VARIANT->DBTYPE_UI4

[Alistair Leslie-Hughes]

Hi,


Changelog:
     oledb32: Implement DataConvert DBTYPE_VARIANT->DBTYPE_UI4


Best Regards
  Alistair Leslie-Hughes
-------------- next part --------------
>From 82c72a969eff0b6c87e9280268d605f47ef68624 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Thu, 18 Apr 2013 12:15:06 +1000
Subject: [PATCH] Implement DataConvert DBTYPE_VARIANT->DBTYPE_UI4
To: wine-patches <wine-patches at winehq.org>

---
 dlls/oledb32/convert.c       |    6 ++++++
 dlls/oledb32/tests/convert.c |    9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 07b9342..0bcaae9 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -589,6 +589,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
 
     case DBTYPE_UI4:
     {
+        VARIANT tmp;
         DWORD *d = dst;
         switch(src_type)
         {
@@ -608,6 +609,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
         case DBTYPE_UI4:         *d = *(DWORD*)src; hr = S_OK;                   break;
         case DBTYPE_I8:          hr = VarUI4FromI8(*(LONGLONG*)src, d);          break;
         case DBTYPE_UI8:         hr = VarUI4FromUI8(*(ULONGLONG*)src, d);        break;
+        case DBTYPE_VARIANT:
+            VariantInit(&tmp);
+            if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_UI4)) == S_OK)
+                *d = V_UI4(&tmp);
+            break;
         default: FIXME("Unimplemented conversion %04x -> UI4\n", src_type); return E_NOTIMPL;
         }
         break;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index 58b6965..bfb606b 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2303,6 +2303,15 @@ todo_wine
     ok(broken(dst_len == sizeof(dst)) || dst_len == 0x1234 /* W2K+ */, "got %ld\n", dst_len);
     ok(dst == 0x12345678, "got %08x\n", dst);
 
+    dst_len = dst = 0x1234;
+    V_VT((VARIANT*)src) = VT_I2;
+    V_I2((VARIANT*)src) = 0x4321;
+    hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_UI4, 0, &dst_len, src, &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(dst == 0x4321, "got %08x\n", dst);
+
     IDataConvert_Release(convert);
 }
 
-- 
1.7.10.4