diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-07-20 12:08:52 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-07-20 12:08:52 +0000 |
| commit | 2fd4ab0c905354393036e324e76527d7e78a2305 (patch) | |
| tree | 9cb12ef006ff70024f0a6588492cafc46b218c6b | |
| parent | 600c5bcb32c94c1cb86fa39f05568be10003d6a9 (diff) | |
fix for the processing of encrypted mmap_sa profiles
git-svn-id: http://svn.miranda-ng.org/main/trunk@9884 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/Db3x_mmap/src/dbheaders.cpp | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/plugins/Db3x_mmap/src/dbheaders.cpp b/plugins/Db3x_mmap/src/dbheaders.cpp index 005b0022ec..86a384e9eb 100644 --- a/plugins/Db3x_mmap/src/dbheaders.cpp +++ b/plugins/Db3x_mmap/src/dbheaders.cpp @@ -27,8 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. int CDb3Mmap::CreateDbHeaders(const DBSignature& _sign)
{
- DWORD bytesWritten;
-
CopyMemory(m_dbHeader.signature, &_sign, sizeof(m_dbHeader.signature));
m_dbHeader.version = DB_095_1_VERSION;
@@ -38,11 +36,14 @@ int CDb3Mmap::CreateDbHeaders(const DBSignature& _sign) m_dbHeader.ofsFirstContact = 0;
m_dbHeader.ofsModuleNames = 0;
m_dbHeader.ofsUser = 0;
- //create user
+
+ // 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);
+
+ DWORD bytesWritten;
+ WriteFile(m_hDbFile, &m_dbHeader, sizeof(m_dbHeader), &bytesWritten, NULL);
DBContact user = { 0 };
user.signature = DBCONTACT_SIGNATURE;
@@ -66,23 +67,25 @@ int CDb3Mmap::CheckDbHeaders(bool bInteractive) !memcmp(&m_dbHeader.signature, &dbSignatureSA, sizeof(m_dbHeader.signature)))
return EGROKPRF_OBSOLETE;
- if (bInteractive && !memcmp(&m_dbHeader.signature, &dbSignatureSD, sizeof(m_dbHeader.signature))) {
- if (IDYES == MessageBox(NULL, TranslateTS(tszOldHeaders), TranslateT("Obsolete database format"), MB_YESNO | MB_ICONWARNING)) {
- TCHAR tszCurPath[MAX_PATH];
- GetModuleFileName(NULL, tszCurPath, SIZEOF(tszCurPath));
- TCHAR *p = _tcsrchr(tszCurPath, '\\');
- if (p) *p = 0;
-
- HKEY hPathSetting;
- if (!RegCreateKey(HKEY_CURRENT_USER, _T("Software\\Miranda NG"), &hPathSetting)) {
- RegSetValue(hPathSetting, _T("InstallPath"), REG_SZ, tszCurPath, sizeof(tszCurPath));
- RegCloseKey(hPathSetting);
+ if (!memcmp(&m_dbHeader.signature, &dbSignatureSD, sizeof(m_dbHeader.signature))) {
+ if (bInteractive)
+ if (IDYES == MessageBox(NULL, TranslateTS(tszOldHeaders), TranslateT("Obsolete database format"), MB_YESNO | MB_ICONWARNING)) {
+ TCHAR tszCurPath[MAX_PATH];
+ GetModuleFileName(NULL, tszCurPath, SIZEOF(tszCurPath));
+ TCHAR *p = _tcsrchr(tszCurPath, '\\');
+ if (p) *p = 0;
+
+ HKEY hPathSetting;
+ if (!RegCreateKey(HKEY_CURRENT_USER, _T("Software\\Miranda NG"), &hPathSetting)) {
+ RegSetValue(hPathSetting, _T("InstallPath"), REG_SZ, tszCurPath, sizeof(tszCurPath));
+ RegCloseKey(hPathSetting);
+ }
+
+ CallService(MS_UTILS_OPENURL, 0, LPARAM("http://wiki.miranda-ng.org/index.php?title=Updating_pre-0.94.9_version_to_0.95.1_and_later"));
+ Sleep(1000);
+ exit(0);
}
-
- CallService(MS_UTILS_OPENURL, 0, LPARAM("http://wiki.miranda-ng.org/index.php?title=Updating_pre-0.94.9_version_to_0.95.1_and_later"));
- Sleep(1000);
- exit(0);
- }
+ return EGROKPRF_OBSOLETE;
}
return EGROKPRF_UNKHEADER;
}
|