diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-08-14 18:33:57 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-08-14 18:33:57 +0000 |
| commit | 005f6df9008a111d28253b0cbb83564188ee9169 (patch) | |
| tree | 98d6d138106f55319657c60c85081c8d7d0b1939 /plugins | |
| parent | 68a3fc7b15763f415970ec49623a449fbae41e7c (diff) | |
ContactsPlus:
- Warnings fixed (one caused a failure on adding contacts to a group)
git-svn-id: http://svn.miranda-ng.org/main/trunk@14955 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/ContactsPlus/src/receive.cpp | 2 | ||||
| -rw-r--r-- | plugins/ContactsPlus/src/send.cpp | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp index c7045053ad..6606c2fdbb 100644 --- a/plugins/ContactsPlus/src/receive.cpp +++ b/plugins/ContactsPlus/src/receive.cpp @@ -305,7 +305,7 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara int nGroupId = -1;
if (curs != CB_ERR && IsWindowEnabled(hGroupsCheck) && SendMessage(hGroupsCheck, BM_GETCHECK, 0, 0))
{ //got groups, get the one selected in combo
- TCHAR* caGroup = (TCHAR*)_alloca((SendMessage(hGroupsCombo, CB_GETLBTEXTLEN, curs, 0) + 1) * sizeof(TCHAR));
+ caGroup = (TCHAR*)_alloca((SendMessage(hGroupsCombo, CB_GETLBTEXTLEN, curs, 0) + 1) * sizeof(TCHAR));
SendMessage(hGroupsCombo, CB_GETLBTEXT, curs, (LPARAM)caGroup);
nGroupId = SendMessage(hGroupsCombo, CB_GETITEMDATA, curs, 0);
}
diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp index 52d5c06614..d698ab6252 100644 --- a/plugins/ContactsPlus/src/send.cpp +++ b/plugins/ContactsPlus/src/send.cpp @@ -105,16 +105,16 @@ void TSendContactsData::ClearContacts() nContacts = 0;
}
-void TSendContactsData::AddContact(MCONTACT hContact)
+void TSendContactsData::AddContact(MCONTACT hContact1)
{
aContacts = (MCONTACT*)mir_realloc(aContacts, (nContacts + 1)*sizeof(MCONTACT));
- aContacts[nContacts] = hContact;
+ aContacts[nContacts] = hContact1;
nContacts++;
}
-int TSendContactsData::SendContactsPacket(HWND hwndDlg, MCONTACT *phContacts, int nContacts)
+int TSendContactsData::SendContactsPacket(HWND hwndDlg, MCONTACT *phContacts, int nContacts1)
{
- HANDLE hProcc = (HANDLE)CallContactService(hContact, PSS_CONTACTS, MAKEWPARAM(0, nContacts), (LPARAM)phContacts);
+ HANDLE hProcc = (HANDLE)CallContactService(hContact, PSS_CONTACTS, MAKEWPARAM(0, nContacts1), (LPARAM)phContacts);
if (!hProcc) {
// on trivial error - do not close dialog
ShowErrorDlg(hwndDlg, "Contacts transfer failed!", FALSE);
@@ -123,9 +123,9 @@ int TSendContactsData::SendContactsPacket(HWND hwndDlg, MCONTACT *phContacts, in TAckData *ackData = g_aAckData.Add(hProcc, new TAckData(hContact));
uacklist.Add(hProcc);
- ackData->nContacts = nContacts;
- ackData->aContacts = (MCONTACT*)mir_alloc(nContacts*sizeof(MCONTACT));
- memmove(ackData->aContacts, phContacts, nContacts*sizeof(MCONTACT)); // copy the array of hContact for ack array
+ ackData->nContacts = nContacts1;
+ ackData->aContacts = (MCONTACT*)mir_alloc(nContacts1*sizeof(MCONTACT));
+ memmove(ackData->aContacts, phContacts, nContacts1*sizeof(MCONTACT)); // copy the array of hContact for ack array
EnableDlgItem(hwndDlg, IDOK, FALSE);
EnableDlgItem(hwndDlg, IDC_LIST, FALSE);
return TRUE; // Success
|