Module: wine Branch: master Commit: 64dc7306d880b85de1dcd5d084547e889c45c728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64dc7306d880b85de1dcd5d084...
Author: Huw Davies huw@codeweavers.com Date: Tue Oct 27 10:11:36 2009 +0000
include: Add rstinf.idl.
---
dlls/msdaps/usrmarshal.c | 51 ++++++++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/rstinf.idl | 58 ++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 5 files changed, 112 insertions(+), 0 deletions(-)
diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 885a463..6ed855a 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -601,6 +601,57 @@ HRESULT __RPC_STUB IAccessor_ReleaseAccessor_Stub(IAccessor* This, HACCESSOR hAc return hr; }
+HRESULT CALLBACK IRowsetInfo_GetProperties_Proxy(IRowsetInfo* This, const ULONG cPropertyIDSets, const DBPROPIDSET rgPropertyIDSets[], + ULONG *pcPropertySets, DBPROPSET **prgPropertySets) +{ + ULONG i; + + FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + + for(i = 0; i < cPropertyIDSets; i++) + { + int j; + TRACE("%d: %s %d props\n", i, debugstr_guid(&rgPropertyIDSets[i].guidPropertySet), rgPropertyIDSets[i].cPropertyIDs); + for(j = 0; j < rgPropertyIDSets[i].cPropertyIDs; j++) + TRACE("\t%d: prop id %d\n", j, rgPropertyIDSets[i].rgPropertyIDs[j]); + } + + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowsetInfo_GetProperties_Stub(IRowsetInfo* This, ULONG cPropertyIDSets, const DBPROPIDSET *rgPropertyIDSets, + ULONG *pcPropertySets, DBPROPSET **prgPropertySets, IErrorInfo **ppErrorInfoRem) +{ + FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets, ppErrorInfoRem); + + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowsetInfo_GetReferencedRowset_Proxy(IRowsetInfo* This, DBORDINAL iOrdinal, REFIID riid, IUnknown **ppReferencedRowset) +{ + FIXME("(%p)->(%d, %s, %p): stub\n", This, iOrdinal, debugstr_guid(riid), ppReferencedRowset); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowsetInfo_GetReferencedRowset_Stub(IRowsetInfo* This, DBORDINAL iOrdinal, REFIID riid, IUnknown **ppReferencedRowset, + IErrorInfo **ppErrorInfoRem) +{ + FIXME("(%p)->(%d, %s, %p, %p): stub\n", This, iOrdinal, debugstr_guid(riid), ppReferencedRowset, ppErrorInfoRem); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowsetInfo_GetSpecification_Proxy(IRowsetInfo* This, REFIID riid, IUnknown **ppSpecification) +{ + FIXME("(%p)->(%s, %p): stub\n", This, debugstr_guid(riid), ppSpecification); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowsetInfo_GetSpecification_Stub(IRowsetInfo* This, REFIID riid, IUnknown **ppSpecification, IErrorInfo **ppErrorInfoRem) +{ + FIXME("(%p)->(%s, %p, %p): stub\n", This, debugstr_guid(riid), ppSpecification, ppErrorInfoRem); + return E_NOTIMPL; +} + HRESULT CALLBACK ICommand_Cancel_Proxy(ICommand* This) { FIXME("(%p): stub\n", This); diff --git a/include/Makefile.in b/include/Makefile.in index bfcae56..f799f45 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -402,6 +402,7 @@ SRCDIR_INCLUDES = \ rpcndr.h \ rpcnterr.h \ rpcproxy.h \ + rstinf.idl \ rtutils.h \ scarderr.h \ schannel.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 6fee519..3ef9241 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -42,6 +42,7 @@ typedef LONG DB_LPARAMS; #include "dbs.idl"
#include "access.idl" +#include "rstinf.idl" #include "cmdbas.idl" #include "cmdtxt.idl" #include "dbccmd.idl" diff --git a/include/rstinf.idl b/include/rstinf.idl new file mode 100644 index 0000000..7c9779b --- /dev/null +++ b/include/rstinf.idl @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2009 Huw Davies + * + * 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 + */ + +[ + object, + uuid(0c733a55-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowsetInfo : IUnknown +{ + [local] + HRESULT GetProperties([in] const ULONG cPropertyIDSets, + [in, size_is(cPropertyIDSets), annotation("__in_ecount_opt(cPropertyIDSets)")] const DBPROPIDSET rgPropertyIDSets[], + [in, out, annotation("__out")] ULONG *pcPropertySets, + [out, size_is(,*pcPropertySets), annotation("__deref_out_ecount_opt(*pcPropertySets)")] DBPROPSET **prgPropertySets); + + [call_as(GetProperties)] + HRESULT RemoteGetProperties([in] ULONG cPropertyIDSets, + [in, unique, size_is(cPropertyIDSets)] const DBPROPIDSET *rgPropertyIDSets, + [in, out] ULONG *pcPropertySets, + [out, size_is(,*pcPropertySets)] DBPROPSET **prgPropertySets, + [out] IErrorInfo **ppErrorInfoRem); + + [local] + HRESULT GetReferencedRowset([in] DBORDINAL iOrdinal, + [in, annotation("__in")] REFIID riid, + [out, iid_is(riid), annotation("deref_out_opt")] IUnknown **ppReferencedRowset); + + [call_as(GetReferencedRowset)] + HRESULT RemoteGetReferencedRowset([in] DBORDINAL iOrdinal, + [in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppReferencedRowset, + [out] IErrorInfo **ppErrorInfoRem); + [local] + HRESULT GetSpecification([in, annotation("__in")] REFIID riid, + [out, iid_is(riid), annotation("__deref_out_opt")] IUnknown **ppSpecification); + + [call_as(GetSpecification)] + HRESULT RemoteGetSpecification([in] REFIID riid, + [out, iid_is(riid)] IUnknown **ppSpecification, + [out] IErrorInfo **ppErrorInfoRem); + +} diff --git a/tools/make_makefiles b/tools/make_makefiles index 9c6a89e..fbf3150 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -125,6 +125,7 @@ my %private_idl_headers = ( "devenum.idl" => 1, "dyngraph.idl" => 1, "opnrst.idl" => 1, + "rstinf.idl" => 1, "sesprp.idl" => 1, "vmrender.idl" => 1, "wine/wined3d.idl" => 1,