transactd 1.2.0 → 2.0.0

data/source/global/tdclatl/DbDef.cpp

@@ -12,8 +12,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include "stdafx.h"
@@ -26,8 +26,6 @@
 
 using namespace bzs::db::protocol::tdap;
 
-
-
 STDMETHODIMP CDbDef::get_TableCount(short* Value)
 {
     *Value = m_dbDef->tableCount();
@@ -39,19 +37,19 @@ STDMETHODIMP CDbDef::TableDef(short Index, ITableDef** Value)
     if (!m_dbDef->tableDefs(Index))
         return Error("Invalid index.", IID_IDbDef);
 
-    CComObject<CTableDef> *piObj = NULL;
+    CComObject<CTableDef>* piObj = NULL;
     CComObject<CTableDef>::CreateInstance(&piObj);
-	if (piObj)
-	{
-		piObj->m_tabledefPtr = m_dbDef->tableDefPtr(Index);
-		ITableDef* tbd;
-		piObj->QueryInterface(IID_ITableDef, (void**)&tbd);
-		_ASSERTE(tbd);
-		*Value = tbd;
-	}
-	else
-		*Value = 0;
-	
+    if (piObj)
+    {
+        piObj->m_tabledefPtr = m_dbDef->tableDefPtr(Index);
+        ITableDef* tbd;
+        piObj->QueryInterface(IID_ITableDef, (void**)&tbd);
+        _ASSERTE(tbd);
+        *Value = tbd;
+    }
+    else
+        *Value = 0;
+
     return S_OK;
 }
 
@@ -73,7 +71,6 @@ STDMETHODIMP CDbDef::InsertTable(short index, ITableDef** Param1)
     m_dbDef->insertTable(&TableDef);
     this->TableDef(index, Param1);
     return S_OK;
-
 }
 
 STDMETHODIMP CDbDef::DeleteField(short TableIndex, short FieldIndex)
