ProtoBroadcastAck macro converted into a function

git-svn-id: http://svn.miranda-ng.org/main/trunk@5007 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 5 insertions, 26 deletions

diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index 04801f8702..2ab7632acc 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -521,10 +521,12 @@ function mir_vsntprintf(buffer:pWideChar;count:size_t;fmt:pWideChar;va:va_list):
 ///////////////////////////////////////////////////////////////////////////////

 // protocol functions

 

+function ProtoBroadcastAck(const szModule: PAnsiChar; hContact: THandle; type_: int; result_: int; hProcess: THandle; lParam: LPARAM): int_ptr; stdcall;

+                 external CoreDLL name 'ProtoBroadcastAck';

+

 function ProtoServiceExists(const szModule, szName:PAnsiChar):int; stdcall;

                  external CoreDLL name 'ProtoServiceExists';

 

-

 ///////////////////////////////////////////////////////////////////////////////

 // sha1 functions

 type

diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc
index 9c3881fe31..f14fab1727 100644
--- a/include/delphi/m_helpers.inc
+++ b/include/delphi/m_helpers.inc
@@ -38,7 +38,6 @@ procedure TranslateDialogDefault(hwndDlg: THandle);
 procedure TranslateMenu(hMenu: HMENU);

 function Langpack_Register:int_ptr;

 

-function ProtoBroadcastAck(const szModule: PAnsiChar; hContact: THandle; type_: int; result_: int; hProcess: THandle; lParam: LPARAM): int_ptr;

 function CreateProtoServiceFunction(const szModule, szService: PAnsiChar; serviceProc: TMIRANDASERVICE): int_ptr;

 

 function  Srmm_AddIcon   (sid: PStatusIconData):int_ptr;

@@ -330,21 +329,6 @@ begin
   result:=CallService(MS_LANGPACK_REGISTER,WPARAM(@hLangpack),LPARAM(@PluginInfo));

 end;

 

-

-function ProtoBroadcastAck(const szModule: PAnsiChar; hContact: THandle; type_: int; result_: int; hProcess: THandle; lParam: LPARAM): int_ptr;

-var

-  ack: TACKDATA;

-begin

-  ack.cbSize   := sizeof(TACKDATA);

-  ack.szModule := szModule;

-  ack.hContact := hContact;

-  ack._type    := type_;

-  ack._result  := result_;

-  ack.hProcess := hProcess;

-  ack.lParam   := lParam;

-  Result := CallService(MS_PROTO_BROADCASTACK, 0, tlParam(@ack));

-end;

-

 function CreateProtoServiceFunction(const szModule, szService: PAnsiChar; serviceProc: TMIRANDASERVICE): int_ptr;

 var

   szStr: array[0..MAXMODULELABELLENGTH*2] of AnsiChar;

diff --git a/include/m_core.h b/include/m_core.h
index 9c315e76d4..7e3c4ea99f 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -433,7 +433,8 @@ MIR_CORE_DLL(int)    mir_vsntprintf(TCHAR *buffer, size_t count, const TCHAR* fm
 ///////////////////////////////////////////////////////////////////////////////

 // protocol functions

 

-MIR_CORE_DLL(int)    ProtoServiceExists(const char *szModule, const char *szService);

+MIR_CORE_DLL(int)     ProtoServiceExists(const char *szModule, const char *szService);

+MIR_CORE_DLL(INT_PTR) ProtoBroadcastAck(const char *szModule, HANDLE hContact, int type, int result, HANDLE hProcess, LPARAM lParam);

 

 ///////////////////////////////////////////////////////////////////////////////

 // sha1 functions

diff --git a/include/m_protomod.h b/include/m_protomod.h
index 4b7bcf2de1..3e28b55591 100644
--- a/include/m_protomod.h
+++ b/include/m_protomod.h
@@ -123,12 +123,4 @@ __forceinline INT_PTR ProtoChainRecvFile(HANDLE hContact, PROTORECVFILET *pre)
 //See the notes in core/modules.h under NotifyEventHooks()

 #define MS_PROTO_BROADCASTACK    "Proto/BroadcastAck"

 

-__forceinline INT_PTR ProtoBroadcastAck(const char *szModule, HANDLE hContact, int type, int result, HANDLE hProcess, LPARAM lParam)

-{

-	ACKDATA ack = { sizeof(ACKDATA), szModule, hContact, type, result, hProcess, lParam };

-	return CallService(MS_PROTO_BROADCASTACK, 0, (LPARAM)&ack);

-}

-

 #endif // M_PROTOMOD_H__

-

-