[PATCH 0/3] MR9576: include: Add IRowsetView, IViewChapter and IViewFilter definitions.
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msdaps/usrmarshal.c | 30 +++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/rstvw.idl | 53 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 include/rstvw.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 80ae1305872..096b26967cc 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1901,3 +1901,33 @@ HRESULT __RPC_STUB IErrorLookup_ReleaseErrors_Stub(IErrorLookup* This, FIXME("(%p)->(%#lx, %p): stub\n", This, dwDynamicErrorID, ppErrorInfoRem); return E_NOTIMPL; } + +HRESULT CALLBACK IRowsetView_CreateView_Proxy(IRowsetView* This, + IUnknown *unk_outer, REFIID riid, IUnknown **view) +{ + FIXME("(%p)->(%p, %s, %p): stub\n", This, unk_outer, wine_dbgstr_guid(riid), view); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowsetView_CreateView_Stub(IRowsetView* This, IUnknown *unk_outer, + REFIID riid, IUnknown **view, IErrorInfo **err_info) +{ + FIXME("(%p)->(%p, %s, %p, %p): stub\n", This, unk_outer, wine_dbgstr_guid(riid), view, err_info); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowsetView_GetView_Proxy(IRowsetView* This, HCHAPTER hchapter, + REFIID riid, HCHAPTER *hchapter_src, IUnknown **view) +{ + FIXME("(%p)->(%Ix, %s, %p %p): stub\n", This, hchapter, + wine_dbgstr_guid(riid), hchapter_src, view); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowsetView_GetView_Stub(IRowsetView* This, HCHAPTER hchapter, + REFIID riid, HCHAPTER *hchapter_src, IUnknown **view, IErrorInfo **err_info) +{ + FIXME("(%p)->(%Ix, %s, %p, %p, %p): stub\n", This, hchapter, + wine_dbgstr_guid(riid), hchapter_src, view, err_info); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index 30a9e6ac1b3..de836b6067f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -713,6 +713,7 @@ SOURCES = \ rstnot.idl \ rstscr.idl \ rstupd.idl \ + rstvw.idl \ rstxsc.idl \ rtlsupportapi.h \ rtutils.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 54fe572f2dc..04c248b6ba7 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -52,6 +52,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstxsc.idl" #include "chprst.idl" #include "rstfnd.idl" +#include "rstvw.idl" #include "cmdbas.idl" #include "cmdtxt.idl" #include "colinf.idl" diff --git a/include/rstvw.idl b/include/rstvw.idl new file mode 100644 index 00000000000..1e0c0c59cc6 --- /dev/null +++ b/include/rstvw.idl @@ -0,0 +1,53 @@ +/* + * Copyright (C) 2025 Piotr Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a99-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetView : IUnknown +{ + [local] + HRESULT CreateView([in] IUnknown *unk_outer, + [in] REFIID riid, + [out] IUnknown **view); + + [call_as(CreateView)] + HRESULT RemoteCreateView([in] IUnknown *unk_outer, + [in] REFIID riid, + [out] IUnknown **view, + [out] IErrorInfo **err_info); + + [local] + HRESULT GetView([in] HCHAPTER hchapter, + [in] REFIID riid, + [out] HCHAPTER *hchapter_src, + [out] IUnknown **view); + + [call_as(GetView)] + HRESULT RemoteGetView([in] HCHAPTER hchapter, + [in] REFIID riid, + [out] HCHAPTER *hchapter_src, + [out] IUnknown **view, + [out] IErrorInfo **err_info); +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9576
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msdaps/usrmarshal.c | 27 +++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/vwchp.idl | 47 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 include/vwchp.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 096b26967cc..53f134a6a6b 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1931,3 +1931,30 @@ HRESULT __RPC_STUB IRowsetView_GetView_Stub(IRowsetView* This, HCHAPTER hchapter wine_dbgstr_guid(riid), hchapter_src, view, err_info); return E_NOTIMPL; } + +HRESULT CALLBACK IViewChapter_GetSpecification_Proxy(IViewChapter* This, REFIID riid, IUnknown **rowset) +{ + FIXME("(%p)->(%s, %p): stub\n", This, wine_dbgstr_guid(riid), rowset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IViewChapter_GetSpecification_Stub(IViewChapter* This, + REFIID riid, IUnknown **rowset, IErrorInfo **err_info) +{ + FIXME("(%p)->(%s, %p, %p): stub\n", This, wine_dbgstr_guid(riid), rowset, err_info); + return E_NOTIMPL; +} + +HRESULT CALLBACK IViewChapter_OpenViewChapter_Proxy(IViewChapter* This, + HCHAPTER hsrc, HCHAPTER *view_hchapter) +{ + FIXME("(%p)->(%Ix, %p):stub\n", This, hsrc, view_hchapter); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IViewChapter_OpenViewChapter_Stub(IViewChapter* This, + HCHAPTER hsrc, HCHAPTER *view_hchapter, IErrorInfo **err_info) +{ + FIXME("(%p)->(%Ix, %p, %p):stub\n", This, hsrc, view_hchapter, err_info); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index de836b6067f..b42f67007b6 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -835,6 +835,7 @@ SOURCES = \ vsstyle.h \ vssym32.h \ vswriter.idl \ + vwchp.idl \ wbemcli.idl \ wbemdisp.idl \ wbemprov.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index 04c248b6ba7..5dad6dbaf07 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -53,6 +53,7 @@ typedef LONG_PTR DB_LRESERVE; #include "chprst.idl" #include "rstfnd.idl" #include "rstvw.idl" +#include "vwchp.idl" #include "cmdbas.idl" #include "cmdtxt.idl" #include "colinf.idl" diff --git a/include/vwchp.idl b/include/vwchp.idl new file mode 100644 index 00000000000..e867f31e6e0 --- /dev/null +++ b/include/vwchp.idl @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2025 Piotr Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a98-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IViewChapter : IUnknown +{ + [local] + HRESULT GetSpecification([in] REFIID riid, + [out] IUnknown **rowset); + + [call_as(GetSpecification)] + HRESULT RemoteGetSpecification([in] REFIID riid, + [out] IUnknown **rowset, + [out] IErrorInfo **err_info); + + [local] + HRESULT OpenViewChapter([in] HCHAPTER hsrc, + [out] HCHAPTER *view_hchapter); + + [call_as(OpenViewChapter)] + HRESULT RemoteOpenViewChapter([in] HCHAPTER hsrc, + [out] HCHAPTER *view_hchapter, + [out] IErrorInfo **err_info); +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9576
From: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msdaps/usrmarshal.c | 14 +++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/vwflt.idl | 50 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 include/vwflt.idl diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 53f134a6a6b..0029069f6c7 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1958,3 +1958,17 @@ HRESULT __RPC_STUB IViewChapter_OpenViewChapter_Stub(IViewChapter* This, FIXME("(%p)->(%Ix, %p, %p):stub\n", This, hsrc, view_hchapter, err_info); return E_NOTIMPL; } + +HRESULT CALLBACK IViewFilter_GetFilterBindings_Proxy(IViewFilter* This, + DBCOUNTITEM *bindings_count, DBBINDING **bindings) +{ + FIXME("(%p)->(%p, %p): stub\n", This, bindings_count, bindings); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IViewFilter_GetFilterBindings_Stub(IViewFilter* This, + DBCOUNTITEM *bindings_count, DBBINDING **bindings, IErrorInfo **err_info) +{ + FIXME("(%p)->(%p, %p, %p): stub\n", This, bindings_count, bindings, err_info); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index b42f67007b6..b8df29d4788 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -836,6 +836,7 @@ SOURCES = \ vssym32.h \ vswriter.idl \ vwchp.idl \ + vwflt.idl \ wbemcli.idl \ wbemdisp.idl \ wbemprov.idl \ diff --git a/include/oledb.idl b/include/oledb.idl index 5dad6dbaf07..c2e0f91f8f7 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -54,6 +54,7 @@ typedef LONG_PTR DB_LRESERVE; #include "rstfnd.idl" #include "rstvw.idl" #include "vwchp.idl" +#include "vwflt.idl" #include "cmdbas.idl" #include "cmdtxt.idl" #include "colinf.idl" diff --git a/include/vwflt.idl b/include/vwflt.idl new file mode 100644 index 00000000000..90cb4cd6b4a --- /dev/null +++ b/include/vwflt.idl @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2025 Piotr Caban + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep install +#endif + +[ + object, + uuid(0c733a9b-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IViewFilter : IUnknown +{ + [local] + HRESULT GetFilter([in] HACCESSOR haccessor, + [out] DBCOUNTITEM *rows, + [out] DBCOMPAREOP *compare[], + [out] void *criteria); + + [local] + HRESULT GetFilterBindings([out] DBCOUNTITEM *bindings_count, + [out] DBBINDING **bindings); + + [call_as(GetFilterBindings)] + HRESULT RemoteGetFilterBindings([in, out] DBCOUNTITEM *bindings_count, + [out, size_is(, (ULONG)*bindings_count)] DBBINDING **bindings, + [out] IErrorInfo **err_info); + + [local] + HRESULT SetFilter([in] HACCESSOR haccessor, + [in] DBCOUNTITEM rows, + [in] DBCOMPAREOP compare[], + [in] void *criteria); +} -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9576
participants (2)
-
Piotr Caban -
Piotr Caban (＠piotr)