From 4b679c038af5dc4ad891ab28fe600b5f67a002b3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 17 Jun 2013 22:47:15 +0000 Subject: a few remaining calls of MS_PROTO_BROADCASTACK removed git-svn-id: http://svn.miranda-ng.org/main/trunk@5008 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/SecureIM/src/commonheaders.h | 5 ++++- plugins/SecureIM/src/crypt_misc.cpp | 12 ------------ 2 files changed, 4 insertions(+), 13 deletions(-) (limited to 'plugins/SecureIM') diff --git a/plugins/SecureIM/src/commonheaders.h b/plugins/SecureIM/src/commonheaders.h index 15e739cf32..b821fbcbc5 100644 --- a/plugins/SecureIM/src/commonheaders.h +++ b/plugins/SecureIM/src/commonheaders.h @@ -102,7 +102,10 @@ int onModulesLoaded(WPARAM, LPARAM); int onSystemOKToExit(WPARAM, LPARAM); int ModuleLoad(WPARAM wParam, LPARAM lParam); -int SendBroadcast(HANDLE hContact, int type, int result, HANDLE hProcess, LPARAM lParam); +__forceinline int SendBroadcast(HANDLE hContact, int type, int result, HANDLE hProcess, LPARAM lParam) +{ + return ProtoBroadcastAck( GetContactProto(hContact), hContact, type, result, hProcess, lParam); +} LPSTR myDBGetStringDecode(HANDLE,const char *,const char *); int myDBWriteStringEncode(HANDLE,const char *,const char *,const char *); diff --git a/plugins/SecureIM/src/crypt_misc.cpp b/plugins/SecureIM/src/crypt_misc.cpp index 1732c54ccc..aa0025038c 100644 --- a/plugins/SecureIM/src/crypt_misc.cpp +++ b/plugins/SecureIM/src/crypt_misc.cpp @@ -1,17 +1,5 @@ #include "commonheaders.h" -int SendBroadcast(HANDLE hContact, int type, int result, HANDLE hProcess, LPARAM lParam) -{ - ACKDATA ack = { sizeof(ack) }; - ack.szModule = GetContactProto(hContact); - ack.hContact = hContact; - ack.type = type; - ack.result = result; - ack.hProcess = hProcess; - ack.lParam = lParam; - return CallService(MS_PROTO_BROADCASTACK, 0, (LPARAM)&ack); -} - static void sttWaitForExchange(LPVOID param) { HANDLE hContact = (HANDLE)param; -- cgit v1.2.3