From bdd6a8a6b981a019e6818230077567b4fb51604c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 31 Jan 2018 17:51:08 +0300
Subject: mir_app:

- structure renamed: PROTORECVFILET -> PROTORECVFILE;
- useless service MS_PROTO_AUTHRECV removed;
- Proto_AuthRecv() helper converted into a function.
---
 include/delphi/m_protosvc.inc |  1 -
 include/m_protoint.h          |  2 +-
 include/m_protosvc.h          | 15 ++++++---------
 3 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'include')

diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc
index 8e0279c170..73bc565a72 100644
--- a/include/delphi/m_protosvc.inc
+++ b/include/delphi/m_protosvc.inc
@@ -882,7 +882,6 @@ Copies the EVENTTYPE_AUTHREQUEST event from PROTORECVEVENT into DBEVENTINFO and
 Returns the result of MS_DB_EVENT_ADD
 }
   PSR_AUTH = '/RecvAuth';
-  MS_PROTO_AUTHRECV = 'Proto/AuthRecv';
 
 //File(s) have been received
 //wParam = 0
diff --git a/include/m_protoint.h b/include/m_protoint.h
index ef69a2008d..6231df6990 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -203,7 +203,7 @@ public:
 	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);
 
 	virtual	int       __cdecl RecvContacts(MCONTACT hContact, PROTORECVEVENT*);
-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);
+	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILE*);
 	virtual	int       __cdecl RecvMsg(MCONTACT hContact, PROTORECVEVENT*);
 	virtual	int       __cdecl RecvUrl(MCONTACT hContact, PROTORECVEVENT*);
 
diff --git a/include/m_protosvc.h b/include/m_protosvc.h
index e6c7177695..0ccd3d3c46 100644
--- a/include/m_protosvc.h
+++ b/include/m_protosvc.h
@@ -793,20 +793,17 @@ __forceinline INT_PTR ProtoChainRecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)
 
 #define PSR_AUTH		"/RecvAuth"
 
-#define MS_PROTO_AUTHRECV  "Proto/AuthRecv"
-
-__forceinline INT_PTR Proto_AuthRecv(const char *szProtoName, PROTORECVEVENT *pcre)
-{	return CallService(MS_PROTO_AUTHRECV, (WPARAM)szProtoName, (LPARAM)pcre);
-}
+// adds the standard EVENTTYPE_AUTHREQUEST event to the database
+EXTERN_C MIR_APP_DLL(MEVENT) Proto_AuthRecv(const char *szProtoName, PROTORECVEVENT *pcre);
 
 ///////////////////////////////////////////////////////////////////////////////
 // File(s) have been received
 // wParam = 0
-// lParam = (LPARAM)(PROTORECVFILET*)&prf
+// lParam = (LPARAM)(PROTORECVFILE*)&prf
 
 #define PRFF_UNICODE 1
 
-struct PROTORECVFILET
+struct PROTORECVFILE
 {
 	DWORD dwFlags;          // PRFF_*
 	DWORD timestamp;        // unix time
@@ -820,13 +817,13 @@ struct PROTORECVFILET
 
 #define MS_PROTO_RECVFILET "Proto/RecvFileT"
 
-__forceinline INT_PTR Proto_RecvFile(MCONTACT hContact, PROTORECVFILET *pcre)
+__forceinline INT_PTR Proto_RecvFile(MCONTACT hContact, PROTORECVFILE *pcre)
 {
 	CCSDATA ccs = { hContact, PSR_FILE, 0, (LPARAM)pcre };
 	return CallService(MS_PROTO_RECVFILET, 0, (LPARAM)&ccs);
 }
 
-__forceinline INT_PTR ProtoChainRecvFile(MCONTACT hContact, PROTORECVFILET *pre)
+__forceinline INT_PTR ProtoChainRecvFile(MCONTACT hContact, PROTORECVFILE *pre)
 {
 	CCSDATA ccs = { hContact, PSR_FILE, 0, (LPARAM)pre };
 	return Proto_ChainRecv(0, &ccs);
-- 
cgit v1.2.3