mir_app:

- structure renamed: PROTORECVFILET -> PROTORECVFILE;
- useless service MS_PROTO_AUTHRECV removed;
- Proto_AuthRecv() helper converted into a function.

14 files changed, 16 insertions, 16 deletions

diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp
index dcc51fc84e..266ff97786 100644
--- a/protocols/Gadu-Gadu/src/core.cpp
+++ b/protocols/Gadu-Gadu/src/core.cpp
@@ -1036,7 +1036,7 @@ retry:
 

 			wchar_t* filenameT = mir_a2u((char*)dcc7->filename);

 

-			PROTORECVFILET pre = { 0 };

+			PROTORECVFILE pre = { 0 };

 			pre.dwFlags = PRFF_UNICODE;

 			pre.fileCount = 1;

 			pre.timestamp = time(nullptr);

diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp
index b02bdfaf9d..65e3ce7a1b 100644
--- a/protocols/Gadu-Gadu/src/filetransfer.cpp
+++ b/protocols/Gadu-Gadu/src/filetransfer.cpp
@@ -390,7 +390,7 @@ void __cdecl GaduProto::dccmainthread(void*)
 						local_dcc->contact = (void*)getcontact(local_dcc->peer_uin, 0, 0, nullptr);

 						wchar_t* filenameT = mir_utf8decodeW((char*)dcc->file_info.filename);

 

-						PROTORECVFILET pre = { 0 };

+						PROTORECVFILE pre = { 0 };

 						pre.dwFlags = PRFF_UNICODE;

 						pre.fileCount = 1;

 						pre.timestamp = time(nullptr);

@@ -927,7 +927,7 @@ int GaduProto::FileDeny(MCONTACT, HANDLE hTransfer, const wchar_t *)
 ////////////////////////////////////////////////////////////

 // Called when received an file

 //

-int GaduProto::RecvFile(MCONTACT hContact, PROTORECVFILET* pre)

+int GaduProto::RecvFile(MCONTACT hContact, PROTORECVFILE* pre)

 {

 	return Proto_RecvFile(hContact, pre);

 }

diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h
index 361830b64a..f342797018 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.h
+++ b/protocols/Gadu-Gadu/src/gg_proto.h
@@ -45,7 +45,7 @@ struct GaduProto : public PROTO<GaduProto>
 	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

 	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);

+	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILE*);

 

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

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

@@ -139,7 +139,7 @@ struct GaduProto : public PROTO<GaduProto>
 	HANDLE fileallow(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szPath);

 	int filecancel(MCONTACT hContact, HANDLE hTransfer);

 	int filedeny(MCONTACT hContact, HANDLE hTransfer, const wchar_t* szReason);

-	int recvfile(MCONTACT hContact, PROTORECVFILET* pre);

+	int recvfile(MCONTACT hContact, PROTORECVFILE* pre);

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

 

 	HANDLE dccfileallow(HANDLE hTransfer, const wchar_t* szPath);

diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index e07a5e6283..005d9cd96f 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -1161,7 +1161,7 @@ bool CIrcProto::IsCTCP(const CIrcMessage *pmsg)
 

 						wchar_t* tszTemp = sFile.GetBuffer();

 

-						PROTORECVFILET pre = { 0 };

+						PROTORECVFILE pre = { 0 };

 						pre.dwFlags = PRFF_UNICODE;

 						pre.timestamp = (DWORD)time(nullptr);

 						pre.fileCount = 1;

