summaryrefslogtreecommitdiff
path: root/protocols/Yahoo/src/proto.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-03-30 17:32:39 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-03-30 17:32:39 +0000
commit109877a3c75cb290c55755dcfc88794d2453669d (patch)
tree3ede8b9170b2fc3f6f35dc2cea6742d44b19d631 /protocols/Yahoo/src/proto.cpp
parentfee8d991bdf4a59b563d1b92165ea0ed2f7bacb8 (diff)
MS_DB_EVENT_* services remained, but their calls removed
git-svn-id: http://svn.miranda-ng.org/main/trunk@4255 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Yahoo/src/proto.cpp')
-rw-r--r--protocols/Yahoo/src/proto.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index d78943f4b7..245a1fbd1f 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -147,28 +147,28 @@ HANDLE CYahooProto::AddToList( int flags, PROTOSEARCHRESULT* psr )
HANDLE __cdecl CYahooProto::AddToListByEvent( int flags, int /*iContact*/, HANDLE hDbEvent )
{
DebugLog("[YahooAddToListByEvent]");
- if ( !m_bLoggedIn )
+ if (!m_bLoggedIn)
return 0;
DBEVENTINFO dbei = { sizeof( dbei ) };
- if (( dbei.cbBlob = CallService( MS_DB_EVENT_GETBLOBSIZE, (LPARAM)hDbEvent, 0)) == -1 ) {
+ if ((dbei.cbBlob = db_event_getBlobSize(hDbEvent)) == -1 ) {
DebugLog("[YahooAddToListByEvent] ERROR: Can't get blob size.");
return 0;
}
DebugLog("[YahooAddToListByEvent] Got blob size: %lu", dbei.cbBlob);
dbei.pBlob = ( PBYTE )_alloca( dbei.cbBlob );
- if ( CallService( MS_DB_EVENT_GET, ( WPARAM )hDbEvent, (LPARAM)&dbei )) {
+ if (db_event_get(hDbEvent, &dbei)) {
DebugLog("[YahooAddToListByEvent] ERROR: Can't get event.");
return 0;
}
- if ( dbei.eventType != EVENTTYPE_AUTHREQUEST ) {
+ if (dbei.eventType != EVENTTYPE_AUTHREQUEST) {
DebugLog("[YahooAddToListByEvent] ERROR: Not an authorization request.");
return 0;
}
- if ( strcmp( dbei.szModule, m_szModuleName )) {
+ if ( strcmp(dbei.szModule, m_szModuleName)) {
DebugLog("[YahooAddToListByEvent] ERROR: Not Yahoo protocol.");
return 0;
}
@@ -194,11 +194,11 @@ int CYahooProto::Authorize( HANDLE hdbe )
}
DBEVENTINFO dbei = { sizeof(dbei) };
- if (( dbei.cbBlob = CallService( MS_DB_EVENT_GETBLOBSIZE, ( WPARAM )hdbe, 0)) == -1 )
+ if (( dbei.cbBlob = db_event_getBlobSize(hdbe)) == -1 )
return 1;
dbei.pBlob = ( PBYTE )_alloca( dbei.cbBlob );
- if ( CallService( MS_DB_EVENT_GET, ( WPARAM )hdbe, (LPARAM)&dbei ))
+ if (db_event_get(hdbe, &dbei))
return 1;
if (dbei.eventType != EVENTTYPE_AUTHREQUEST)
@@ -235,23 +235,23 @@ int CYahooProto::AuthDeny( HANDLE hdbe, const TCHAR* reason )
return 1;
DBEVENTINFO dbei = { sizeof( dbei ) };
- if (( dbei.cbBlob = CallService( MS_DB_EVENT_GETBLOBSIZE, ( WPARAM )hdbe, 0)) == -1 ) {
+ if (( dbei.cbBlob = db_event_getBlobSize(hdbe)) == -1 ) {
DebugLog("[YahooAuthDeny] ERROR: Can't get blob size");
return 1;
}
dbei.pBlob = ( PBYTE )alloca( dbei.cbBlob );
- if ( CallService( MS_DB_EVENT_GET, ( WPARAM )hdbe, (LPARAM)&dbei )) {
+ if (db_event_get(hdbe, &dbei)) {
DebugLog("YahooAuthDeny - Can't get db event!");
return 1;
}
- if ( dbei.eventType != EVENTTYPE_AUTHREQUEST ) {
+ if (dbei.eventType != EVENTTYPE_AUTHREQUEST) {
DebugLog("YahooAuthDeny - not Authorization event");
return 1;
}
- if ( strcmp( dbei.szModule, m_szModuleName )) {
+ if (strcmp( dbei.szModule, m_szModuleName)) {
DebugLog("YahooAuthDeny - wrong module?");
return 1;
}