diff options
Diffstat (limited to 'protocols/IcqOscarJ')
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_db.cpp | 7 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/icq_proto.cpp | 7 | ||||
| -rw-r--r-- | protocols/IcqOscarJ/src/utilities.cpp | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/protocols/IcqOscarJ/src/icq_db.cpp b/protocols/IcqOscarJ/src/icq_db.cpp index ebb0f08ac1..ed45b307db 100644 --- a/protocols/IcqOscarJ/src/icq_db.cpp +++ b/protocols/IcqOscarJ/src/icq_db.cpp @@ -292,17 +292,14 @@ int CIcqProto::IsICQContact(HANDLE hContact) HANDLE CIcqProto::AddEvent(HANDLE hContact, WORD wType, DWORD dwTime, DWORD flags, DWORD cbBlob, PBYTE pBlob)
{
- DBEVENTINFO dbei = {0};
-
- dbei.cbSize = sizeof(dbei);
+ DBEVENTINFO dbei = { sizeof(dbei) };
dbei.szModule = m_szModuleName;
dbei.timestamp = dwTime;
dbei.flags = flags;
dbei.eventType = wType;
dbei.cbBlob = cbBlob;
dbei.pBlob = pBlob;
-
- return (HANDLE)CallService(MS_DB_EVENT_ADD, (WPARAM)hContact, (LPARAM)&dbei);
+ return db_event_add(hContact, &dbei);
}
HANDLE CIcqProto::FindFirstContact()
diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index 73ecda2a7c..690e5011dc 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -372,15 +372,14 @@ HANDLE __cdecl CIcqProto::AddToListByEvent( int flags, int iContact, HANDLE hDbE DWORD uin = 0;
uid_str uid = {0};
- DBEVENTINFO dbei = {0};
- dbei.cbSize = sizeof(dbei);
- if ((dbei.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, (WPARAM)hDbEvent, 0)) == -1)
+ DBEVENTINFO dbei = { sizeof(dbei) };
+ if ((dbei.cbBlob = db_event_getBlobSize(hDbEvent)) == -1)
return 0;
dbei.pBlob = (PBYTE)_alloca(dbei.cbBlob + 1);
dbei.pBlob[dbei.cbBlob] = '\0';
- if (CallService(MS_DB_EVENT_GET, (WPARAM)hDbEvent, (LPARAM)&dbei))
+ if ( db_event_get(hDbEvent, &dbei))
return 0; // failed to get event
if (strcmpnull(dbei.szModule, m_szModuleName))
diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp index 53cf92c3f8..633e798259 100644 --- a/protocols/IcqOscarJ/src/utilities.cpp +++ b/protocols/IcqOscarJ/src/utilities.cpp @@ -599,7 +599,7 @@ HANDLE CIcqProto::HContactFromAuthEvent(HANDLE hEvent) dbei.cbBlob = sizeof(DWORD)*2;
dbei.pBlob = (PBYTE)&body;
- if (CallService(MS_DB_EVENT_GET, (WPARAM)hEvent, (LPARAM)&dbei))
+ if (db_event_get(hEvent, &dbei))
return INVALID_HANDLE_VALUE;
if (dbei.eventType != EVENTTYPE_AUTHREQUEST)
|