fix for the proper return type of PROTO<>::RecvMsg

19 files changed, 17 insertions, 17 deletions

diff --git a/include/m_protoint.h b/include/m_protoint.h
index 56063d0cd1..25f2607714 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -202,7 +202,7 @@ public:
 						   

 	virtual	int      RecvContacts(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int      RecvFile(MCONTACT hContact, PROTORECVFILE*);

-	virtual	int      RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

+	virtual	MEVENT   RecvMsg(MCONTACT hContact, PROTORECVEVENT*);

 	virtual	int      RecvUrl(MCONTACT hContact, PROTORECVEVENT*);

 						   

 	virtual	int      SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList);

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 18d51641b2..317438069d 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index ef55d2c68d..280ac51e0e 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp
index ec9faa0690..61ed2237bf 100644
--- a/protocols/Discord/src/proto.cpp
+++ b/protocols/Discord/src/proto.cpp
@@ -353,7 +353,7 @@ MCONTACT CDiscordProto::AddToList(int flags, PROTOSEARCHRESULT *psr)
 ////////////////////////////////////////////////////////////////////////////////////////
 // RecvMsg
 
-int CDiscordProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt)
+MEVENT CDiscordProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt)
 {
 	T2Utf szResUtf((const wchar_t*)evt->lParam);
 	evt->pCustomData = (char*)szResUtf;
diff --git a/protocols/Discord/src/proto.h b/protocols/Discord/src/proto.h
index 502f52fb2f..878b054e6f 100644
--- a/protocols/Discord/src/proto.h
+++ b/protocols/Discord/src/proto.h
@@ -273,7 +273,7 @@ public:
 	int AuthDeny(MEVENT hDbEvent, const wchar_t* szReason) override;
 	int AuthRequest(MCONTACT hContact, const wchar_t*) override;
 
-	int RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt) override;
+	MEVENT RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt) override;
 	int SendMsg(MCONTACT hContact, int flags, const char* pszSrc) override;
 
 	HANDLE SendFile(MCONTACT hContact, const wchar_t *szDescription, wchar_t **ppszFiles) override;
diff --git a/protocols/FacebookRM/src/messages.cpp b/protocols/FacebookRM/src/messages.cpp
index 4801f61a56..015ec134f9 100644
--- a/protocols/FacebookRM/src/messages.cpp
+++ b/protocols/FacebookRM/src/messages.cpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdafx.h"
 
-int FacebookProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)
+MEVENT FacebookProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)
 {
 	StopTyping(hContact);
 
diff --git a/protocols/FacebookRM/src/proto.h b/protocols/FacebookRM/src/proto.h
index 48a8c22ee7..4b66e7d779 100644
--- a/protocols/FacebookRM/src/proto.h
+++ b/protocols/FacebookRM/src/proto.h
@@ -116,7 +116,7 @@ public:
 	HANDLE   SearchByEmail(const wchar_t* email) override;
 	HANDLE   SearchByName(const wchar_t* nick, const wchar_t* firstName, const wchar_t* lastName) override;
 				 
-	int      RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;
+	MEVENT   RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;
 	int      SendMsg(MCONTACT hContact, int flags, const char* msg) override;
 				 
 	int      SetStatus(int iNewStatus) override;
diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp
index fef9525a51..da2972c014 100644
--- a/protocols/IcqOscarJ/src/icq_proto.cpp
+++ b/protocols/IcqOscarJ/src/icq_proto.cpp
@@ -868,7 +868,7 @@ int CIcqProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT* pre)
 ////////////////////////////////////////////////////////////////////////////////////////

 // RecvMsg

 

-int CIcqProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)

+MEVENT CIcqProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)

 {

 	size_t cbBlob = mir_strlen(pre->szMessage) + 1;

 	ICQAddRecvEvent(hContact, EVENTTYPE_MESSAGE, pre, cbBlob, (PBYTE)pre->szMessage, DBEF_UTF);

diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h
index 704e7d402c..f50c445126 100644
--- a/protocols/IcqOscarJ/src/icq_proto.h
+++ b/protocols/IcqOscarJ/src/icq_proto.h
@@ -77,7 +77,7 @@ struct CIcqProto : public PROTO<CIcqProto>
 	HWND     CreateExtendedSearchUI(HWND owner) override;

 

 	int      RecvContacts(MCONTACT hContact, PROTORECVEVENT*) override;

-	int      RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;

+	MEVENT   RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;

 

 	int      SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList) override;

 	HANDLE   SendFile(MCONTACT hContact, const wchar_t *szDescription, wchar_t **ppszFiles) override;

diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp
index 424800517d..30c33ed266 100755
--- a/protocols/JabberG/src/jabber_proto.cpp
+++ b/protocols/JabberG/src/jabber_proto.cpp
@@ -807,7 +807,7 @@ HANDLE CJabberProto::SearchByName(const wchar_t *nick, const wchar_t *firstName,
 ////////////////////////////////////////////////////////////////////////////////////////

 // RecvMsg

 

-int CJabberProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt)

+MEVENT CJabberProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT *evt)

 {

 	T2Utf szResUtf((const wchar_t *)evt->lParam);

 	evt->pCustomData = (char*)szResUtf;

diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h
index b02a17ae97..6bd4a2d6da 100755
--- a/protocols/JabberG/src/jabber_proto.h
+++ b/protocols/JabberG/src/jabber_proto.h
@@ -96,7 +96,7 @@ struct CJabberProto : public PROTO<CJabberProto>, public IJabberInterface
 	HWND     SearchAdvanced(HWND owner) override;

 	HWND     CreateExtendedSearchUI(HWND owner) override;

 

-	int      RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;

+	MEVENT   RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;

 

 	int      SendContacts(MCONTACT hContact, int flags, int nContacts, MCONTACT *hContactsList) override;

 	HANDLE   SendFile(MCONTACT hContact, const wchar_t *szDescription, wchar_t **ppszFiles) override;

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index eedaaf9a3b..8eaa4ef394 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -682,7 +682,7 @@ INT_PTR CMsnProto::GetCaps(int type, MCONTACT)
 /////////////////////////////////////////////////////////////////////////////////////////

 // MsnRecvMessage - creates a database event from the message been received

 

-int CMsnProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)

+MEVENT CMsnProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)

 {

 	char tEmail[MSN_MAX_EMAIL_LEN];

 	if (!db_get_static(hContact, m_szModuleName, "wlid", tEmail, sizeof(tEmail)) || !db_get_static(hContact, m_szModuleName, "e-mail", tEmail, sizeof(tEmail)))

diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h
index 33851a20b0..ec37f0d4a4 100644
--- a/protocols/MSN/src/msn_proto.h
+++ b/protocols/MSN/src/msn_proto.h
@@ -51,7 +51,7 @@ struct CMsnProto : public PROTO<CMsnProto>
 	HANDLE   SearchBasic(const wchar_t* id) override;

 	HANDLE   SearchByEmail(const wchar_t* email) override;

 

-	int      RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;

+	MEVENT   RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;

 	int      RecvContacts(MCONTACT hContact, PROTORECVEVENT*) override;

 

 	int      SendMsg(MCONTACT hContact, int flags, const char* msg) override;

diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp
index f84ed684e3..fd5d5c4eb2 100644
--- a/protocols/Sametime/src/sametime_proto.cpp
+++ b/protocols/Sametime/src/sametime_proto.cpp
@@ -186,7 +186,7 @@ int CSametimeProto::RecvFile(MCONTACT hContact, PROTORECVFILE* pre)
 	return CSuper::RecvFile(hContact, pre);

 }

 

-int CSametimeProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)

