some fixes for MRA file transfers

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

2 files changed, 616 insertions, 751 deletions

diff --git a/protocols/MRA/MraFilesQueue.cpp b/protocols/MRA/MraFilesQueue.cpp
index 67def10d64..332386ea56 100644
--- a/protocols/MRA/MraFilesQueue.cpp
+++ b/protocols/MRA/MraFilesQueue.cpp
@@ -50,26 +50,23 @@ struct MRA_FILES_THREADPROC_PARAMS
 	MRA_FILES_QUEUE_ITEM	*dat;

 };

 

-

-

-//#define mir_calloc(Size)		HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (Size+sizeof(size_t)))

-//#define mir_realloc(Mem, Size)	HeapReAlloc(GetProcessHeap(), (HEAP_ZERO_MEMORY), (LPVOID)Mem, (Size+sizeof(size_t)))

-//#define mir_free(Mem)			if (Mem) {HeapFree(GetProcessHeap(), 0, (LPVOID)Mem);Mem = NULL;}

-

-

 DWORD  MraFilesQueueItemFindByID(HANDLE hFilesQueueHandle, DWORD dwIDRequest, MRA_FILES_QUEUE_ITEM **ppmrafqFilesQueueItem);

 void   MraFilesQueueItemFree(MRA_FILES_QUEUE_ITEM *dat);

 

+/////////////////////////////////////////////////////////////////////////////////////////

+// File transfer options

+

+static WORD wMraFilesControlsList[] = {

+	IDC_FILE_SEND_NOOUTCONNECTIONONRECEIVE, 

+	IDC_FILE_SEND_NOOUTCONNECTIONONSEND, 

+	IDC_FILE_SEND_IGNORYADDITIONALPORTS, 

+	IDC_FILE_SEND_HIDE_MY_ADDRESSES, 

+	IDC_FILE_SEND_ADD_EXTRA_ADDRESS, 

+	IDC_FILE_SEND_EXTRA_ADDRESS

+};

+

 void MraFilesQueueDlgEnableDirectConsControls(HWND hWndDlg, BOOL bEnabled)

 {

-	WORD wMraFilesControlsList[] = {

-							IDC_FILE_SEND_NOOUTCONNECTIONONRECEIVE, 

-							IDC_FILE_SEND_NOOUTCONNECTIONONSEND, 

-							IDC_FILE_SEND_IGNORYADDITIONALPORTS, 

-							IDC_FILE_SEND_HIDE_MY_ADDRESSES, 

-							IDC_FILE_SEND_ADD_EXTRA_ADDRESS, 

-							IDC_FILE_SEND_EXTRA_ADDRESS

-	};

 	EnableControlsArray(hWndDlg, (WORD*)&wMraFilesControlsList, SIZEOF(wMraFilesControlsList), bEnabled);

 	EnableWindow(GetDlgItem(hWndDlg, IDC_FILE_SEND_EXTRA_ADDRESS), (bEnabled && IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_FILE_SEND_ADD_EXTRA_ADDRESS)));

 }

@@ -96,7 +93,7 @@ INT_PTR CALLBACK MraFilesQueueDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wParam,
 				SET_DLG_ITEM_TEXT(hWndDlg, IDC_FILE_SEND_EXTRA_ADDRESS, szBuff);

 

 			CHECK_DLG_BUTTON(hWndDlg, IDC_FILE_SEND_ENABLE_MRIMPROXY_CONS, ppro->mraGetByte(NULL, "FileSendEnableMRIMProxyCons", MRA_DEF_FS_ENABLE_MRIM_PROXY_CONS));

-			

+

 			SetDlgItemInt(hWndDlg, IDC_FILE_SEND_BLOCK_SIZE, ppro->mraGetDword(NULL, "FileSendBlockSize", MRA_DEFAULT_FILE_SEND_BLOCK_SIZE), FALSE);

 

 			MraFilesQueueDlgEnableDirectConsControls(hWndDlg, IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_FILE_SEND_ENABLE_DIRECT_CONN));

@@ -135,101 +132,83 @@ INT_PTR CALLBACK MraFilesQueueDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wParam,
 		}

 		break;

 	}

-return FALSE;

+	return FALSE;

 }

 

-

+/////////////////////////////////////////////////////////////////////////////////////////

+// MRA files' queue

 

 DWORD MraFilesQueueInitialize(DWORD dwSendTimeOutInterval, HANDLE *phFilesQueueHandle)

 {

-	DWORD dwRetErrorCode;

+	if (!phFilesQueueHandle)

+		return ERROR_INVALID_HANDLE;

 

-	if (phFilesQueueHandle)

-	{

-		MRA_FILES_QUEUE *pmrafqFilesQueue;

+	MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)mir_calloc(sizeof(MRA_FILES_QUEUE));

+	if (!pmrafqFilesQueue)

+		return GetLastError();

 

-		pmrafqFilesQueue = (MRA_FILES_QUEUE*)mir_calloc(sizeof(MRA_FILES_QUEUE));

-		if (pmrafqFilesQueue)

-		{

-			dwRetErrorCode = ListMTInitialize(pmrafqFilesQueue, 0);

-			if (dwRetErrorCode == NO_ERROR)

-			{

-				pmrafqFilesQueue->dwSendTimeOutInterval = dwSendTimeOutInterval;

-				(*phFilesQueueHandle) = (HANDLE)pmrafqFilesQueue;

-			}else {

-				mir_free(pmrafqFilesQueue);

-			}

-		}else {

-			dwRetErrorCode = GetLastError();

-		}

-	}else {

-		dwRetErrorCode = ERROR_INVALID_HANDLE;

+	DWORD dwRetErrorCode = ListMTInitialize(pmrafqFilesQueue, 0);

+	if (dwRetErrorCode == NO_ERROR) {

+		pmrafqFilesQueue->dwSendTimeOutInterval = dwSendTimeOutInterval;

+		(*phFilesQueueHandle) = (HANDLE)pmrafqFilesQueue;

 	}

-return(dwRetErrorCode);

+	else mir_free(pmrafqFilesQueue);

+	

+	return dwRetErrorCode;

 }

 

-

 void MraFilesQueueDestroy(HANDLE hFilesQueueHandle)

 {

-	if (hFilesQueueHandle)

-	{

-		MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

-		MRA_FILES_QUEUE_ITEM *dat;

+	if ( !hFilesQueueHandle)

+		return;

 

-		ListMTLock(pmrafqFilesQueue);

-		while( ListMTItemGetFirst(pmrafqFilesQueue, NULL, (LPVOID*)&dat) == NO_ERROR)

-		{

-			MraFilesQueueItemFree(dat);

-		}

-		ListMTUnLock(pmrafqFilesQueue);

+	MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

+	MRA_FILES_QUEUE_ITEM *dat;

 

-		ListMTDestroy(pmrafqFilesQueue);

-		mir_free(pmrafqFilesQueue);

-	}

-}

+	ListMTLock(pmrafqFilesQueue);

+	while( ListMTItemGetFirst(pmrafqFilesQueue, NULL, (LPVOID*)&dat) == NO_ERROR)

+		MraFilesQueueItemFree(dat);

 

+	ListMTUnLock(pmrafqFilesQueue);

+

+	ListMTDestroy(pmrafqFilesQueue);

+	mir_free(pmrafqFilesQueue);

