include: Add cmdbas.idl.

dlls/msdaps/usrmarshal.c

@@ -600,3 +600,48 @@ HRESULT __RPC_STUB IAccessor_ReleaseAccessor_Stub(IAccessor* This, HACCESSOR hAc
     if(FAILED(hr)) GetErrorInfo(0, ppErrorInfoRem);
     return hr;
 }
+
+HRESULT CALLBACK ICommand_Cancel_Proxy(ICommand* This)
+{
+    FIXME("(%p): stub\n", This);
+    return E_NOTIMPL;
+}
+
+HRESULT __RPC_STUB ICommand_Cancel_Stub(ICommand* This, IErrorInfo **ppErrorInfoRem)
+{
+    FIXME("(%p)->(%p): stub\n", This, ppErrorInfoRem);
+    return E_NOTIMPL;
+}
+
+HRESULT CALLBACK ICommand_Execute_Proxy(ICommand* This, IUnknown *pUnkOuter, REFIID riid,
+                                        DBPARAMS *pParams, DBROWCOUNT *pcRowsAffected, IUnknown **ppRowset)
+{
+    FIXME("(%p)->(%p, %s, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid), pParams,
+          pcRowsAffected, ppRowset);
+    if(pParams) TRACE("params {%p, %d, %08lx}\n", pParams->pData, pParams->cParamSets, pParams->hAccessor);
+
+    return E_NOTIMPL;
+}
+
+HRESULT __RPC_STUB ICommand_Execute_Stub(ICommand* This, IUnknown *pUnkOuter, REFIID riid, HACCESSOR hAccessor,
+                                         DB_UPARAMS cParamSets, GUID *pGuid, ULONG ulGuidOffset, RMTPACK *pInputParams,
+                                         RMTPACK *pOutputParams, DBCOUNTITEM cBindings, DBBINDING *rgBindings,
+                                         DBSTATUS *rgStatus, DBROWCOUNT *pcRowsAffected, IUnknown **ppRowset)
+{
+    FIXME("(%p)->(%p, %s, %08lx, %d, %p, %d, %p, %p, %d, %p, %p, %p, %p): stub\n", This, pUnkOuter, debugstr_guid(riid),
+          hAccessor, cParamSets, pGuid, ulGuidOffset, pInputParams, pOutputParams, cBindings, rgBindings, rgStatus,
+          pcRowsAffected, ppRowset);
+    return E_NOTIMPL;
+}
+
+HRESULT CALLBACK ICommand_GetDBSession_Proxy(ICommand* This, REFIID riid, IUnknown **ppSession)
+{
+    FIXME("(%p)->(%s, %p): stub\n", This, debugstr_guid(riid), ppSession);
+    return E_NOTIMPL;
+}
+
+HRESULT __RPC_STUB ICommand_GetDBSession_Stub(ICommand* This, REFIID riid, IUnknown **ppSession, IErrorInfo **ppErrorInfoRem)
+{
+    FIXME("(%p)->(%s, %p, %p): stub\n", This, debugstr_guid(riid), ppSession, ppErrorInfoRem);
+    return E_NOTIMPL;
+}

include/Makefile.in

@@ -117,6 +117,7 @@ SRCDIR_INCLUDES = \
 	cguid.h \
 	cierror.h \
 	clusapi.h \
+	cmdbas.idl \
 	commctrl.h \
 	commctrl.rh \
 	commdlg.h \

include/cmdbas.idl

@@ -0,0 +1,62 @@
+/*
+ * 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(0c733a63-2a1c-11ce-ade5-00aa0044773d),
+    pointer_default(unique)
+]
+interface ICommand : IUnknown
+{
+    [local]
+    HRESULT Cancel();
+
+    [call_as(Cancel)]
+    HRESULT RemoteCancel([out] IErrorInfo **ppErrorInfoRem);
+
+    [local]
+    HRESULT Execute([in, annotation("__in_opt")] IUnknown *pUnkOuter,
+                    [in] REFIID riid,
+                    [in, out, annotation("__inout_opt")] DBPARAMS *pParams,
+                    [out, annotation("__out_opt")] DBROWCOUNT *pcRowsAffected,
+                    [out, iid_is(riid), annotation("__deref_opt_out")] IUnknown **ppRowset);
+
+    [call_as(Execute)]
+    HRESULT RemoteExecute([in] IUnknown *pUnkOuter,
+                          [in] REFIID riid,
+                          [in] HACCESSOR hAccessor,
+                          [in] DB_UPARAMS cParamSets,
+                          [in, unique] GUID *pGuid,
+                          [in] ULONG ulGuidOffset,
+                          [in, unique] RMTPACK *pInputParams,
+                          [in, out, unique] RMTPACK *pOutputParams,
+                          [in] DBCOUNTITEM cBindings,
+                          [in, unique, size_is(cBindings)] DBBINDING *rgBindings,
+                          [in, out, unique, size_is(cBindings)] DBSTATUS *rgStatus,
+                          [in, out, unique] DBROWCOUNT *pcRowsAffected,
+                          [in, out, unique, iid_is(riid)] IUnknown **ppRowset);
+
+    [local]
+    HRESULT GetDBSession([in] REFIID riid,
+                         [out, iid_is(riid), annotation("__deref_out_opt")] IUnknown **ppSession);
+
+    [call_as(GetDBSession)]
+    HRESULT RemoteGetDBSession([in] REFIID riid,
+                               [out, iid_is(riid)] IUnknown **ppSession,
+                               [out] IErrorInfo **ppErrorInfoRem);
+};

include/oledb.idl

@@ -29,6 +29,8 @@ import "propidl.idl";
 import "urlmon.idl";
 
 typedef ULONG DBBYTEOFFSET;
+typedef LONG  DBROWOFFSET;
+typedef LONG  DBROWCOUNT;
 typedef ULONG DBCOUNTITEM;
 typedef ULONG DBLENGTH;
 typedef ULONG DBORDINAL;
@@ -40,6 +42,7 @@ typedef LONG  DB_LPARAMS;
 #include "dbs.idl"
 
 #include "access.idl"
+#include "cmdbas.idl"
 #include "dbccmd.idl"
 #include "dbcses.idl"
 #include "dbprop.idl"

tools/make_makefiles

@@ -113,6 +113,7 @@ my %private_idl_headers = (
     "axcore.idl" => 1,
     "axextend.idl" => 1,
     "binres.idl" => 1,
+    "cmdbas.idl" => 1,
     "crtrow.idl" => 1,
     "dbccmd.idl" => 1,
     "dbcses.idl" => 1,