[PATCH 0/1] MR10752: msado15: Handle BSTR data in IRowsetFind::FindNextRow.

[Piotr Caban (＠piotr)]

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

[PATCH 1/1] msado15: Handle BSTR data in IRowsetFind::FindNextRow.

[Piotr Caban]

From: Piotr Caban <[e-mail]>

---
 dlls/msado15/rowsetex.c      | 66 ++++++++++++++++++++++++---
 dlls/msado15/tests/msado15.c | 88 ++++++++++++++++++++++++++++++++----
 2 files changed, 138 insertions(+), 16 deletions(-)

diff --git a/dlls/msado15/rowsetex.c b/dlls/msado15/rowsetex.c
index 07b2a70e288..e2f68bf1d55 100644
--- a/dlls/msado15/rowsetex.c
+++ b/dlls/msado15/rowsetex.c
@@ -514,6 +514,54 @@ static HRESULT int_compare(DBCOMPAREOP compare_op, long long x, long long y)
     }
 }
 
+static HRESULT str_compare(DBCOMPAREOP compare_op, BSTR x, BSTR y)
+{
+    HRESULT hr;
+
+    if (compare_op == DBCOMPAREOPS_BEGINSWITH)
+    {
+        unsigned int x_len = SysStringLen(x);
+        unsigned int y_len = SysStringLen(y);
+
+        if (x_len < y_len) return S_FALSE;
+        hr = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, x, y_len, y, y_len);
+        return hr == CSTR_EQUAL ? S_OK : S_FALSE;
+    }
+
+    if (compare_op == DBCOMPAREOPS_CONTAINS)
+    {
+        unsigned int x_len = SysStringLen(x);
+        unsigned int y_len = SysStringLen(y);
+        int i;
+
+        if (x_len < y_len) return S_FALSE;
+        for (i = 0; i <= x_len - y_len; i++)
+        {
+            hr = CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE, x + i, y_len, y, y_len);
+            if (hr == CSTR_EQUAL) return S_OK;
+        }
+        return S_FALSE;
+    }
+
+    hr = VarBstrCmp(x, y, LOCALE_USER_DEFAULT, NORM_IGNORECASE);
+    switch (compare_op)
+    {
+    case DBCOMPAREOPS_LT:
+        return hr == VARCMP_LT ? S_OK : S_FALSE;
+    case DBCOMPAREOPS_LE:
+        return hr != VARCMP_GT ? S_OK : S_FALSE;
+    case DBCOMPAREOPS_EQ:
+        return hr == VARCMP_EQ ? S_OK : S_FALSE;
+    case DBCOMPAREOPS_GE:
+        return hr != VARCMP_LT ? S_OK : S_FALSE;
+    case DBCOMPAREOPS_GT:
+        return hr == VARCMP_GT ? S_OK : S_FALSE;
+    case DBCOMPAREOPS_NE:
+        return hr != VARCMP_EQ ? S_OK : S_FALSE;
+    }
+    return S_FALSE;
+}
+
 static HRESULT WINAPI find_FindNextRow(IRowsetFind *iface, HCHAPTER chapter, HACCESSOR hacc,
         void *find_value, DBCOMPAREOP compare_op, DBBKMARK bookmark_size, const BYTE *bookmark,
         DBROWOFFSET offset, DBROWCOUNT rows, DBCOUNTITEM *obtained, HROW **hrows)
@@ -596,6 +644,8 @@ static HRESULT WINAPI find_FindNextRow(IRowsetFind *iface, HCHAPTER chapter, HAC
     }
     if (!rowset->rowset_loc) bookmark_size = 0;
 
