[3/5] oledb32: Implement DataConvert DBTYPE_BYTES->DBTYPE_BYTES |, DBTYPE_BYREF

[Alistair Leslie-Hughes]

Hi,


Changelog:
     oledb32: Implement DataConvert DBTYPE_BYTES->DBTYPE_BYTES |
  DBTYPE_BYREF


Best Regards
  Alistair Leslie-Hughes
-------------- next part --------------
>From e206d3d7db12665da32725475a51246ab8754b29 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Thu, 23 May 2013 14:24:08 +1000
Subject: [PATCH] Implement DataConvert DBTYPE_BYTES->DBTYPE_BYTES |
 DBTYPE_BYREF
To: wine-patches <wine-patches at winehq.org>

---
 dlls/oledb32/convert.c       | 19 +++++++++++++++++++
 dlls/oledb32/tests/convert.c | 18 ++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 7c4bf6d..7e6a0c0 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -983,6 +983,25 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
         }
         break;
     }
+    case DBTYPE_BYTES | DBTYPE_BYREF:
+    {
+        BYTE **d = dst;
+
+        switch(src_type)
+        {
+        case DBTYPE_BYTES:
+            *d = CoTaskMemAlloc(src_len);
+            if(*d) memcpy(*d, src, src_len);
+            else hr = E_OUTOFMEMORY;
+
+            *dst_len = src_len;
+            *dst_status = DBSTATUS_S_OK;
+            return S_OK;
+        default: FIXME("Unimplemented conversion %04x -> DBTYPE_BYTES | DBTYPE_BYREF\n", src_type); return E_NOTIMPL;
+        }
+        break;
+    }
+    break;
 
     default:
         FIXME("Unimplemented conversion %04x -> %04x\n", src_type, dst_type);
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index 540eb25..e0c6671 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -2463,6 +2463,23 @@ static void test_converttobytes(void)
     ok(!memcmp(byte_src, dst, 2 ), "bytes differ\n");
 }
 
+static void test_converttobytesbyref(void)
+{
+    DBLENGTH dst_len;
+    HRESULT hr;
+    BYTE byte_src[] = {0, 1, 2, 4, 5};
+    BYTE *dst;
+    DBSTATUS dst_status;
+
+    dst_len = 0;
+    hr = IDataConvert_DataConvert(convert, DBTYPE_BYTES, DBTYPE_BYTES | DBTYPE_BYREF, sizeof(byte_src), &dst_len, byte_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(byte_src), "got %ld\n", dst_len);
+    ok(!memcmp(byte_src, dst, dst_len ), "bytes differ\n");
+    CoTaskMemFree(dst);
+}
+
 static void test_converttodbdate(void)
 {
     DBLENGTH dst_len;
@@ -2704,6 +2721,7 @@ START_TEST(convert)
     test_converttoui8();
     test_converttovar();
     test_converttobytes();
+    test_converttobytesbyref();
     test_converttodbdate();
     test_getconversionsize();
     test_converttotimestamp();
-- 
1.8.1.2