diff --git a/protocols/IcqOscarJ/src/icq_filerequests.cpp b/protocols/IcqOscarJ/src/icq_filerequests.cpp
index 480c84f334..9af0b9203c 100644
--- a/protocols/IcqOscarJ/src/icq_filerequests.cpp
+++ b/protocols/IcqOscarJ/src/icq_filerequests.cpp
@@ -154,7 +154,7 @@ void CIcqProto::handleFileRequest(PBYTE buf, DWORD dwUin, DWORD dwCookie, DWORD
 	// Send chain event

 	wchar_t* ptszFileName = mir_utf8decodeW(pszFileName);

 

-	PROTORECVFILET pre = { 0 };

+	PROTORECVFILE pre = { 0 };

 	pre.dwFlags = PRFF_UNICODE;

 	pre.fileCount = 1;

 	pre.timestamp = time(nullptr);

diff --git a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
index 991de1a453..f4f5222df6 100644
--- a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
+++ b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp
@@ -476,7 +476,7 @@ void CIcqProto::handleRecvServMsgOFT(BYTE *buf, size_t wLen, DWORD dwUin, char *
 

 				wchar_t* ptszFileName = mir_utf8decodeW(pszFileName);

 

-				PROTORECVFILET pre = { 0 };

+				PROTORECVFILE pre = { 0 };

 				pre.dwFlags = PRFF_UNICODE;

 				pre.fileCount = 1;

 				pre.timestamp = time(nullptr);

diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp
index d480517332..5038c9f1ec 100644
--- a/protocols/JabberG/src/jabber_ft.cpp
+++ b/protocols/JabberG/src/jabber_ft.cpp
@@ -374,7 +374,7 @@ void CJabberProto::FtHandleSiRequest(HXML iqNode)
 				ft->std.tszCurrentFile = mir_wstrdup(filename);

 				ft->std.totalBytes = ft->std.currentFileSize = filesize;

 

-				PROTORECVFILET pre = { 0 };

+				PROTORECVFILE pre = { 0 };

 				pre.dwFlags = PRFF_UNICODE;

 				pre.fileCount = 1;

 				pre.timestamp = time(nullptr);

diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp
index 778e8fd22c..84b45355d8 100644
--- a/protocols/JabberG/src/jabber_iq_handlers.cpp
+++ b/protocols/JabberG/src/jabber_iq_handlers.cpp
@@ -375,7 +375,7 @@ BOOL CJabberProto::OnIqRequestOOB(HXML, CJabberIqInfo *pInfo)
 		str2 = mir_wstrdup(str2);

 		JabberHttpUrlDecode(str2);

 

-		PROTORECVFILET pre;

+		PROTORECVFILE pre;

 		pre.dwFlags = PRFF_UNICODE;

 		pre.timestamp = time(nullptr);

 		pre.descr.w = desc;

diff --git a/protocols/MRA/src/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp
index cdf220ffc1..ee10de4897 100644
--- a/protocols/MRA/src/MraFilesQueue.cpp
+++ b/protocols/MRA/src/MraFilesQueue.cpp
@@ -692,7 +692,7 @@ DWORD CMraProto::MraFilesQueueAddReceive(HANDLE hQueue, DWORD dwFlags, MCONTACT
 	}

 

 	// Send chain event

-	PROTORECVFILET prf;

+	PROTORECVFILE prf;

 	prf.dwFlags = PRFF_UNICODE;

 	prf.timestamp = _time32(nullptr);

 	prf.descr.w = dat->pwszDescription;

diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index a354ee31ee..97bd3e71a9 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -452,7 +452,7 @@ void CMsnProto::MSN_ProcessURIObject(MCONTACT hContact, ezxml_t xmli)
 				wchar_t tComment[40];

 				mir_snwprintf(tComment, TranslateT("%I64u bytes"), ft->std.currentFileSize);

 

-				PROTORECVFILET pre = { 0 };

+				PROTORECVFILE pre = { 0 };

 				pre.dwFlags = PRFF_UNICODE;

 				pre.fileCount = 1;

 				pre.timestamp = time(nullptr);

diff --git a/protocols/Sametime/src/files.cpp b/protocols/Sametime/src/files.cpp
index 6d4813dbca..dd85be9e64 100644
--- a/protocols/Sametime/src/files.cpp
+++ b/protocols/Sametime/src/files.cpp
@@ -38,7 +38,7 @@ void mwFileTransfer_offered(mwFileTransfer* ft)
 	} else

 		wcsncpy_s(descriptionT, filenameT, _TRUNCATE);

 

-	PROTORECVFILET pre = {0};

+	PROTORECVFILE pre = {0};

 	pre.dwFlags = PRFF_UNICODE;

 	pre.fileCount = 1;

 	pre.timestamp = time(nullptr);

diff --git a/protocols/Sametime/src/sametime_proto.cpp b/protocols/Sametime/src/sametime_proto.cpp
index 3fb384cb38..9adfa781f7 100644
--- a/protocols/Sametime/src/sametime_proto.cpp
+++ b/protocols/Sametime/src/sametime_proto.cpp
@@ -181,7 +181,7 @@ HWND CSametimeProto::CreateExtendedSearchUI(HWND owner)
 }

 

 

-int CSametimeProto::RecvFile(MCONTACT hContact, PROTORECVFILET* pre)

+int CSametimeProto::RecvFile(MCONTACT hContact, PROTORECVFILE* pre)

 {

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

 

diff --git a/protocols/Sametime/src/sametime_proto.h b/protocols/Sametime/src/sametime_proto.h
index f822118c88..92170d575e 100644
--- a/protocols/Sametime/src/sametime_proto.h
+++ b/protocols/Sametime/src/sametime_proto.h
@@ -29,7 +29,7 @@ struct CSametimeProto : public PROTO<CSametimeProto>
 	virtual	HWND      __cdecl SearchAdvanced(HWND owner);

 	virtual	HWND      __cdecl CreateExtendedSearchUI(HWND owner);

 

-	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILET*);

+	virtual	int       __cdecl RecvFile(MCONTACT hContact, PROTORECVFILE*);

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

 

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

diff --git a/protocols/Tox/src/tox_transfer.cpp b/protocols/Tox/src/tox_transfer.cpp
index 908c54c37a..8defc01b66 100644
--- a/protocols/Tox/src/tox_transfer.cpp
+++ b/protocols/Tox/src/tox_transfer.cpp
@@ -49,7 +49,7 @@ void CToxProto::OnFriendFile(Tox *tox, uint32_t friendNumber, uint32_t fileNumbe
 				transfer->pfts.hContact = hContact;

 				proto->transfers.Add(transfer);

 

-				PROTORECVFILET pre = { 0 };

+				PROTORECVFILE pre = { 0 };

 				pre.dwFlags = PRFF_UNICODE;

 				pre.fileCount = 1;

 				pre.timestamp = now();