- CDb3Mmap::FillContacts(): returned support for the old contact's format;

- CDb3Mmap::AdaptEvent: fast enough method to unify old & new event's formats;
- CDb3Mmap::m_csDbAccess finally switched to mir_cs;
- code cleaning;
- pre-release version bump

git-svn-id: http://svn.miranda-ng.org/main/trunk@11556 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 8 insertions, 12 deletions

diff --git a/plugins/Db3x_mmap/src/dbintf.cpp b/plugins/Db3x_mmap/src/dbintf.cpp
index ef2106f5cb..8f44ca98b2 100644
--- a/plugins/Db3x_mmap/src/dbintf.cpp
+++ b/plugins/Db3x_mmap/src/dbintf.cpp
@@ -45,20 +45,18 @@ static int stringCompare2(const char *p1, const char *p2)
 }

 

 CDb3Mmap::CDb3Mmap(const TCHAR *tszFileName, int iMode) :

-m_hDbFile(INVALID_HANDLE_VALUE),

-m_safetyMode(true),

-m_bReadOnly((iMode & DBMODE_READONLY) != 0),

-m_bShared((iMode & DBMODE_SHARED) != 0),

-m_dwMaxContactId(1),

-m_lMods(50, ModCompare),

-m_lOfs(50, OfsCompare),

-m_lResidentSettings(50, stringCompare2)

+	m_hDbFile(INVALID_HANDLE_VALUE),

+	m_safetyMode(true),

+	m_bReadOnly((iMode & DBMODE_READONLY) != 0),

+	m_bShared((iMode & DBMODE_SHARED) != 0),

+	m_dwMaxContactId(1),

+	m_lMods(50, ModCompare),

+	m_lOfs(50, OfsCompare),

+	m_lResidentSettings(50, stringCompare2)

 {

 	m_tszProfileName = mir_tstrdup(tszFileName);

 	InitDbInstance(this);

 

-	InitializeCriticalSection(&m_csDbAccess);

-

 	SYSTEM_INFO sinf;

 	GetSystemInfo(&sinf);

 	m_ChunkSize = sinf.dwAllocationGranularity;

@@ -107,8 +105,6 @@ CDb3Mmap::~CDb3Mmap()
 	DestroyHookableEvent(hEventDeletedEvent);

 	DestroyHookableEvent(hEventFilterAddedEvent);

 

-	DeleteCriticalSection(&m_csDbAccess);

-

 	DestroyDbInstance(this);

 	mir_free(m_tszProfileName);