Zhiyi Zhang : oledb32: Support converting DBTYPE_VARIANT to DBTYPE_UI8.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0dc1c6ac00df458809f7dc9e11d000bf5f1a6841
URL:    https://gitlab.winehq.org/wine/wine/-/commit/0dc1c6ac00df458809f7dc9e11d000b...

Author: Zhiyi Zhang 
Date:   Mon May  8 22:32:16 2023 +0800

oledb32: Support converting DBTYPE_VARIANT to DBTYPE_UI8.

---

dlls/oledb32/convert.c       | 5 +++++
 dlls/oledb32/tests/convert.c | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c
index b8db8f06d8b..4ed9f0d8cc6 100644
--- a/dlls/oledb32/convert.c
+++ b/dlls/oledb32/convert.c
@@ -826,6 +826,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface,
         case DBTYPE_UI4:         hr = VarUI8FromUI4(*(DWORD*)src, d);            break;
         case DBTYPE_I8:          hr = VarUI8FromI8(*(LONGLONG*)src, d);          break;
         case DBTYPE_UI8:         *d = *(ULONGLONG*)src; hr = S_OK;               break;
+        case DBTYPE_VARIANT:
+            VariantInit(&tmp);
+            if ((hr = VariantChangeType(&tmp, src, 0, VT_UI8)) == S_OK)
+                *d = V_UI8(&tmp);
+            break;
         default: FIXME("Unimplemented conversion %04x -> UI8\n", src_type); return E_NOTIMPL;
         }
         break;
diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c
index f70562f8e79..2d5f898e0df 100644
--- a/dlls/oledb32/tests/convert.c
+++ b/dlls/oledb32/tests/convert.c
@@ -3082,13 +3082,9 @@ static void test_converttoui8(void)
     V_UI8(&v) = 4321;
     dst_len = 0x1234;
     hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_UI8, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0);
-    todo_wine
     ok(hr == S_OK, "got %08lx\n", hr);
-    todo_wine
     ok(dst_status == DBSTATUS_S_OK, "got %08lx\n", dst_status);
-    todo_wine
     ok(dst_len == sizeof(dst), "got %Id\n", dst_len);
-    todo_wine
     ok(dst.QuadPart == 4321, "got %d\n", (int)dst.QuadPart);
 }