From dae0d079ad629d499034ff911e0b1a807c19fce0 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 8 Jan 2021 13:16:14 +0300 Subject: duplicate code and variables removed --- include/m_db_int.h | 1 + libs/win32/mir_app.lib | Bin 212774 -> 213084 bytes libs/win64/mir_app.lib | Bin 208466 -> 208782 bytes plugins/Db3x_mmap/src/dbintf.cpp | 3 --- plugins/Db3x_mmap/src/dbintf.h | 2 +- plugins/Dbx_mdbx/src/dbintf.cpp | 3 --- plugins/Dbx_mdbx/src/dbintf.h | 1 - src/mir_app/src/MDatabaseCommon.cpp | 3 +++ src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + 10 files changed, 7 insertions(+), 8 deletions(-) diff --git a/include/m_db_int.h b/include/m_db_int.h index a393b23bbe..600d478c14 100644 --- a/include/m_db_int.h +++ b/include/m_db_int.h @@ -195,6 +195,7 @@ public: MDatabaseCommon(); virtual ~MDatabaseCommon(); + __forceinline bool isEncrypted() const { return m_bEncrypted; } __forceinline MICryptoEngine* getCrypt() const { return m_crypto; } __forceinline MIDatabaseCache* getCache() const { return m_cache; } diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib index 709bc424ec..6a5b982b3a 100644 Binary files a/libs/win32/mir_app.lib and b/libs/win32/mir_app.lib differ diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib index 4c60455f8b..8904fa32d5 100644 Binary files a/libs/win64/mir_app.lib and b/libs/win64/mir_app.lib differ diff --git a/plugins/Db3x_mmap/src/dbintf.cpp b/plugins/Db3x_mmap/src/dbintf.cpp index 72a15450b6..cee46868a9 100644 --- a/plugins/Db3x_mmap/src/dbintf.cpp +++ b/plugins/Db3x_mmap/src/dbintf.cpp @@ -74,9 +74,6 @@ CDb3Mmap::~CDb3Mmap() DestroyServiceFunction(hService); UnhookEvent(hHook); - if (m_crypto) - m_crypto->destroy(); - if (m_hMap) CloseHandle(m_hMap); diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h index e839d56e4f..70d60e80df 100644 --- a/plugins/Db3x_mmap/src/dbintf.h +++ b/plugins/Db3x_mmap/src/dbintf.h @@ -264,7 +264,7 @@ protected: HANDLE m_hDbFile; DBHeader m_dbHeader; DWORD m_ChunkSize; - bool m_safetyMode, m_bReadOnly, m_bShared, m_bEncrypted, m_bUsesPassword; + bool m_safetyMode, m_bReadOnly, m_bShared, m_bUsesPassword; //////////////////////////////////////////////////////////////////////////// // database stuff diff --git a/plugins/Dbx_mdbx/src/dbintf.cpp b/plugins/Dbx_mdbx/src/dbintf.cpp index dd0ed5cbaf..a9d57566c2 100644 --- a/plugins/Dbx_mdbx/src/dbintf.cpp +++ b/plugins/Dbx_mdbx/src/dbintf.cpp @@ -50,9 +50,6 @@ CDbxMDBX::~CDbxMDBX() for (auto &it : hService) DestroyServiceFunction(it); UnhookEvent(hHook); - - if (m_crypto) - m_crypto->destroy(); } ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Dbx_mdbx/src/dbintf.h b/plugins/Dbx_mdbx/src/dbintf.h index 0705359342..c802b05d3b 100644 --- a/plugins/Dbx_mdbx/src/dbintf.h +++ b/plugins/Dbx_mdbx/src/dbintf.h @@ -247,7 +247,6 @@ public: __forceinline LPSTR GetMenuTitle() const { return m_bUsesPassword ? (char*)LPGEN("Change/remove password") : (char*)LPGEN("Set password"); } - __forceinline bool isEncrypted() const { return m_bEncrypted; } __forceinline bool usesPassword() const { return m_bUsesPassword; } public: diff --git a/src/mir_app/src/MDatabaseCommon.cpp b/src/mir_app/src/MDatabaseCommon.cpp index d22c530517..a7240dc764 100644 --- a/src/mir_app/src/MDatabaseCommon.cpp +++ b/src/mir_app/src/MDatabaseCommon.cpp @@ -38,6 +38,9 @@ MDatabaseCommon::MDatabaseCommon() : MDatabaseCommon::~MDatabaseCommon() { + if (m_crypto) + m_crypto->destroy(); + UnlockName(); delete (MDatabaseCache*)m_cache; } diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 68e30d3dc4..07ad4cb79b 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -755,3 +755,4 @@ _Netlib_GetTlsUnique@8 @831 NONAME ?GetContactSettingWorker@MDatabaseCommon@@MAGHIPBD0PAUDBVARIANT@@H@Z @843 NONAME ?WriteContactSetting@MDatabaseCommon@@UAGHIPAUDBCONTACTWRITESETTING@@@Z @844 NONAME ?getCrypt@MDatabaseCommon@@QBEPAUMICryptoEngine@@XZ @845 NONAME +?isEncrypted@MDatabaseCommon@@QBE_NXZ @846 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 85ec395060..542d44b8f6 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -755,3 +755,4 @@ Netlib_GetTlsUnique @831 NONAME ?GetContactSettingWorker@MDatabaseCommon@@MEAAHIPEBD0PEAUDBVARIANT@@H@Z @843 NONAME ?WriteContactSetting@MDatabaseCommon@@UEAAHIPEAUDBCONTACTWRITESETTING@@@Z @844 NONAME ?getCrypt@MDatabaseCommon@@QEBAPEAUMICryptoEngine@@XZ @845 NONAME +?isEncrypted@MDatabaseCommon@@QEBA_NXZ @846 NONAME -- cgit v1.2.3