From c842fa175cdda0331567ea6f06e7084ceb51d260 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 13 Jan 2015 21:33:15 +0000
Subject: well, everything works but events

git-svn-id: http://svn.miranda-ng.org/main/trunk@11850 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Dbx_mdb/src/dbintf.cpp | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'plugins/Dbx_mdb/src/dbintf.cpp')

diff --git a/plugins/Dbx_mdb/src/dbintf.cpp b/plugins/Dbx_mdb/src/dbintf.cpp
index 52e5083e75..b889ea8f5b 100644
--- a/plugins/Dbx_mdb/src/dbintf.cpp
+++ b/plugins/Dbx_mdb/src/dbintf.cpp
@@ -51,7 +51,6 @@ CDbxMdb::CDbxMdb(const TCHAR *tszFileName, int iMode) :
 	InitDbInstance(this);
 
 	mdb_env_create(&m_pMdbEnv);
-	mdb_env_set_mapsize(m_pMdbEnv, 65536);
 	mdb_env_set_maxdbs(m_pMdbEnv, 10);
 
 	m_codePage = CallService(MS_LANGPACK_GETCODEPAGE, 0, 0);
@@ -86,13 +85,7 @@ CDbxMdb::~CDbxMdb()
 
 int CDbxMdb::Load(bool bSkipInit)
 {
-	int mode = MDB_NOSYNC | MDB_NOSUBDIR;
-	if (m_bReadOnly)
-		mode += MDB_RDONLY;
-	else
-		mode += MDB_WRITEMAP;
-
-	if (mdb_env_open(m_pMdbEnv, _T2A(m_tszProfileName), mode, 0664) != 0)
+	if (!Remap())
 		return EGROKPRF_CANTREAD;
 
 	if (!bSkipInit) {
@@ -129,16 +122,8 @@ int CDbxMdb::Load(bool bSkipInit)
 
 int CDbxMdb::Create(void)
 {
-	int mode = MDB_NOSYNC | MDB_NOSUBDIR;
-	if (m_bReadOnly)
-		mode += MDB_RDONLY;
-	else
-		mode += MDB_WRITEMAP;
-
-	if (mdb_env_open(m_pMdbEnv, _T2A(m_tszProfileName), mode, 0664) != 0)
-		return EGROKPRF_CANTREAD;
-
-	return 0;
+	m_dwFileSize = 0;
+	return (Remap()) ? 0 : EGROKPRF_CANTREAD;
 }
 
 int CDbxMdb::Check(void)
@@ -147,6 +132,10 @@ int CDbxMdb::Check(void)
 	if (hFile == INVALID_HANDLE_VALUE)
 		return EGROKPRF_CANTREAD;
 
+	LARGE_INTEGER iFileSize;
+	GetFileSizeEx(hFile, &iFileSize);
+	m_dwFileSize = (iFileSize.LowPart & 0xFFFFF000);
+
 	DWORD dummy = 0;
 	char buf[32];
 	if (!ReadFile(hFile, buf, sizeof(buf), &dummy, NULL)) {
@@ -170,6 +159,19 @@ STDMETHODIMP_(void) CDbxMdb::SetCacheSafetyMode(BOOL bIsSet)
 	m_safetyMode = bIsSet != 0;
 }
 
+bool CDbxMdb::Remap()
+{
+	m_dwFileSize += 0x100000;
+	mdb_env_set_mapsize(m_pMdbEnv, m_dwFileSize);
+
+	int mode = MDB_NOSYNC | MDB_NOSUBDIR;
+	if (m_bReadOnly)
+		mode += MDB_RDONLY;
+	else
+		mode += MDB_WRITEMAP;
+	return mdb_env_open(m_pMdbEnv, _T2A(m_tszProfileName), mode, 0664) == MDB_SUCCESS;
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////
 
 static DWORD DatabaseCorrupted = 0;
-- 
cgit v1.2.3