[PATCH 0/2] MR9929: msado15: Respect DBPROP_CANHOLDROWS property in cache_get().

[Piotr Caban (＠piotr)]

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

[PATCH 1/2] msado15: Respect DBPROP_CANHOLDROWS property in cache_get().

[Piotr Caban]

From: Piotr Caban <[e-mail]>

---
 dlls/msado15/recordset.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
index f276ffbf625..a324e500e4d 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -268,12 +268,14 @@ static HRESULT cache_get( struct recordset *recordset, BOOL forward )
     if (fetch)
     {
         DBCOUNTITEM count;
+        VARIANT_BOOL b;
         HROW row = 0;
 
-        if (!cache_is_empty( recordset ))
+        if (!cache_is_empty( recordset ) &&
+                SUCCEEDED(_Recordset_Supports(&recordset->Recordset_iface, adHoldRecords, &b)) && b &&
+                SUCCEEDED(IRowset_AddRefRows(recordset->row_set, 1, &recordset->current_row, NULL, NULL)))
         {
-            if (SUCCEEDED(IRowset_AddRefRows(recordset->row_set, 1, &recordset->current_row, NULL, NULL)))
-               row = recordset->current_row;
+            row = recordset->current_row;
         }
         cache_release( recordset );
         recordset->current_row = row;
-- 
GitLab


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

[PATCH 2/2] msado15: Dump rowset properties if logging is enabled.

[Piotr Caban]

From: Piotr Caban <[e-mail]>

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

diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
index a324e500e4d..1495c9b4dc4 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -3837,6 +3837,58 @@ static void init_bookmark( struct recordset *recordset )
     CoTaskMemFree( colinfo );
 }
 
+static const char* debugstr_propset_guid(const GUID *guid)
+{
+    if (IsEqualGUID(guid, &DBPROPSET_ROWSET)) return "DBPROPSET_ROWSET";
+    return wine_dbgstr_guid(guid);
+}
+
+static const char* debugstr_prop_id(const GUID *guid, DBPROPID id)
+{
+    if (IsEqualGUID(guid, &DBPROPSET_ROWSET))
+    {
+        switch (id)
+        {
+        case DBPROP_OTHERUPDATEDELETE: return "DBPROP_OTHERUPDATEDELETE";
+        case DBPROP_OTHERINSERT: return "DBPROP_OTHERINSERT";
+        case DBPROP_CANHOLDROWS: return "DBPROP_CANHOLDROWS";
+        case DBPROP_CANSCROLLBACKWARDS: return "DBPROP_CANSCROLLBACKWARDS";
+        case DBPROP_UPDATABILITY: return "DBPROP_UPDATABILITY";
+        case DBPROP_IRowsetLocate: return "DBPROP_IRowsetLocate";
+        case DBPROP_IRowsetScroll: return "DBPROP_IRowsetScroll";
+        case DBPROP_IRowsetUpdate: return "DBPROP_IRowsetUpdate";
+        case DBPROP_IRowsetResynch: return "DBPROP_IRowsetResynch";
+        case DBPROP_IConnectionPointContainer: return "DBPROP_IConnectionPointContainer";
+        case DBPROP_BOOKMARKSKIPPED: return "DBPROP_BOOKMARKSKIPPED";
+        case DBPROP_IRowsetFind: return "DBPROP_IRowsetFind";
+        case DBPROP_IRowsetRefresh: return "DBPROP_IRowsetRefresh";
+        case DBPROP_LOCKMODE: return "DBPROP_LOCKMODE";
+        case DBPROP_IRowsetIndex: return "DBPROP_IRowsetIndex";
+        case DBPROP_IRowsetCurrentIndex: return "DBPROP_IRowsetCurrentIndex";
+        case DBPROP_REMOVEDELETED: return "DBPROP_REMOVEDELETED";
+        }
+    }
+
+    return wine_dbg_sprintf( "%lx", id );
+}
+
+static void dump_recordset_properties(struct recordset *recordset)
+{
+    ULONG i, j;
+
+    for (i = 0; i < recordset->prop_count; i++)
+    {
+        for (j = 0; j < recordset->prop[i].cProperties; j++)
+        {
+            const GUID *guid = &recordset->prop[i].guidPropertySet;
+            DBPROP *prop = recordset->prop[i].rgProperties + j;
+
+            TRACE( "%p %s (%lx) %s = %s\n", recordset, debugstr_propset_guid(guid), prop->dwStatus,
+                    debugstr_prop_id(guid, prop->dwPropertyID), wine_dbgstr_variant(&prop->vValue));
+        }
+    }
+}
+
 static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *unk)
 {
     struct recordset *recordset = impl_from_ADORecordsetConstruction( iface );
@@ -3883,6 +3935,8 @@ static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface,
         IRowsetInfo_GetProperties( rowset_info, 1, &propidset,
                 &recordset->prop_count, &recordset->prop);
         IRowsetInfo_Release( rowset_info );
+        if (TRACE_ON( msado15 ))
+            dump_recordset_properties( recordset );
     }
 
     if (recordset_get_prop( recordset, &DBPROPSET_ROWSET, DBPROP_UPDATABILITY, &v ) && V_I4( &v ))
-- 
GitLab

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