[PATCH 0/2] MR6099: msado15: Report success in a few functions.

[Alistair Leslie-Hughes (＠alesliehughes)]

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

[PATCH 1/2] msado15: _Recordset::CancelUpdate fake success

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

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

diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c
index b288f4c547c..545c8799bc0 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -1621,7 +1621,7 @@ static HRESULT WINAPI recordset_CancelUpdate( _Recordset *iface )
         return S_OK;
 
     recordset->editmode = adEditNone;
-    return E_NOTIMPL;
+    return S_OK;
 }
 
 static HRESULT WINAPI recordset_Close( _Recordset *iface )
-- 
GitLab


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

[PATCH 2/2] msado15: _Recordset::Supports report we support all options

[Alistair Leslie-Hughes]

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com>

Just because we an option is reported as supported doesn't
mean it can be used.

Quoted from help.
'For example, the Supports method may indicate that a Recordset object supports
updates even though the cursor is based on a multiple table join, some columns
of which are not updatable.'
---
 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 545c8799bc0..dd8e15cbe86 100644
--- a/dlls/msado15/recordset.c
+++ b/dlls/msado15/recordset.c
@@ -2361,7 +2361,8 @@ static HRESULT WINAPI recordset_NextRecordset( _Recordset *iface, VARIANT *recor
 static HRESULT WINAPI recordset_Supports( _Recordset *iface, CursorOptionEnum cursor_options, VARIANT_BOOL *ret )
 {
     FIXME( "%p, %08x, %p\n", iface, cursor_options, ret );
-    return E_NOTIMPL;
+    *ret = VARIANT_TRUE;
+    return S_OK;
 }
 
 static HRESULT WINAPI recordset_get_Collect( _Recordset *iface, VARIANT index, VARIANT *var )
-- 
GitLab

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

[PATCH 2/2] msado15: _Recordset::Supports report we support all options

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=147166

Your paranoid android.


=== debian11b (64 bit WoW report) ===

ddraw:
ddraw1.c:3645: Test failed: Expected (0,0)-(640,480), got (-32000,-32000)-(-31840,-31969).
ddraw7.c:3741: Test failed: Expected message 0x5, but didn't receive it.
ddraw7.c:3743: Test failed: Expected screen size 1024x768, got 0x0.

Report validation errors:
dxgi:dxgi has unaccounted for todo messages
dxgi:dxgi has unaccounted for skip messages
The report seems to have been truncated