[PATCH v2 0/3] MR8561: msado15 check all interfaces in hierarchy
-- v2: msado15: Support all Connection interfaces msado15: Support all Field interfaces msado15: Support all Fields interfaces https://gitlab.winehq.org/wine/wine/-/merge_requests/8561
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 84084bee5a7..1e4c27cba13 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -865,7 +865,11 @@ static HRESULT WINAPI fields_QueryInterface( Fields *iface, REFIID riid, void ** struct fields *fields = impl_from_Fields( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); - if (IsEqualGUID( riid, &IID_Fields ) || IsEqualGUID( riid, &IID_IDispatch ) || + if (IsEqualGUID( riid, &IID_Fields ) || + IsEqualGUID( riid, &IID_Fields20 ) || + IsEqualGUID( riid, &IID_Fields15 ) || + IsEqualGUID( riid, &IID__Collection ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { *obj = iface; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8561
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/recordset.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/recordset.c b/dlls/msado15/recordset.c index 1e4c27cba13..918ed805316 100644 --- a/dlls/msado15/recordset.c +++ b/dlls/msado15/recordset.c @@ -123,7 +123,10 @@ static HRESULT WINAPI field_QueryInterface( Field *iface, REFIID riid, void **ob struct field *field = impl_from_Field( iface ); TRACE( "%p, %s, %p\n", iface, debugstr_guid(riid), obj ); - if (IsEqualGUID( riid, &IID_Field ) || IsEqualGUID( riid, &IID_IDispatch ) || + if (IsEqualGUID( riid, &IID_Field ) || + IsEqualGUID( riid, &IID_Field20 ) || + IsEqualGUID( riid, &IID__ADO ) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { *obj = iface; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8561
From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/msado15/connection.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 278ef1e76f4..bc74cb98e02 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -122,7 +122,10 @@ static HRESULT WINAPI connection_QueryInterface( _Connection *iface, REFIID riid *obj = NULL; - if (IsEqualGUID( riid, &IID__Connection ) || IsEqualGUID( riid, &IID_IDispatch ) || + if (IsEqualGUID( riid, &IID__Connection ) || + IsEqualGUID( riid, &IID_Connection15) || + IsEqualGUID( riid, &IID__ADO) || + IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IUnknown )) { *obj = iface; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8561
Please add check_interface() tests for those, same as we do in other modules. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8561#note_109753
participants (3)
-
Alistair Leslie-Hughes -
Alistair Leslie-Hughes (@alesliehughes) -
Nikolay Sivov (@nsivov)