Nikolay Sivov : oledb32: Implemented conversion from DBTYPE_VARIANT to DBTYPE_BSTR.

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Sat Apr  6 14:57:09 2013 +0400

oledb32: Implemented conversion from DBTYPE_VARIANT to DBTYPE_BSTR.

---

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

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index badb899..f56601b 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -503,6 +503,15 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
             }
         }
         break;
+        case DBTYPE_VARIANT:
+        {
+            VARIANT tmp;
+
+            VariantInit(&tmp);
+            if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_BSTR)) == S_OK)
+                *d = V_BSTR(&tmp);
+        }
+        break;
         default: FIXME("Unimplemented conversion %04x -> BSTR\n", src_type); return E_NOTIMPL;
         }
         break;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index 9d50b8a..dd80fe4 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -926,6 +926,7 @@ static void test_converttobstr(void)
     DBSTATUS dst_status;
     DBLENGTH dst_len;
     static const WCHAR ten[] = {'1','0',0};
+    VARIANT v;
     BSTR b;

hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert);
@@ -972,6 +973,19 @@ static void test_converttobstr(void)
     SysFreeString(dst);
     SysFreeString(b);

+    b = SysAllocString(ten);
+    V_VT(&v) = VT_BSTR;
+    V_BSTR(&v) = b;
+    hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_BSTR, 0, &dst_len, &v, &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 != NULL, "got %p\n", dst);
+    ok(dst != b, "got %p src %p\n", dst, b);
+    ok(!lstrcmpW(b, dst), "got %s\n", wine_dbgstr_w(dst));
+    SysFreeString(dst);
+    SysFreeString(b);
+
     IDataConvert_Release(convert);
 }