From c0dc4dcad95f8d8e95986c61514544b52387408a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 23 Jan 2014 15:10:09 +0000 Subject: dbx_mmap to verify password before checking file git-svn-id: http://svn.miranda-ng.org/main/trunk@7835 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Db3x_mmap/src/dbtool/finaltasks.cpp | 12 ------------ plugins/Db3x_mmap/src/dbtool/initialchecks.cpp | 8 -------- 2 files changed, 20 deletions(-) (limited to 'plugins/Db3x_mmap/src/dbtool') diff --git a/plugins/Db3x_mmap/src/dbtool/finaltasks.cpp b/plugins/Db3x_mmap/src/dbtool/finaltasks.cpp index a7f9c8ef46..dc1e05463c 100644 --- a/plugins/Db3x_mmap/src/dbtool/finaltasks.cpp +++ b/plugins/Db3x_mmap/src/dbtool/finaltasks.cpp @@ -27,17 +27,5 @@ int CDb3Base::WorkFinalTasks(int firstTime) if (WriteSegment(0, &m_dbHeader, sizeof(m_dbHeader)) == WS_ERROR) return ERROR_WRITE_FAULT; - if (m_hDbFile) { - CloseHandle(m_hDbFile); - m_hDbFile = NULL; - } - if (m_pDbCache) { - UnmapViewOfFile(m_pDbCache); - m_pDbCache = NULL; - } - if (m_hMap) { - CloseHandle(m_hMap); - m_hMap = NULL; - } return ERROR_NO_MORE_ITEMS; } diff --git a/plugins/Db3x_mmap/src/dbtool/initialchecks.cpp b/plugins/Db3x_mmap/src/dbtool/initialchecks.cpp index 2d9dfae04c..4501162263 100644 --- a/plugins/Db3x_mmap/src/dbtool/initialchecks.cpp +++ b/plugins/Db3x_mmap/src/dbtool/initialchecks.cpp @@ -48,14 +48,6 @@ int CDb3Base::WorkInitialChecks(int firstTime) if (res) return res; - m_hMap = CreateFileMapping(m_hDbFile, NULL, cb->bAggressive ? PAGE_WRITECOPY : PAGE_READONLY, 0, 0, NULL); - if (m_hMap) - m_pDbCache = (BYTE*)MapViewOfFile(m_hMap, cb->bAggressive ? FILE_MAP_COPY : FILE_MAP_READ, 0, 0, 0); - else { - cb->pfnAddLogMessage(STATUS_FATAL, TranslateT("Can't create file mapping (%u)"), GetLastError()); - return ERROR_ACCESS_DENIED; - } - if (!m_pDbCache) { cb->pfnAddLogMessage(STATUS_FATAL, TranslateT("Can't create map view of file (%u)"), GetLastError()); return ERROR_ACCESS_DENIED; -- cgit v1.2.3