+MEVENT CSametimeProto::RecvMsg(MCONTACT hContact, PROTORECVEVENT* pre)

 {

 	debugLogW(L"CSametimeProto::RecvMsg() hContact=[%x]", hContact);

 

diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h
index bb043f5ff9..08199a929d 100644
--- a/protocols/Sametime/src/sametime_proto.h
+++ b/protocols/Sametime/src/sametime_proto.h
@@ -29,7 +29,7 @@ struct CSametimeProto : public PROTO<CSametimeProto>
 	HWND     CreateExtendedSearchUI(HWND owner) override;

 

 	int      RecvFile(MCONTACT hContact, PROTORECVFILE*) override;

-	int      RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;

+	MEVENT   RecvMsg(MCONTACT hContact, PROTORECVEVENT*) override;

 

 	HANDLE   SendFile(MCONTACT hContact, const wchar_t* szDescription, wchar_t** ppszFiles) override;

 	int      SendMsg(MCONTACT hContact, int flags, const char* msg) override;

diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index bbf32ae9ce..b9f156f89f 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -55,7 +55,7 @@ Skin_GetIconName           @24
 ?RecvAwayMsg@PROTO_INTERFACE@@UAEHIHPAUPROTORECVEVENT@@@Z @57 NONAME

 ?RecvContacts@PROTO_INTERFACE@@UAEHIPAUPROTORECVEVENT@@@Z @58 NONAME

 ?RecvFile@PROTO_INTERFACE@@UAEHIPAUPROTORECVFILE@@@Z @59 NONAME

-?RecvMsg@PROTO_INTERFACE@@UAEHIPAUPROTORECVEVENT@@@Z @60 NONAME

+?RecvMsg@PROTO_INTERFACE@@UAEIIPAUPROTORECVEVENT@@@Z @60 NONAME

 ?RecvUrl@PROTO_INTERFACE@@UAEHIPAUPROTORECVEVENT@@@Z @61 NONAME

 ?SearchAdvanced@PROTO_INTERFACE@@UAEPAUHWND__@@PAU2@@Z @62 NONAME

 ?SearchBasic@PROTO_INTERFACE@@UAEPAXPB_W@Z @63 NONAME

diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index e57021e5ed..200a31a90c 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -55,7 +55,7 @@ Skin_GetIconName           @24
 ?RecvAwayMsg@PROTO_INTERFACE@@UEAAHIHPEAUPROTORECVEVENT@@@Z @57 NONAME

 ?RecvContacts@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVEVENT@@@Z @58 NONAME

 ?RecvFile@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVFILE@@@Z @59 NONAME

-?RecvMsg@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVEVENT@@@Z @60 NONAME

+?RecvMsg@PROTO_INTERFACE@@UEAAIIPEAUPROTORECVEVENT@@@Z @60 NONAME

 ?RecvUrl@PROTO_INTERFACE@@UEAAHIPEAUPROTORECVEVENT@@@Z @61 NONAME

 ?SearchAdvanced@PROTO_INTERFACE@@UEAAPEAUHWND__@@PEAU2@@Z @62 NONAME

 ?SearchBasic@PROTO_INTERFACE@@UEAAPEAXPEB_W@Z @63 NONAME

diff --git a/src/mir_app/src/proto_internal.cpp b/src/mir_app/src/proto_internal.cpp
index 616d84402d..f3dfea2402 100644
--- a/src/mir_app/src/proto_internal.cpp
+++ b/src/mir_app/src/proto_internal.cpp
@@ -199,7 +199,7 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE
 		return ProtoCallService(m_szModuleName, PSR_FILE, 0, (LPARAM)&ccs);

 	}

 

-	int RecvMsg(MCONTACT hContact, PROTORECVEVENT* evt) override

+	MEVENT RecvMsg(MCONTACT hContact, PROTORECVEVENT* evt) override

 	{

 		CCSDATA ccs = { hContact, PSR_MESSAGE, 0, (LPARAM)evt };

 		INT_PTR res = ProtoCallService(m_szModuleName, PSR_MESSAGE, 0, (LPARAM)&ccs);

diff --git a/src/mir_app/src/proto_utils.cpp b/src/mir_app/src/proto_utils.cpp
index 7cbff3bb47..92c4d14e51 100644
--- a/src/mir_app/src/proto_utils.cpp
+++ b/src/mir_app/src/proto_utils.cpp
@@ -493,7 +493,7 @@ int PROTO_INTERFACE::RecvFile(MCONTACT hContact, PROTORECVFILE *pcre)
 	return CallService(MS_PROTO_RECVFILET, 0, (LPARAM)&ccs);

 }

 

-int PROTO_INTERFACE::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)

+MEVENT PROTO_INTERFACE::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)

 {

 	if (pre->szMessage == nullptr)

 		return 0;