From d3cb19278d60ac6f7963379254546cdca36a90e2 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 14 Jan 2017 01:22:55 +0300
Subject: separate handle types for HNETLIBCONN & HNETLIBBIND

---
 protocols/MRA/src/MraFilesQueue.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'protocols/MRA/src/MraFilesQueue.cpp')

diff --git a/protocols/MRA/src/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp
index 9b062e46c7..edf341a755 100644
--- a/protocols/MRA/src/MraFilesQueue.cpp
+++ b/protocols/MRA/src/MraFilesQueue.cpp
@@ -37,7 +37,7 @@ struct MRA_FILES_QUEUE_ITEM : public LIST_MT_ITEM
 	LPWSTR                lpwszPath;
 	size_t                dwPathSize;
 	bool                  bSending;
-	HANDLE                hConnection;
+	HNETLIBCONN           hConnection;
 	HANDLE                hListen;
 	HANDLE                hThread;
 	HANDLE                hWaitHandle;
@@ -378,7 +378,7 @@ DWORD CMraProto::MraFilesQueueSendMirror(HANDLE hQueue, DWORD dwIDRequest, const
 	return dwRetErrorCode;
 }
 
-bool CMraProto::MraFilesQueueHandCheck(HANDLE hConnection, MRA_FILES_QUEUE_ITEM *dat)
+bool CMraProto::MraFilesQueueHandCheck(HNETLIBCONN hConnection, MRA_FILES_QUEUE_ITEM *dat)
 {
 	if (hConnection && dat) {
 		BYTE btBuff[((MAX_EMAIL_LEN * 2) + (sizeof(MRA_FT_HELLO)* 2) + 8)] = { 0 };
@@ -522,7 +522,6 @@ HANDLE CMraProto::MraFilesQueueConnectIn(MRA_FILES_QUEUE_ITEM *dat)
 		// копируем адреса в соответствии с правилами и начинаем слушать порт
 		if (getByte("FileSendEnableDirectConn", MRA_DEF_FS_ENABLE_DIRECT_CONN)) {
 			NETLIBBIND nlbBind = {};
-			nlbBind.cbSize = sizeof(nlbBind);
 			nlbBind.pfnNewConnectionV2 = MraFilesQueueConnectionReceived;
 			nlbBind.wPort = 0;
 			nlbBind.pExtra = (LPVOID)dat;
@@ -587,7 +586,7 @@ HANDLE CMraProto::MraFilesQueueConnectIn(MRA_FILES_QUEUE_ITEM *dat)
 
 // This function is called from the Netlib when someone is connecting to
 // one of our incomming DC ports
-void MraFilesQueueConnectionReceived(HANDLE hNewConnection, DWORD dwRemoteIP, void *pExtra)
+void MraFilesQueueConnectionReceived(HNETLIBCONN hNewConnection, DWORD dwRemoteIP, void *pExtra)
 {
 	if (pExtra) {
 		MRA_FILES_QUEUE_ITEM *dat = (MRA_FILES_QUEUE_ITEM*)pExtra;
-- 
cgit v1.2.3