diff options
| author | George Hazan <george.hazan@gmail.com> | 2016-03-02 08:37:52 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2016-03-02 08:37:52 +0000 |
| commit | 86afe40c9f5e7c97de33e6bda58038ca764e74e4 (patch) | |
| tree | ab817e2dc074eccd85a514652153f719840d07c6 /plugins/Dbx_mdb/src | |
| parent | 557077718ec034e47e11556b99ce86424e6550a2 (diff) | |
- 64-bit issues fixed;
- warning fixes;
git-svn-id: http://svn.miranda-ng.org/main/trunk@16386 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Dbx_mdb/src')
| -rw-r--r-- | plugins/Dbx_mdb/src/dbcontacts.cpp | 6 | ||||
| -rw-r--r-- | plugins/Dbx_mdb/src/dbcrypt.cpp | 2 | ||||
| -rw-r--r-- | plugins/Dbx_mdb/src/dbsettings.cpp | 2 | ||||
| -rw-r--r-- | plugins/Dbx_mdb/src/ui.cpp | 4 | ||||
| -rw-r--r-- | plugins/Dbx_mdb/src/ui.h | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/plugins/Dbx_mdb/src/dbcontacts.cpp b/plugins/Dbx_mdb/src/dbcontacts.cpp index 9b4775990c..55b34aef5c 100644 --- a/plugins/Dbx_mdb/src/dbcontacts.cpp +++ b/plugins/Dbx_mdb/src/dbcontacts.cpp @@ -348,10 +348,10 @@ void CDbxMdb::FillContacts() cc->nSubs = (0 != GetContactSetting(cc->contactID, META_PROTO, "NumContacts", &dbv)) ? -1 : dbv.dVal;
if (cc->nSubs != -1) {
cc->pSubs = (MCONTACT*)mir_alloc(cc->nSubs*sizeof(MCONTACT));
- for (int i = 0; i < cc->nSubs; i++) {
+ for (int k = 0; k < cc->nSubs; k++) {
char setting[100];
- mir_snprintf(setting, _countof(setting), "Handle%d", i);
- cc->pSubs[i] = (0 != GetContactSetting(cc->contactID, META_PROTO, setting, &dbv)) ? NULL : dbv.dVal;
+ mir_snprintf(setting, _countof(setting), "Handle%d", k);
+ cc->pSubs[k] = (0 != GetContactSetting(cc->contactID, META_PROTO, setting, &dbv)) ? NULL : dbv.dVal;
}
}
cc->nDefault = (0 != GetContactSetting(cc->contactID, META_PROTO, "Default", &dbv)) ? -1 : dbv.dVal;
diff --git a/plugins/Dbx_mdb/src/dbcrypt.cpp b/plugins/Dbx_mdb/src/dbcrypt.cpp index 66d74ebf67..52c192cfc7 100644 --- a/plugins/Dbx_mdb/src/dbcrypt.cpp +++ b/plugins/Dbx_mdb/src/dbcrypt.cpp @@ -195,7 +195,7 @@ int CDbxMdb::EnableEncryption(bool bEncrypted) return 0;
}
-int CDbxMdb::EnableContactEncryption(MCONTACT hContact, bool bEncrypted)
+int CDbxMdb::EnableContactEncryption(MCONTACT /*hContact*/, bool /*bEncrypted*/)
{
//TODO: encrypt/decrypt all contact events and settings
return 0;
diff --git a/plugins/Dbx_mdb/src/dbsettings.cpp b/plugins/Dbx_mdb/src/dbsettings.cpp index 1d6caac3f9..2abaaa648a 100644 --- a/plugins/Dbx_mdb/src/dbsettings.cpp +++ b/plugins/Dbx_mdb/src/dbsettings.cpp @@ -205,7 +205,7 @@ LBL_Seek: /**** add to cache **********************/
if (iType != DBVT_BLOB && iType != DBVT_ENCRYPTED) {
- DBVARIANT *pCachedValue = m_cache->GetCachedValuePtr(contactID, szCachedSettingName, 1);
+ pCachedValue = m_cache->GetCachedValuePtr(contactID, szCachedSettingName, 1);
if (pCachedValue != NULL)
m_cache->SetCachedVariant(dbv, pCachedValue);
}
diff --git a/plugins/Dbx_mdb/src/ui.cpp b/plugins/Dbx_mdb/src/ui.cpp index 8c7ec8c52c..003b068a48 100644 --- a/plugins/Dbx_mdb/src/ui.cpp +++ b/plugins/Dbx_mdb/src/ui.cpp @@ -28,7 +28,7 @@ static HGENMENU hSetPwdMenu; static UINT oldLangID;
void LanguageChanged(HWND hwndDlg)
{
- UINT LangID = (UINT)GetKeyboardLayout(0);
+ UINT_PTR LangID = (UINT_PTR)GetKeyboardLayout(0);
char Lang[3] = { 0 };
if (LangID != oldLangID) {
oldLangID = LangID;
@@ -80,7 +80,7 @@ static INT_PTR CALLBACK sttChangePassword(HWND hwndDlg, UINT uMsg, WPARAM wParam if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_LANG)) {
SetTextColor((HDC)wParam, GetSysColor(COLOR_HIGHLIGHTTEXT));
SetBkMode((HDC)wParam, TRANSPARENT);
- return (BOOL)GetSysColorBrush(COLOR_HIGHLIGHT);
+ return (INT_PTR)GetSysColorBrush(COLOR_HIGHLIGHT);
}
return FALSE;
diff --git a/plugins/Dbx_mdb/src/ui.h b/plugins/Dbx_mdb/src/ui.h index 4ee297e81f..b20a43d623 100644 --- a/plugins/Dbx_mdb/src/ui.h +++ b/plugins/Dbx_mdb/src/ui.h @@ -119,7 +119,7 @@ class CEnterPasswordDialog : public CDlgBase {
if (msg == WM_TIMER)
{
- UINT LangID = (UINT)GetKeyboardLayout(0);
+ UINT_PTR LangID = (UINT_PTR)GetKeyboardLayout(0);
char Lang[3] = { 0 };
GetLocaleInfoA(MAKELCID((LangID & 0xffffffff), SORT_DEFAULT), LOCALE_SABBREVLANGNAME, Lang, 2);
Lang[0] = toupper(Lang[0]);
@@ -132,7 +132,7 @@ class CEnterPasswordDialog : public CDlgBase if ((HWND)lParam == m_language.GetHwnd()) {
SetTextColor((HDC)wParam, GetSysColor(COLOR_HIGHLIGHTTEXT));
SetBkMode((HDC)wParam, TRANSPARENT);
- return (BOOL)GetSysColorBrush(COLOR_HIGHLIGHT);
+ return (INT_PTR)GetSysColorBrush(COLOR_HIGHLIGHT);
}
}
return CDlgBase::DlgProc(msg, wParam, lParam);
|