transactd 2.4.3 → 2.4.4

data/source/global/tdclatl/Record.cpp

@@ -37,6 +37,21 @@ short CRecord::GetFieldNum(VARIANT* Index)
     return index;
 }
 
+STDMETHODIMP CRecord::InterfaceSupportsErrorInfo(REFIID riid)
+{
+	static const IID* const arr[] = 
+	{
+		&IID_IRecord
+	};
+
+	for (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)
+	{
+		if (InlineIsEqualGUID(*arr[i],riid))
+			return S_OK;
+	}
+	return S_FALSE;
+}
+
 STDMETHODIMP CRecord::get_Size(short* retVal)
 {
     *retVal = (short)m_rec->size();
@@ -79,6 +94,21 @@ STDMETHODIMP CRecord::get_IsInvalidRecord(VARIANT_BOOL* retVal)
 
 
 //---------------------------------------------------------------------
+STDMETHODIMP CWritableRecord::InterfaceSupportsErrorInfo(REFIID riid)
+{
+	static const IID* const arr[] = 
+	{
+		&IID_IWritableRecord
+	};
+
+	for (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)
+	{
+		if (InlineIsEqualGUID(*arr[i],riid))
+			return S_OK;
+	}
+	return S_FALSE;
+}
+
 void CWritableRecord::FinalRelease()
 {
     if (m_fieldDefsObj != NULL)

data/source/global/tdclatl/Record.h

@@ -28,6 +28,7 @@ class CFieldDefs;
 class ATL_NO_VTABLE CRecord
     : public CComObjectRootEx<CComSingleThreadModel>,
       public CComCoClass<CRecord, &CLSID_Record>,
+	  public ISupportErrorInfo,
       public IDispatchImpl<IRecord, &IID_IRecord, &LIBID_transactd,
                            /* wMajor = */ 1, /* wMinor = */ 0>
 {
@@ -42,7 +43,10 @@ public:
     BEGIN_COM_MAP(CRecord)
     COM_INTERFACE_ENTRY(IRecord)
     COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
     END_COM_MAP()
+// ISupportsErrorInfo
+	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
@@ -59,6 +63,7 @@ public:
 class ATL_NO_VTABLE CWritableRecord
     : public CComObjectRootEx<CComSingleThreadModel>,
       public CComCoClass<CWritableRecord, &CLSID_Record>,
+	  public ISupportErrorInfo,
       public IDispatchImpl<IWritableRecord, &IID_IWritableRecord,
                            &LIBID_transactd, /* wMajor = */ 1, /* wMinor = */ 0>
 {
@@ -74,7 +79,10 @@ public:
     BEGIN_COM_MAP(CWritableRecord)
     COM_INTERFACE_ENTRY(IWritableRecord)
     COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
     END_COM_MAP()
+// ISupportsErrorInfo
+	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 

data/source/global/tdclatl/Recordset.cpp

@@ -51,7 +51,22 @@ void CARecordset::setResult(IRecordset** retVal)
     this->QueryInterface(IID_IRecordset, (void**)retVal);
 }
 
-STDMETHODIMP CARecordset::Record(unsigned long Index, IRecord** retVal)
+STDMETHODIMP CARecordset::InterfaceSupportsErrorInfo(REFIID riid)
+{
+	static const IID* const arr[] = 
+	{
+		&IID_IRecordset
+	};
+
+	for (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)
+	{
+		if (InlineIsEqualGUID(*arr[i],riid))
+			return S_OK;
+	}
+	return S_FALSE;
+}
+
+STDMETHODIMP CARecordset::get_Record(unsigned long Index, IRecord** retVal)
 {
     if (Index >= 0 && Index < m_rs->size())
     {
@@ -81,12 +96,12 @@ STDMETHODIMP CARecordset::Record(unsigned long Index, IRecord** retVal)
 
 STDMETHODIMP CARecordset::First(IRecord** retVal)
 {
-    return Record(0, retVal);
+    return get_Record(0, retVal);
 }
 
 STDMETHODIMP CARecordset::Last(IRecord** retVal)
 {
-    return Record((short)m_rs->size() - 1, retVal);
+    return get_Record((short)m_rs->size() - 1, retVal);
 }
 
 STDMETHODIMP CARecordset::Top(unsigned long Num, IRecordset** retVal)

data/source/global/tdclatl/Recordset.h

@@ -29,6 +29,7 @@ class CFieldDefs;
 class ATL_NO_VTABLE CARecordset
     : public CComObjectRootEx<CComSingleThreadModel>,
       public CComCoClass<CARecordset, &CLSID_Recordset>,
+	  public ISupportErrorInfo,
       public IDispatchImpl<IRecordset, &IID_IRecordset, &LIBID_transactd,
                            /* wMajor = */ 1, /* wMinor = */ 0>
 {
@@ -51,7 +52,10 @@ public:
     BEGIN_COM_MAP(CARecordset)
     COM_INTERFACE_ENTRY(IRecordset)
     COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
     END_COM_MAP()
+// ISupportsErrorInfo
+	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
@@ -60,7 +64,7 @@ public:
     void FinalRelease();
 
 public:
-    STDMETHOD(Record)(unsigned long Index, IRecord** retVal);
+    STDMETHOD(get_Record)(unsigned long Index, IRecord** retVal);
     STDMETHOD(First)(IRecord** retVal);
     STDMETHOD(Last)(IRecord** retVal);
     STDMETHOD(Top)(unsigned long Num, IRecordset** retVal);

data/source/global/tdclatl/RecordsetQuery.cpp

@@ -18,6 +18,20 @@
 =================================================================*/
 #include "stdafx.h"
 #include "RecordsetQuery.h"
+STDMETHODIMP CRecordsetQuery::InterfaceSupportsErrorInfo(REFIID riid)
+{
+	static const IID* const arr[] = 
+	{
+		&IID_IRecordsetQuery
+	};
+
+	for (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)
+	{
+		if (InlineIsEqualGUID(*arr[i],riid))
+			return S_OK;
+	}
+	return S_FALSE;
+}
 
 void CRecordsetQuery::setResult(IRecordsetQuery** retVal)
 {
@@ -94,7 +108,7 @@ STDMETHODIMP CSortFields::get_Size(int* Value)
     return S_OK;
 }
 
-STDMETHODIMP CSortFields::Item(int Index, ISortField** retVal)
+STDMETHODIMP CSortFields::get_Item(int Index, ISortField** retVal)
 {
     CComObject<CSortField>* obj;
 

data/source/global/tdclatl/RecordsetQuery.h

@@ -27,6 +27,7 @@ using namespace ATL;
 class ATL_NO_VTABLE CRecordsetQuery
     : public CComObjectRootEx<CComSingleThreadModel>,
       public CComCoClass<CRecordsetQuery, &CLSID_RecordsetQuery>,
+	  public ISupportErrorInfo,
       public IDispatchImpl<IRecordsetQuery, &IID_IRecordsetQuery,
                            &LIBID_transactd, /*wMajor =*/1, /*wMinor =*/0>
 {
@@ -42,7 +43,10 @@ public:
     BEGIN_COM_MAP(CRecordsetQuery)
     COM_INTERFACE_ENTRY(IRecordsetQuery)
     COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
     END_COM_MAP()
+// ISupportsErrorInfo
+	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
@@ -118,7 +122,7 @@ public:
 public:
     STDMETHOD(Add)(BSTR Name, VARIANT_BOOL Asc);
     STDMETHOD(get_Size)(int* Value);
-    STDMETHOD(Item)(int Index, ISortField** retVal);
+    STDMETHOD(get_Item)(int Index, ISortField** retVal);
     STDMETHOD(Clear)();
 };
 

data/source/global/tdclatl/Table.cpp

@@ -28,6 +28,21 @@
 
 using namespace bzs::db::protocol::tdap;
 
+STDMETHODIMP CTableTd::InterfaceSupportsErrorInfo(REFIID riid)
+{
+	static const IID* const arr[] = 
+	{
+		&IID_ITable
+	};
+
+	for (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)
+	{
+		if (InlineIsEqualGUID(*arr[i],riid))
+			return S_OK;
+	}
+	return S_FALSE;
+}
+
 short CTableTd::GetFieldNum(VARIANT* Index)
 {
     short index = -1;
@@ -522,6 +537,14 @@ STDMETHODIMP CTableTd::TdapErr(OLE_HANDLE hWnd, BSTR* Value)
     return S_OK;
 }
 
+STDMETHODIMP CTableTd::StatMsg(BSTR* Value)
+{
+    wchar_t tmp[1024] = { NULL };
+    m_tb->tdapErr(0, tmp);
+    *Value = ::SysAllocString(tmp);
+    return S_OK;
+}
+
 STDMETHODIMP CTableTd::Unlock_()
 {
     m_tb->unlock();
@@ -617,6 +640,7 @@ STDMETHODIMP CTableTd::SetQuery(IQueryBase* Value, VARIANT_BOOL ServerPrepare, I
 {
     if (Value)
     {
+        *retVal = NULL;
         CQueryBase* p = dynamic_cast<CQueryBase*>(Value);
         if (p)
         {
@@ -633,13 +657,15 @@ STDMETHODIMP CTableTd::SetQuery(IQueryBase* Value, VARIANT_BOOL ServerPrepare, I
                 rsObj->QueryInterface(IID_IPreparedQuery, (void**)&pd);
                 _ASSERTE(pd);
                 *retVal = pd;
-                return S_OK;
-            }else
+                
+            }
+            return S_OK;
+            /*else
             {
                 _TCHAR buf[1024];
                 client::table::tdapErr(NULL, m_tb->stat(), m_tb->tableDef()->tableName(), buf);
                 return Error(buf, IID_ITable);
-            }
+            }*/
         }
     }
     return S_FALSE;

data/source/global/tdclatl/Table.h

@@ -31,6 +31,7 @@ void __stdcall onRecordCount(bzs::db::protocol::tdap::client::table* tb,
 class ATL_NO_VTABLE CTableTd
     : public CComObjectRootEx<CComSingleThreadModel>,
       public CComCoClass<CTableTd, &CLSID_Table>,
+	  public ISupportErrorInfo,
       public IDispatchImpl<ITable, &IID_ITable, &LIBID_transactd,
                            /* wMajor = */ 1, /* wMinor = */ 0>,
       public IConnectionPointContainerImpl<CTableTd>,
@@ -56,7 +57,10 @@ public:
     COM_INTERFACE_ENTRY(ITable)
     COM_INTERFACE_ENTRY(IDispatch)
     COM_INTERFACE_ENTRY(IConnectionPointContainer)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
     END_COM_MAP()
+// ISupportsErrorInfo
+	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
 
     BEGIN_CONNECTION_POINT_MAP(CTableTd)
     CONNECTION_POINT_ENTRY(__uuidof(_ITableEvents))
@@ -139,6 +143,7 @@ public:
     STDMETHOD(SetAccessRights)(unsigned char curd);
     STDMETHOD(SetOwnerName)(BSTR* name, short enctype);
     STDMETHOD(TdapErr)(OLE_HANDLE hWnd, BSTR* Value);
+    STDMETHOD(StatMsg)(BSTR* Value);
     STDMETHOD(Unlock_)();
     STDMETHOD(get_BlobFieldUsed)(VARIANT_BOOL* Value);
     STDMETHOD(get_BookmarkFindCurrent)(IBookmark** Value);

data/source/global/tdclatl/TableDef.cpp

@@ -22,6 +22,21 @@
 #include "KeyDef.h"
 #include "Flags.h"
 
+STDMETHODIMP CTableDef::InterfaceSupportsErrorInfo(REFIID riid)
+{
+	static const IID* const arr[] = 
+	{
+		&IID_ITableDef
+	};
+
+	for (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)
+	{
+		if (InlineIsEqualGUID(*arr[i],riid))
+			return S_OK;
+	}
+	return S_FALSE;
+}
+
 STDMETHODIMP CTableDef::get_FieldDef(short Index, IFieldDef** Value)
 {
     if (Index >= (*m_tabledefPtr)->fieldCount)

data/source/global/tdclatl/TableDef.h

@@ -27,6 +27,7 @@ using namespace ATL;
 class ATL_NO_VTABLE CTableDef
     : public CComObjectRootEx<CComSingleThreadModel>,
       public CComCoClass<CTableDef, &CLSID_TableDef>,
+	  public ISupportErrorInfo,
       public IDispatchImpl<ITableDef, &IID_ITableDef, &LIBID_transactd,
                            /* wMajor = */ 1, /* wMinor = */ 0>
 {
@@ -37,7 +38,10 @@ public:
     BEGIN_COM_MAP(CTableDef)
     COM_INTERFACE_ENTRY(ITableDef)
     COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
     END_COM_MAP()
+// ISupportsErrorInfo
+	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 

data/source/global/tdclatl/activeTable.cpp

@@ -30,6 +30,21 @@
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
 
+STDMETHODIMP CActiveTable::InterfaceSupportsErrorInfo(REFIID riid)
+{
+	static const IID* const arr[] = 
+	{
+		&IID_IActiveTable
+	};
+
+	for (int i=0; i < sizeof(arr) / sizeof(arr[0]); i++)
+	{
+		if (InlineIsEqualGUID(*arr[i],riid))
+			return S_OK;
+	}
+	return S_FALSE;
+}
+
 void CActiveTable::setResult(IActiveTable** retVal)
 {
     this->QueryInterface(IID_IActiveTable, (void**)retVal);

data/source/global/tdclatl/activeTable.h

@@ -29,6 +29,7 @@ class CARecordset;
 class ATL_NO_VTABLE CActiveTable
     : public CComObjectRootEx<CComSingleThreadModel>,
       public CComCoClass<CActiveTable, &CLSID_ActiveTable>,
+	  public ISupportErrorInfo,
       public IDispatchImpl<IActiveTable, &IID_IActiveTable, &LIBID_transactd,
                            /* wMajor = */ 1, /* wMinor = */ 0>
 {
@@ -45,7 +46,10 @@ public:
     BEGIN_COM_MAP(CActiveTable)
     COM_INTERFACE_ENTRY(IActiveTable)
     COM_INTERFACE_ENTRY(IDispatch)
+    COM_INTERFACE_ENTRY(ISupportErrorInfo)
     END_COM_MAP()
+// ISupportsErrorInfo
+	STDMETHOD(InterfaceSupportsErrorInfo)(REFIID riid);
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 

data/source/global/tdclatl/tdclatl.idl

@@ -507,7 +507,9 @@ interface IDatabase : IDispatch
   HRESULT _stdcall DisconnectForReconnectTest([out, retval] VARIANT_BOOL* Value);
   [id(0x000000F8)]
   HRESULT _stdcall Reconnect([out, retval] VARIANT_BOOL* Value);
-  
+  [id(0x000000F9)]
+  HRESULT _stdcall StatMsg([out, retval] BSTR* Value);
+
 };
 
 
@@ -572,7 +574,9 @@ interface IDbDef : IDispatch
   HRESULT _stdcall TdapErr([in]OLE_HANDLE hWnd, [out, retval] BSTR* Value);
   [id(0x000000DF)]
   HRESULT _stdcall ValidateTableDef([in]short TableIndex, [out, retval] short* Value);
-  
+  [id(0x000000E0)]
+  HRESULT _stdcall StatMsg([out, retval] BSTR* Value);
+
 };
 [
 	object,
@@ -751,6 +755,8 @@ interface ITable : IDispatch
   HRESULT _stdcall BookmarkLen([out, retval] unsigned short* Value);
   [propget, id(0x000000E4)]
   HRESULT _stdcall Bookmarks([in] long index, [out, retval] IBookmark** Value);
+  [id(0x000000E5)]
+  HRESULT _stdcall StatMsg([out, retval] BSTR* Value);
 
   
 
@@ -934,7 +940,7 @@ interface IKeyDef : IDispatch
   HRESULT _stdcall SegmentCount([out, retval] unsigned char* Value);
   [propput, id(0x00000001)]
   HRESULT _stdcall SegmentCount([in] unsigned char Value);
-  [id(0x000000C9)]
+  [propget, id(0x00000000)]
   HRESULT _stdcall Segments([in] short Index, [out, retval] IKeySegment** Value);
 
 };
@@ -947,9 +953,9 @@ interface IKeyDef : IDispatch
 ]
 interface IFlags : IDispatch
 {
-  [propget, id(0x00000001)]
+  [propget, id(0x00000000)]
   HRESULT _stdcall Bits([in] short Index, [out, retval] VARIANT_BOOL* Value);
-  [propput, id(0x00000001)]
+  [propput, id(0x00000000)]
   HRESULT _stdcall Bits([in] short Index, [in] VARIANT_BOOL Value);
   [id(0x000000C9)]
   HRESULT _stdcall All([out] unsigned short* Value);
@@ -1211,7 +1217,7 @@ interface IActiveTable : IDispatch
 interface IRecordset : IDispatch
 {
 
-  [id(0x0000002)]
+  [propget,id(0x0000000)]
   HRESULT _stdcall Record([in] unsigned long Index, [out, retval] IRecord** retVal);
   [id(0x0000003)]
   HRESULT _stdcall First([out, retval] IRecord** retVal);
@@ -1278,7 +1284,7 @@ interface IRecord : IDispatch
 {
   [propget, id(0x0000001)]
   HRESULT _stdcall Size([out, retval] short* retVal);
-  [propget, id(0x0000002)]
+  [propget, id(0x0000000)]
   HRESULT _stdcall Field([in] VARIANT Index, [out, retval] IField** retVal);
   [propget, id(0x0000003)]
   HRESULT _stdcall IsInvalidRecord( [out, retval] VARIANT_BOOL* retVal);
@@ -1368,7 +1374,7 @@ interface IFieldDefs : IDispatch
 {
   [id(0x0000001)]
   HRESULT _stdcall IndexByName([in] BSTR Name, [out, retval] short* retVal);
-  [propget, id(0x0000002)]
+  [propget, id(0x0000000)]
   HRESULT _stdcall FieldDef([in] VARIANT Name, [out, retval] IFieldDef** retVal);
   [propget, id(0x0000003)]
   HRESULT _stdcall Size([out, retval] short* retVal);
@@ -1408,7 +1414,7 @@ interface ISortFields : IDispatch
   HRESULT _stdcall Add([in] BSTR Name, [in] VARIANT_BOOL asc);
   [propget, id(2)]
   HRESULT _stdcall Size([out, retval] int* Value);
-  [id(3)]
+  [propget, id(0)]
   HRESULT _stdcall Item([in] int index, [out, retval] ISortField** retVal);
   [id(4)]
   HRESULT _stdcall Clear();
@@ -1434,7 +1440,7 @@ interface IFieldNames : IDispatch
   HRESULT _stdcall Count([out, retval] int* Value);
   [id(3)]
   HRESULT _stdcall addValue([in] BSTR val);
-  [propget, id(4)]
+  [propget, id(0)]
   HRESULT _stdcall Value([in] int index, [out, retval] BSTR* retVal);
   [id(5)]
   HRESULT _stdcall addValues([in] BSTR val, [in] BSTR delm);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transactd
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.4.4
 platform: ruby
 authors:
 - BizStation Corp.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-08 00:00:00.000000000 Z
 dependencies: []
 description: Transactd client for ruby gem
 email: transactd@bizstation.jp