@@ -88,47 +85,52 @@ STDMETHODIMP CDbDef::DeleteKey(short TableIndex, short KeyIndex)
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::InsertField(short TableIndex, short InsertIndex, IFieldDef** Param3)
+STDMETHODIMP CDbDef::InsertField(short TableIndex, short InsertIndex,
+                                 IFieldDef** Param3)
 
 {
     fielddef* fdPtr = m_dbDef->insertField(TableIndex, InsertIndex);
     if (!fdPtr)
         return Error("Invalid index.", IID_IDbDef);
 
-    CComObject<CFieldDef> *piObj;
+    CComObject<CFieldDef>* piObj;
     CComObject<CFieldDef>::CreateInstance(&piObj);
-	if (piObj)
-	{
-		piObj->m_tabledefPtr = m_dbDef->tableDefPtr(TableIndex);
-		piObj->m_index = InsertIndex;
-		IFieldDef* fd;
-		piObj->QueryInterface(IID_IFieldDef, (void**)&fd);
-		_ASSERTE(fd);
-		*Param3 = piObj;
-	}else
-		*Param3 = 0;
-		
+    if (piObj)
+    {
+        piObj->m_tabledefPtr = m_dbDef->tableDefPtr(TableIndex);
+        piObj->m_index = InsertIndex;
+        IFieldDef* fd;
+        piObj->QueryInterface(IID_IFieldDef, (void**)&fd);
+        _ASSERTE(fd);
+        *Param3 = piObj;
+    }
+    else
+        *Param3 = 0;
+
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::InsertKey(short TableIndex, short InsertIndex, IKeyDef** Param3)
+STDMETHODIMP CDbDef::InsertKey(short TableIndex, short InsertIndex,
+                               IKeyDef** Param3)
 
 {
     keydef* keyPtr = m_dbDef->insertKey(TableIndex, InsertIndex);
     if (!keyPtr)
         return Error("Invalid index.", IID_IDbDef);
-    CComObject<CKeyDef> *piObj;
+    CComObject<CKeyDef>* piObj;
     CComObject<CKeyDef>::CreateInstance(&piObj);
-	if (piObj)
-	{
-   		piObj->m_tabledefPtr = m_dbDef->tableDefPtr(TableIndex);;
-		piObj->m_index = InsertIndex;
-		IKeyDef* kb;
-		piObj->QueryInterface(IID_IKeyDef, (void**)&kb);
-		_ASSERTE(kb);
-		*Param3 = piObj;
-	}else
-		*Param3 = 0;
+    if (piObj)
+    {
+        piObj->m_tabledefPtr = m_dbDef->tableDefPtr(TableIndex);
+        ;
+        piObj->m_index = InsertIndex;
+        IKeyDef* kb;
+        piObj->QueryInterface(IID_IKeyDef, (void**)&kb);
+        _ASSERTE(kb);
+        *Param3 = piObj;
+    }
+    else
+        *Param3 = 0;
     return S_OK;
 }
 
@@ -156,74 +158,77 @@ STDMETHODIMP CDbDef::TableNumByName(BSTR Name, short* Value)
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::FieldNumByName( short TableIndex, BSTR Name, short* Value)
+STDMETHODIMP CDbDef::FieldNumByName(short TableIndex, BSTR Name, short* Value)
 {
     *Value = m_dbDef->fieldNumByName(TableIndex, Name);
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::FieldValidLength( eFieldQuery Query, short FieldType, unsigned int* Value)
+STDMETHODIMP CDbDef::FieldValidLength(eFieldQuery Query, short FieldType,
+                                      unsigned int* Value)
 {
-    *Value = m_dbDef->fieldValidLength((client::eFieldQuery)Query, (uchar_td)FieldType);
+    *Value = m_dbDef->fieldValidLength((client::eFieldQuery)Query,
+                                       (uchar_td)FieldType);
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::FindKeynumByFieldNum( short TableIndex, short Index, unsigned short* Value)
+STDMETHODIMP CDbDef::FindKeynumByFieldNum(short TableIndex, short Index,
+                                          unsigned short* Value)
 {
     *Value = m_dbDef->findKeynumByFieldNum(TableIndex, Index);
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::GetRecordLen( short TableIndex, unsigned short* Value)
+STDMETHODIMP CDbDef::GetRecordLen(short TableIndex, unsigned short* Value)
 {
     *Value = m_dbDef->getRecordLen(TableIndex);
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::get_OpenMode( eOpenMode* Value)
+STDMETHODIMP CDbDef::get_OpenMode(eOpenMode* Value)
 {
     *Value = (eOpenMode)m_dbDef->openMode();
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::PopBackup( short TableIndex)
+STDMETHODIMP CDbDef::PopBackup(short TableIndex)
 {
-	m_dbDef->popBackup(TableIndex);
+    m_dbDef->popBackup(TableIndex);
     return S_OK;
 }
-STDMETHODIMP CDbDef::PushBackup( short TableIndex)
+STDMETHODIMP CDbDef::PushBackup(short TableIndex)
 {
-	m_dbDef->pushBackup(TableIndex);
+    m_dbDef->pushBackup(TableIndex);
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::RenumberTable( short OldIndex, short NewIndex)
+STDMETHODIMP CDbDef::RenumberTable(short OldIndex, short NewIndex)
 {
-	m_dbDef->renumberTable(OldIndex, NewIndex);
+    m_dbDef->renumberTable(OldIndex, NewIndex);
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::Reopen( eOpenMode Mode)
+STDMETHODIMP CDbDef::Reopen(eOpenMode Mode)
 {
-	m_dbDef->reopen((char_td)Mode);
+    m_dbDef->reopen((char_td)Mode);
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::get_Version( int* Value)
+STDMETHODIMP CDbDef::get_Version(int* Value)
 {
-	*Value = m_dbDef->version();
+    *Value = m_dbDef->version();
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::put_Version( int Value)
+STDMETHODIMP CDbDef::put_Version(int Value)
 {
-	m_dbDef->setVersion(Value);
+    m_dbDef->setVersion(Value);
     return S_OK;
 }
 
-STDMETHODIMP CDbDef::get_Stat( eStatus* Value)
+STDMETHODIMP CDbDef::get_Stat(eStatus* Value)
 {
-	*Value = (eStatus)m_dbDef->stat();
+    *Value = (eStatus)m_dbDef->stat();
     return S_OK;
 }
 
@@ -231,7 +236,7 @@ STDMETHODIMP CDbDef::TdapErr(OLE_HANDLE hWnd, BSTR* Value)
 {
     if (Value)
     {
-        wchar_t tmp[512] = {NULL};
+        wchar_t tmp[512] = { NULL };
         m_dbDef->tdapErr((HWND)hWnd, tmp);
         *Value = ::SysAllocString(tmp);
     }
@@ -239,4 +244,3 @@ STDMETHODIMP CDbDef::TdapErr(OLE_HANDLE hWnd, BSTR* Value)
         m_dbDef->tdapErr((HWND)hWnd);
     return S_OK;
 }
-

data/source/global/tdclatl/DbDef.h

@@ -13,67 +13,67 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include "resource.h"
 #include "tdclatl_i.h"
 #include <bzs/db/protocol/tdap/client/dbDef.h>
 
-
 using namespace ATL;
 
-
-
-class ATL_NO_VTABLE CDbDef : public CComObjectRootEx<CComSingleThreadModel>, public CComCoClass<CDbDef, &CLSID_DbDef>,
-    public IDispatchImpl<IDbDef, &IID_IDbDef, &LIBID_transactd, /* wMajor = */ 1, /* wMinor = */ 0>
+class ATL_NO_VTABLE CDbDef
+    : public CComObjectRootEx<CComSingleThreadModel>,
+      public CComCoClass<CDbDef, &CLSID_DbDef>,
+      public IDispatchImpl<IDbDef, &IID_IDbDef, &LIBID_transactd,
+                           /* wMajor = */ 1, /* wMinor = */ 0>
 {
-    
 
 public:
-    CDbDef():m_dbDef(NULL) {}
+    CDbDef() : m_dbDef(NULL) {}
 
- 	bzs::db::protocol::tdap::client::dbdef* m_dbDef;
-    
-    BEGIN_COM_MAP(CDbDef) 
-		COM_INTERFACE_ENTRY(IDbDef) 
-		COM_INTERFACE_ENTRY(IDispatch) 
-	END_COM_MAP()
+    bzs::db::protocol::tdap::client::dbdef* m_dbDef;
+
+    BEGIN_COM_MAP(CDbDef)
+    COM_INTERFACE_ENTRY(IDbDef)
+    COM_INTERFACE_ENTRY(IDispatch)
+    END_COM_MAP()
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-    HRESULT FinalConstruct() {return S_OK;}
+    HRESULT FinalConstruct() { return S_OK; }
 
-	void FinalRelease(){}
+    void FinalRelease() {}
 
 public:
-
     STDMETHOD(get_TableCount)(short* Value);
     STDMETHOD(TableDef)(short Index, ITableDef** Value);
 
     STDMETHOD(InsertTable)(short index, ITableDef** Param1);
     STDMETHOD(DeleteField)(short TableIndex, short FieldIndex);
     STDMETHOD(DeleteKey)(short TableIndex, short KeyIndex);
-    STDMETHOD(InsertField)(short TableIndex, short InsertIndex, IFieldDef** Param3);
+    STDMETHOD(InsertField)(short TableIndex, short InsertIndex,
+                           IFieldDef** Param3);
 
     STDMETHOD(InsertKey)(short TableIndex, short InsertIndex, IKeyDef** Param3);
     STDMETHOD(UpDateTableDef)(short TableIndex);
-	STDMETHOD(CompAsBackup)(short TableIndex, VARIANT_BOOL* Value);
-	STDMETHOD(DeleteTable)(short TableIndex);
-	STDMETHOD(TableNumByName)(BSTR Name, short* Value);
-	STDMETHOD(FieldNumByName)( short TableIndex, BSTR Name, short* Value);
-	STDMETHOD(FieldValidLength)( eFieldQuery Query, short FieldType, unsigned int* Value);
-	STDMETHOD(FindKeynumByFieldNum)( short TableIndex, short Index, unsigned short* Value);
-	STDMETHOD(GetRecordLen)( short TableIndex, unsigned short* Value);
-	STDMETHOD(get_OpenMode)( eOpenMode* Value);
-	STDMETHOD(PopBackup)( short TableIndex);
-	STDMETHOD(PushBackup)( short TableIndex);
-	STDMETHOD(RenumberTable)( short OldIndex, short NewIndex);
-	STDMETHOD(Reopen)( eOpenMode Mode);
-	STDMETHOD(get_Version)( int* Value);
-	STDMETHOD(put_Version)( int Value);
-	STDMETHOD(get_Stat)( eStatus* Value);
-	STDMETHOD(TdapErr)(OLE_HANDLE hWnd, BSTR* Value);
-
+    STDMETHOD(CompAsBackup)(short TableIndex, VARIANT_BOOL* Value);
+    STDMETHOD(DeleteTable)(short TableIndex);
+    STDMETHOD(TableNumByName)(BSTR Name, short* Value);
+    STDMETHOD(FieldNumByName)(short TableIndex, BSTR Name, short* Value);
+    STDMETHOD(FieldValidLength)(eFieldQuery Query, short FieldType,
+                                unsigned int* Value);
+    STDMETHOD(FindKeynumByFieldNum)(short TableIndex, short Index,
+                                    unsigned short* Value);
+    STDMETHOD(GetRecordLen)(short TableIndex, unsigned short* Value);
+    STDMETHOD(get_OpenMode)(eOpenMode* Value);
+    STDMETHOD(PopBackup)(short TableIndex);
+    STDMETHOD(PushBackup)(short TableIndex);
+    STDMETHOD(RenumberTable)(short OldIndex, short NewIndex);
+    STDMETHOD(Reopen)(eOpenMode Mode);
+    STDMETHOD(get_Version)(int* Value);
+    STDMETHOD(put_Version)(int Value);
+    STDMETHOD(get_Stat)(eStatus* Value);
+    STDMETHOD(TdapErr)(OLE_HANDLE hWnd, BSTR* Value);
 };

data/source/global/tdclatl/Field.cpp

@@ -12,8 +12,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include "stdafx.h"
@@ -22,46 +22,44 @@
 STDMETHODIMP CField::get_Text(BSTR* Value)
 {
 
-    *Value = ::SysAllocString(m_tb->getFVstr(m_index));
+    *Value = ::SysAllocString(m_fd.getFVstr());
     return S_OK;
 }
 
 STDMETHODIMP CField::get_Vlng(int* Value)
 {
-    *Value = m_tb->getFVint(m_index);
+    *Value = m_fd.getFVint();
     return S_OK;
 }
 
 STDMETHODIMP CField::put_Text(BSTR Value)
 {
-    m_tb->setFVW(m_index, Value);
-    ::SysFreeString(Value);
-
+    m_fd.operator=(Value);
     return S_OK;
 }
 
 STDMETHODIMP CField::put_Vlng(int Value)
 {
-    m_tb->setFV(m_index, Value);
+    m_fd.operator=(Value);
     return S_OK;
 }
 
 STDMETHODIMP CField::get_V64(__int64* Value)
 {
-    *Value = m_tb->getFV64(m_index);
+    *Value = m_fd.getFV64();
     return S_OK;
 }
 
 STDMETHODIMP CField::put_V64(__int64 Value)
 {
-    m_tb->setFV(m_index, Value);
+    m_fd.operator=(Value);
     return S_OK;
 }
 
 STDMETHODIMP CField::get_Vbin(BSTR* Value)
 {
     uint_td size;
-    void* p = m_tb->getFVbin(m_index, size);
+    void* p = m_fd.getFVbin(size);
 
     *Value = ::SysAllocStringByteLen((char*)p, size);
 
@@ -70,7 +68,7 @@ STDMETHODIMP CField::get_Vbin(BSTR* Value)
 
 STDMETHODIMP CField::get_Vdbl(double* Value)
 {
-    *Value = m_tb->getFVdbl(m_index);
+    *Value = m_fd.getFVdbl();
     return S_OK;
 }
 
@@ -78,15 +76,12 @@ STDMETHODIMP CField::put_Vbin(BSTR Value)
 {
 
     int len = ::SysStringByteLen(Value);
-    if (len > m_tb->tableDef()->fieldDefs[m_index].len)
-        len = m_tb->tableDef()->fieldDefs[m_index].len;
-    m_tb->setFV(m_index, Value, len);
-
+    m_fd.setBin(Value, len);
     return S_OK;
 }
 
 STDMETHODIMP CField::put_Vdbl(double Value)
 {
-    m_tb->setFV(m_index, Value);
+    m_fd.operator=(Value);
     return S_OK;
 }

data/source/global/tdclatl/Field.h

@@ -13,38 +13,42 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
    02111-1307, USA.
 =================================================================*/
 #include "resource.h"
 
 #include "tdclatl_i.h"
 #include <bzs/db/protocol/tdap/client/table.h>
+#include <bzs/db/protocol/tdap/client/field.h>
 
 using namespace ATL;
 
-class ATL_NO_VTABLE CField : public CComObjectRootEx<CComSingleThreadModel>, public CComCoClass<CField, &CLSID_Field>,
-    public IDispatchImpl<IField, &IID_IField, &LIBID_transactd, /* wMajor = */ 1, /* wMinor = */ 0>
+class ATL_NO_VTABLE CField
+    : public CComObjectRootEx<CComSingleThreadModel>,
+      public CComCoClass<CField, &CLSID_Field>,
+      public IDispatchImpl<IField, &IID_IField, &LIBID_transactd,
+                           /* wMajor = */ 1, /* wMinor = */ 0>
 {
 public:
-    CField():m_tb(NULL) {}
+    CField() : m_tb(NULL) {}
+    bzs::db::protocol::tdap::client::field m_fd;
     bzs::db::protocol::tdap::client::table* m_tb;
     short m_index;
 
-    BEGIN_COM_MAP(CField) 
-		COM_INTERFACE_ENTRY(IField) 
-		COM_INTERFACE_ENTRY(IDispatch) 
-	END_COM_MAP()
+    BEGIN_COM_MAP(CField)
+    COM_INTERFACE_ENTRY(IField)
+    COM_INTERFACE_ENTRY(IDispatch)
+    END_COM_MAP()
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
-    HRESULT FinalConstruct() {return S_OK;}
+    HRESULT FinalConstruct() { return S_OK; }
 
     void FinalRelease() {}
 
 public:
-
     STDMETHOD(get_Text)(BSTR* Value);
     STDMETHOD(get_Vlng)(int* Value);
     STDMETHOD(put_Text)(BSTR Value);
@@ -55,5 +59,4 @@ public:
     STDMETHOD(get_Vdbl)(double* Value);
     STDMETHOD(put_Vbin)(BSTR Value);
     STDMETHOD(put_Vdbl)(double Value);
-
 };