diff options
Diffstat (limited to 'plugins/Db3x_mmap')
| -rw-r--r-- | plugins/Db3x_mmap/src/commonheaders.h | 1 | ||||
| -rw-r--r-- | plugins/Db3x_mmap/src/dbheaders.cpp | 22 | ||||
| -rw-r--r-- | plugins/Db3x_mmap/src/dbintf.h | 2 | ||||
| -rw-r--r-- | plugins/Db3x_mmap/src/init.cpp | 2 |
4 files changed, 12 insertions, 15 deletions
diff --git a/plugins/Db3x_mmap/src/commonheaders.h b/plugins/Db3x_mmap/src/commonheaders.h index a0ad519e4d..72b0b265d9 100644 --- a/plugins/Db3x_mmap/src/commonheaders.h +++ b/plugins/Db3x_mmap/src/commonheaders.h @@ -55,6 +55,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "version.h"
extern LIST<CDb3Mmap> g_Dbs;
+extern DBSignature dbSignature;
#ifdef __GNUC__
#define mir_i64(x) (x##LL)
diff --git a/plugins/Db3x_mmap/src/dbheaders.cpp b/plugins/Db3x_mmap/src/dbheaders.cpp index 68e7da15e1..e2afc03658 100644 --- a/plugins/Db3x_mmap/src/dbheaders.cpp +++ b/plugins/Db3x_mmap/src/dbheaders.cpp @@ -25,14 +25,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //the cache has not been loaded when these functions are used
-extern DBSignature dbSignature;
-
-int CDb3Base::CreateDbHeaders()
+int CDb3Base::CreateDbHeaders(const DBSignature& _sign)
{
- DBContact user;
DWORD bytesWritten;
- CopyMemory(m_dbHeader.signature, &dbSignature,sizeof(m_dbHeader.signature));
+ CopyMemory(m_dbHeader.signature, &_sign, sizeof(m_dbHeader.signature));
+
m_dbHeader.version = DB_THIS_VERSION;
m_dbHeader.ofsFileEnd = sizeof(struct DBHeader);
m_dbHeader.slackSpace = 0;
@@ -43,15 +41,13 @@ int CDb3Base::CreateDbHeaders() //create user
m_dbHeader.ofsUser = m_dbHeader.ofsFileEnd;
m_dbHeader.ofsFileEnd += sizeof(DBContact);
- SetFilePointer(m_hDbFile,0,NULL,FILE_BEGIN);
- WriteFile(m_hDbFile,&m_dbHeader,sizeof(m_dbHeader),&bytesWritten,NULL);
+ SetFilePointer(m_hDbFile, 0, NULL, FILE_BEGIN);
+ WriteFile(m_hDbFile, &m_dbHeader, sizeof(m_dbHeader), &bytesWritten,NULL);
+
+ DBContact user = { 0 };
user.signature = DBCONTACT_SIGNATURE;
- user.ofsNext = 0;
- user.ofsFirstSettings = 0;
- user.eventCount = 0;
- user.ofsFirstEvent = user.ofsLastEvent = 0;
- SetFilePointer(m_hDbFile,m_dbHeader.ofsUser,NULL,FILE_BEGIN);
- WriteFile(m_hDbFile,&user,sizeof(DBContact),&bytesWritten,NULL);
+ SetFilePointer(m_hDbFile, m_dbHeader.ofsUser, NULL, FILE_BEGIN);
+ WriteFile(m_hDbFile, &user, sizeof(DBContact), &bytesWritten, NULL);
FlushFileBuffers(m_hDbFile);
return 0;
}
diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h index 3a744427a8..d5bef059ef 100644 --- a/plugins/Db3x_mmap/src/dbintf.h +++ b/plugins/Db3x_mmap/src/dbintf.h @@ -166,7 +166,7 @@ struct CDb3Base : public MIDatabase, public MIDatabaseChecker, public MZeroedObj int Load(bool bSkipInit);
int Create(void);
- int CreateDbHeaders();
+ int CreateDbHeaders(const DBSignature&);
int CheckDbHeaders();
void DatabaseCorruption(TCHAR *text);
diff --git a/plugins/Db3x_mmap/src/init.cpp b/plugins/Db3x_mmap/src/init.cpp index 2e2490dc66..bb76ccd3a8 100644 --- a/plugins/Db3x_mmap/src/init.cpp +++ b/plugins/Db3x_mmap/src/init.cpp @@ -52,7 +52,7 @@ static int makeDatabase(const TCHAR *profile) if (db->Create() != ERROR_SUCCESS)
return EMKPRF_CREATEFAILED;
- return db->CreateDbHeaders();
+ return db->CreateDbHeaders(dbSignature);
}
// returns 0 if the given profile has a valid header
|