+}

 

 DWORD MraFilesQueueItemFindByID(HANDLE hFilesQueueHandle, DWORD dwIDRequest, MRA_FILES_QUEUE_ITEM **ppmrafqFilesQueueItem)

 {

-	DWORD dwRetErrorCode;

-

-	if (hFilesQueueHandle)

-	{

-		MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

-		MRA_FILES_QUEUE_ITEM *dat;

-		LIST_MT_ITERATOR lmtiIterator;

+	if (!hFilesQueueHandle)

+		return ERROR_INVALID_HANDLE;

 

-		dwRetErrorCode = ERROR_NOT_FOUND;

-		ListMTLock(pmrafqFilesQueue);

-		ListMTIteratorMoveFirst(pmrafqFilesQueue, &lmtiIterator);

-		do

-		{// цикл

-			if (ListMTIteratorGet(&lmtiIterator, NULL, (LPVOID*)&dat) == NO_ERROR)

-			if (dat->dwIDRequest == dwIDRequest)

-			{

-				if (ppmrafqFilesQueueItem) (*ppmrafqFilesQueueItem) = dat;

-				dwRetErrorCode = NO_ERROR;

-				break;

-			}

-		}while(ListMTIteratorMoveNext(&lmtiIterator));

-		ListMTUnLock(pmrafqFilesQueue);

-	}else {

-		dwRetErrorCode = ERROR_INVALID_HANDLE;

+	MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

+	MRA_FILES_QUEUE_ITEM *dat;

+	LIST_MT_ITERATOR lmtiIterator;

+

+	DWORD dwRetErrorCode = ERROR_NOT_FOUND;

+	ListMTLock(pmrafqFilesQueue);

+	ListMTIteratorMoveFirst(pmrafqFilesQueue, &lmtiIterator);

+	do

+	{// цикл

+		if (ListMTIteratorGet(&lmtiIterator, NULL, (LPVOID*)&dat) == NO_ERROR)

+		if (dat->dwIDRequest == dwIDRequest)

+		{

+			if (ppmrafqFilesQueueItem) (*ppmrafqFilesQueueItem) = dat;

+			dwRetErrorCode = NO_ERROR;

+			break;

+		}

 	}

-return(dwRetErrorCode);

+		while(ListMTIteratorMoveNext(&lmtiIterator));

+	ListMTUnLock(pmrafqFilesQueue);

+	return dwRetErrorCode;

 }

 

-

 HANDLE MraFilesQueueItemProxyByID(HANDLE hFilesQueueHandle, DWORD dwIDRequest)

 {

-	HANDLE hRet = NULL;

 	MRA_FILES_QUEUE_ITEM *dat;

+	if ( !MraFilesQueueItemFindByID(hFilesQueueHandle, dwIDRequest, &dat))

+		return dat->hMraMrimProxyData;

 

-	if (MraFilesQueueItemFindByID(hFilesQueueHandle, dwIDRequest, &dat) == NO_ERROR)

-	{

-		hRet = dat->hMraMrimProxyData;

-	}

-return(hRet);

+	return NULL;

 }

 

 void MraFilesQueueItemFree(MRA_FILES_QUEUE_ITEM *dat)

@@ -262,24 +241,22 @@ size_t CMraProto::MraFilesQueueGetLocalAddressesList(LPSTR lpszBuff, size_t dwBu
 		{// только если не добавляем адрес роутера

 			lpszCurPos += mir_snprintf(lpszCurPos, (dwBuffSize-((size_t)lpszCurPos-(size_t)lpszBuff)), MRA_FILES_NULL_ADDRR);

 		}

-	}else {// создаём список наших IP адресов

+	}

+	else {// создаём список наших IP адресов

 		BYTE btAddress[32];

 		DWORD dwSelfExternalIP;

 		size_t dwAdapter = 0;

 		hostent *sh;

 

 		dwSelfExternalIP = NTOHL(mraGetDword(NULL, "IP", 0));

-		if (dwSelfExternalIP)

-		{

+		if (dwSelfExternalIP) {

 			memmove(&btAddress, &dwSelfExternalIP, sizeof(DWORD));

 			lpszCurPos += mir_snprintf(lpszCurPos, (dwBuffSize-((size_t)lpszCurPos-(size_t)lpszBuff)), "%lu.%lu.%lu.%lu:%lu;", btAddress[0], btAddress[1], btAddress[2], btAddress[3], dwPort);

 		}

 

 		if (gethostname(szHostName, SIZEOF(szHostName)) == 0)

-		if ((sh = gethostbyname((LPSTR)&szHostName)))

-		{

-			while(sh->h_addr_list[dwAdapter])

-			{

+		if ((sh = gethostbyname((LPSTR)&szHostName))) {

+			while(sh->h_addr_list[dwAdapter]) {

 				lpszCurPos += mir_snprintf(lpszCurPos, (dwBuffSize-((size_t)lpszCurPos-(size_t)lpszBuff)), "%s:%lu;", inet_ntoa(*((struct in_addr*)sh->h_addr_list[dwAdapter])), dwPort);

 				dwAdapter++;

 			}

@@ -288,296 +265,81 @@ size_t CMraProto::MraFilesQueueGetLocalAddressesList(LPSTR lpszBuff, size_t dwBu
 

 	if (mraGetByte(NULL, "FileSendAddExtraAddresses", MRA_DEF_FS_ADD_EXTRA_ADDRESSES))// добавляем произвольный адрес

 	if (mraGetStaticStringA(NULL, "FileSendExtraAddresses", szHostName, SIZEOF(szHostName), NULL))

-	{

 		lpszCurPos += mir_snprintf(lpszCurPos, (dwBuffSize-((size_t)lpszCurPos-(size_t)lpszBuff)), "%s:%lu;", szHostName, dwPort);

-	}

-return((lpszCurPos-lpszBuff));

-}

-

 

-

-

-DWORD CMraProto::MraFilesQueueAddReceive(HANDLE hFilesQueueHandle, DWORD dwFlags, HANDLE hContact, DWORD dwIDRequest, LPWSTR lpwszFiles, size_t dwFilesSize, LPSTR lpszAddreses, size_t dwAddresesSize)

-{

-	DWORD dwRetErrorCode;

-

-	if (hFilesQueueHandle && dwIDRequest)

-	{

-		MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

-		MRA_FILES_QUEUE_ITEM *dat;

-

-		dat = (MRA_FILES_QUEUE_ITEM*)mir_calloc(sizeof(MRA_FILES_QUEUE_ITEM)+sizeof(LPSTR)+64);

-		if (dat)

-		{

-			WCHAR szBuff[MAX_PATH];

-			LPWSTR lpwszCurrentItem, lpwszDelimiter, lpwszEndItem;

-			size_t dwMemSize, dwAllocatedCount, dwFileNameTotalSize;

-			CCSDATA ccs;

-			PROTORECVFILET prf;

-

-			//dat->lmtListMTItem;

-			dat->ppro = this;

-			dat->bIsWorking = TRUE;

-			dat->dwSendTime = GetTickCount();

-			dat->dwIDRequest = dwIDRequest;

-			dat->dwFlags = dwFlags;

-			dat->hContact = hContact;

-			if (mraGetByte(NULL, "FileSendEnableMRIMProxyCons", MRA_DEF_FS_ENABLE_MRIM_PROXY_CONS))

-				dat->hMraMrimProxyData = MraMrimProxyCreate();

-

-			dwFileNameTotalSize = 0;

-			dwAllocatedCount = ALLOCATED_COUNT;

-			dat->dwFilesCount = 0;

-			dat->dwFilesTotalSize = 0;

-			dat->pmfqfFiles = (MRA_FILES_QUEUE_FILE*)mir_calloc((sizeof(MRA_FILES_QUEUE_FILE)*dwAllocatedCount));

-			lpwszCurrentItem = lpwszFiles;

-			while(TRUE)

-			{

-				lpwszDelimiter = (LPWSTR)MemoryFind(((size_t)lpwszCurrentItem-(size_t)lpwszFiles), lpwszFiles, (dwFilesSize*sizeof(WCHAR)), ";", 2);

-				if (lpwszDelimiter)

-				{

-					lpwszEndItem = (LPWSTR)MemoryFind((((size_t)lpwszDelimiter+2)-(size_t)lpwszFiles), lpwszFiles, (dwFilesSize*sizeof(WCHAR)), ";", 2);

-					if (lpwszEndItem)

-					{

-						if (dat->dwFilesCount == dwAllocatedCount)

-						{

-							dwAllocatedCount *= 2;

-							dat->pmfqfFiles = (MRA_FILES_QUEUE_FILE*)mir_realloc(dat->pmfqfFiles, (sizeof(MRA_FILES_QUEUE_FILE)*dwAllocatedCount));

-						}

-

-						dwMemSize = ((size_t)lpwszDelimiter-(size_t)lpwszCurrentItem);

-						dat->pmfqfFiles[dat->dwFilesCount].lpwszName = (LPWSTR)mir_calloc(dwMemSize);

-						memmove(dat->pmfqfFiles[dat->dwFilesCount].lpwszName, lpwszCurrentItem, dwMemSize);

-						dat->pmfqfFiles[dat->dwFilesCount].dwSize = StrToUNum64((LPSTR)((size_t)lpwszDelimiter+1), ((size_t)lpwszEndItem-((size_t)lpwszDelimiter+1)));

-						dat->dwFilesTotalSize += dat->pmfqfFiles[dat->dwFilesCount].dwSize;

-						dat->pmfqfFiles[dat->dwFilesCount].dwNameLen = (dwMemSize/sizeof(WCHAR));

-						dwFileNameTotalSize += dwMemSize;

-						

-						dat->dwFilesCount++;

-						lpwszCurrentItem = (lpwszEndItem+1);

-					}else {

-						break;

-					}

-				}else {

-					break;

-				}

-			}

-			dat->pmfqfFiles = (MRA_FILES_QUEUE_FILE*)mir_realloc(dat->pmfqfFiles, (sizeof(MRA_FILES_QUEUE_FILE)*(dat->dwFilesCount+4)));

-

-			dwMemSize = (((dat->dwFilesCount+4)*64)+(dwFileNameTotalSize*sizeof(WCHAR))+(dwAddresesSize*sizeof(WCHAR))+128);

-			dat->pwszFilesList = (LPWSTR)mir_calloc(dwMemSize);

-			dat->pwszDescription = (LPWSTR)mir_calloc(dwMemSize);

-

-

-			lpwszDelimiter = dat->pwszFilesList;

-			lpwszCurrentItem = dat->pwszDescription;

-			StrFormatByteSizeW(dat->dwFilesTotalSize, szBuff, SIZEOF(szBuff));

-			lpwszCurrentItem += mir_sntprintf(lpwszCurrentItem, ((dwMemSize-((size_t)lpwszCurrentItem-(size_t)dat->pwszDescription))/sizeof(WCHAR)), L"%I64u Files (%s)\r\n", dat->dwFilesCount, szBuff);

-

-			// description + filesnames

-			for (size_t i = 0;i<dat->dwFilesCount;i++)

-			{

-				lpwszDelimiter += mir_sntprintf(lpwszDelimiter, ((dwMemSize-((size_t)lpwszDelimiter-(size_t)dat->pwszFilesList))/sizeof(WCHAR)), L"%s; ", dat->pmfqfFiles[i].lpwszName);

-				StrFormatByteSizeW(dat->pmfqfFiles[i].dwSize, szBuff, SIZEOF(szBuff));

-				lpwszCurrentItem += mir_sntprintf(lpwszCurrentItem, ((dwMemSize-((size_t)lpwszCurrentItem-(size_t)dat->pwszDescription))/sizeof(WCHAR)), L"%s - %s\r\n", dat->pmfqfFiles[i].lpwszName, szBuff);

-			}

-

-			lpwszCurrentItem += MultiByteToWideChar(MRA_CODE_PAGE, 0, lpszAddreses, dwAddresesSize, lpwszCurrentItem, ((dwMemSize-((size_t)lpwszCurrentItem-(size_t)dat->pwszDescription))/sizeof(WCHAR)));

-			(*lpwszCurrentItem) = 0;

-			//lpwszCurrentItem++;

-

-

-			MraAddrListGetFromBuff(lpszAddreses, dwAddresesSize, &dat->malAddrList);

-			MraAddrListStoreToContact(dat->hContact, &dat->malAddrList);

-

-			ListMTLock(pmrafqFilesQueue);

-			ListMTItemAdd(pmrafqFilesQueue, dat, dat);

-			ListMTUnLock(pmrafqFilesQueue);

-

-

-			// Send chain event

-

-			ccs.szProtoService = PSR_FILE;

-			ccs.hContact = hContact;

-			ccs.wParam = 0;

-			ccs.lParam = (LPARAM)&prf;

-			prf.flags = PREF_UNICODE;

-			prf.timestamp = _time32(NULL);

-			prf.tszDescription = dat->pwszDescription;

-			prf.fileCount = 1;//dat->dwFilesCount;

-			prf.ptszFiles = &dat->pwszFilesList;

-			prf.lParam = dwIDRequest;

- 

-			CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);

-

-			dwRetErrorCode = NO_ERROR;

-		}else {

-			dwRetErrorCode = GetLastError();

-		}

-	}else {

-		dwRetErrorCode = ERROR_INVALID_HANDLE;

-	}

-return(dwRetErrorCode);

+	return lpszCurPos - lpszBuff;

 }

 

-DWORD CMraProto::MraFilesQueueAddSend(HANDLE hFilesQueueHandle, DWORD dwFlags, HANDLE hContact, LPWSTR *plpwszFiles, size_t dwFilesCount, DWORD *pdwIDRequest)

+DWORD CMraProto::MraFilesQueueAccept(HANDLE hFilesQueueHandle, DWORD dwIDRequest, LPCWSTR lpwszPath, size_t dwPathSize)

 {

-	DWORD dwRetErrorCode;

-

-	if (hFilesQueueHandle)

-	{

-		MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

-		MRA_FILES_QUEUE_ITEM *dat;

-

-

-		dat = (MRA_FILES_QUEUE_ITEM*)mir_calloc(sizeof(MRA_FILES_QUEUE_ITEM)+sizeof(LPSTR)+64);

-		if (dat)

-		{

-			size_t i;

-			ULARGE_INTEGER uliFileSize;

-			WIN32_FILE_ATTRIBUTE_DATA wfad;

-

-			//dat->lmtListMTItem;

-			dat->bIsWorking = TRUE;

-			dat->dwSendTime = GetTickCount();

-			dat->dwIDRequest = InterlockedIncrement((LONG volatile*)&dwCMDNum);// уникальный, рандомный идентификатор

-			dat->dwFlags = dwFlags;

-			dat->hContact = hContact;

-			if (mraGetByte(NULL, "FileSendEnableMRIMProxyCons", MRA_DEF_FS_ENABLE_MRIM_PROXY_CONS)) dat->hMraMrimProxyData = MraMrimProxyCreate();

-			dat->dwFilesCount = dwFilesCount;

-			dat->pmfqfFiles = (MRA_FILES_QUEUE_FILE*)mir_calloc((sizeof(MRA_FILES_QUEUE_FILE)*(dat->dwFilesCount+1)));

-			dat->dwFilesTotalSize = 0;

+	if ( !hFilesQueueHandle || !lpwszPath || !dwPathSize)

+		return ERROR_INVALID_HANDLE;

 

-			for (i = 0;i<dat->dwFilesCount;i++)

-			{

-				if (GetFileAttributesExW(plpwszFiles[i], GetFileExInfoStandard, &wfad))

-				{

-					uliFileSize.LowPart = wfad.nFileSizeLow;

-					uliFileSize.HighPart = wfad.nFileSizeHigh;

-					dat->pmfqfFiles[i].dwSize = uliFileSize.QuadPart;

-					dat->dwFilesTotalSize += uliFileSize.QuadPart;

-				}else {

-					dat->pmfqfFiles[i].dwSize = 0;

-				}

-				dat->pmfqfFiles[i].dwNameLen = lstrlenW(plpwszFiles[i]);

-				dat->pmfqfFiles[i].lpwszName = (LPWSTR)mir_calloc((dat->pmfqfFiles[i].dwNameLen*sizeof(WCHAR)));

-				if (dat->pmfqfFiles[i].lpwszName)

-				{

-					memmove(dat->pmfqfFiles[i].lpwszName, plpwszFiles[i], (dat->pmfqfFiles[i].dwNameLen*sizeof(WCHAR)));

-				}

-			}

-			//dat->malAddrList.dwAddrCount = 0;

-			//dat->pmfqaAddreses = NULL;

-			dat->bSending = TRUE;

-			if (pdwIDRequest) (*pdwIDRequest) = dat->dwIDRequest;

-

-			ListMTLock(pmrafqFilesQueue);

-			ListMTItemAdd(pmrafqFilesQueue, dat, dat);

-			ListMTUnLock(pmrafqFilesQueue);

-

-			{

-				MRA_FILES_THREADPROC_PARAMS *pmftpp = (MRA_FILES_THREADPROC_PARAMS*)mir_calloc(sizeof(MRA_FILES_THREADPROC_PARAMS));

-				pmftpp->hFilesQueueHandle = hFilesQueueHandle;

-				pmftpp->dat = dat;

-				

-				dat->hThread = ForkThreadEx(&CMraProto::MraFilesQueueSendThreadProc, pmftpp);

-			}

+	MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

+	MRA_FILES_QUEUE_ITEM *dat;

 

-			dwRetErrorCode = NO_ERROR;

-		}else {

-			dwRetErrorCode = GetLastError();

+	ListMTLock(pmrafqFilesQueue);

+	DWORD dwRetErrorCode = MraFilesQueueItemFindByID(hFilesQueueHandle, dwIDRequest, &dat);

+	if (dwRetErrorCode == NO_ERROR) {

+		MRA_FILES_THREADPROC_PARAMS *pmftpp = (MRA_FILES_THREADPROC_PARAMS*)mir_calloc(sizeof(MRA_FILES_THREADPROC_PARAMS));

+		dat->lpwszPath = (LPWSTR)mir_calloc((dwPathSize*sizeof(WCHAR)));

+		dat->dwPathSize = dwPathSize;

+		memmove(dat->lpwszPath, lpwszPath, (dwPathSize*sizeof(WCHAR)));

+

+		if ( (*(WCHAR*)(dat->lpwszPath+(dat->dwPathSize-1))) != '\\')

+		{// add slash at the end if needed

+			(*(WCHAR*)(dat->lpwszPath+dat->dwPathSize)) = '\\';

+			dat->dwPathSize++;

+			(*(WCHAR*)(dat->lpwszPath+dat->dwPathSize)) = 0;

 		}

-	}else {

-		dwRetErrorCode = ERROR_INVALID_HANDLE;

-	}

-return(dwRetErrorCode);

-}

-

-DWORD CMraProto::MraFilesQueueAccept(HANDLE hFilesQueueHandle, DWORD dwIDRequest, LPCWSTR lpwszPath, size_t dwPathSize)

-{

-	DWORD dwRetErrorCode;

-

-	if (hFilesQueueHandle && lpwszPath && dwPathSize)

-	{

-		MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

-		MRA_FILES_QUEUE_ITEM *dat;

 

-		ListMTLock(pmrafqFilesQueue);

-		if ((dwRetErrorCode = MraFilesQueueItemFindByID(hFilesQueueHandle, dwIDRequest, &dat)) == NO_ERROR)

-		{

-			MRA_FILES_THREADPROC_PARAMS *pmftpp = (MRA_FILES_THREADPROC_PARAMS*)mir_calloc(sizeof(MRA_FILES_THREADPROC_PARAMS));

-			dat->lpwszPath = (LPWSTR)mir_calloc((dwPathSize*sizeof(WCHAR)));

-			dat->dwPathSize = dwPathSize;

-			memmove(dat->lpwszPath, lpwszPath, (dwPathSize*sizeof(WCHAR)));

-

-			if ( (*(WCHAR*)(dat->lpwszPath+(dat->dwPathSize-1))) != '\\')

-			{// add slash at the end if needed

-				(*(WCHAR*)(dat->lpwszPath+dat->dwPathSize)) = '\\';

-				dat->dwPathSize++;

-				(*(WCHAR*)(dat->lpwszPath+dat->dwPathSize)) = 0;

-			}

+		pmftpp->hFilesQueueHandle = hFilesQueueHandle;

+		pmftpp->dat = dat;

 

-			pmftpp->hFilesQueueHandle = hFilesQueueHandle;

-			pmftpp->dat = dat;

-			

-			dat->hThread = ForkThreadEx(&CMraProto::MraFilesQueueRecvThreadProc, pmftpp);

-		}

-		ListMTUnLock(pmrafqFilesQueue);

-	}else {

-		dwRetErrorCode = ERROR_INVALID_HANDLE;

+		dat->hThread = ForkThreadEx(&CMraProto::MraFilesQueueRecvThreadProc, pmftpp);

 	}

-return(dwRetErrorCode);

+	ListMTUnLock(pmrafqFilesQueue);

+	return dwRetErrorCode;

 }

 

-

 DWORD CMraProto::MraFilesQueueCancel(HANDLE hFilesQueueHandle, DWORD dwIDRequest, BOOL bSendDecline)

 {

-	DWORD dwRetErrorCode;

+	if (!hFilesQueueHandle)

+		return ERROR_INVALID_HANDLE;

 

-	if (hFilesQueueHandle)

-	{

-		MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

-		MRA_FILES_QUEUE_ITEM *dat;

+	MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

+	MRA_FILES_QUEUE_ITEM *dat;

 

-		ListMTLock(pmrafqFilesQueue);

-		if ((dwRetErrorCode = MraFilesQueueItemFindByID(hFilesQueueHandle, dwIDRequest, &dat)) == NO_ERROR)

-		{//***deb closesocket, send message to thread

-			InterlockedExchange((volatile LONG*)&dat->bIsWorking, FALSE);

+	ListMTLock(pmrafqFilesQueue);

+	DWORD dwRetErrorCode = MraFilesQueueItemFindByID(hFilesQueueHandle, dwIDRequest, &dat);

+	if (dwRetErrorCode == NO_ERROR) { //***deb closesocket, send message to thread

+		InterlockedExchange((volatile LONG*)&dat->bIsWorking, FALSE);

 

-			if (bSendDecline)

-			{

-				CHAR szEMail[MAX_EMAIL_LEN];

-				size_t dwEMailSize;

+		if (bSendDecline) {

+			CHAR szEMail[MAX_EMAIL_LEN];

+			size_t dwEMailSize;

 

-				if (mraGetStaticStringA(dat->hContact, "e-mail", szEMail, SIZEOF(szEMail), &dwEMailSize))

-				{

-					MraFileTransferAck(FILE_TRANSFER_STATUS_DECLINE, szEMail, dwEMailSize, dwIDRequest, NULL, 0);

-				}

-			}

+			if (mraGetStaticStringA(dat->hContact, "e-mail", szEMail, SIZEOF(szEMail), &dwEMailSize))

+				MraFileTransferAck(FILE_TRANSFER_STATUS_DECLINE, szEMail, dwEMailSize, dwIDRequest, NULL, 0);

+		}

 			

-			MraMrimProxyCloseConnection(dat->hMraMrimProxyData);

+		MraMrimProxyCloseConnection(dat->hMraMrimProxyData);

 

-			Netlib_CloseHandle(dat->hListen);

-			dat->hListen = NULL;

+		Netlib_CloseHandle(dat->hListen);

+		dat->hListen = NULL;

 

-			Netlib_CloseHandle(dat->hConnection);

-			dat->hConnection = NULL;

+		Netlib_CloseHandle(dat->hConnection);

+		dat->hConnection = NULL;

 

-			SetEvent(dat->hWaitHandle);

+		SetEvent(dat->hWaitHandle);

 

-			if (dat->hThread == NULL)

-			{

-				MraFilesQueueItemFree(dat);

-			}

-		}

-		ListMTUnLock(pmrafqFilesQueue);

-	}else {

-		dwRetErrorCode = ERROR_INVALID_HANDLE;

+		if (dat->hThread == NULL)

+			MraFilesQueueItemFree(dat);

 	}

-return(dwRetErrorCode);

+	ListMTUnLock(pmrafqFilesQueue);

+	return dwRetErrorCode;

 }

 

-

 DWORD CMraProto::MraFilesQueueStartMrimProxy(HANDLE hFilesQueueHandle, DWORD dwIDRequest)

 {

 	DWORD dwRetErrorCode;

@@ -609,60 +371,50 @@ DWORD MraFilesQueueFree(HANDLE hFilesQueueHandle, DWORD dwIDRequest)
 {

 	DWORD dwRetErrorCode;

 

-	if (hFilesQueueHandle)

-	{

-		MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

-		MRA_FILES_QUEUE_ITEM *dat;

-		LIST_MT_ITERATOR lmtiIterator;

+	if (!hFilesQueueHandle)

+		return ERROR_INVALID_HANDLE;

 

-		dwRetErrorCode = ERROR_NOT_FOUND;

-		ListMTLock(pmrafqFilesQueue);

-		ListMTIteratorMoveFirst(pmrafqFilesQueue, &lmtiIterator);

-		do

-		{// цикл

-			if (ListMTIteratorGet(&lmtiIterator, NULL, (LPVOID*)&dat) == NO_ERROR)

-			if (dat->dwIDRequest == dwIDRequest)

-			{

-				MraFilesQueueItemFree(dat);

-				dwRetErrorCode = NO_ERROR;

-				break;

-			}

-		}while(ListMTIteratorMoveNext(&lmtiIterator));

-		ListMTUnLock(pmrafqFilesQueue);

-	}else {

-		dwRetErrorCode = ERROR_INVALID_HANDLE;

+	MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

+	MRA_FILES_QUEUE_ITEM *dat;

+	LIST_MT_ITERATOR lmtiIterator;

+

+	dwRetErrorCode = ERROR_NOT_FOUND;

+	ListMTLock(pmrafqFilesQueue);

+	ListMTIteratorMoveFirst(pmrafqFilesQueue, &lmtiIterator);

+	do { // цикл

+		if (ListMTIteratorGet(&lmtiIterator, NULL, (LPVOID*)&dat) == NO_ERROR)

+		if (dat->dwIDRequest == dwIDRequest) {

+			MraFilesQueueItemFree(dat);

+			dwRetErrorCode = NO_ERROR;

+			break;

+		}

 	}

-return(dwRetErrorCode);

+		while(ListMTIteratorMoveNext(&lmtiIterator));

+	ListMTUnLock(pmrafqFilesQueue);

+	return dwRetErrorCode;

 }

 

-

 DWORD CMraProto::MraFilesQueueSendMirror(HANDLE hFilesQueueHandle, DWORD dwIDRequest, LPSTR lpszAddreses, size_t dwAddresesSize)

 {

-	DWORD dwRetErrorCode;

+	if (!hFilesQueueHandle)

+		return ERROR_INVALID_HANDLE;

 

-	if (hFilesQueueHandle)

-	{

-		MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

-		MRA_FILES_QUEUE_ITEM *dat;

+	MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

+	MRA_FILES_QUEUE_ITEM *dat;

 

-		ListMTLock(pmrafqFilesQueue);

-		if ((dwRetErrorCode = MraFilesQueueItemFindByID(hFilesQueueHandle, dwIDRequest, &dat)) == NO_ERROR)

-		{

-			MraAddrListGetFromBuff(lpszAddreses, dwAddresesSize, &dat->malAddrList);

-			MraAddrListStoreToContact(dat->hContact, &dat->malAddrList);

+	ListMTLock(pmrafqFilesQueue);

+	DWORD dwRetErrorCode = MraFilesQueueItemFindByID(hFilesQueueHandle, dwIDRequest, &dat);

+	if (dwRetErrorCode == NO_ERROR) {

+		MraAddrListGetFromBuff(lpszAddreses, dwAddresesSize, &dat->malAddrList);

+		MraAddrListStoreToContact(dat->hContact, &dat->malAddrList);

 

-			dat->hConnection = NULL;

-			SetEvent(dat->hWaitHandle);

-		}

-		ListMTUnLock(pmrafqFilesQueue);

-	}else {

-		dwRetErrorCode = ERROR_INVALID_HANDLE;

+		dat->hConnection = NULL;

+		SetEvent(dat->hWaitHandle);

 	}

-return(dwRetErrorCode);

+	ListMTUnLock(pmrafqFilesQueue);

+	return dwRetErrorCode;

 }

 

-

-

 BOOL CMraProto::MraFilesQueueHandCheck(HANDLE hConnection, MRA_FILES_QUEUE_ITEM *dat)

 {

 	BOOL bRet = FALSE;

@@ -678,8 +430,8 @@ BOOL CMraProto::MraFilesQueueHandCheck(HANDLE hConnection, MRA_FILES_QUEUE_ITEM
 

 		if (dat->bSending == FALSE)

 		{// receiving

-			dwBuffSize = (mir_snprintf((LPSTR)btBuff, SIZEOF(btBuff), "%s %s", MRA_FT_HELLO, szEMailMy)+1);

-			if (dwBuffSize == Netlib_Send(hConnection, (LPSTR)btBuff, dwBuffSize, 0))

+			dwBuffSize = mir_snprintf((LPSTR)btBuff, SIZEOF(btBuff), "%s %s", MRA_FT_HELLO, szEMailMy)+1;

+			if (dwBuffSize == Netlib_Send(hConnection, (LPSTR)btBuff, (int)dwBuffSize, 0))

 			{// my email sended

 				ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, (HANDLE)dat->dwIDRequest, 0);

 				dwBuffSize = Netlib_Recv(hConnection, (LPSTR)btBuff, sizeof(btBuff), 0);

@@ -687,9 +439,7 @@ BOOL CMraProto::MraFilesQueueHandCheck(HANDLE hConnection, MRA_FILES_QUEUE_ITEM
 				{// email received

 					mir_snprintf(((LPSTR)btBuff+dwBuffSize), (SIZEOF(btBuff)-dwBuffSize), "%s %s", MRA_FT_HELLO, szEMail);

 					if (CompareStringA( MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NORM_IGNORECASE, (LPSTR)btBuff, dwBuffSize, ((LPSTR)btBuff+dwBuffSize), dwBuffSize) == CSTR_EQUAL)

-					{// email verifyed

 						bRet = TRUE;

-					}

 				}

 			}

 		}else {// sending

@@ -699,7 +449,7 @@ BOOL CMraProto::MraFilesQueueHandCheck(HANDLE hConnection, MRA_FILES_QUEUE_ITEM
 				ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, (HANDLE)dat->dwIDRequest, 0);

 				mir_snprintf(((LPSTR)btBuff+dwBuffSize), (SIZEOF(btBuff)-dwBuffSize), "%s %s", MRA_FT_HELLO, szEMail);

 				if (CompareStringA( MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NORM_IGNORECASE, (LPSTR)btBuff, dwBuffSize, ((LPSTR)btBuff+dwBuffSize), dwBuffSize) == CSTR_EQUAL)

-				{// email verifyed

+				{// email verified

 					dwBuffSize = (mir_snprintf((LPSTR)btBuff, SIZEOF(btBuff), "%s %s", MRA_FT_HELLO, szEMailMy)+1);

 					if (dwBuffSize == Netlib_Send(hConnection, (LPSTR)btBuff, dwBuffSize, 0))

 					{// my email sended

@@ -709,203 +459,184 @@ BOOL CMraProto::MraFilesQueueHandCheck(HANDLE hConnection, MRA_FILES_QUEUE_ITEM
 			}

 		}

 	}

-return(bRet);

+	return bRet;

 }

 

-

 HANDLE CMraProto::MraFilesQueueConnectOut(MRA_FILES_QUEUE_ITEM *dat)

 {

-	HANDLE hRet;

-

-	if (dat)

-	{

-		if (mraGetByte(NULL, "FileSendEnableDirectConn", MRA_DEF_FS_ENABLE_DIRECT_CONN) && InterlockedExchangeAdd((volatile LONG*)&dat->bIsWorking, 0) && ((dat->bSending == FALSE && mraGetByte(NULL, "FileSendNoOutConnOnRcv", MRA_DEF_FS_NO_OUT_CONN_ON_RCV) == FALSE) || (dat->bSending == TRUE && mraGetByte(NULL, "FileSendNoOutConnOnSend", MRA_DEF_FS_NO_OUT_CONN_ON_SEND) == FALSE)))

-		{

-			BOOL bFiltering = FALSE, bIsHTTPSProxyUsed = IsHTTPSProxyUsed(hNetlibUser);

-			DWORD dwLocalPort, dwConnectReTryCount, dwCurConnectReTryCount;

-			size_t i, dwAddrCount;

-			NETLIBOPENCONNECTION nloc = {0};

-

-			dwLocalPort = 0;

-

-			if (mraGetByte(NULL, "FileSendIgnoryAdditionalPorts", MRA_DEF_FS_IGNORY_ADDITIONAL_PORTS) || bIsHTTPSProxyUsed)

-			{// фильтруем порты для одного IP, вместо 3 будем коннектится только к одному

-				if (bIsHTTPSProxyUsed)

-				{// через https прокси только 443 порт

-					dwLocalPort = MRA_SERVER_PORT_HTTPS;

-				}else {

-					if ((dwLocalPort = mraGetWord(NULL, "ServerPort", MRA_DEFAULT_SERVER_PORT)) == MRA_SERVER_PORT_STANDART_NLB) dwLocalPort = MRA_SERVER_PORT_STANDART;

-				}

-

-				dwAddrCount = 0;

-				for (i = 0;i<dat->malAddrList.dwAddrCount;i++)

-				{

-					if (dwLocalPort == dat->malAddrList.pmaliAddress[i].dwPort)

-					{

-						bFiltering = TRUE;

-						dwAddrCount++;

-					}

+	if (!dat)

+		return NULL;

+

+	if (mraGetByte(NULL, "FileSendEnableDirectConn", MRA_DEF_FS_ENABLE_DIRECT_CONN) && InterlockedExchangeAdd((volatile LONG*)&dat->bIsWorking, 0) && ((dat->bSending == FALSE && mraGetByte(NULL, "FileSendNoOutConnOnRcv", MRA_DEF_FS_NO_OUT_CONN_ON_RCV) == FALSE) || (dat->bSending == TRUE && mraGetByte(NULL, "FileSendNoOutConnOnSend", MRA_DEF_FS_NO_OUT_CONN_ON_SEND) == FALSE))) {

+		BOOL bFiltering = FALSE, bIsHTTPSProxyUsed = IsHTTPSProxyUsed(hNetlibUser);

+		DWORD dwLocalPort = 0, dwConnectReTryCount, dwCurConnectReTryCount;

+		size_t dwAddrCount;

+		NETLIBOPENCONNECTION nloc = {0};

+

+		if (mraGetByte(NULL, "FileSendIgnoryAdditionalPorts", MRA_DEF_FS_IGNORY_ADDITIONAL_PORTS) || bIsHTTPSProxyUsed)

+		{// фильтруем порты для одного IP, вместо 3 будем коннектится только к одному

+			if (bIsHTTPSProxyUsed)

+				dwLocalPort = MRA_SERVER_PORT_HTTPS;

+			else if ((dwLocalPort = mraGetWord(NULL, "ServerPort", MRA_DEFAULT_SERVER_PORT)) == MRA_SERVER_PORT_STANDART_NLB)

+				dwLocalPort = MRA_SERVER_PORT_STANDART;

+

+			dwAddrCount = 0;

+			for (size_t i = 0; i < dat->malAddrList.dwAddrCount; i++) {

+				if (dwLocalPort == dat->malAddrList.pmaliAddress[i].dwPort) {

+					bFiltering = TRUE;

+					dwAddrCount++;

 				}

 			}

-			if (bFiltering == FALSE) dwAddrCount = dat->malAddrList.dwAddrCount;

+		}

 

-			if (dwAddrCount)

-			{

-				dat->hConnection = NULL;

-				dwConnectReTryCount = mraGetDword(NULL, "ConnectReTryCountFileSend", MRA_DEFAULT_CONN_RETRY_COUNT_FILES);

-				nloc.cbSize = sizeof(nloc);

-				nloc.flags = NLOCF_V2;

-				nloc.timeout = mraGetDword(NULL, "TimeOutConnectFileSend", ((MRA_TIMEOUT_DIRECT_CONN-1)/(dwAddrCount*dwConnectReTryCount)));// -1 сек чтобы был запас

-				if (nloc.timeout<MRA_TIMEOUT_CONN_MIN) nloc.timeout = MRA_TIMEOUT_CONN_MIN;

-				if (nloc.timeout>MRA_TIMEOUT_CONN_МАХ) nloc.timeout = MRA_TIMEOUT_CONN_МАХ;

-

-				for (i = 0;i<dat->malAddrList.dwAddrCount;i++)

-				{// Set up the sockaddr structure

-					if (dwLocalPort == dat->malAddrList.pmaliAddress[i].dwPort || bFiltering == FALSE)

-					{

-						ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTING, (HANDLE)dat->dwIDRequest, 0);

-

-						nloc.szHost = inet_ntoa((*((in_addr*)&dat->malAddrList.pmaliAddress[i].dwAddr)));

-						nloc.wPort = (WORD)dat->malAddrList.pmaliAddress[i].dwPort;

-

-						dwCurConnectReTryCount = dwConnectReTryCount;

-						do{

-							dat->hConnection = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)hNetlibUser, (LPARAM)&nloc);

-						}while(--dwCurConnectReTryCount && dat->hConnection == NULL);

-

-						if (dat->hConnection)

-						{

-							ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);

-							if (MraFilesQueueHandCheck(dat->hConnection, dat))

-							{// связь установленная с тем кем нужно

-								mraSetDword(dat->hContact, "OldIP", mraGetDword(dat->hContact, "IP", 0));

-								mraSetDword(dat->hContact, "IP", HTONL(dat->malAddrList.pmaliAddress[i].dwAddr));

-								break;

-							}else {// кажется не туда подключились :)

-								Netlib_CloseHandle(dat->hConnection);

-								dat->hConnection = NULL;

-							}

+		if (bFiltering == FALSE)

+			dwAddrCount = dat->malAddrList.dwAddrCount;

+

+		if (dwAddrCount) {

+			dat->hConnection = NULL;

+			dwConnectReTryCount = mraGetDword(NULL, "ConnectReTryCountFileSend", MRA_DEFAULT_CONN_RETRY_COUNT_FILES);

+			nloc.cbSize = sizeof(nloc);

+			nloc.flags = NLOCF_V2;

+			nloc.timeout = mraGetDword(NULL, "TimeOutConnectFileSend", ((MRA_TIMEOUT_DIRECT_CONN-1)/(dwAddrCount*dwConnectReTryCount)));// -1 сек чтобы был запас

+			if (nloc.timeout<MRA_TIMEOUT_CONN_MIN) nloc.timeout = MRA_TIMEOUT_CONN_MIN;

+			if (nloc.timeout>MRA_TIMEOUT_CONN_МАХ) nloc.timeout = MRA_TIMEOUT_CONN_МАХ;

+

+			// Set up the sockaddr structure

+			for (size_t i = 0;i<dat->malAddrList.dwAddrCount;i++) {

+				if (dwLocalPort == dat->malAddrList.pmaliAddress[i].dwPort || bFiltering == FALSE) {

+					ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTING, (HANDLE)dat->dwIDRequest, 0);

+

+					nloc.szHost = inet_ntoa((*((in_addr*)&dat->malAddrList.pmaliAddress[i].dwAddr)));

+					nloc.wPort = (WORD)dat->malAddrList.pmaliAddress[i].dwPort;

+

+					dwCurConnectReTryCount = dwConnectReTryCount;

+					do {

+						dat->hConnection = (HANDLE)CallService(MS_NETLIB_OPENCONNECTION, (WPARAM)hNetlibUser, (LPARAM)&nloc);

+					}

+						while(--dwCurConnectReTryCount && dat->hConnection == NULL);

+

+					if (dat->hConnection) {

+						ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);

+						if (MraFilesQueueHandCheck(dat->hConnection, dat)) {

+							// связь установленная с тем кем нужно

+							mraSetDword(dat->hContact, "OldIP", mraGetDword(dat->hContact, "IP", 0));

+							mraSetDword(dat->hContact, "IP", HTONL(dat->malAddrList.pmaliAddress[i].dwAddr));

+							break;

+						}

+						else {

+							// кажется не туда подключились :)

+							Netlib_CloseHandle(dat->hConnection);

+							dat->hConnection = NULL;

 						}

 					}

 				}

 			}

 		}

-		hRet = dat->hConnection;

-	}else {

-		hRet = NULL;

 	}

-return(hRet);

+	return dat->hConnection;

 }

 

-

 LPWSTR GetFileNameFromFullPathW(LPWSTR lpwszFullPath, size_t dwFullPathSize)

 {

 	LPWSTR lpwszFileName = lpwszFullPath, lpwszCurPos;

 

 	lpwszCurPos = (lpwszFullPath+dwFullPathSize);

-	for (;lpwszCurPos>lpwszFullPath;lpwszCurPos--)

-	{

-		if ((*lpwszCurPos) == '\\')

-		{

+	for (; lpwszCurPos>lpwszFullPath; lpwszCurPos--) {

+		if ((*lpwszCurPos) == '\\') {

 			lpwszFileName = (lpwszCurPos+1);

 			break;

 		}

 	}

-return(lpwszFileName);

+	return lpwszFileName;

 }

 

-

-

 HANDLE CMraProto::MraFilesQueueConnectIn(MRA_FILES_QUEUE_ITEM *dat)

 {

-	HANDLE hRet = NULL;

-

-	if (dat)

-	if (InterlockedExchangeAdd((volatile LONG*)&dat->bIsWorking, 0))

-	{

-		CHAR szEMail[MAX_EMAIL_LEN];

-		size_t dwEMailSize;

-

-		if (mraGetStaticStringA(dat->hContact, "e-mail", szEMail, SIZEOF(szEMail), &dwEMailSize))

-		{

-			CHAR szAddrList[2048] = {0};

-			size_t dwAddrListSize;

-

-			if (mraGetByte(NULL, "FileSendEnableDirectConn", MRA_DEF_FS_ENABLE_DIRECT_CONN))

-			{// копируем адреса в соответствии с правилами и начинаем слушать порт

-				NETLIBBIND nlbBind = {0};

-

-				nlbBind.cbSize = sizeof(nlbBind);

-				nlbBind.pfnNewConnectionV2 = MraFilesQueueConnectionReceived;

-				nlbBind.wPort = 0;

-				nlbBind.pExtra = (LPVOID)dat;

-

-				dat->hListen = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)hNetlibUser, (LPARAM)&nlbBind);

-				if (dat->hListen)

-				{

-					ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_LISTENING, (HANDLE)dat->dwIDRequest, 0);

-					dwAddrListSize = MraFilesQueueGetLocalAddressesList(szAddrList, sizeof(szAddrList), nlbBind.wPort);

-				}else {// не смогли слушать порт, хз почему.

-					ShowFormattedErrorMessage(L"Files exchange: cant create listen soscket, will try connect to remonte host. Error", GetLastError());

+	if (!dat)

+		return NULL;

+	if ( !InterlockedExchangeAdd((volatile LONG*)&dat->bIsWorking, 0))

+		return NULL;

+

+	CHAR szEMail[MAX_EMAIL_LEN];

+	size_t dwEMailSize;

+

+	if (mraGetStaticStringA(dat->hContact, "e-mail", szEMail, SIZEOF(szEMail), &dwEMailSize)) {

+		CHAR szAddrList[2048] = {0};

+		size_t dwAddrListSize;

+

+		// копируем адреса в соответствии с правилами и начинаем слушать порт

+		if (mraGetByte(NULL, "FileSendEnableDirectConn", MRA_DEF_FS_ENABLE_DIRECT_CONN)) {

+			NETLIBBIND nlbBind = {0};

+

+			nlbBind.cbSize = sizeof(nlbBind);

+			nlbBind.pfnNewConnectionV2 = MraFilesQueueConnectionReceived;

+			nlbBind.wPort = 0;

+			nlbBind.pExtra = (LPVOID)dat;

+

+			dat->hListen = (HANDLE)CallService(MS_NETLIB_BINDPORT, (WPARAM)hNetlibUser, (LPARAM)&nlbBind);

+			if (dat->hListen) {

+				ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_LISTENING, (HANDLE)dat->dwIDRequest, 0);

+				dwAddrListSize = MraFilesQueueGetLocalAddressesList(szAddrList, sizeof(szAddrList), nlbBind.wPort);

+			}

+			// не смогли слушать порт, хз почему.

+			else {

+				ShowFormattedErrorMessage(L"Files exchange: cant create listen soscket, will try connect to remonte host. Error", GetLastError());

 					

-					//dwAddrListSize = 0;

-					memmove(szAddrList, MRA_FILES_NULL_ADDRR, sizeof(MRA_FILES_NULL_ADDRR));

-					dwAddrListSize = (sizeof(MRA_FILES_NULL_ADDRR)-1);

-				}

-			}else {// подставляем ложный адрес, чтобы точно не подключились и не слушаем порт

+				//dwAddrListSize = 0;

 				memmove(szAddrList, MRA_FILES_NULL_ADDRR, sizeof(MRA_FILES_NULL_ADDRR));

 				dwAddrListSize = (sizeof(MRA_FILES_NULL_ADDRR)-1);

 			}

+		}

+		// подставляем ложный адрес, чтобы точно не подключились и не слушаем порт

+		else {

+			memmove(szAddrList, MRA_FILES_NULL_ADDRR, sizeof(MRA_FILES_NULL_ADDRR));

+			dwAddrListSize = (sizeof(MRA_FILES_NULL_ADDRR)-1);

+		}

 

-			if (dwAddrListSize)

-			{

-				dat->hWaitHandle = CreateEvent(NULL, TRUE, FALSE, NULL);

-				if (dat->bSending == FALSE)

-				{// запрашиваем зеркальное соединение, тк сами подключится не смогли

-					MraFileTransferAck(FILE_TRANSFER_MIRROR, szEMail, dwEMailSize, dat->dwIDRequest, (LPBYTE)szAddrList, dwAddrListSize);

-				}else {// здесь отправляем запрос на передачу(установление соединения)

-					// создаём текстовый список файлов для отправки другой стороне

-					LPWSTR lpwszFiles, lpwszCurPos;

-					size_t dwFilesSize;

-

-					dwFilesSize = ((MAX_PATH*2)*dat->dwFilesCount);

-					lpwszFiles = (LPWSTR)mir_calloc((dwFilesSize*sizeof(WCHAR)));

-					if (lpwszFiles)

-					{

-						lpwszCurPos = lpwszFiles;

-						for (size_t i = 0;i<dat->dwFilesCount;i++)

-						{

-							lpwszCurPos += mir_sntprintf(lpwszCurPos, (dwFilesSize-((size_t)lpwszCurPos-(size_t)lpwszFiles)), L"%s;%I64u;", GetFileNameFromFullPathW(dat->pmfqfFiles[i].lpwszName, dat->pmfqfFiles[i].dwNameLen), dat->pmfqfFiles[i].dwSize);

-						}

-						dwFilesSize = (lpwszCurPos-lpwszFiles);// size in WCHARs

-

-						if (dat->hMraMrimProxyData)

-						{// устанавливаем данные для майловской прокси, если она разрешена

-							LPSTR lpszFiles;

-							size_t dwFilesSizeA;

-

-							dwFilesSizeA = WideCharToMultiByte(MRA_CODE_PAGE, 0, lpwszFiles, dwFilesSize, NULL, 0, NULL, NULL);

-							lpszFiles = (LPSTR)mir_calloc((dwFilesSizeA+MAX_PATH));

-							if (lpszFiles)

-							{

-								dwFilesSizeA = WideCharToMultiByte(MRA_CODE_PAGE, 0, lpwszFiles, dwFilesSize, lpszFiles, (dwFilesSizeA+MAX_PATH), NULL, NULL);

-								MraMrimProxySetData(dat->hMraMrimProxyData, szEMail, dwEMailSize, dat->dwIDRequest, MRIM_PROXY_TYPE_FILES, lpszFiles, dwFilesSizeA, NULL, 0, NULL);

-								mir_free(lpszFiles);

-							}

+		if (dwAddrListSize) {

+			dat->hWaitHandle = CreateEvent(NULL, TRUE, FALSE, NULL);

+			if (dat->bSending == FALSE) // запрашиваем зеркальное соединение, тк сами подключится не смогли

+				MraFileTransferAck(FILE_TRANSFER_MIRROR, szEMail, dwEMailSize, dat->dwIDRequest, (LPBYTE)szAddrList, dwAddrListSize);

+			else {  // здесь отправляем запрос на передачу(установление соединения)

+				// создаём текстовый список файлов для отправки другой стороне

+				LPWSTR lpwszFiles, lpwszCurPos;

+				size_t dwFilesSize;

+

+				dwFilesSize = ((MAX_PATH*2)*dat->dwFilesCount);

+				lpwszFiles = (LPWSTR)mir_calloc((dwFilesSize*sizeof(WCHAR)));

+				if (lpwszFiles) {

+					lpwszCurPos = lpwszFiles;

+					for (size_t i = 0;i < dat->dwFilesCount;i++) {

+						MRA_FILES_QUEUE_FILE &p = dat->pmfqfFiles[i];

+						lpwszCurPos += mir_sntprintf(lpwszCurPos, (dwFilesSize-((size_t)lpwszCurPos-(size_t)lpwszFiles)), L"%s;%I64u;", 

+							GetFileNameFromFullPathW(p.lpwszName, p.dwNameLen), p.dwSize);

+					}

+					dwFilesSize = (lpwszCurPos-lpwszFiles);// size in WCHARs

+

+					if (dat->hMraMrimProxyData) {

+						// устанавливаем данные для майловской прокси, если она разрешена

+						LPSTR lpszFiles;

+						size_t dwFilesSizeA;

+

+						dwFilesSizeA = WideCharToMultiByte(MRA_CODE_PAGE, 0, lpwszFiles, dwFilesSize, NULL, 0, NULL, NULL);

+						lpszFiles = (LPSTR)mir_calloc((dwFilesSizeA+MAX_PATH));

+						if (lpszFiles) {

+							dwFilesSizeA = WideCharToMultiByte(MRA_CODE_PAGE, 0, lpwszFiles, dwFilesSize, lpszFiles, (dwFilesSizeA+MAX_PATH), NULL, NULL);

+							MraMrimProxySetData(dat->hMraMrimProxyData, szEMail, dwEMailSize, dat->dwIDRequest, MRIM_PROXY_TYPE_FILES, lpszFiles, dwFilesSizeA, NULL, 0, NULL);

+							mir_free(lpszFiles);

 						}

-						MraFileTransfer(szEMail, dwEMailSize, dat->dwIDRequest, dat->dwFilesTotalSize, lpwszFiles, dwFilesSize, szAddrList, dwAddrListSize);

-						

-						mir_free(lpwszFiles);

 					}

+					MraFileTransfer(szEMail, dwEMailSize, dat->dwIDRequest, dat->dwFilesTotalSize, lpwszFiles, dwFilesSize, szAddrList, dwAddrListSize);

+						

+					mir_free(lpwszFiles);

 				}

-				WaitForSingleObjectEx(dat->hWaitHandle, INFINITE, FALSE);

-				CloseHandle(dat->hWaitHandle);

-				dat->hWaitHandle = NULL;

 			}

+			WaitForSingleObjectEx(dat->hWaitHandle, INFINITE, FALSE);

+			CloseHandle(dat->hWaitHandle);

+			dat->hWaitHandle = NULL;

 		}

-		hRet = dat->hConnection;

 	}

-return(hRet);

+	return dat->hConnection;

 }

 

 // This function is called from the Netlib when someone is connecting to

@@ -930,6 +661,111 @@ void MraFilesQueueConnectionReceived(HANDLE hNewConnection, DWORD dwRemoteIP, vo
 	else Netlib_CloseHandle(hNewConnection);

 }

 

+/////////////////////////////////////////////////////////////////////////////////////////

+// Receive files

+

+DWORD CMraProto::MraFilesQueueAddReceive(HANDLE hFilesQueueHandle, DWORD dwFlags, HANDLE hContact, DWORD dwIDRequest, LPWSTR lpwszFiles, size_t dwFilesSize, LPSTR lpszAddreses, size_t dwAddresesSize)

+{

+	if (!hFilesQueueHandle || !dwIDRequest)

+		return ERROR_INVALID_HANDLE;

+

+	MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

+	MRA_FILES_QUEUE_ITEM *dat = (MRA_FILES_QUEUE_ITEM*)mir_calloc(sizeof(MRA_FILES_QUEUE_ITEM)+sizeof(LPSTR)+64);

+	if ( !dat)

+		return GetLastError();

+

+	WCHAR szBuff[MAX_PATH];

+	LPWSTR lpwszCurrentItem, lpwszDelimiter, lpwszEndItem;

+	size_t dwMemSize, dwAllocatedCount, dwFileNameTotalSize;

+

+	//dat->lmtListMTItem;

+	dat->ppro = this;

+	dat->bIsWorking = TRUE;

+	dat->dwSendTime = GetTickCount();

+	dat->dwIDRequest = dwIDRequest;

+	dat->dwFlags = dwFlags;

+	dat->hContact = hContact;

+	if (mraGetByte(NULL, "FileSendEnableMRIMProxyCons", MRA_DEF_FS_ENABLE_MRIM_PROXY_CONS))

+		dat->hMraMrimProxyData = MraMrimProxyCreate();

+

+	dwFileNameTotalSize = 0;

+	dwAllocatedCount = ALLOCATED_COUNT;

+	dat->dwFilesCount = 0;

+	dat->dwFilesTotalSize = 0;

+	dat->pmfqfFiles = (MRA_FILES_QUEUE_FILE*)mir_calloc((sizeof(MRA_FILES_QUEUE_FILE)*dwAllocatedCount));

+	lpwszCurrentItem = lpwszFiles;

+	while(TRUE) {

+		lpwszDelimiter = (LPWSTR)MemoryFind(((size_t)lpwszCurrentItem-(size_t)lpwszFiles), lpwszFiles, (dwFilesSize*sizeof(WCHAR)), ";", 2);

+		if (!lpwszDelimiter)

+			break;

+

+		lpwszEndItem = (LPWSTR)MemoryFind((((size_t)lpwszDelimiter+2)-(size_t)lpwszFiles), lpwszFiles, (dwFilesSize*sizeof(WCHAR)), ";", 2);

+		if (!lpwszEndItem)

+			break;

+

+		if (dat->dwFilesCount == dwAllocatedCount) {

+			dwAllocatedCount *= 2;

+			dat->pmfqfFiles = (MRA_FILES_QUEUE_FILE*)mir_realloc(dat->pmfqfFiles, (sizeof(MRA_FILES_QUEUE_FILE)*dwAllocatedCount));

+		}

+

+		MRA_FILES_QUEUE_FILE &p = dat->pmfqfFiles[dat->dwFilesCount];

+		*lpwszDelimiter++ = 0;

+		p.lpwszName = mir_wstrdup(lpwszCurrentItem);

+		p.dwNameLen = lstrlen(p.lpwszName);

+		p.dwSize = StrToUNum64((LPSTR)lpwszDelimiter, (size_t)lpwszEndItem-(size_t)lpwszDelimiter+1);

+		dat->dwFilesTotalSize += p.dwSize;

+		dwFileNameTotalSize += p.dwNameLen * sizeof(TCHAR);

+						

+		dat->dwFilesCount++;

+		lpwszCurrentItem = lpwszEndItem+1;

+	}

+	dat->pmfqfFiles = (MRA_FILES_QUEUE_FILE*)mir_realloc(dat->pmfqfFiles, (sizeof(MRA_FILES_QUEUE_FILE)*(dat->dwFilesCount+4)));

+

+	dwMemSize = (((dat->dwFilesCount+4)*64)+(dwFileNameTotalSize*sizeof(WCHAR))+(dwAddresesSize*sizeof(WCHAR))+128);

+	dat->pwszFilesList = (LPWSTR)mir_calloc(dwMemSize);

+	dat->pwszDescription = (LPWSTR)mir_calloc(dwMemSize);

+

+	lpwszDelimiter = dat->pwszFilesList;

+	lpwszCurrentItem = dat->pwszDescription;

+	StrFormatByteSizeW(dat->dwFilesTotalSize, szBuff, SIZEOF(szBuff));

+	lpwszCurrentItem += mir_sntprintf(lpwszCurrentItem, ((dwMemSize-((size_t)lpwszCurrentItem-(size_t)dat->pwszDescription))/sizeof(WCHAR)), L"%I64u Files (%s)\r\n", dat->dwFilesCount, szBuff);

+

+	// description + filesnames

+	for (size_t i = 0; i < dat->dwFilesCount; i++) {

+		lpwszDelimiter += mir_sntprintf(lpwszDelimiter, ((dwMemSize-((size_t)lpwszDelimiter-(size_t)dat->pwszFilesList))/sizeof(WCHAR)), L"%s", dat->pmfqfFiles[i].lpwszName);

+		StrFormatByteSizeW(dat->pmfqfFiles[i].dwSize, szBuff, SIZEOF(szBuff));

+		lpwszCurrentItem += mir_sntprintf(lpwszCurrentItem, ((dwMemSize-((size_t)lpwszCurrentItem-(size_t)dat->pwszDescription))/sizeof(WCHAR)), L"%s - %s\r\n", dat->pmfqfFiles[i].lpwszName, szBuff);

+	}

+

+	lpwszCurrentItem += MultiByteToWideChar(MRA_CODE_PAGE, 0, lpszAddreses, dwAddresesSize, lpwszCurrentItem, ((dwMemSize-((size_t)lpwszCurrentItem-(size_t)dat->pwszDescription))/sizeof(WCHAR)));

+	*lpwszCurrentItem = 0;

+

+	MraAddrListGetFromBuff(lpszAddreses, dwAddresesSize, &dat->malAddrList);

+	MraAddrListStoreToContact(dat->hContact, &dat->malAddrList);

+

+	ListMTLock(pmrafqFilesQueue);

+	ListMTItemAdd(pmrafqFilesQueue, dat, dat);

+	ListMTUnLock(pmrafqFilesQueue);

+

+	// Send chain event

+	PROTORECVFILET prf;

+	prf.flags = PREF_UNICODE;

+	prf.timestamp = _time32(NULL);

+	prf.tszDescription = dat->pwszDescription;

+	prf.fileCount = 1;//dat->dwFilesCount;

+	prf.ptszFiles = &dat->pwszFilesList;

+	prf.lParam = dwIDRequest;

+ 

+	CCSDATA ccs;

+	ccs.szProtoService = PSR_FILE;

+	ccs.hContact = hContact;

+	ccs.wParam = 0;

+	ccs.lParam = (LPARAM)&prf;

+

+	CallService(MS_PROTO_CHAINRECV, 0, (LPARAM)&ccs);

+	return NO_ERROR;

+}

+

 void CMraProto::MraFilesQueueRecvThreadProc(LPVOID lpParameter)

 {

 	DWORD dwRetErrorCode = NO_ERROR;

@@ -993,7 +829,7 @@ void CMraProto::MraFilesQueueRecvThreadProc(LPVOID lpParameter)
 		}

 

 		if (bConnected)

-		{// email verifyed

+		{// email verified

 			bFailed = FALSE;

 			for (i = 0;i<dat->dwFilesCount;i++)

 			{// receiving files

@@ -1128,19 +964,16 @@ void CMraProto::MraFilesQueueRecvThreadProc(LPVOID lpParameter)
 			dat->hConnection = NULL;

 		}

 

-		if (bFailed)

-		{

+		if (bFailed) {

 			CHAR szEMail[MAX_EMAIL_LEN];

 			size_t dwEMailSize;

 

 			if (mraGetStaticStringA(dat->hContact, "e-mail", szEMail, SIZEOF(szEMail), &dwEMailSize))

-			{

 				MraFileTransferAck(FILE_TRANSFER_STATUS_ERROR, szEMail, dwEMailSize, dat->dwIDRequest, NULL, 0);

-			}

+

 			ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, (HANDLE)dat->dwIDRequest, 0);

-		}else {

-			ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, (HANDLE)dat->dwIDRequest, 0);

 		}

+		else ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, (HANDLE)dat->dwIDRequest, 0);

 

 		ListMTLock(pmrafqFilesQueue);

 		MraFilesQueueItemFree(dat);

@@ -1148,220 +981,252 @@ void CMraProto::MraFilesQueueRecvThreadProc(LPVOID lpParameter)
 	}

 }

 

+/////////////////////////////////////////////////////////////////////////////////////////

+// Send files

 

-

-void CMraProto::MraFilesQueueSendThreadProc(LPVOID lpParameter)

+DWORD CMraProto::MraFilesQueueAddSend(HANDLE hFilesQueueHandle, DWORD dwFlags, HANDLE hContact, LPWSTR *plpwszFiles, size_t dwFilesCount, DWORD *pdwIDRequest)

 {

-	DWORD dwRetErrorCode = NO_ERROR;

+	DWORD dwRetErrorCode;

 

-	if (lpParameter)

-	{

-		MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)((MRA_FILES_THREADPROC_PARAMS*)lpParameter)->hFilesQueueHandle;

-		MRA_FILES_QUEUE_ITEM *dat = ((MRA_FILES_THREADPROC_PARAMS*)lpParameter)->dat;

-	    

-		CHAR szFileName[MAX_FILEPATH] = {0};

-		WCHAR szErrorText[2048];

-		BYTE btBuff[BUFF_SIZE_RCV];

-		BOOL bFailed = TRUE, bOK, bConnected = FALSE;

-		DWORD dwReceived, dwSendBlockSize, dwUpdateTimeNext, dwUpdateTimeCur;

-		HANDLE hFile;

-		size_t i, j, dwBuffSizeUsed = 0;

-		LPWSTR lpwszFileName;

-		PROTOFILETRANSFERSTATUS pfts = {0};

+	if ( !hFilesQueueHandle)

+		return ERROR_INVALID_HANDLE;

+

+	MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)hFilesQueueHandle;

+	MRA_FILES_QUEUE_ITEM *dat = (MRA_FILES_QUEUE_ITEM*)mir_calloc(sizeof(MRA_FILES_QUEUE_ITEM)+sizeof(LPSTR)+64);

+	if ( !dat)

+		return GetLastError();

+

+	size_t i;

+	ULARGE_INTEGER uliFileSize;

+	WIN32_FILE_ATTRIBUTE_DATA wfad;

+

+	//dat->lmtListMTItem;

+	dat->bIsWorking = TRUE;

+	dat->dwSendTime = GetTickCount();

+	dat->dwIDRequest = InterlockedIncrement((LONG volatile*)&dwCMDNum);// уникальный, рандомный идентификатор

+	dat->dwFlags = dwFlags;

+	dat->hContact = hContact;

+	if (mraGetByte(NULL, "FileSendEnableMRIMProxyCons", MRA_DEF_FS_ENABLE_MRIM_PROXY_CONS)) dat->hMraMrimProxyData = MraMrimProxyCreate();

+	dat->dwFilesCount = dwFilesCount;

+	dat->pmfqfFiles = (MRA_FILES_QUEUE_FILE*)mir_calloc((sizeof(MRA_FILES_QUEUE_FILE)*(dat->dwFilesCount+1)));

+	dat->dwFilesTotalSize = 0;

+

+	for (size_t i = 0; i < dat->dwFilesCount; i++) {

+		MRA_FILES_QUEUE_FILE &p = dat->pmfqfFiles[i];

+		if (GetFileAttributesExW(plpwszFiles[i], GetFileExInfoStandard, &wfad)) {

+			uliFileSize.LowPart = wfad.nFileSizeLow;

+			uliFileSize.HighPart = wfad.nFileSizeHigh;

+			p.dwSize = uliFileSize.QuadPart;

+			dat->dwFilesTotalSize += uliFileSize.QuadPart;

+		}

+		else p.dwSize = 0;

 

-		mir_free(lpParameter);

+		p.dwNameLen = lstrlenW(plpwszFiles[i]);

+		p.lpwszName = mir_wstrdup(plpwszFiles[i]);

+	}

 

-		pfts.cbSize = sizeof(pfts);

-		pfts.hContact = dat->hContact;

-		pfts.flags = (PFTS_SENDING|PFTS_UNICODE);// pfts.sending = dat->bSending;	//true if sending, false if receiving

-		//pfts.files;

-		pfts.totalFiles = dat->dwFilesCount;

-		//pfts.currentFileNumber = 0;

-		pfts.totalBytes = dat->dwFilesTotalSize;

-		//pfts.totalProgress = 0;

-		pfts.wszWorkingDir = dat->lpwszPath;

-		//pfts.currentFile;

-		//pfts.currentFileSize;

-		//pfts.currentFileProgress;

-		//pfts.currentFileTime;  //as seconds since 1970

+	dat->bSending = TRUE;

+	if (pdwIDRequest)

+		*pdwIDRequest = dat->dwIDRequest;

 

-		dwSendBlockSize = mraGetDword(NULL, "FileSendBlockSize", MRA_DEFAULT_FILE_SEND_BLOCK_SIZE);

-		if (dwSendBlockSize>SIZEOF(btBuff)) dwSendBlockSize = SIZEOF(btBuff);

-		if (dwSendBlockSize<512) dwSendBlockSize = MRA_DEFAULT_FILE_SEND_BLOCK_SIZE;

+	ListMTLock(pmrafqFilesQueue);

+	ListMTItemAdd(pmrafqFilesQueue, dat, dat);

+	ListMTUnLock(pmrafqFilesQueue);

 

-		if (MraFilesQueueConnectIn(dat))

-		{

-			bConnected = TRUE;

-		}else {

-			if (MraFilesQueueConnectOut(dat))

-			{

-				bConnected = TRUE;

-			}else {

-				if (InterlockedExchangeAdd((volatile LONG*)&dat->bIsWorking, 0))

-				{

-					ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKRESULT_CONNECTPROXY, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);

-					if (MraMrimProxyConnect(dat->hMraMrimProxyData, &dat->hConnection) == NO_ERROR)

-					{// подключились к прокси, проверяем та ли сессия (ещё раз, на этот раз сами)

-						if (MraFilesQueueHandCheck(dat->hConnection, dat))

-						{// связь установленная с тем кем нужно// dat->bSending

-							ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);

-							bConnected = TRUE;

-						}

-					}

+	MRA_FILES_THREADPROC_PARAMS *pmftpp = (MRA_FILES_THREADPROC_PARAMS*)mir_calloc(sizeof(MRA_FILES_THREADPROC_PARAMS));

+	pmftpp->hFilesQueueHandle = hFilesQueueHandle;

+	pmftpp->dat = dat;

+	dat->hThread = ForkThreadEx(&CMraProto::MraFilesQueueSendThreadProc, pmftpp);

+

+	return NO_ERROR;

+}

+

+void CMraProto::MraFilesQueueSendThreadProc(LPVOID lpParameter)

+{

+	DWORD dwRetErrorCode = NO_ERROR;

+

+	if ( !lpParameter)

+		return;

+

+	MRA_FILES_QUEUE *pmrafqFilesQueue = (MRA_FILES_QUEUE*)((MRA_FILES_THREADPROC_PARAMS*)lpParameter)->hFilesQueueHandle;

+	MRA_FILES_QUEUE_ITEM *dat = ((MRA_FILES_THREADPROC_PARAMS*)lpParameter)->dat;

+	mir_free(lpParameter);

+	    

+	CHAR szFileName[MAX_FILEPATH] = {0};

+	WCHAR szErrorText[2048];

+	BYTE btBuff[BUFF_SIZE_RCV];

+	BOOL bFailed = TRUE, bOK, bConnected = FALSE;

+	DWORD dwReceived, dwSendBlockSize, dwUpdateTimeNext, dwUpdateTimeCur;

+	HANDLE hFile;

+	size_t i, j, dwBuffSizeUsed = 0;

+	LPWSTR lpwszFileName;

+

+	PROTOFILETRANSFERSTATUS pfts = {0};

+	pfts.cbSize = sizeof(pfts);

+	pfts.hContact = dat->hContact;

+	pfts.flags = (PFTS_SENDING|PFTS_UNICODE);// pfts.sending = dat->bSending;	//true if sending, false if receiving

+	pfts.totalFiles = dat->dwFilesCount;

+	pfts.totalBytes = dat->dwFilesTotalSize;

+	pfts.wszWorkingDir = dat->lpwszPath;

+

+	dwSendBlockSize = mraGetDword(NULL, "FileSendBlockSize", MRA_DEFAULT_FILE_SEND_BLOCK_SIZE);

+	if (dwSendBlockSize>SIZEOF(btBuff)) dwSendBlockSize = SIZEOF(btBuff);

+	if (dwSendBlockSize<512) dwSendBlockSize = MRA_DEFAULT_FILE_SEND_BLOCK_SIZE;

+

+	if (MraFilesQueueConnectIn(dat))

+		bConnected = TRUE;

+	else if (MraFilesQueueConnectOut(dat))

+		bConnected = TRUE;

+	else {

+		if (InterlockedExchangeAdd((volatile LONG*)&dat->bIsWorking, 0)) {

+			ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKRESULT_CONNECTPROXY, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);

+			if (MraMrimProxyConnect(dat->hMraMrimProxyData, &dat->hConnection) == NO_ERROR) {

+				// подключились к прокси, проверяем та ли сессия (ещё раз, на этот раз сами)

+				if (MraFilesQueueHandCheck(dat->hConnection, dat)) {

+					// связь установленная с тем кем нужно// dat->bSending

+					ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);

+					bConnected = TRUE;

 				}

 			}

 		}

+	}

 

-		if (bConnected)

-		{// email verifyed

-			bFailed = FALSE;

-			for (i = 0;i<dat->dwFilesCount;i++)

-			{// sending files

-				ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, (HANDLE)dat->dwIDRequest, 0);

+	if (bConnected) { // email verified

+		bFailed = FALSE;

+		for (i = 0; i < dat->dwFilesCount; i++) { // sending files

+			ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_NEXTFILE, (HANDLE)dat->dwIDRequest, 0);

 

-				dwBuffSizeUsed = 0;

-				while(TRUE)

-				{

-					dwReceived = Netlib_Recv(dat->hConnection, ((LPSTR)btBuff+dwBuffSizeUsed), (SIZEOF(btBuff)-dwBuffSizeUsed), 0);

-					if (dwReceived == 0 || dwReceived == SOCKET_ERROR)

-					{// err on receive file name to send

-						dwRetErrorCode = GetLastError();

-						ShowFormattedErrorMessage(L"Send files: file send request not received, error", dwRetErrorCode);

-						bFailed = TRUE;

+			dwBuffSizeUsed = 0;

+			while(TRUE) {

+				dwReceived = Netlib_Recv(dat->hConnection, ((LPSTR)btBuff+dwBuffSizeUsed), (SIZEOF(btBuff)-dwBuffSizeUsed), 0);

+				if (dwReceived == 0 || dwReceived == SOCKET_ERROR) { // err on receive file name to send

+					dwRetErrorCode = GetLastError();

+					ShowFormattedErrorMessage(L"Send files: file send request not received, error", dwRetErrorCode);

+					bFailed = TRUE;

+					break;

+				}

+				else {

+					dwBuffSizeUsed += dwReceived;

+					if (MemoryFindByte((dwBuffSizeUsed-dwReceived), btBuff, dwBuffSizeUsed, 0))

 						break;

-					}else {

-						dwBuffSizeUsed += dwReceived;

-						if (MemoryFindByte((dwBuffSizeUsed-dwReceived), btBuff, dwBuffSizeUsed, 0)) break;

-					}

-				}// end while (file name passible received)*/

+				}

+			}// end while (file name passible received)*/

 

+			if (bFailed)

+				break;

+			

+			// ...received

+			if (dwBuffSizeUsed > (sizeof(MRA_FT_GET_FILE)+1)) {// file name received

+				if (CompareStringA( MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NORM_IGNORECASE, (LPSTR)btBuff, (sizeof(MRA_FT_GET_FILE)-1), MRA_FT_GET_FILE, (sizeof(MRA_FT_GET_FILE)-1)) == CSTR_EQUAL) {

+					// MRA_FT_GET_FILE verified

+					bFailed = TRUE;

+					for (j = 0;j<dat->dwFilesCount;j++) {

+						lpwszFileName = GetFileNameFromFullPathW(dat->pmfqfFiles[j].lpwszName, dat->pmfqfFiles[j].dwNameLen);

+						szFileName[WideCharToMultiByte(MRA_CODE_PAGE, 0, lpwszFileName, (dat->pmfqfFiles[j].dwNameLen-(lpwszFileName-dat->pmfqfFiles[j].lpwszName)), szFileName, SIZEOF(szFileName), NULL, NULL)] = 0;

 

-				if (bFailed == FALSE)

-				{// ...received

-					if (dwBuffSizeUsed>(sizeof(MRA_FT_GET_FILE)+1))

-					{// file name received

-						if (CompareStringA( MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NORM_IGNORECASE, (LPSTR)btBuff, (sizeof(MRA_FT_GET_FILE)-1), MRA_FT_GET_FILE, (sizeof(MRA_FT_GET_FILE)-1)) == CSTR_EQUAL)

-						{// MRA_FT_GET_FILE verifyed

-							bFailed = TRUE;

-							for (j = 0;j<dat->dwFilesCount;j++)

-							{

-								lpwszFileName = GetFileNameFromFullPathW(dat->pmfqfFiles[j].lpwszName, dat->pmfqfFiles[j].dwNameLen);

-								szFileName[WideCharToMultiByte(MRA_CODE_PAGE, 0, lpwszFileName, (dat->pmfqfFiles[j].dwNameLen-(lpwszFileName-dat->pmfqfFiles[j].lpwszName)), szFileName, SIZEOF(szFileName), NULL, NULL)] = 0;

+						if (CompareStringA( MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NORM_IGNORECASE, (((LPSTR)btBuff)+sizeof(MRA_FT_GET_FILE)), (dwBuffSizeUsed-(sizeof(MRA_FT_GET_FILE)+1)), szFileName, -1) == CSTR_EQUAL) {

+							bFailed = FALSE;

+							break;

+						}

+					}

 

-								if (CompareStringA( MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), NORM_IGNORECASE, (((LPSTR)btBuff)+sizeof(MRA_FT_GET_FILE)), (dwBuffSizeUsed-(sizeof(MRA_FT_GET_FILE)+1)), szFileName, -1) == CSTR_EQUAL)

-								{

-									bFailed = FALSE;

-									break;

-								}

-							}

+					if (bFailed == FALSE) {

+						hFile = CreateFileW(dat->pmfqfFiles[j].lpwszName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, (FILE_ATTRIBUTE_NORMAL|FILE_FLAG_SEQUENTIAL_SCAN), NULL);

+						if (hFile != INVALID_HANDLE_VALUE) {

+							bOK = FALSE;

+							dwUpdateTimeNext = GetTickCount();

+							pfts.currentFileNumber = i;

+							pfts.wszCurrentFile = dat->pmfqfFiles[j].lpwszName;

+							pfts.currentFileSize = dat->pmfqfFiles[j].dwSize;

+							pfts.currentFileProgress = 0;

+							//pfts.currentFileTime;  //as seconds since 1970

 

-							if (bFailed == FALSE)

-							{

-								hFile = CreateFileW(dat->pmfqfFiles[j].lpwszName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, (FILE_ATTRIBUTE_NORMAL|FILE_FLAG_SEQUENTIAL_SCAN), NULL);

-								if (hFile != INVALID_HANDLE_VALUE)

-								{

-									bOK = FALSE;

-									dwUpdateTimeNext = GetTickCount();

-									pfts.currentFileNumber = i;

-									pfts.wszCurrentFile = dat->pmfqfFiles[j].lpwszName;

-									pfts.currentFileSize = dat->pmfqfFiles[j].dwSize;

-									pfts.currentFileProgress = 0;

-									//pfts.currentFileTime;  //as seconds since 1970

-

-									WideCharToMultiByte(MRA_CODE_PAGE, 0, dat->pmfqfFiles[j].lpwszName, dat->pmfqfFiles[j].dwNameLen, szFileName, SIZEOF(szFileName), NULL, NULL);

-									ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (HANDLE)dat->dwIDRequest, (LPARAM)&pfts);

-

-									while(TRUE)

-									{// read and sending

-										if (ReadFile(hFile, btBuff, dwSendBlockSize, (DWORD*)&dwBuffSizeUsed, NULL))

-										{

-											dwReceived = Netlib_Send(dat->hConnection, (LPSTR)btBuff, dwBuffSizeUsed, 0);

-											if (dwBuffSizeUsed == dwReceived)

-											{

-												pfts.currentFileProgress += dwBuffSizeUsed;

-												pfts.totalProgress += dwBuffSizeUsed;

+							WideCharToMultiByte(MRA_CODE_PAGE, 0, dat->pmfqfFiles[j].lpwszName, dat->pmfqfFiles[j].dwNameLen, szFileName, SIZEOF(szFileName), NULL, NULL);

+							ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (HANDLE)dat->dwIDRequest, (LPARAM)&pfts);

+

+							while(TRUE) { // read and sending

+								if (ReadFile(hFile, btBuff, dwSendBlockSize, (DWORD*)&dwBuffSizeUsed, NULL)) {

+									dwReceived = Netlib_Send(dat->hConnection, (LPSTR)btBuff, dwBuffSizeUsed, 0);

+									if (dwBuffSizeUsed == dwReceived) {

+										pfts.currentFileProgress += dwBuffSizeUsed;

+										pfts.totalProgress += dwBuffSizeUsed;

 												

-												// progress updates

-												dwUpdateTimeCur = GetTickCount();

-												if (dwUpdateTimeNext <= dwUpdateTimeCur || pfts.currentFileProgress >= dat->pmfqfFiles[j].dwSize)

-												{// we update it

-													dwUpdateTimeNext = dwUpdateTimeCur+MRA_FILES_QUEUE_PROGRESS_INTERVAL;

+										// progress updates

+										dwUpdateTimeCur = GetTickCount();

+										if (dwUpdateTimeNext <= dwUpdateTimeCur || pfts.currentFileProgress >= dat->pmfqfFiles[j].dwSize) { // we update it

+											dwUpdateTimeNext = dwUpdateTimeCur+MRA_FILES_QUEUE_PROGRESS_INTERVAL;

 

-													ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (HANDLE)dat->dwIDRequest, (LPARAM)&pfts);

+											ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_DATA, (HANDLE)dat->dwIDRequest, (LPARAM)&pfts);

 													

-													if (pfts.currentFileProgress >= dat->pmfqfFiles[j].dwSize)

-													{// file received

-														bOK = TRUE;

-														break;

-													}

-												}

-											}else {// err on send file data

-												dwRetErrorCode = GetLastError();

-												ShowFormattedErrorMessage(L"Send files: error on send file data", dwRetErrorCode);

+											if (pfts.currentFileProgress >= dat->pmfqfFiles[j].dwSize) { // file received

+												bOK = TRUE;

 												break;

 											}

-										}else {// read failure

-											dwRetErrorCode = GetLastError();

-											ShowFormattedErrorMessage(L"Send files: cant read file data, error", dwRetErrorCode);

-											break;

 										}

-									}// end while

-									CloseHandle(hFile);

-

-									if (bOK == FALSE)

-									{// file recv failed

-										bFailed = TRUE;

+									}

+									else { // err on send file data

+										dwRetErrorCode = GetLastError();

+										ShowFormattedErrorMessage(L"Send files: error on send file data", dwRetErrorCode);

 										break;

 									}

-								}else {// err on open file

+								}

+								else {// read failure

 									dwRetErrorCode = GetLastError();

-

-									mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateW(L"Send files: cant open file %s, error"), dat->pmfqfFiles[j].lpwszName);

-									ShowFormattedErrorMessage(szErrorText, dwRetErrorCode);

-									bFailed = TRUE;

+									ShowFormattedErrorMessage(L"Send files: cant read file data, error", dwRetErrorCode);

 									break;

 								}

-							}else {

-								mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateW(L"Send files: requested file: %S - not found in send files list."), (((LPSTR)btBuff)+sizeof(MRA_FT_GET_FILE)));

-								ShowFormattedErrorMessage(szErrorText, NO_ERROR);

+							}// end while

+							CloseHandle(hFile);

+

+							if (bOK == FALSE) { // file recv failed

 								bFailed = TRUE;

 								break;

 							}

-						}else {// err on receive, trash

-							ShowFormattedErrorMessage(L"Send files: bad file send request - invalid header", NO_ERROR);

+						}

+						else {// err on open file

+							dwRetErrorCode = GetLastError();

+							mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateW(L"Send files: cant open file %s, error"), dat->pmfqfFiles[j].lpwszName);

+							ShowFormattedErrorMessage(szErrorText, dwRetErrorCode);

 							bFailed = TRUE;

 							break;

 						}

-					}else {// bad file name or trash

-						ShowFormattedErrorMessage(L"Send files: bad file send request - to small packet", NO_ERROR);

+					}

+					else {

+						mir_sntprintf(szErrorText, SIZEOF(szErrorText), TranslateW(L"Send files: requested file: %S - not found in send files list."), (((LPSTR)btBuff)+sizeof(MRA_FT_GET_FILE)));

+						ShowFormattedErrorMessage(szErrorText, NO_ERROR);

 						bFailed = TRUE;

 						break;

 					}

-				}else {

+				}

+				else {// err on receive, trash

+					ShowFormattedErrorMessage(L"Send files: bad file send request - invalid header", NO_ERROR);

+					bFailed = TRUE;

 					break;

 				}

-			}// end for

+			}

+			else {// bad file name or trash

+				ShowFormattedErrorMessage(L"Send files: bad file send request - to small packet", NO_ERROR);

+				bFailed = TRUE;

+				break;

+			}

+		}// end for

 

-			Netlib_CloseHandle(dat->hConnection);

-			dat->hConnection = NULL;

-		}

+		Netlib_CloseHandle(dat->hConnection);

+		dat->hConnection = NULL;

+	}

 

-		if (bFailed)

-		{

-			CHAR szEMail[MAX_EMAIL_LEN];

-			size_t dwEMailSize;

+	if (bFailed) {

+		CHAR szEMail[MAX_EMAIL_LEN];

+		size_t dwEMailSize;

 

-			if (mraGetStaticStringA(dat->hContact, "e-mail", szEMail, SIZEOF(szEMail), &dwEMailSize))

-			{

-				MraFileTransferAck(FILE_TRANSFER_STATUS_ERROR, szEMail, dwEMailSize, dat->dwIDRequest, NULL, 0);

-			}

-			ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, (HANDLE)dat->dwIDRequest, 0);

-		}else {

-			ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, (HANDLE)dat->dwIDRequest, 0);

-		}

+		if (mraGetStaticStringA(dat->hContact, "e-mail", szEMail, SIZEOF(szEMail), &dwEMailSize))

+			MraFileTransferAck(FILE_TRANSFER_STATUS_ERROR, szEMail, dwEMailSize, dat->dwIDRequest, NULL, 0);

 

-		ListMTLock(pmrafqFilesQueue);

-		MraFilesQueueItemFree(dat);

-		ListMTUnLock(pmrafqFilesQueue);

+		ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_FAILED, (HANDLE)dat->dwIDRequest, 0);

 	}

+	else ProtoBroadcastAck(m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, (HANDLE)dat->dwIDRequest, 0);

+

+	ListMTLock(pmrafqFilesQueue);

+	MraFilesQueueItemFree(dat);

+	ListMTUnLock(pmrafqFilesQueue);

 }

diff --git a/protocols/MRA/MraSendCommand.cpp b/protocols/MRA/MraSendCommand.cpp
index 2d56edb6b7..13bf18e557 100644
--- a/protocols/MRA/MraSendCommand.cpp
+++ b/protocols/MRA/MraSendCommand.cpp
@@ -89,7 +89,7 @@ DWORD CMraProto::MraMessageW(BOOL bAddToQueue, HANDLE hContact, DWORD dwAckType,
 			lpbDataCurrent = lpbAuthMsgBuff;

 			SetUL(&lpbDataCurrent, 2);

 			SetLPSW(&lpbDataCurrent, NULL, 0);//***deb possible nick here

-			SetLPSW(&lpbDataCurrent, (LPWSTR)lpwszMessage, dwMessageSize);

+			SetLPSW(&lpbDataCurrent, lpwszMessage, dwMessageSize);

 

 			BASE64EncodeUnSafe(lpbAuthMsgBuff, (lpbDataCurrent-lpbAuthMsgBuff), lpszMessageConverted, dwMessageConvertedBuffSize, &dwMessageConvertedSize);

 		}

@@ -343,27 +343,27 @@ DWORD CMraProto::MraChangeStatusW(DWORD dwStatus, LPSTR lpszStatusUri, size_t dw
 }

 

 // Отправка файлов

-DWORD CMraProto::MraFileTransfer(LPSTR lpszEMail, size_t dwEMailSize, DWORD dwIDRequest, DWORD dwFilesTotalSize, LPWSTR lpwszFiles, size_t dwFilesSize, LPSTR lpszAddreses, size_t dwAddresesSize)

+DWORD CMraProto::MraFileTransfer(LPSTR lpszEMail, size_t dwEMailSize, DWORD dwIDRequest, DWORD dwFilesTotalSize, LPWSTR lpwszFiles, size_t dwFilesSize, LPSTR lpszAddreses, size_t dwAddressesSize)

 {

 	DWORD dwRet = 0;

 

 	if (lpszEMail && dwEMailSize>4) {

 		int dwFilesSizeA = WideCharToMultiByte(MRA_CODE_PAGE, 0, lpwszFiles, dwFilesSize, NULL, 0, NULL, NULL);

-		LPBYTE lpbData = (LPBYTE)mir_calloc((dwEMailSize+dwFilesSizeA+(dwFilesSize*sizeof(WCHAR))+dwAddresesSize+MAX_PATH));

+		LPBYTE lpbData = (LPBYTE)mir_calloc((dwEMailSize+dwFilesSizeA+(dwFilesSize*sizeof(WCHAR))+dwAddressesSize+MAX_PATH));

 		if (lpbData) {

 			LPBYTE lpbDataCurrent = lpbData;

 			SetLPSLowerCase(&lpbDataCurrent, lpszEMail, dwEMailSize);

 			SetUL(&lpbDataCurrent, dwIDRequest);

 			SetUL(&lpbDataCurrent, dwFilesTotalSize);

-			SetUL(&lpbDataCurrent, (sizeof(DWORD)+dwFilesSizeA + sizeof(DWORD)+(sizeof(DWORD)+sizeof(DWORD)+(dwFilesSize*sizeof(WCHAR))) + sizeof(DWORD)+(DWORD)dwAddresesSize));

+			SetUL(&lpbDataCurrent, sizeof(DWORD)*5 + dwFilesSizeA + dwFilesSize*sizeof(WCHAR) + DWORD(dwAddressesSize));

 

 			SetLPSWtoA(&lpbDataCurrent, lpwszFiles, dwFilesSize);

-			SetUL(&lpbDataCurrent, (sizeof(DWORD)+sizeof(DWORD)+(dwFilesSize*sizeof(WCHAR))));

+			SetUL(&lpbDataCurrent, sizeof(DWORD)*2 + dwFilesSize*sizeof(WCHAR));

 

 			SetUL(&lpbDataCurrent, 1);

 			SetLPSW(&lpbDataCurrent, lpwszFiles, dwFilesSize);

 

-			SetLPS(&lpbDataCurrent, lpszAddreses, dwAddresesSize);

+			SetLPS(&lpbDataCurrent, lpszAddreses, dwAddressesSize);

 

 			dwRet = MraSendCMD(MRIM_CS_FILE_TRANSFER, lpbData, lpbDataCurrent-lpbData);

 			mir_free(lpbData);

@@ -583,19 +583,19 @@ DWORD CMraProto::MraSMSW(HANDLE hContact, LPSTR lpszPhone, size_t dwPhoneSize, L
 }

 

 // Соединение с прокси

-DWORD CMraProto::MraProxy(LPSTR lpszEMail, size_t dwEMailSize, DWORD dwIDRequest, DWORD dwDataType, LPSTR lpszData, size_t dwDataSize, LPSTR lpszAddreses, size_t dwAddresesSize, MRA_GUID mguidSessionID)

+DWORD CMraProto::MraProxy(LPSTR lpszEMail, size_t dwEMailSize, DWORD dwIDRequest, DWORD dwDataType, LPSTR lpszData, size_t dwDataSize, LPSTR lpszAddreses, size_t dwAddressesSize, MRA_GUID mguidSessionID)

 {

 	DWORD dwRet = 0;

 

 	if (lpszEMail && dwEMailSize>4) {

-		LPBYTE lpbData = (LPBYTE)mir_calloc((dwEMailSize+(sizeof(DWORD)*2)+dwDataSize+dwAddresesSize+sizeof(MRA_GUID)+32));

+		LPBYTE lpbData = (LPBYTE)mir_calloc((dwEMailSize+(sizeof(DWORD)*2)+dwDataSize+dwAddressesSize+sizeof(MRA_GUID)+32));

 		if (lpbData) {

 			LPBYTE lpbDataCurrent = lpbData;

 			SetLPSLowerCase(&lpbDataCurrent, lpszEMail, dwEMailSize);

 			SetUL(&lpbDataCurrent, dwIDRequest);

 			SetUL(&lpbDataCurrent, dwDataType);

 			SetLPS(&lpbDataCurrent, lpszData, dwDataSize);

-			SetLPS(&lpbDataCurrent, lpszAddreses, dwAddresesSize);

+			SetLPS(&lpbDataCurrent, lpszAddreses, dwAddressesSize);

 			SetGUID(&lpbDataCurrent, mguidSessionID);

 

 			dwRet = MraSendCMD(MRIM_CS_PROXY, lpbData, (lpbDataCurrent-lpbData));

@@ -606,12 +606,12 @@ DWORD CMraProto::MraProxy(LPSTR lpszEMail, size_t dwEMailSize, DWORD dwIDRequest
 }

 

 // Ответ на соединение с прокси

-DWORD CMraProto::MraProxyAck(DWORD dwStatus, LPSTR lpszEMail, size_t dwEMailSize, DWORD dwIDRequest, DWORD dwDataType, LPSTR lpszData, size_t dwDataSize, LPSTR lpszAddreses, size_t dwAddresesSize, MRA_GUID mguidSessionID)

+DWORD CMraProto::MraProxyAck(DWORD dwStatus, LPSTR lpszEMail, size_t dwEMailSize, DWORD dwIDRequest, DWORD dwDataType, LPSTR lpszData, size_t dwDataSize, LPSTR lpszAddreses, size_t dwAddressesSize, MRA_GUID mguidSessionID)

 {

 	DWORD dwRet = 0;

 

 	if (lpszEMail && dwEMailSize>4) {

-		LPBYTE lpbData = (LPBYTE)mir_calloc((dwEMailSize+(sizeof(DWORD)*3)+dwDataSize+dwAddresesSize+sizeof(MRA_GUID)+32));

+		LPBYTE lpbData = (LPBYTE)mir_calloc((dwEMailSize+(sizeof(DWORD)*3)+dwDataSize+dwAddressesSize+sizeof(MRA_GUID)+32));

 		if (lpbData) {

 			LPBYTE lpbDataCurrent = lpbData;

 			SetUL(&lpbDataCurrent, dwStatus);

@@ -619,7 +619,7 @@ DWORD CMraProto::MraProxyAck(DWORD dwStatus, LPSTR lpszEMail, size_t dwEMailSize
 			SetUL(&lpbDataCurrent, dwIDRequest);

 			SetUL(&lpbDataCurrent, dwDataType);

 			SetLPS(&lpbDataCurrent, lpszData, dwDataSize);

-			SetLPS(&lpbDataCurrent, lpszAddreses, dwAddresesSize);

+			SetLPS(&lpbDataCurrent, lpszAddreses, dwAddressesSize);

 			SetGUID(&lpbDataCurrent, mguidSessionID);

 

 			dwRet = MraSendCMD(MRIM_CS_PROXY_ACK, lpbData, (lpbDataCurrent-lpbData));