diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-02-10 14:42:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-02-10 14:42:51 +0000 |
| commit | 33953cc6a0fab6a91af293c6838f8a46dd7922da (patch) | |
| tree | 2dbbe718ad42545bde6c9f7672387827c530550a /src/modules/addcontact | |
| parent | e190a7fde521bd6af9ea485cc730f854aaf38e11 (diff) | |
HCONTACT, part 3
git-svn-id: http://svn.miranda-ng.org/main/trunk@8081 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/modules/addcontact')
| -rw-r--r-- | src/modules/addcontact/addcontact.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/addcontact/addcontact.cpp b/src/modules/addcontact/addcontact.cpp index c44183faba..2659705072 100644 --- a/src/modules/addcontact/addcontact.cpp +++ b/src/modules/addcontact/addcontact.cpp @@ -42,25 +42,25 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp DBEVENTINFO dbei = { sizeof(dbei) };
dbei.cbBlob = sizeof(DWORD);
dbei.pBlob = (PBYTE)&dwUin;
- db_event_get(acs->handle, &dbei);
+ db_event_get(acs->hDbEvent, &dbei);
_ltoa(dwUin, szUin, 10);
acs->szProto = dbei.szModule;
}
{
TCHAR *szName = NULL, *tmpStr = NULL;
if (acs->handleType == HANDLE_CONTACT)
- szName = cli.pfnGetContactDisplayName((HCONTACT)acs->handle, GCDNF_TCHAR);
+ szName = cli.pfnGetContactDisplayName(acs->hContact, GCDNF_TCHAR);
else {
int isSet = 0;
if (acs->handleType == HANDLE_EVENT) {
DBEVENTINFO dbei = { sizeof(dbei) };
- dbei.cbBlob = db_event_getBlobSize(acs->handle);
+ dbei.cbBlob = db_event_getBlobSize(acs->hDbEvent);
dbei.pBlob = (PBYTE)mir_alloc(dbei.cbBlob);
- db_event_get(acs->handle, &dbei);
+ db_event_get(acs->hDbEvent, &dbei);
HCONTACT hcontact = *(HCONTACT*)(dbei.pBlob + sizeof(DWORD));
mir_free(dbei.pBlob);
- if (hcontact != INVALID_HANDLE_VALUE) {
+ if (hcontact != (HCONTACT)INVALID_HANDLE_VALUE) {
szName = cli.pfnGetContactDisplayName(hcontact, 0);
isSet = 1;
}
@@ -81,9 +81,9 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp }
}
- if (acs->handleType == HANDLE_CONTACT && acs->handle)
+ if (acs->handleType == HANDLE_CONTACT && acs->hContact)
if (acs->szProto == NULL || (acs->szProto != NULL && *acs->szProto == 0))
- acs->szProto = GetContactProto((HCONTACT)acs->handle);
+ acs->szProto = GetContactProto(acs->hContact);
{
TCHAR *grpName;
@@ -152,8 +152,8 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp case HANDLE_EVENT:
{
DBEVENTINFO dbei = { sizeof(dbei) };
- db_event_get(acs->handle, &dbei);
- hContact = (HCONTACT)CallProtoServiceInt(NULL, dbei.szModule, PS_ADDTOLISTBYEVENT, 0, (LPARAM)acs->handle);
+ db_event_get(acs->hDbEvent, &dbei);
+ hContact = (HCONTACT)CallProtoServiceInt(NULL, dbei.szModule, PS_ADDTOLISTBYEVENT, 0, (LPARAM)acs->hDbEvent);
}
break;
@@ -162,7 +162,7 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp break;
case HANDLE_CONTACT:
- hContact = (HCONTACT)acs->handle;
+ hContact = acs->hContact;
break;
}
|