Huw Davies : oledb32: Add a few simple conversions to DBTYPE_GUID.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 64a8eb601e719f25e827f73f3d554b689c67dac2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=64a8eb601e719f25e827f73f3d...

Author: Huw Davies 
Date:   Wed Oct 28 11:49:21 2009 +0000

oledb32: Add a few simple conversions to DBTYPE_GUID.

---

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

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index 44d86bb..6394204 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -130,6 +130,8 @@ static int get_length(DBTYPE type)
         return sizeof(BSTR);
     case DBTYPE_FILETIME:
         return sizeof(FILETIME);
+    case DBTYPE_GUID:
+        return sizeof(GUID);
     case DBTYPE_WSTR:
     case DBTYPE_BYREF | DBTYPE_WSTR:
         return 0;
@@ -295,6 +297,18 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
         break;
     }

+    case DBTYPE_GUID:
+    {
+        GUID *d = dst;
+        switch(src_type)
+        {
+        case DBTYPE_EMPTY:       *d = GUID_NULL; hr = S_OK; break;
+        case DBTYPE_GUID:        *d = *(GUID*)src; hr = S_OK; break;
+        default: FIXME("Unimplemented conversion %04x -> GUID\n", src_type); return E_NOTIMPL;
+        }
+        break;
+    }
+
     case DBTYPE_WSTR:
     {
         BSTR b;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index 2095b9b..4f9ca6b 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -35,6 +35,8 @@

#include "wine/test.h"

+DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
+
 static void test_dcinfo(void)
 {
     IDCInfo *info;
@@ -1111,6 +1113,47 @@ static void test_converttobyrefwstr(void)
     IDataConvert_Release(convert);
 }

+static void test_converttoguid(void)
+{
+    IDataConvert *convert;
+    HRESULT hr;
+    GUID dst;
+    BYTE src[20];
+    DBSTATUS dst_status;
+    DBLENGTH dst_len;
+
+    hr = CoCreateInstance(&CLSID_OLEDB_CONVERSIONLIBRARY, NULL, CLSCTX_INPROC_SERVER, &IID_IDataConvert, (void**)&convert);
+    if(FAILED(hr))
+    {
+        win_skip("Unable to load oledb conversion library\n");
+        return;
+    }
+
+    dst = IID_IDCInfo;
+    hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_GUID, 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(GUID), "got %d\n", dst_len);
+    ok(IsEqualGUID(&dst, &GUID_NULL), "didn't get GUID_NULL\n");
+
+    dst = IID_IDCInfo;
+    hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_GUID, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
+    ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr);
+    ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status);
+    ok(dst_len == sizeof(GUID), "got %d\n", dst_len);
+    ok(IsEqualGUID(&dst, &IID_IDCInfo), "dst has changed\n");
+
+    dst = IID_IDCInfo;
+    memcpy(src, &IID_IDataConvert, sizeof(GUID));
+    hr = IDataConvert_DataConvert(convert, DBTYPE_GUID, DBTYPE_GUID, 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(GUID), "got %d\n", dst_len);
+    ok(IsEqualGUID(&dst, &IID_IDataConvert), "didn't get IID_IDataConvert\n");
+
+    IDataConvert_Release(convert);
+}
+
 static void test_converttofiletime(void)
 {
     IDataConvert *convert;
@@ -1150,6 +1193,7 @@ START_TEST(convert)
     test_converttobstr();
     test_converttowstr();
     test_converttobyrefwstr();
+    test_converttoguid();
     test_converttofiletime();
     OleUninitialize();
 }