[PATCH 0/2] MR9643: msado15: connection_OpenSchema and field_get_Value improvements.

[Piotr Caban (＠piotr)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9643

[PATCH 1/2] msado15: Set ActiveConnection on recordset created by connection_OpenSchema.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 dlls/msado15/connection.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c
index 568eb8b12c9..02bd35c6e95 100644
--- a/dlls/msado15/connection.c
+++ b/dlls/msado15/connection.c
@@ -558,10 +558,10 @@ static HRESULT WINAPI connection_OpenSchema( _Connection *iface, SchemaEnum sche
     ADORecordsetConstruction *construct;
     IDBSchemaRowset *schema_rowset;
     _Recordset *recordset;
+    VARIANT *restr, conn;
     ULONG restr_count;
     IUnknown *rowset;
     const GUID *guid;
-    VARIANT *restr;
     HRESULT hr;
 
     TRACE( "%p, %d, %s, %s, %p\n", iface, schema, debugstr_variant(&restrictions),
@@ -632,7 +632,12 @@ static HRESULT WINAPI connection_OpenSchema( _Connection *iface, SchemaEnum sche
         return hr;
     }
 
-    hr = _Recordset_QueryInterface( recordset, &IID_ADORecordsetConstruction, (void**)&construct );
+    V_VT(&conn) = VT_DISPATCH;
+    V_DISPATCH(&conn) = (IDispatch *)iface;
+    hr = _Recordset_put_ActiveConnection( recordset, conn );
+
+    if (SUCCEEDED(hr))
+        hr = _Recordset_QueryInterface( recordset, &IID_ADORecordsetConstruction, (void**)&construct );
     if (SUCCEEDED(hr))
     {
         hr = ADORecordsetConstruction_put_Rowset( construct, rowset );
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/9643

[PATCH 2/2] msado15: Handle NULL values in field_get_Value.

[Piotr Caban]

From: Piotr Caban <piotr(a)codeweavers.com>

---
 dlls/msado15/recordset.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
index f3d3e1b32b8..2412890f7e4 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -573,7 +573,8 @@ static HRESULT WINAPI field_get_Value( Field *iface, VARIANT *val )
     memset(&buf, 0, sizeof(buf));
     hr = IRowset_GetData(recordset->row_set, recordset->current_row, field->hacc_get, &buf);
     if (FAILED(hr)) return hr;
-    if (buf.status != DBSTATUS_S_OK) return E_FAIL;
+    if (buf.status == DBSTATUS_S_ISNULL) V_VT(&buf.val) = VT_NULL;
+    else if (buf.status != DBSTATUS_S_OK) return E_FAIL;
 
     *val = buf.val;
     return S_OK;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9643