diff --git a/MITLIB/Dll/CommDll100D.dll b/MITLIB/Dll/CommDll100D.dll index 9a359a7..09f4664 100644 Binary files a/MITLIB/Dll/CommDll100D.dll and b/MITLIB/Dll/CommDll100D.dll differ diff --git a/MITLIB/Dll/CommDllD.dll b/MITLIB/Dll/CommDllD.dll index 26efe63..57c588c 100644 Binary files a/MITLIB/Dll/CommDllD.dll and b/MITLIB/Dll/CommDllD.dll differ diff --git a/MITLIB/Dll/GuiDLL100BD.dll b/MITLIB/Dll/GuiDLL100BD.dll index a4f7e55..ab5ab44 100644 Binary files a/MITLIB/Dll/GuiDLL100BD.dll and b/MITLIB/Dll/GuiDLL100BD.dll differ diff --git a/MITLIB/Dll/GuiDLLBD.dll b/MITLIB/Dll/GuiDLLBD.dll index 5138429..a648fd0 100644 Binary files a/MITLIB/Dll/GuiDLLBD.dll and b/MITLIB/Dll/GuiDLLBD.dll differ diff --git a/MITLIB/Dll/GuiDLLD.dll b/MITLIB/Dll/GuiDLLD.dll index 27e63a9..f1fa87c 100644 Binary files a/MITLIB/Dll/GuiDLLD.dll and b/MITLIB/Dll/GuiDLLD.dll differ diff --git a/MITLIB/Dll/GuiDll100D.dll b/MITLIB/Dll/GuiDll100D.dll index 2a4db58..8c7835b 100644 Binary files a/MITLIB/Dll/GuiDll100D.dll and b/MITLIB/Dll/GuiDll100D.dll differ diff --git a/MITLIB/Dll/IODll100D.dll b/MITLIB/Dll/IODll100D.dll index a151b1c..0815ea4 100644 Binary files a/MITLIB/Dll/IODll100D.dll and b/MITLIB/Dll/IODll100D.dll differ diff --git a/MITLIB/Dll/IODllD.dll b/MITLIB/Dll/IODllD.dll index 53d8da1..05a47cd 100644 Binary files a/MITLIB/Dll/IODllD.dll and b/MITLIB/Dll/IODllD.dll differ diff --git a/MITLIB/Dll/SecsGem.dll b/MITLIB/Dll/SecsGem.dll index fa176cc..f34be41 100644 Binary files a/MITLIB/Dll/SecsGem.dll and b/MITLIB/Dll/SecsGem.dll differ diff --git a/MITLIB/Dll/SecsGem100.dll b/MITLIB/Dll/SecsGem100.dll index ab97c99..31cc81f 100644 Binary files a/MITLIB/Dll/SecsGem100.dll and b/MITLIB/Dll/SecsGem100.dll differ diff --git a/MITLIB/Dll/Utility100D.dll b/MITLIB/Dll/Utility100D.dll index 9b634d1..a44d916 100644 Binary files a/MITLIB/Dll/Utility100D.dll and b/MITLIB/Dll/Utility100D.dll differ diff --git a/MITLIB/Dll/UtilityD.dll b/MITLIB/Dll/UtilityD.dll index 9332e0d..4f5a333 100644 Binary files a/MITLIB/Dll/UtilityD.dll and b/MITLIB/Dll/UtilityD.dll differ diff --git a/MITLIB/Dll/mcctrdll100BD.dll b/MITLIB/Dll/mcctrdll100BD.dll index aedade9..244b8d1 100644 Binary files a/MITLIB/Dll/mcctrdll100BD.dll and b/MITLIB/Dll/mcctrdll100BD.dll differ diff --git a/MITLIB/Dll/mcctrdll100D.dll b/MITLIB/Dll/mcctrdll100D.dll index dbedaa2..44b81e5 100644 Binary files a/MITLIB/Dll/mcctrdll100D.dll and b/MITLIB/Dll/mcctrdll100D.dll differ diff --git a/MITLIB/Dll/mcctrdllBD.dll b/MITLIB/Dll/mcctrdllBD.dll index 1944242..4309421 100644 Binary files a/MITLIB/Dll/mcctrdllBD.dll and b/MITLIB/Dll/mcctrdllBD.dll differ diff --git a/MITLIB/Dll/mcctrdllD.dll b/MITLIB/Dll/mcctrdllD.dll index 393e710..a030871 100644 Binary files a/MITLIB/Dll/mcctrdllD.dll and b/MITLIB/Dll/mcctrdllD.dll differ diff --git a/MITLIB/GuiDLL/GuiDLL.dsp b/MITLIB/GuiDLL/GuiDLL.dsp index 06812ea..fda8c72 100644 --- a/MITLIB/GuiDLL/GuiDLL.dsp +++ b/MITLIB/GuiDLL/GuiDLL.dsp @@ -266,6 +266,10 @@ SOURCE=.\PackageEdit.cpp # End Source File # Begin Source File +SOURCE=.\PackageInfoTable.cpp +# End Source File +# Begin Source File + SOURCE=.\PageSetupDlg.cpp # End Source File # Begin Source File @@ -582,6 +586,10 @@ SOURCE=.\PackageEdit.h # End Source File # Begin Source File +SOURCE=.\PackageInfoTable.h +# End Source File +# Begin Source File + SOURCE=..\Include\PageSecurity.h # End Source File # Begin Source File diff --git a/MITLIB/Lib/CommDll100D.lib b/MITLIB/Lib/CommDll100D.lib index 558dfc1..1216728 100644 Binary files a/MITLIB/Lib/CommDll100D.lib and b/MITLIB/Lib/CommDll100D.lib differ diff --git a/MITLIB/Lib/CommDllD.lib b/MITLIB/Lib/CommDllD.lib index 3adefd5..ac93b10 100644 Binary files a/MITLIB/Lib/CommDllD.lib and b/MITLIB/Lib/CommDllD.lib differ diff --git a/MITLIB/Lib/GuiDLL100BD.lib b/MITLIB/Lib/GuiDLL100BD.lib index 2431ab8..85406eb 100644 Binary files a/MITLIB/Lib/GuiDLL100BD.lib and b/MITLIB/Lib/GuiDLL100BD.lib differ diff --git a/MITLIB/Lib/GuiDLLBD.lib b/MITLIB/Lib/GuiDLLBD.lib index e8cf08c..1cd5c06 100644 Binary files a/MITLIB/Lib/GuiDLLBD.lib and b/MITLIB/Lib/GuiDLLBD.lib differ diff --git a/MITLIB/Lib/GuiDLLD.lib b/MITLIB/Lib/GuiDLLD.lib index b449c7c..f5ac1fc 100644 Binary files a/MITLIB/Lib/GuiDLLD.lib and b/MITLIB/Lib/GuiDLLD.lib differ diff --git a/MITLIB/Lib/GuiDll100D.lib b/MITLIB/Lib/GuiDll100D.lib index c50e209..8faa704 100644 Binary files a/MITLIB/Lib/GuiDll100D.lib and b/MITLIB/Lib/GuiDll100D.lib differ diff --git a/MITLIB/Lib/IODll100D.lib b/MITLIB/Lib/IODll100D.lib index f12e3cb..d550a01 100644 Binary files a/MITLIB/Lib/IODll100D.lib and b/MITLIB/Lib/IODll100D.lib differ diff --git a/MITLIB/Lib/IODllD.lib b/MITLIB/Lib/IODllD.lib index d0515dd..d3afba7 100644 Binary files a/MITLIB/Lib/IODllD.lib and b/MITLIB/Lib/IODllD.lib differ diff --git a/MITLIB/Lib/SecsGem.lib b/MITLIB/Lib/SecsGem.lib index ec1ae11..899690b 100644 Binary files a/MITLIB/Lib/SecsGem.lib and b/MITLIB/Lib/SecsGem.lib differ diff --git a/MITLIB/Lib/SecsGem100.lib b/MITLIB/Lib/SecsGem100.lib index eed7e4d..3569a9c 100644 Binary files a/MITLIB/Lib/SecsGem100.lib and b/MITLIB/Lib/SecsGem100.lib differ diff --git a/MITLIB/Lib/TestHelpers.lib b/MITLIB/Lib/TestHelpers.lib index 5edfebb..bc9ce9f 100644 Binary files a/MITLIB/Lib/TestHelpers.lib and b/MITLIB/Lib/TestHelpers.lib differ diff --git a/MITLIB/Lib/Utility100D.lib b/MITLIB/Lib/Utility100D.lib index 93ebe7a..d0235bf 100644 Binary files a/MITLIB/Lib/Utility100D.lib and b/MITLIB/Lib/Utility100D.lib differ diff --git a/MITLIB/Lib/UtilityD.lib b/MITLIB/Lib/UtilityD.lib index ea77d8a..b09b10f 100644 Binary files a/MITLIB/Lib/UtilityD.lib and b/MITLIB/Lib/UtilityD.lib differ diff --git a/MITLIB/Lib/mcctrdll100BD.lib b/MITLIB/Lib/mcctrdll100BD.lib index 26a0aa3..357d79b 100644 Binary files a/MITLIB/Lib/mcctrdll100BD.lib and b/MITLIB/Lib/mcctrdll100BD.lib differ diff --git a/MITLIB/Lib/mcctrdll100D.lib b/MITLIB/Lib/mcctrdll100D.lib index 4fb6339..f7fb588 100644 Binary files a/MITLIB/Lib/mcctrdll100D.lib and b/MITLIB/Lib/mcctrdll100D.lib differ diff --git a/MITLIB/Lib/mcctrdllBD.lib b/MITLIB/Lib/mcctrdllBD.lib index b15ba1b..a1a094c 100644 Binary files a/MITLIB/Lib/mcctrdllBD.lib and b/MITLIB/Lib/mcctrdllBD.lib differ diff --git a/MITLIB/Lib/mcctrdllD.lib b/MITLIB/Lib/mcctrdllD.lib index 5c037f4..34420d7 100644 Binary files a/MITLIB/Lib/mcctrdllD.lib and b/MITLIB/Lib/mcctrdllD.lib differ diff --git a/MITLIB/Utility/DatabaseUtility.h b/MITLIB/Utility/DatabaseUtility.h index e44d5d6..01546bc 100644 --- a/MITLIB/Utility/DatabaseUtility.h +++ b/MITLIB/Utility/DatabaseUtility.h @@ -63,6 +63,13 @@ struct CMyDaoFieldInfo: CDaoFieldInfo } }; +/** + * @class CDatabaseUtility + * + * @brief An utility class to perform common operations on the database. + * + */ + class UTILITYDLL CDatabaseUtility { public: @@ -77,8 +84,6 @@ public: static bool IsFieldPresent(CString csPath, CString csTableName, CString csFieldName); static bool IsFieldPresent(CDaoDatabase *db, CString csTableName, CString csFieldName); static void IsFieldPresent(CDaoDatabase *db, CString csTableName, std::set &vFieldName, std::map &mapFieldName); - CDatabaseUtility(); - virtual ~CDatabaseUtility(); static bool CreateNewField(CString csPath, CString csTableName, CDaoFieldInfo *pFieldInfo, CString csDefaultValue); @@ -138,6 +143,9 @@ public: /// copy packageData from source table to destination table. return true if successful static bool CopyPackageData(CDaoDatabase* pDatabase,CString csSourceTableName,CString csDestTableName,CString csPackageName); + static void SafeClose(CDaoDatabase &db); + static void SafeClose(CDaoRecordset &rs); + static void SafeClose(CDaoTableDef &td); private: static bool CreateTempTable(CDaoDatabase *pDatabase,CString csTempTableName,CString csTempFieldName,int nRecordCount); @@ -146,6 +154,9 @@ private: This list is used by InsertFieldList() to store the field name. Call ExecuteInsertField to insert the field to the database table */ std::set m_setFieldInfoList; + + CDatabaseUtility(); + virtual ~CDatabaseUtility(); }; #endif // !defined(AFX_DATABASEUTILITY_H__02069DB9_2872_407E_9CFD_50FAD481ADD7__INCLUDED_) diff --git a/MITLIB/Utility/DbData.h b/MITLIB/Utility/DbData.h index fd08e36..815a4c4 100644 --- a/MITLIB/Utility/DbData.h +++ b/MITLIB/Utility/DbData.h @@ -76,6 +76,9 @@ public: // get dbBoolean data in "Enable" or "Disable" Format static CString GetBoolValueAsEnableDisable(COleVariant ovFieldValue); +#if _MSC_VER > 1200 +#pragma deprecated(GetValueAsBOOl) +#endif // get dbBoolean data in BOOL data type static BOOL GetValueAsBOOl(COleVariant ovFieldValue); diff --git a/MITLib/Release Notes/RELEASE_1.40.txt b/MITLib/Release Notes/RELEASE_1.40.txt deleted file mode 100644 index 2dafa8e..0000000 --- a/MITLib/Release Notes/RELEASE_1.40.txt +++ /dev/null @@ -1,24 +0,0 @@ -== MitLib 1.40.00 13-MAR-2014 == -The MitLib 1.40 release is the first release using Git and Gerrit. -This release branch will be used to push non-breaking changes and as continuation of the [[MitLib 1.39]] branch - -Changes in MitLib 1.40.00: -* {{done|({{bug|416}})}} Re-authentication to clear messages -** Added option to stop after user has been re-authenticated, default the system will start to run after re-authentication. See the below option that can be added to [[#GuiDll.ini|GuiDll.ini]] -** Fix bug where the user could open a door while the re-authentication dialog was displayed. After re-authentication the machine would start to run - -* {{doing}} During development of ({{bug|419}}) some issues were found in the MyWait class. Although the fix ({{bug|419}}) is not included in this release due to breaking changes, the non-breaking bug fixes have been included -* {{done}} Fix stack overflow in DebugLogTiming when it was called with arguments that would result in a string of more then 100 character -* {{done}} Fix bug where CMyWait would not timeout due to messages being send the calling thread -* {{done}} Fix bug in MySocket where OnReceive could be called if CMyWait was used -* {{done}} Fixed some memory leakes where auto_ptr was used with arrays -* {{done}} Fixed some memory leakes where delete was used with new[] instead of delete [] - -== Configuration Changes == -=== GuiDll.ini === -* Option to stop the machine after the user has re-authenticated, see ({{bug|416}}) - [Authentication] - StopAfterHigherLevelAuthentication = TRUE - -== Upgrading == -Upgrading from [[MitLib 1.39]] does not require any changes. diff --git a/MITLib/Release Notes/RELEASE_2.00.txt b/MITLib/Release Notes/RELEASE_2.00.txt deleted file mode 100644 index 42e69f7..0000000 --- a/MITLib/Release Notes/RELEASE_2.00.txt +++ /dev/null @@ -1,7 +0,0 @@ -== MitLib 2.00.00 25-APR-2014 == -The MitLib 2.00.00.0 is a release candidate for test purpose. This is a combined release for VS6 and VS2010 - -Changes in MitLib 2.00.00.0: -* Re-authentication to clear messages -* ticket:419 SecsGem socket replacement -* Merge of latest changes of the 1.39 branch with the Visual Studio 2010 version \ No newline at end of file