+    compare_op &= ~(DBCOMPAREOPS_CASESENSITIVE | DBCOMPAREOPS_CASEINSENSITIVE);
+
     while (1)
     {
         BYTE *x = data_buf + bindings->obValue;
@@ -636,12 +686,6 @@ static HRESULT WINAPI find_FindNextRow(IRowsetFind *iface, HCHAPTER chapter, HAC
             goto done;
         }
 
-        if (bookmark_size)
-        {
-            hr = get_bookmark(rowset, row, &bookmark_size, &bm, tmp);
-            if (FAILED(hr)) goto done;
-        }
-
         if (type == DBTYPE_VARIANT)
         {
             VARIANT *xv = (VARIANT *)x;
@@ -677,6 +721,9 @@ static HRESULT WINAPI find_FindNextRow(IRowsetFind *iface, HCHAPTER chapter, HAC
         case DBTYPE_I8:
             hr = int_compare(compare_op, *(long long*)x, *(long long*)y);
             break;
+        case DBTYPE_BSTR:
+            hr = str_compare(compare_op, *(BSTR *)x, *(BSTR *)y);
+            break;
         default:
             FIXME("unhandled data type: %d\n", type);
             hr = E_NOTIMPL;
@@ -684,6 +731,13 @@ static HRESULT WINAPI find_FindNextRow(IRowsetFind *iface, HCHAPTER chapter, HAC
         }
 
         if (hr != S_FALSE) break;
+
+        if (bookmark_size)
+        {
+            hr = get_bookmark(rowset, row, &bookmark_size, &bm, tmp);
+            if (FAILED(hr)) goto done;
+        }
+
         if (bindings->dwMemOwner == DBMEMOWNER_CLIENTOWNED)
             dbtype_free(bindings->wType, data_buf + bindings->obValue);
         free_val = FALSE;
diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c
index 551d18890f6..64c3300eec9 100644
--- a/dlls/msado15/tests/msado15.c
+++ b/dlls/msado15/tests/msado15.c
@@ -859,15 +859,16 @@ static HRESULT WINAPI column_info_GetColumnInfo(IColumnsInfo *This, DBORDINAL *c
         DBCOLUMNINFO **colinfo, OLECHAR **stringsbuffer)
 {
     DBCOLUMNINFO *dbcolumn;
+    OLECHAR *p;
 
     CHECK_EXPECT2(column_info_GetColumnInfo);
 
-    *columns = 2;
-    *stringsbuffer = CoTaskMemAlloc(sizeof(L"Column1"));
+    *columns = 3;
+    *stringsbuffer = CoTaskMemAlloc(sizeof(L"Column1") + sizeof(L"Column2"));
     lstrcpyW(*stringsbuffer, L"Column1");
 
-    dbcolumn = CoTaskMemAlloc(sizeof(*dbcolumn) * 2);
-    memset(dbcolumn, 0, sizeof(*dbcolumn) * 2);
+    dbcolumn = CoTaskMemAlloc(sizeof(*dbcolumn) * 3);
+    memset(dbcolumn, 0, sizeof(*dbcolumn) * 3);
 
     dbcolumn[0].dwFlags = DBCOLUMNFLAGS_ISBOOKMARK | DBCOLUMNFLAGS_ISFIXEDLENGTH;
     dbcolumn[0].ulColumnSize = sizeof(unsigned int);
@@ -876,7 +877,6 @@ static HRESULT WINAPI column_info_GetColumnInfo(IColumnsInfo *This, DBORDINAL *c
     dbcolumn[0].columnid.uGuid.guid = DBCOL_SPECIALCOL;
 
     dbcolumn[1].pwszName = *stringsbuffer;
-    dbcolumn[1].pTypeInfo = NULL;
     dbcolumn[1].iOrdinal = 1;
     dbcolumn[1].dwFlags = DBCOLUMNFLAGS_MAYBENULL;
     dbcolumn[1].ulColumnSize = 5;
@@ -886,6 +886,14 @@ static HRESULT WINAPI column_info_GetColumnInfo(IColumnsInfo *This, DBORDINAL *c
     dbcolumn[1].columnid.eKind = DBKIND_NAME;
     dbcolumn[1].columnid.uName.pwszName = *stringsbuffer;
 
+    p = *stringsbuffer + ARRAY_SIZE(L"Column1");
+    lstrcpyW(p, L"Column2");
+    dbcolumn[2].pwszName = p;
+    dbcolumn[2].iOrdinal = 1;
+    dbcolumn[2].wType = DBTYPE_BSTR;
+    dbcolumn[2].columnid.eKind = DBKIND_NAME;
+    dbcolumn[2].columnid.uName.pwszName = p;
+
     *colinfo = dbcolumn;
     return S_OK;
 }
@@ -1658,6 +1666,16 @@ static HRESULT WINAPI rowset_GetData(IRowsetExactScroll *iface, HROW hRow, HACCE
         V_I4(&val.v) = 123;
         len = sizeof(val.v);
         break;
+    case 2:
+        todo_wine ok(haccessor->binding.dwPart == (DBPART_VALUE | DBPART_STATUS | DBPART_LENGTH),
+                "dwPart = %ld\n", haccessor->binding.dwPart);
+        ok(haccessor->binding.cbMaxLen == sizeof(VARIANT), "cbMaxLen = %Id\n", haccessor->binding.cbMaxLen);
+        ok(haccessor->binding.wType == DBTYPE_VARIANT, "wType = %d\n", haccessor->binding.wType);
+
+        V_VT(&val.v) = VT_BSTR;
+        V_BSTR(&val.v) = SysAllocString(L"test");
+        len = sizeof(val.v);
+        break;
     default:
         ok(0, "unexpected GetData argument\n");
         return E_NOTIMPL;
@@ -1991,11 +2009,11 @@ static void test_ADORecordsetConstruction(BOOL exact_scroll)
     hr = Fields_get_Count( fields, &count );
     ok( hr == S_OK, "got %08lx\n", hr );
     CHECK_CALLED( column_info_GetColumnInfo );
-    ok( count == 1, "got %ld\n", count );
+    ok( count == 2, "got %ld\n", count );
 
     hr = Fields_get_Count( fields, &count );
     ok( hr == S_OK, "got %08lx\n", hr );
-    ok( count == 1, "got %ld\n", count );
+    ok( count == 2, "got %ld\n", count );
 
     V_VT( &index ) = VT_BSTR;
     V_BSTR( &index ) = SysAllocString( L"Column1" );
@@ -2298,7 +2316,7 @@ static void test_ADORecordsetConstruction(BOOL exact_scroll)
     if (exact_scroll) CHECK_CALLED(rowset_GetData);
 
     if (exact_scroll) SET_EXPECT(rowset_GetData);
-    hr = _Recordset_Find( recordset, (BSTR)L"Column2 = 1", 0, adSearchForward, missing );
+    hr = _Recordset_Find( recordset, (BSTR)L"non_existing = 1", 0, adSearchForward, missing );
     ok(hr == MAKE_ADO_HRESULT( adErrItemNotFound ), "got %08lx\n", hr );
     if (exact_scroll) CHECK_CALLED(rowset_GetData);
 
@@ -3927,7 +3945,6 @@ static void test_ADOConnectionConstruction(void)
 
     rows = 0;
     SET_EXPECT(rowset_GetRowsAt);
-    SET_EXPECT(accessor_CreateAccessor);
     SET_EXPECT(rowset_GetData);
     SET_EXPECT(rowset_ReleaseRows);
     hr = IRowsetExactScroll_GetExactPosition(rowset_es, 0, 0, 0, 0, &rows);
@@ -3952,9 +3969,11 @@ static void test_ADOConnectionConstruction(void)
     binding.dwPart = DBPART_VALUE;
     binding.cbMaxLen = sizeof(VARIANT);
     binding.wType = DBTYPE_VARIANT;
+    SET_EXPECT(accessor_CreateAccessor);
     SET_EXPECT(rowset_QI_IConvertType);
     hr = IAccessor_CreateAccessor(accessor, DBACCESSOR_ROWDATA, 1, &binding, 0, &hacc, NULL);
     ok(hr == S_OK, "got %08lx\n", hr);
+    CHECK_CALLED(accessor_CreateAccessor);
     todo_wine CHECK_CALLED(rowset_QI_IConvertType);
 
     hr = IRowsetFind_FindNextRow(find, 0, 0, NULL, DBCOMPAREOPS_EQ, 0, NULL, 0, 1, &rows, &hrows);
@@ -4011,7 +4030,8 @@ static void test_ADOConnectionConstruction(void)
     SET_EXPECT(rowset_GetData);
     SET_EXPECT(rowset_AddRefRows);
     SET_EXPECT(rowset_ReleaseRows);
-    hr = IRowsetFind_FindNextRow(find, 0, hacc, &v, DBCOMPAREOPS_EQ, 0, NULL, 0, 1, &rows, &hrows);
+    hr = IRowsetFind_FindNextRow(find, 0, hacc, &v,
+            DBCOMPAREOPS_EQ | DBCOMPAREOPS_CASESENSITIVE, 0, NULL, 0, 1, &rows, &hrows);
     CHECK_CALLED(rowset_GetNextRows);
     CHECK_CALLED(rowset_GetData);
     CHECK_CALLED(rowset_AddRefRows);
@@ -4035,6 +4055,54 @@ static void test_ADOConnectionConstruction(void)
     ok(hrow == 2, "hrow = %Id\n", hrow);
     VariantClear(&v);
 
+    SET_EXPECT(accessor_ReleaseAccessor);
+    hr = IAccessor_ReleaseAccessor(accessor, hacc, NULL);
+    ok(hr == S_OK, "got %08lx\n", hr);
+    CHECK_CALLED(accessor_ReleaseAccessor);
+
+    memset(&binding, 0, sizeof(binding));
+    binding.iOrdinal = 2;
+    binding.dwPart = DBPART_VALUE;
+    binding.cbMaxLen = sizeof(VARIANT);
+    binding.wType = DBTYPE_VARIANT;
+    SET_EXPECT(accessor_CreateAccessor);
+    hr = IAccessor_CreateAccessor(accessor, DBACCESSOR_ROWDATA, 1, &binding, 0, &hacc, NULL);
+    ok(hr == S_OK, "got %08lx\n", hr);
+    CHECK_CALLED(accessor_CreateAccessor);
+
+    V_VT(&v) = VT_BSTR;
+    V_BSTR(&v) = SysAllocString(L"TEST");
+    SET_EXPECT(rowset_GetRowsAt);
+    SET_EXPECT(rowset_GetData);
+    SET_EXPECT(rowset_AddRefRows);
+    SET_EXPECT(rowset_ReleaseRows);
+    hr = IRowsetFind_FindNextRow(find, 0, hacc, &v, DBCOMPAREOPS_EQ,
+            sizeof(bookmark), &bookmark, 0, 1, &rows, &hrows);
+    ok(hr == S_OK, "got %08lx\n", hr);
+    CHECK_CALLED(rowset_GetRowsAt);
+    CHECK_CALLED(rowset_GetData);
+    CHECK_CALLED(rowset_AddRefRows);
+    CHECK_CALLED(rowset_ReleaseRows);
+    ok(rows == 1, "rows = %Id\n", rows);
+    ok(hrow == 1, "hrow = %Id\n", hrow);
+
+    /* DBCOMPAREOPS_CASESENSITIVE is ignored */
+    SET_EXPECT(rowset_GetRowsAt);
+    SET_EXPECT(rowset_GetData);
+    SET_EXPECT(rowset_AddRefRows);
+    SET_EXPECT(rowset_ReleaseRows);
+    hr = IRowsetFind_FindNextRow(find, 0, hacc, &v,
+            DBCOMPAREOPS_BEGINSWITH | DBCOMPAREOPS_CASESENSITIVE,
+            sizeof(bookmark), &bookmark, 0, 1, &rows, &hrows);
+    ok(hr == S_OK, "got %08lx\n", hr);
+    CHECK_CALLED(rowset_GetRowsAt);
+    CHECK_CALLED(rowset_GetData);
+    CHECK_CALLED(rowset_AddRefRows);
+    CHECK_CALLED(rowset_ReleaseRows);
+    ok(rows == 1, "rows = %Id\n", rows);
+    ok(hrow == 1, "hrow = %Id\n", hrow);
+    VariantClear(&v);
+
     SET_EXPECT(accessor_ReleaseAccessor);
     hr = IAccessor_ReleaseAccessor(accessor, hacc, NULL);
     ok(hr == S_OK, "got %08lx\n", hr);
-- 
GitLab

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