diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-12-21 15:04:18 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-12-21 15:04:18 +0000 |
| commit | f9e33a21e734d927f224cf93fd7be05dce3f7391 (patch) | |
| tree | 12e52da87181c0725aa9d7740c09d7315d4fb533 /plugins/Db3x_mmap/src/dbintf.h | |
| parent | 310cdd11d658f232ab9b05a7b39cc9c3d9a00436 (diff) | |
- 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
Diffstat (limited to 'plugins/Db3x_mmap/src/dbintf.h')
| -rw-r--r-- | plugins/Db3x_mmap/src/dbintf.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h index fc75cc2c31..9dcde4bca1 100644 --- a/plugins/Db3x_mmap/src/dbintf.h +++ b/plugins/Db3x_mmap/src/dbintf.h @@ -293,13 +293,12 @@ protected: DWORD m_dwFileSize, m_dwMaxContactId;
HANDLE hSettingChangeEvent, hContactDeletedEvent, hContactAddedEvent, hEventMarkedRead;
- CRITICAL_SECTION m_csDbAccess;
+ mir_cs m_csDbAccess;
int CheckProto(DBCachedContact *cc, const char *proto);
DWORD CreateNewSpace(int bytes);
void DeleteSpace(DWORD ofs, int bytes);
DWORD ReallocSpace(DWORD ofs, int oldSize, int newSize);
- DWORD GetContactOffset(MCONTACT contactID, DBCachedContact **cc = NULL);
////////////////////////////////////////////////////////////////////////////
// settings
@@ -311,6 +310,14 @@ protected: // contacts
int WipeContactHistory(DBContact *dbc);
+ DWORD GetContactOffset(MCONTACT contactID, DBCachedContact **cc = NULL);
+
+ ////////////////////////////////////////////////////////////////////////////
+ // events
+
+ DBEvent m_tmpEvent;
+
+ DBEvent* AdaptEvent(DWORD offset, DWORD hContact);
////////////////////////////////////////////////////////////////////////////
// modules
@@ -346,7 +353,7 @@ protected: DWORD WriteSegment(DWORD ofs, PVOID buf, int cbBytes);
DWORD WriteEvent(DBEvent *dbe);
- DWORD PeekEvent(DWORD ofs, DWORD dwContactID, DBEvent *dbe);
+ DWORD PeekEvent(DWORD ofs, DWORD dwContactID, DBEvent &dbe);
void WriteOfsNextToPrevious(DWORD ofsPrev, DBContact *dbc, DWORD ofsNext);
void FinishUp(DWORD ofsLast, DBContact *dbc);
|