From b1db27c61150e1313a537d1de009ec26bae414ab Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 31 May 2015 22:09:02 +0000 Subject: - CreateProtoServiceFunction() moved into mir_core.dll instead of inlining - all old protocols moved on it; - code cleaning; git-svn-id: http://svn.miranda-ng.org/main/trunk@13953 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_core.h | 1 + include/m_protomod.h | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-) (limited to 'include') diff --git a/include/m_core.h b/include/m_core.h index efcde5e1c2..c70a79a7ab 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -104,6 +104,7 @@ MIR_CORE_DLL(HANDLE) CreateServiceFunction(const char *name, MIRANDASERVICE ser MIR_CORE_DLL(HANDLE) CreateServiceFunctionParam(const char *name, MIRANDASERVICEPARAM serviceProc, LPARAM lParam); MIR_CORE_DLL(HANDLE) CreateServiceFunctionObj(const char *name, MIRANDASERVICEOBJ serviceProc, void* object); MIR_CORE_DLL(HANDLE) CreateServiceFunctionObjParam(const char *name, MIRANDASERVICEOBJPARAM serviceProc, void* object, LPARAM lParam); +MIR_CORE_DLL(HANDLE) CreateProtoServiceFunction(const char *szModule, const char *szService, MIRANDASERVICE serviceProc); MIR_CORE_DLL(int) DestroyServiceFunction(HANDLE hService); MIR_CORE_DLL(int) ServiceExists(const char *name); diff --git a/include/m_protomod.h b/include/m_protomod.h index fcff1ac654..2a4abf55d6 100644 --- a/include/m_protomod.h +++ b/include/m_protomod.h @@ -61,20 +61,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //returns 0 on success, nonzero on failure #define MS_PROTO_REMOVEFROMCONTACT "Proto/RemoveFromContact" -//Create a protocol service -//Protocol services are called with wParam and lParam as standard if they are -//to be called with CallProtoServiceInt(NULL,) (as PS_ services are) -//If they are called with CallContactService() (PSS_ and PSR_ services) then -//they are called with lParam = (CCSDATA*)&ccs and wParam an opaque internal -//reference that should be passed unchanged to MS_PROTO_CHAIN*. -__forceinline HANDLE CreateProtoServiceFunction(const char *szModule, const char *szService, MIRANDASERVICE serviceProc) -{ - char str[MAXMODULELABELLENGTH]; - mir_snprintf(str, sizeof(str), "%s%s", szModule, szService); - str[MAXMODULELABELLENGTH-1] = 0; - return CreateServiceFunction(str, serviceProc); -} - //Call the next service in the chain for this send operation //wParam = wParam //lParam = lParam -- cgit v1.2.3