minus CreateThread

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

1 files changed, 607 insertions, 590 deletions

diff --git a/plugins/YAMN/src/proto/pop3/pop3comm.cpp b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
index e2994d88b9..4bebbbbd91 100644
--- a/plugins/YAMN/src/proto/pop3/pop3comm.cpp
+++ b/plugins/YAMN/src/proto/pop3/pop3comm.cpp
@@ -7,7 +7,7 @@
  *

  * (c) majvan 2002-2004

  * 18/08

-*/

+ */

 

 

 #include "../../yamn.h"

@@ -16,11 +16,11 @@
 

 //--------------------------------------------------------------------------------------------------

 

-HANDLE hNetLib								= NULL;

-PSCOUNTER CPOP3Account::AccountWriterSO		= NULL;

+HANDLE hNetLib = NULL;

+PSCOUNTER CPOP3Account::AccountWriterSO = NULL;

 

 //Creates new CPOP3Account structure

-HACCOUNT WINAPI CreatePOP3Account(HYAMNPROTOPLUGIN Plugin,DWORD CAccountVersion);

+HACCOUNT WINAPI CreatePOP3Account(HYAMNPROTOPLUGIN Plugin, DWORD CAccountVersion);

 

 //Deletes CPOP3Account structure

 void WINAPI DeletePOP3Account(HACCOUNT Which);

@@ -29,7 +29,7 @@ void WINAPI DeletePOP3Account(HACCOUNT Which);
 void WINAPI StopPOP3Account(HACCOUNT Which);

 

 //Function registers standard functions for YAMN

-int RegisterPOP3Plugin(WPARAM,LPARAM);

+int RegisterPOP3Plugin(WPARAM, LPARAM);

 

 //Unloads all variables created on heap (delete[])

 DWORD WINAPI UnLoadPOP3(void *);

@@ -38,17 +38,17 @@ DWORD WINAPI UnLoadPOP3(void *);
 DWORD WINAPI WritePOP3Accounts();

 

 //Function stores plugin's data for account to file

-DWORD WINAPI WritePOP3Options(HANDLE,HACCOUNT);

+DWORD WINAPI WritePOP3Options(HANDLE, HACCOUNT);

 

 //Function reads plugin's data for account from file

-DWORD WINAPI ReadPOP3Options(HACCOUNT,char **,char *);

+DWORD WINAPI ReadPOP3Options(HACCOUNT, char **, char *);

 

 //Creates new mail for an account

-HYAMNMAIL WINAPI CreatePOP3Mail(HACCOUNT Account,DWORD CMimeMailVersion);

+HYAMNMAIL WINAPI CreatePOP3Mail(HACCOUNT Account, DWORD CMimeMailVersion);

 

 //Function does all needed work when connection failed or any error occured

 //Creates structure containing error code, closes internet session, runs "bad connect" function

-static void PostErrorProc(HPOP3ACCOUNT ActualAccount,void *ParamToBadConnect,DWORD POP3PluginParam,BOOL UseSSL);

+static void PostErrorProc(HPOP3ACCOUNT ActualAccount, void *ParamToBadConnect, DWORD POP3PluginParam, BOOL UseSSL);

 

 //Checks POP3 account and stores all info to account. It deletes old mails=> synchro

 // WhichTemp- pointer to strucure containing needed information

@@ -57,7 +57,7 @@ DWORD WINAPI SynchroPOP3(struct CheckParam *WhichTemp);
 //Deletes mails from POP3 server

 // WhichTemp- structure containing needed information (queued messages to delete)

 //Function deletes from memory queue in WhichTemp structure

-DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp);

+void __cdecl DeleteMailsPOP3(void *param);

 

 //Function makes readable message about error. It sends it back to YAMN, so YAMN then

 //can show it to the message window

@@ -71,24 +71,24 @@ void WINAPI DeleteErrorString(LPVOID String);
 // len- length of source string

 // mboxsize- adreess to integer, that receives size of mailbox

 // mails- adreess to integer, that receives number of mails

-void ExtractStat(char *stream,int len,int *mboxsize,int *mails);

+void ExtractStat(char *stream, int len, int *mboxsize, int *mails);

 

 //Extracts mail ID on mailbox

 // stream- source string

 // len- length of source string

 // queue- address of first message, where first ID will be stored

-void ExtractUIDL(char *stream,int len,HYAMNMAIL queue);

+void ExtractUIDL(char *stream, int len, HYAMNMAIL queue);

 

 //Extracts mail size on mailbox

 // stream- source string

 // len- length of source string

 // queue- address of first message, where size of message #1 will be stored

-void ExtractList(char *stream,int len,HYAMNMAIL queue);

+void ExtractList(char *stream, int len, HYAMNMAIL queue);

 

-void ExtractMail(char *stream,int len,HYAMNMAIL queue);

+void ExtractMail(char *stream, int len, HYAMNMAIL queue);

 

-YAMNExportedFcns *pYAMNFcn				= NULL;

-MailExportedFcns *pYAMNMailFcn			= NULL;

+YAMNExportedFcns *pYAMNFcn = NULL;

+MailExportedFcns *pYAMNMailFcn = NULL;

 

 YAMN_PROTOIMPORTFCN POP3ProtocolFunctions =

 {

@@ -117,8 +117,8 @@ YAMN_MAILIMPORTFCN POP3MailFunctions =
 	NULL,

 };

 

-PYAMN_VARIABLES pYAMNVar			= NULL;

-HYAMNPROTOPLUGIN POP3Plugin			= NULL;

+PYAMN_VARIABLES pYAMNVar = NULL;

+HYAMNPROTOPLUGIN POP3Plugin = NULL;

 

 YAMN_PROTOREGISTRATION POP3ProtocolRegistration =

 {

@@ -139,14 +139,14 @@ HANDLE RegisterNLClient(const char *name);
 

 CPOP3Account::CPOP3Account()

 {

-//NOTE! This constructor constructs CAccount structure. If your plugin is not internal,

-//you will need these constructors. All you need is in Account.cpp. Just copy to your source code

-//constructor and destructor of CAccount.

-	UseInternetFree=CreateEvent(NULL,FALSE,TRUE,NULL);

-	InternetQueries=new SCOUNTER;

-	AbilityFlags=YAMN_ACC_BROWSE | YAMN_ACC_POPUP;

-

-	SetAccountStatus((HACCOUNT)this,TranslateT("Disconnected"));

+	//NOTE! This constructor constructs CAccount structure. If your plugin is not internal,

+	//you will need these constructors. All you need is in Account.cpp. Just copy to your source code

+	//constructor and destructor of CAccount.

+	UseInternetFree = CreateEvent(NULL, FALSE, TRUE, NULL);

+	InternetQueries = new SCOUNTER;

+	AbilityFlags = YAMN_ACC_BROWSE | YAMN_ACC_POPUP;

+

+	SetAccountStatus((HACCOUNT)this, TranslateT("Disconnected"));

 }

 

 CPOP3Account::~CPOP3Account()

@@ -156,15 +156,15 @@ CPOP3Account::~CPOP3Account()
 		delete InternetQueries;

 }

 

-HACCOUNT WINAPI CreatePOP3Account(HYAMNPROTOPLUGIN Plugin,DWORD CAccountVersion)

+HACCOUNT WINAPI CreatePOP3Account(HYAMNPROTOPLUGIN Plugin, DWORD CAccountVersion)

 {

-//First, we should check whether CAccountVersion matches.

-//But this is internal plugin, so YAMN's CAccount structure and our CAccount structure are

-//the same, so we do not need to test version. Otherwise, if CAccount version does not match

-//in your plugin, you should return NULL, like this:

-//	if (CAccountVersion != YAMN_ACCOUNTVERSION) return NULL;

+	//First, we should check whether CAccountVersion matches.

+	//But this is internal plugin, so YAMN's CAccount structure and our CAccount structure are

+	//the same, so we do not need to test version. Otherwise, if CAccount version does not match

+	//in your plugin, you should return NULL, like this:

+	//	if (CAccountVersion != YAMN_ACCOUNTVERSION) return NULL;

 

-//Now it is needed to construct our POP3 account and return its handle

+	//Now it is needed to construct our POP3 account and return its handle

 	return (HACCOUNT)new struct CPOP3Account();

 }

 

@@ -175,110 +175,118 @@ void WINAPI DeletePOP3Account(HACCOUNT Which)
 

 void WINAPI StopPOP3Account(HACCOUNT Which)

 {

-	((HPOP3ACCOUNT)Which)->Client.Stopped=TRUE;

+	((HPOP3ACCOUNT)Which)->Client.Stopped = TRUE;

 	if (((HPOP3ACCOUNT)Which)->Client.NetClient != NULL)			//we should inform also network client. Usefull only when network client implements this feature

-		((HPOP3ACCOUNT)Which)->Client.NetClient->Stopped=TRUE;

+		((HPOP3ACCOUNT)Which)->Client.NetClient->Stopped = TRUE;

 }

 

 //This function is like main function for POP3 internal protocol

-int RegisterPOP3Plugin(WPARAM,LPARAM)

+int RegisterPOP3Plugin(WPARAM, LPARAM)

 {

 

 	//Get YAMN variables we can use

-	if (NULL==(pYAMNVar=(PYAMN_VARIABLES)CallService(MS_YAMN_GETVARIABLES,(WPARAM)YAMN_VARIABLESVERSION,0)))

+	if (NULL == (pYAMNVar = (PYAMN_VARIABLES)CallService(MS_YAMN_GETVARIABLES, (WPARAM)YAMN_VARIABLESVERSION, 0)))

 		return 0;

 

 	//We have to get pointers to YAMN exported functions: allocate structure and fill it

-	if (NULL==(pYAMNFcn=new struct YAMNExportedFcns))

-		{UnLoadPOP3(0); return 0;}

+	if (NULL == (pYAMNFcn = new struct YAMNExportedFcns))

+	{

+		UnLoadPOP3(0); return 0;

+	}

 

 	//Register new pop3 user in netlib

-	if (NULL==(hNetLib=RegisterNLClient("YAMN-POP3")))

-		{UnLoadPOP3(0); return 0;}

-

-	pYAMNFcn->SetProtocolPluginFcnImportFcn=(YAMN_SETPROTOCOLPLUGINFCNIMPORTFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SETPROTOCOLPLUGINFCNIMPORTID,0);

-	pYAMNFcn->WaitToWriteFcn=(YAMN_WAITTOWRITEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_WAITTOWRITEID,0);

-	pYAMNFcn->WriteDoneFcn=(YAMN_WRITEDONEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_WRITEDONEID,0);

-	pYAMNFcn->WaitToReadFcn=(YAMN_WAITTOREADFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_WAITTOREADID,0);

-	pYAMNFcn->ReadDoneFcn=(YAMN_READDONEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_READDONEID,0);

-	pYAMNFcn->SCGetNumberFcn=(YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SCGETNUMBERID,0);

-	pYAMNFcn->SCIncFcn=(YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SCINCID,0);

-	pYAMNFcn->SCDecFcn=(YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SCDECID,0);

-	pYAMNFcn->SetStatusFcn=(YAMN_SETSTATUSFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SETSTATUSID,0);

-	pYAMNFcn->GetStatusFcn=(YAMN_GETSTATUSFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_GETSTATUSID,0);

-

-	if (NULL==(pYAMNMailFcn=new struct MailExportedFcns))

-		{UnLoadPOP3(0); return 0;}

-

-	pYAMNMailFcn->SynchroMessagesFcn=(YAMN_SYNCHROMIMEMSGSFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_SYNCHROMIMEMSGSID,0);

-	pYAMNMailFcn->TranslateHeaderFcn=(YAMN_TRANSLATEHEADERFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_TRANSLATEHEADERID,0);

-	pYAMNMailFcn->AppendQueueFcn=(YAMN_APPENDQUEUEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_APPENDQUEUEID,0);

-	pYAMNMailFcn->DeleteMessagesToEndFcn=(YAMN_DELETEMIMEQUEUEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_DELETEMIMEQUEUEID,0);

-	pYAMNMailFcn->DeleteMessageFromQueueFcn=(YAMN_DELETEMIMEMESSAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_DELETEMIMEMESSAGEID,0);

-	pYAMNMailFcn->FindMessageByIDFcn=(YAMN_FINDMIMEMESSAGEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_FINDMIMEMESSAGEID,0);

-	pYAMNMailFcn->CreateNewDeleteQueueFcn=(YAMN_CREATENEWDELETEQUEUEFCN)CallService(MS_YAMN_GETFCNPTR,(WPARAM)YAMN_CREATENEWDELETEQUEUEID,0);

+	if (NULL == (hNetLib = RegisterNLClient("YAMN-POP3")))

+	{

+		UnLoadPOP3(0); return 0;

+	}

+

+	pYAMNFcn->SetProtocolPluginFcnImportFcn = (YAMN_SETPROTOCOLPLUGINFCNIMPORTFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_SETPROTOCOLPLUGINFCNIMPORTID, 0);

+	pYAMNFcn->WaitToWriteFcn = (YAMN_WAITTOWRITEFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_WAITTOWRITEID, 0);

+	pYAMNFcn->WriteDoneFcn = (YAMN_WRITEDONEFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_WRITEDONEID, 0);

+	pYAMNFcn->WaitToReadFcn = (YAMN_WAITTOREADFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_WAITTOREADID, 0);

+	pYAMNFcn->ReadDoneFcn = (YAMN_READDONEFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_READDONEID, 0);

+	pYAMNFcn->SCGetNumberFcn = (YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_SCGETNUMBERID, 0);

+	pYAMNFcn->SCIncFcn = (YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_SCINCID, 0);

+	pYAMNFcn->SCDecFcn = (YAMN_SCMANAGEFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_SCDECID, 0);

+	pYAMNFcn->SetStatusFcn = (YAMN_SETSTATUSFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_SETSTATUSID, 0);

+	pYAMNFcn->GetStatusFcn = (YAMN_GETSTATUSFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_GETSTATUSID, 0);

+

+	if (NULL == (pYAMNMailFcn = new struct MailExportedFcns))

+	{

+		UnLoadPOP3(0); return 0;

+	}

+

+	pYAMNMailFcn->SynchroMessagesFcn = (YAMN_SYNCHROMIMEMSGSFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_SYNCHROMIMEMSGSID, 0);

+	pYAMNMailFcn->TranslateHeaderFcn = (YAMN_TRANSLATEHEADERFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_TRANSLATEHEADERID, 0);

+	pYAMNMailFcn->AppendQueueFcn = (YAMN_APPENDQUEUEFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_APPENDQUEUEID, 0);

+	pYAMNMailFcn->DeleteMessagesToEndFcn = (YAMN_DELETEMIMEQUEUEFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_DELETEMIMEQUEUEID, 0);

+	pYAMNMailFcn->DeleteMessageFromQueueFcn = (YAMN_DELETEMIMEMESSAGEFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_DELETEMIMEMESSAGEID, 0);

+	pYAMNMailFcn->FindMessageByIDFcn = (YAMN_FINDMIMEMESSAGEFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_FINDMIMEMESSAGEID, 0);

+	pYAMNMailFcn->CreateNewDeleteQueueFcn = (YAMN_CREATENEWDELETEQUEUEFCN)CallService(MS_YAMN_GETFCNPTR, (WPARAM)YAMN_CREATENEWDELETEQUEUEID, 0);

 

 	//set static variable

-	if (CPOP3Account::AccountWriterSO==NULL) {

-		if (NULL==(CPOP3Account::AccountWriterSO=new SCOUNTER))

-			{UnLoadPOP3(0); return 0;}

+	if (CPOP3Account::AccountWriterSO == NULL) {

+		if (NULL == (CPOP3Account::AccountWriterSO = new SCOUNTER))

+		{

+			UnLoadPOP3(0); return 0;

+		}

 	}

 

 	//First, we register this plugin

 	//it is quite impossible this function returns zero (failure) as YAMN and internal plugin structre versions are the same

 	POP3ProtocolRegistration.Name = Translate("POP3 protocol (internal)");

 	POP3ProtocolRegistration.Description = Translate(__DESCRIPTION);

-	if (NULL==(POP3Plugin=(HYAMNPROTOPLUGIN)CallService(MS_YAMN_REGISTERPROTOPLUGIN,(WPARAM)&POP3ProtocolRegistration,(LPARAM)YAMN_PROTOREGISTRATIONVERSION)))

+	if (NULL == (POP3Plugin = (HYAMNPROTOPLUGIN)CallService(MS_YAMN_REGISTERPROTOPLUGIN, (WPARAM)&POP3ProtocolRegistration, (LPARAM)YAMN_PROTOREGISTRATIONVERSION)))

 		return 0;

 

 	//Next we set our imported functions for YAMN

-	if (!SetProtocolPluginFcnImport(POP3Plugin,&POP3ProtocolFunctions,YAMN_PROTOIMPORTFCNVERSION,&POP3MailFunctions,YAMN_MAILIMPORTFCNVERSION))

+	if (!SetProtocolPluginFcnImport(POP3Plugin, &POP3ProtocolFunctions, YAMN_PROTOIMPORTFCNVERSION, &POP3MailFunctions, YAMN_MAILIMPORTFCNVERSION))

 		return 0;

 

 	//Then, we read all mails for accounts.

 	//You must first register account, before using this function as YAMN must use CreatePOP3Account function to add new accounts

 	//But if CreatePOP3Account is not implemented (equals to NULL), YAMN creates account as YAMN's standard HACCOUNT

-	if (FileName) CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName, 0);	//shoud not happen (only for secure)

-	FileName = (TCHAR *)CallService(MS_YAMN_GETFILENAME,(WPARAM)_T("pop3"), 0);

-

-	switch(CallService(MS_YAMN_READACCOUNTS,(WPARAM)POP3Plugin,(LPARAM)FileName)) {

-		case EACC_FILEVERSION:

-			MessageBox(NULL,TranslateT("Found new version of account book, not compatible with this version of YAMN."),TranslateT("YAMN (internal POP3) read error"),MB_OK);

-			CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,0);

-			FileName = NULL;

-			return 0;

-		case EACC_FILECOMPATIBILITY:

-			MessageBox(NULL,TranslateT("Error reading account file. Account file corrupted."),TranslateT("YAMN (internal POP3) read error"),MB_OK);

-			CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,0);

-			FileName = NULL;

-			return 0;

-		case EACC_ALLOC:

-			MessageBox(NULL,TranslateT("Memory allocation error while data reading"),TranslateT("YAMN (internal POP3) read error"),MB_OK);

-			CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,0);

+	if (FileName) CallService(MS_YAMN_DELETEFILENAME, (WPARAM)FileName, 0);	//shoud not happen (only for secure)

+	FileName = (TCHAR *)CallService(MS_YAMN_GETFILENAME, (WPARAM)_T("pop3"), 0);

+

+	switch (CallService(MS_YAMN_READACCOUNTS, (WPARAM)POP3Plugin, (LPARAM)FileName)) {

+	case EACC_FILEVERSION:

+		MessageBox(NULL, TranslateT("Found new version of account book, not compatible with this version of YAMN."), TranslateT("YAMN (internal POP3) read error"), MB_OK);

+		CallService(MS_YAMN_DELETEFILENAME, (WPARAM)FileName, 0);

+		FileName = NULL;

+		return 0;

+	case EACC_FILECOMPATIBILITY:

+		MessageBox(NULL, TranslateT("Error reading account file. Account file corrupted."), TranslateT("YAMN (internal POP3) read error"), MB_OK);

+		CallService(MS_YAMN_DELETEFILENAME, (WPARAM)FileName, 0);

+		FileName = NULL;

+		return 0;

+	case EACC_ALLOC:

+		MessageBox(NULL, TranslateT("Memory allocation error while data reading"), TranslateT("YAMN (internal POP3) read error"), MB_OK);

+		CallService(MS_YAMN_DELETEFILENAME, (WPARAM)FileName, 0);

+		FileName = NULL;

+		return 0;

+	case EACC_SYSTEM:

+		if (ERROR_FILE_NOT_FOUND != GetLastError())

+		{

+			TCHAR temp[1024] = { 0 };

+			mir_sntprintf(temp, SIZEOF(temp), _T("%s\n%s"), TranslateT("Reading file error. File already in use?"), FileName);

+			MessageBox(NULL, temp, TranslateT("YAMN (internal POP3) read error"), MB_OK);

+			CallService(MS_YAMN_DELETEFILENAME, (WPARAM)FileName, 0);

 			FileName = NULL;

 			return 0;

-		case EACC_SYSTEM:

-			if (ERROR_FILE_NOT_FOUND != GetLastError())

-			{

-				TCHAR temp[1024] = {0};

-				mir_sntprintf(temp, SIZEOF(temp), _T("%s\n%s"), TranslateT("Reading file error. File already in use?"), FileName);

-				MessageBox(NULL,temp,TranslateT("YAMN (internal POP3) read error"),MB_OK);

-				CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,0);

-				FileName = NULL;

-				return 0;

-			}

-			break;

+		}

+		break;

 	}

 	//HookEvent(ME_OPT_INITIALISE,POP3OptInit);

 

 	HACCOUNT Finder;

 	DBVARIANT dbv;

 

-	for (Finder=POP3Plugin->FirstAccount;Finder != NULL;Finder=Finder->Next) {

+	for (Finder = POP3Plugin->FirstAccount; Finder != NULL; Finder = Finder->Next) {

 		Finder->hContact = NULL;

 		for (MCONTACT hContact = db_find_first(YAMN_DBMODULE); hContact; hContact = db_find_next(hContact, YAMN_DBMODULE)) {

-			if (!db_get_s(hContact,YAMN_DBMODULE,"Id",&dbv)) {

-				if ( strcmp( dbv.pszVal, Finder->Name) == 0) {

+			if (!db_get_s(hContact, YAMN_DBMODULE, "Id", &dbv)) {

+				if (strcmp(dbv.pszVal, Finder->Name) == 0) {

 					Finder->hContact = hContact;

 					db_set_w(Finder->hContact, YAMN_DBMODULE, "Status", ID_STATUS_ONLINE);

 					db_set_s(Finder->hContact, "CList", "StatusMsg", Translate("No new mail message"));

@@ -296,9 +304,9 @@ int RegisterPOP3Plugin(WPARAM,LPARAM)
 			//No account contact found, have to create one

 			Finder->hContact = CallService(MS_DB_CONTACT_ADD, 0, 0);

 			CallService(MS_PROTO_ADDTOCONTACT, Finder->hContact, (LPARAM)YAMN_DBMODULE);

-			db_set_s(Finder->hContact,YAMN_DBMODULE,"Id",Finder->Name);

-			db_set_s(Finder->hContact,YAMN_DBMODULE,"Nick",Finder->Name);

-			db_set_s(Finder->hContact,"Protocol","p",YAMN_DBMODULE);

+			db_set_s(Finder->hContact, YAMN_DBMODULE, "Id", Finder->Name);

+			db_set_s(Finder->hContact, YAMN_DBMODULE, "Nick", Finder->Name);

+			db_set_s(Finder->hContact, "Protocol", "p", YAMN_DBMODULE);

 			db_set_w(Finder->hContact, YAMN_DBMODULE, "Status", YAMN_STATUS);

 		}

 	}

@@ -310,61 +318,66 @@ DWORD WINAPI UnLoadPOP3(void *)
 {

 	//pYAMNVar is only a pointr, no need delete or free

 	if (hNetLib) {

-		Netlib_CloseHandle(hNetLib); hNetLib = NULL;}

+		Netlib_CloseHandle(hNetLib); hNetLib = NULL;

+	}

 	if (CPOP3Account::AccountWriterSO) {

-		delete CPOP3Account::AccountWriterSO; CPOP3Account::AccountWriterSO = NULL;}

+		delete CPOP3Account::AccountWriterSO; CPOP3Account::AccountWriterSO = NULL;

+	}

 	if (pYAMNMailFcn) {

-		delete pYAMNMailFcn; pYAMNMailFcn = NULL;}

+		delete pYAMNMailFcn; pYAMNMailFcn = NULL;

+	}

 	if (pYAMNFcn) {

-		delete pYAMNFcn; pYAMNFcn = NULL;}

+		delete pYAMNFcn; pYAMNFcn = NULL;

+	}

 	if (FileName) {

-		CallService(MS_YAMN_DELETEFILENAME,(WPARAM)FileName,0); FileName = NULL;}

+		CallService(MS_YAMN_DELETEFILENAME, (WPARAM)FileName, 0); FileName = NULL;

+	}

 

-	#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"UnLoadPOP3:done\n");

-	#endif

+#endif

 	return 1;

 }

 

 DWORD WINAPI WritePOP3Accounts()

 {

-	DWORD ReturnValue = CallService(MS_YAMN_WRITEACCOUNTS,(WPARAM)POP3Plugin,(LPARAM)FileName);

+	DWORD ReturnValue = CallService(MS_YAMN_WRITEACCOUNTS, (WPARAM)POP3Plugin, (LPARAM)FileName);

 	if (ReturnValue == EACC_SYSTEM) {

-		TCHAR temp[1024] = {0};

+		TCHAR temp[1024] = { 0 };

 		mir_sntprintf(temp, SIZEOF(temp), _T("%s\n%s"), TranslateT("Error while copying data to disk occurred. Is file in use?"), FileName);

-		MessageBox(NULL, temp, TranslateT("POP3 plugin - write file error"), MB_OK );

+		MessageBox(NULL, temp, TranslateT("POP3 plugin - write file error"), MB_OK);

 	}

 

 	return ReturnValue;

 }

 

-DWORD WINAPI WritePOP3Options(HANDLE File,HACCOUNT Which)

+DWORD WINAPI WritePOP3Options(HANDLE File, HACCOUNT Which)

 {

 	DWORD WrittenBytes;

-	DWORD Ver=POP3_FILEVERSION;

+	DWORD Ver = POP3_FILEVERSION;

 

-	if ((!WriteFile(File,(char *)&Ver,sizeof(DWORD),&WrittenBytes,NULL)) ||

-		(!WriteFile(File,(char *)&((HPOP3ACCOUNT)Which)->CP,sizeof(WORD),&WrittenBytes,NULL)))

+	if ((!WriteFile(File, (char *)&Ver, sizeof(DWORD), &WrittenBytes, NULL)) ||

+		(!WriteFile(File, (char *)&((HPOP3ACCOUNT)Which)->CP, sizeof(WORD), &WrittenBytes, NULL)))

 		return EACC_SYSTEM;

 	return 0;

 }

 

-DWORD WINAPI ReadPOP3Options(HACCOUNT Which,char **Parser,char *End)

+DWORD WINAPI ReadPOP3Options(HACCOUNT Which, char **Parser, char *End)

 {

 	DWORD Ver;

 #ifdef DEBUG_FILEREAD

 	TCHAR Debug[256];

 #endif

-	Ver=*(DWORD *)(*Parser);

-	(*Parser)+=sizeof(DWORD);

-	if (*Parser>=End)

+	Ver = *(DWORD *)(*Parser);

+	(*Parser) += sizeof(DWORD);

+	if (*Parser >= End)

 		return EACC_FILECOMPATIBILITY;

 	if (Ver != POP3_FILEVERSION)

 		return EACC_FILECOMPATIBILITY;

 

-	((HPOP3ACCOUNT)Which)->CP=*(WORD *)(*Parser);

-	(*Parser)+=sizeof(WORD);

-	if (*Parser>=End)

+	((HPOP3ACCOUNT)Which)->CP = *(WORD *)(*Parser);

+	(*Parser) += sizeof(WORD);

+	if (*Parser >= End)

 		return EACC_FILECOMPATIBILITY;

 #ifdef DEBUG_FILEREAD

 	mir_sntprintf(Debug, SIZEOF(Debug), _T("CodePage: %d, remaining %d chars"), ((HPOP3ACCOUNT)Which)->CP, End-*Parser);

@@ -373,25 +386,25 @@ DWORD WINAPI ReadPOP3Options(HACCOUNT Which,char **Parser,char *End)
 	return 0;

 }

 

-HYAMNMAIL WINAPI CreatePOP3Mail(HACCOUNT Account,DWORD MailDataVersion)

+HYAMNMAIL WINAPI CreatePOP3Mail(HACCOUNT Account, DWORD MailDataVersion)

 {

 	HYAMNMAIL NewMail;

-//First, we should check whether MAILDATA matches.

-//But this is internal plugin, so YAMN's MAILDATA structure and our MAILDATA structure are

-//the same, so we do not need to test version. Otherwise, if MAILDATA version does not match

-//in your plugin, you should return NULL, like this:

-//	if (MailDataVersion != YAMN_MAILDATAVERSION) return NULL;

-

-//Now it is needed to construct our POP3 account and return its handle

-	if (NULL==(NewMail=new YAMNMAIL))

+	//First, we should check whether MAILDATA matches.

+	//But this is internal plugin, so YAMN's MAILDATA structure and our MAILDATA structure are

+	//the same, so we do not need to test version. Otherwise, if MAILDATA version does not match

+	//in your plugin, you should return NULL, like this:

+	//	if (MailDataVersion != YAMN_MAILDATAVERSION) return NULL;

+

+	//Now it is needed to construct our POP3 account and return its handle

+	if (NULL == (NewMail = new YAMNMAIL))

 		return NULL;

-	

-	if (NULL==(NewMail->MailData=new MAILDATA))

+

+	if (NULL == (NewMail->MailData = new MAILDATA))

 	{

 		delete NewMail;

 		return NULL;

 	}

-	NewMail->MailData->CP=((HPOP3ACCOUNT)Account)->CP;

+	NewMail->MailData->CP = ((HPOP3ACCOUNT)Account)->CP;

 	return (HYAMNMAIL)NewMail;

 }

 

@@ -401,65 +414,65 @@ static void SetContactStatus(HACCOUNT account, int status) {
 	}

 }

 

-static void PostErrorProc(HPOP3ACCOUNT ActualAccount,void *ParamToBadConnection,DWORD POP3PluginParam,BOOL UseSSL)

+static void PostErrorProc(HPOP3ACCOUNT ActualAccount, void *ParamToBadConnection, DWORD POP3PluginParam, BOOL UseSSL)

 {

 	char *DataRX;

 

-//We create new structure, that we pass to bad connection dialog procedure. This procedure next calls YAMN imported fuction

-//from POP3 protocol to determine the description of error. We can describe error from our error code structure, because later,

-//when YAMN calls our function, it passes us our error code. This is pointer to structure for POP3 protocol in fact. 

+	//We create new structure, that we pass to bad connection dialog procedure. This procedure next calls YAMN imported fuction

+	//from POP3 protocol to determine the description of error. We can describe error from our error code structure, because later,

+	//when YAMN calls our function, it passes us our error code. This is pointer to structure for POP3 protocol in fact. 

 	PPOP3_ERRORCODE ErrorCode;

 

-//We store status before we do Quit(), because quit can destroy our errorcode status

-	if (NULL != (ErrorCode=new POP3_ERRORCODE))

+	//We store status before we do Quit(), because quit can destroy our errorcode status

+	if (NULL != (ErrorCode = new POP3_ERRORCODE))

 	{

-		ErrorCode->SSL=UseSSL;

-		ErrorCode->AppError=ActualAccount->SystemError;

-		ErrorCode->POP3Error=ActualAccount->Client.POP3Error;

-		ErrorCode->NetError=ActualAccount->Client.NetClient->NetworkError;

-		ErrorCode->SystemError=ActualAccount->Client.NetClient->SystemError;

+		ErrorCode->SSL = UseSSL;

+		ErrorCode->AppError = ActualAccount->SystemError;

+		ErrorCode->POP3Error = ActualAccount->Client.POP3Error;

+		ErrorCode->NetError = ActualAccount->Client.NetClient->NetworkError;

+		ErrorCode->SystemError = ActualAccount->Client.NetClient->SystemError;

 	}

 

-	if (POP3PluginParam==(DWORD)NULL)		//if it was normal YAMN call (force check or so on)

+	if (POP3PluginParam == (DWORD)NULL)		//if it was normal YAMN call (force check or so on)

 	{

 		try

 		{

-			DataRX=ActualAccount->Client.Quit();

+			DataRX = ActualAccount->Client.Quit();

 			if (DataRX != NULL)

 				free(DataRX);

 		}

-		catch(...)

+		catch (...)

 		{

 		}

-//We always close connection if error occured

+		//We always close connection if error occured

 		try

 		{

 			ActualAccount->Client.NetClient->Disconnect();

 		}

-		catch(...)

+		catch (...)

 		{

 		}

 

-		SetAccountStatus(ActualAccount,TranslateT("Disconnected"));

+		SetAccountStatus(ActualAccount, TranslateT("Disconnected"));

 

-//If we cannot allocate memory, do nothing

-		if (ErrorCode==NULL)

+		//If we cannot allocate memory, do nothing

+		if (ErrorCode == NULL)

 		{

 			SetEvent(ActualAccount->UseInternetFree);

 			return;

 		}

 	}

 	else						//else it was called from POP3 plugin, probably error when deleting old mail (POP3 synchro calls POP3 delete)

-		if (ErrorCode==NULL)

+		if (ErrorCode == NULL)

 			return;

 

 	if ((ActualAccount->BadConnectN.Flags & YAMN_ACC_MSG) || (ActualAccount->BadConnectN.Flags & YAMN_ACC_ICO) || (ActualAccount->BadConnectN.Flags & YAMN_ACC_POP))

 	{

-		YAMN_BADCONNECTIONPARAM cp={(HANDLE)0,ActualAccount,(UINT_PTR)ErrorCode,ParamToBadConnection};

+		YAMN_BADCONNECTIONPARAM cp = { (HANDLE)0, ActualAccount, (UINT_PTR)ErrorCode, ParamToBadConnection };

 

-		CallService(MS_YAMN_BADCONNECTION,(WPARAM)&cp,(LPARAM)YAMN_BADCONNECTIONVERSION);

+		CallService(MS_YAMN_BADCONNECTION, (WPARAM)&cp, (LPARAM)YAMN_BADCONNECTIONVERSION);

 	}

-	if (POP3PluginParam==(DWORD)NULL)		//if it was normal YAMN call

+	if (POP3PluginParam == (DWORD)NULL)		//if it was normal YAMN call

 		SetEvent(ActualAccount->UseInternetFree);

 }

 

@@ -468,13 +481,13 @@ DWORD WINAPI SynchroPOP3(struct CheckParam * WhichTemp)
 {

 	HPOP3ACCOUNT ActualAccount;

 	CPop3Client *MyClient;

-	HYAMNMAIL NewMails=NULL,MsgQueuePtr=NULL;

-	char* DataRX=NULL,*Temp;

-	int mboxsize,msgs,i;

+	HYAMNMAIL NewMails = NULL, MsgQueuePtr = NULL;

+	char* DataRX = NULL, *Temp;

+	int mboxsize, msgs, i;

 	SYSTEMTIME now;

 	LPVOID YAMNParam;

 	DWORD CheckFlags;

-	BOOL UsingInternet=FALSE;

+	BOOL UsingInternet = FALSE;

 	struct {

 		char *ServerName;

 		DWORD ServerPort;

@@ -496,57 +509,57 @@ DWORD WINAPI SynchroPOP3(struct CheckParam * WhichTemp)
 	//			//and then we can in our GetErrorStringFcn e.g. return string "Uncompatible version of YAMN".

 	//	}

 

-	ActualAccount=(HPOP3ACCOUNT)WhichTemp->AccountParam;			//copy address of structure from calling thread to stack of this thread

-	YAMNParam=WhichTemp->BrowserParam;

-	CheckFlags=WhichTemp->Flags;

-	#ifdef DEBUG_SYNCHRO

+	ActualAccount = (HPOP3ACCOUNT)WhichTemp->AccountParam;			//copy address of structure from calling thread to stack of this thread

+	YAMNParam = WhichTemp->BrowserParam;

+	CheckFlags = WhichTemp->Flags;

+#ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"CheckPOP3:Incrementing \"using threads\" %x (account %x)\n",ActualAccount->UsingThreads,ActualAccount);

-	#endif

+#endif

 	SCInc(ActualAccount->UsingThreads);

 	//Unblock YAMN, signal that we have copied all parameters from YAMN thread stack

 	if (INVALID_HANDLE_VALUE != WhichTemp->ThreadRunningEV)

 		SetEvent(WhichTemp->ThreadRunningEV);

 

-	#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"CheckPOP3:ActualAccountSO-read wait\n");

-	#endif

+#endif

 	if (WAIT_OBJECT_0 != WaitToRead(ActualAccount))

 	{

-		#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"CheckPOP3:ActualAccountSO-read wait failed\n");

-		#endif

-		#ifdef DEBUG_SYNCHRO

+#endif

+#ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"CheckPOP3:Decrementing \"using threads\" %x (account %x)\n",ActualAccount->UsingThreads,ActualAccount);

-		#endif

+#endif

 		SCDec(ActualAccount->UsingThreads);

 		return 0;

 	}

-	#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"CheckPOP3:ActualAccountSO-read enter\n");

-	#endif

-	MyClient=&ActualAccount->Client;

+#endif

+	MyClient = &ActualAccount->Client;

 	//Now, copy all needed information about account to local variables, so ActualAccount is not blocked in read mode during all connection process, which can last for several minutes.

 	ActualCopied.ServerName = _strdup(ActualAccount->Server->Name);

-	ActualCopied.ServerPort=ActualAccount->Server->Port;

-	ActualCopied.Flags=ActualAccount->Flags;

-	ActualCopied.ServerLogin=_strdup(ActualAccount->Server->Login);

-	ActualCopied.ServerPasswd=_strdup(ActualAccount->Server->Passwd);

-	ActualCopied.NFlags=ActualAccount->NewMailN.Flags;

-	ActualCopied.NNFlags=ActualAccount->NoNewMailN.Flags;

-

-	#ifdef DEBUG_SYNCHRO

+	ActualCopied.ServerPort = ActualAccount->Server->Port;

+	ActualCopied.Flags = ActualAccount->Flags;

+	ActualCopied.ServerLogin = _strdup(ActualAccount->Server->Login);

+	ActualCopied.ServerPasswd = _strdup(ActualAccount->Server->Passwd);

+	ActualCopied.NFlags = ActualAccount->NewMailN.Flags;

+	ActualCopied.NNFlags = ActualAccount->NoNewMailN.Flags;

+

+#ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"CheckPOP3:ActualAccountSO-read done\n");

-	#endif

+#endif

 	ReadDone(ActualAccount);

 

 	SCInc(ActualAccount->InternetQueries);				//increment counter, that there is one more thread waiting for connection

-	#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"CheckPOP3:InternetFreeEV-wait\n");

-	#endif

-	WaitForSingleObject(ActualAccount->UseInternetFree,INFINITE);	//wait until we can use connection

-	#ifdef DEBUG_SYNCHRO

+#endif

+	WaitForSingleObject(ActualAccount->UseInternetFree, INFINITE);	//wait until we can use connection

+#ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"CheckPOP3:InternetFreeEV-enter\n");

-	#endif

+#endif

 	SCDec(ActualAccount->InternetQueries);

 

 	//OK, we enter the "use internet" section. But after we start communication, we can test if we did not enter the "use internet" section only for the reason,

@@ -554,299 +567,300 @@ DWORD WINAPI SynchroPOP3(struct CheckParam * WhichTemp)
 	//the second one waiting for network access- the first one ends because we want to stop account, this one is released, but should be stopped as well).

 	if (!ActualAccount->AbleToWork)

 	{

-		#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"CheckPOP3:stop signal-InternetFreeEV-done\n");

-		#endif

+#endif

 		SetEvent(ActualAccount->UseInternetFree);

-		#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"CheckPOP3:stop signal-Decrementing \"using threads\" %x (account %x)\n",ActualAccount->UsingThreads,ActualAccount);

-		#endif

+#endif

 		SCDec(ActualAccount->UsingThreads);

 		return 0;

 	}

-	UsingInternet=TRUE;

+	UsingInternet = TRUE;

 

 	GetLocalTime(&now);

-	ActualAccount->SystemError=0;					//now we can use internet for this socket. First, clear errorcode.

+	ActualAccount->SystemError = 0;					//now we can use internet for this socket. First, clear errorcode.

 	try

 	{

-		SetContactStatus(ActualAccount,ID_STATUS_OCCUPIED);

-		#ifdef DEBUG_COMM

+		SetContactStatus(ActualAccount, ID_STATUS_OCCUPIED);

+#ifdef DEBUG_COMM

 		DebugLog(CommFile,"<--------Communication-------->\n");

-		#endif

+#endif

 		//	if we are already connected, we have open session (another thread left us open session), so we don't need to login

 		//	note that connected state without logging cannot occur, because if we close session, we always close socket too (we must close socket is the right word :))

-		if ((MyClient->NetClient==NULL) || !MyClient->NetClient->Connected())

+		if ((MyClient->NetClient == NULL) || !MyClient->NetClient->Connected())

 		{

-			SetAccountStatus(ActualAccount,TranslateT("Connecting to server"));

+			SetAccountStatus(ActualAccount, TranslateT("Connecting to server"));

 

-			DataRX=MyClient->Connect(ActualCopied.ServerName,ActualCopied.ServerPort,ActualCopied.Flags & YAMN_ACC_SSL23,ActualCopied.Flags & YAMN_ACC_NOTLS);

-			char *timestamp=NULL;

+			DataRX = MyClient->Connect(ActualCopied.ServerName, ActualCopied.ServerPort, ActualCopied.Flags & YAMN_ACC_SSL23, ActualCopied.Flags & YAMN_ACC_NOTLS);

+			char *timestamp = NULL;

 

 			if (DataRX != NULL)

 			{

 				if (ActualCopied.Flags & YAMN_ACC_APOP)

 				{

-					char *lpos=strchr(DataRX,'<');

-					char *rpos=strchr(DataRX,'>');

-					if (lpos && rpos && rpos>lpos) {

-						int sz=(int)(rpos-lpos+2);

-						timestamp=new char[sz];

-						memcpy(timestamp, lpos, sz-1);

-						timestamp[sz-1]='\0';

+					char *lpos = strchr(DataRX, '<');

+					char *rpos = strchr(DataRX, '>');

+					if (lpos && rpos && rpos > lpos) {

+						int sz = (int)(rpos - lpos + 2);

+						timestamp = new char[sz];

+						memcpy(timestamp, lpos, sz - 1);

+						timestamp[sz - 1] = '\0';

 					}

 				}

 				free(DataRX);

-				DataRX=NULL;

+				DataRX = NULL;

 			}

 

-			SetAccountStatus(ActualAccount,TranslateT("Entering POP3 account"));

+			SetAccountStatus(ActualAccount, TranslateT("Entering POP3 account"));

 

 			if (ActualCopied.Flags & YAMN_ACC_APOP)

 			{

-				DataRX=MyClient->APOP(ActualCopied.ServerLogin,ActualCopied.ServerPasswd,timestamp);

+				DataRX = MyClient->APOP(ActualCopied.ServerLogin, ActualCopied.ServerPasswd, timestamp);

 				if (DataRX != NULL)

 					free(DataRX);

-				DataRX=NULL;

+				DataRX = NULL;

 				delete[] timestamp;

-			} else {

-				DataRX=MyClient->User(ActualCopied.ServerLogin);

+			}

+			else {

+				DataRX = MyClient->User(ActualCopied.ServerLogin);

 				if (DataRX != NULL)

 					free(DataRX);

-				DataRX=NULL;

-				DataRX=MyClient->Pass(ActualCopied.ServerPasswd);

+				DataRX = NULL;

+				DataRX = MyClient->Pass(ActualCopied.ServerPasswd);

 				if (DataRX != NULL)

 					free(DataRX);

-				DataRX=NULL;

+				DataRX = NULL;

 			}

 		}

-		SetAccountStatus(ActualAccount,TranslateT("Searching for new mail message"));

+		SetAccountStatus(ActualAccount, TranslateT("Searching for new mail message"));

 

-		DataRX=MyClient->Stat();

+		DataRX = MyClient->Stat();

 

-		#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<--------Account checking-------->\n");

 		DebugLog(DecodeFile,"<Extracting stat>\n");

-		#endif

-		ExtractStat(DataRX,MyClient->NetClient->Rcv,&mboxsize,&msgs);

-		#ifdef DEBUG_DECODE

+#endif

+		ExtractStat(DataRX, MyClient->NetClient->Rcv, &mboxsize, &msgs);

+#ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<MailBoxSize>%d</MailBoxSize>\n",mboxsize);

 		DebugLog(DecodeFile,"<Msgs>%d</Msgs>\n",msgs);

 		DebugLog(DecodeFile,"</Extracting stat>\n");

-		#endif

+#endif

 		if (DataRX != NULL)

 			free(DataRX);

-		DataRX=NULL;

-		for (i=0;i<msgs;i++)

+		DataRX = NULL;

+		for (i = 0; i < msgs; i++)

 		{

 			if (!i)

-				MsgQueuePtr=NewMails=(HYAMNMAIL)CallService(MS_YAMN_CREATEACCOUNTMAIL,(WPARAM)ActualAccount,(LPARAM)YAMN_MAILVERSION);

+				MsgQueuePtr = NewMails = (HYAMNMAIL)CallService(MS_YAMN_CREATEACCOUNTMAIL, (WPARAM)ActualAccount, (LPARAM)YAMN_MAILVERSION);

 			else

 			{

-				MsgQueuePtr->Next=(HYAMNMAIL)CallService(MS_YAMN_CREATEACCOUNTMAIL,(WPARAM)ActualAccount,(LPARAM)YAMN_MAILVERSION);

-				MsgQueuePtr=MsgQueuePtr->Next;

+				MsgQueuePtr->Next = (HYAMNMAIL)CallService(MS_YAMN_CREATEACCOUNTMAIL, (WPARAM)ActualAccount, (LPARAM)YAMN_MAILVERSION);

+				MsgQueuePtr = MsgQueuePtr->Next;

 			}

-			if (MsgQueuePtr==NULL)

+			if (MsgQueuePtr == NULL)

 			{

-				ActualAccount->SystemError=EPOP3_QUEUEALLOC;

+				ActualAccount->SystemError = EPOP3_QUEUEALLOC;

 				throw (DWORD)ActualAccount->SystemError;

 			}

 		}

 

 		if (msgs)

 		{

-			DataRX=MyClient->List();

-			#ifdef DEBUG_DECODE

+			DataRX = MyClient->List();

+#ifdef DEBUG_DECODE

 			DebugLog(DecodeFile,"<Extracting list>\n");

-			#endif

-			ExtractList(DataRX,MyClient->NetClient->Rcv,NewMails);

-			#ifdef DEBUG_DECODE

+#endif

+			ExtractList(DataRX, MyClient->NetClient->Rcv, NewMails);

+#ifdef DEBUG_DECODE

 			DebugLog(DecodeFile,"</Extracting list>\n");

-			#endif

+#endif

 			if (DataRX != NULL)

 				free(DataRX);

-			DataRX=NULL;

+			DataRX = NULL;

 

-			#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 			DebugLog(DecodeFile,"<Extracting UIDL>\n");

-			#endif

-			DataRX=MyClient->Uidl();

-			ExtractUIDL(DataRX,MyClient->NetClient->Rcv,NewMails);

-			#ifdef DEBUG_DECODE

+#endif

+			DataRX = MyClient->Uidl();

+			ExtractUIDL(DataRX, MyClient->NetClient->Rcv, NewMails);

+#ifdef DEBUG_DECODE

 			DebugLog(DecodeFile,"</Extracting UIDL>\n");

-			#endif

+#endif

 			if (DataRX != NULL)

 				free(DataRX);

-			DataRX=NULL;

+			DataRX = NULL;

 		}

-		#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write wait\n");

-		#endif

+#endif

 		if (WAIT_OBJECT_0 != MsgsWaitToWrite(ActualAccount))

 		{

-			#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 			DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write wait failed\n");

-			#endif

-			throw (DWORD)(ActualAccount->SystemError=EACC_STOPPED);

+#endif

+			throw (DWORD)(ActualAccount->SystemError = EACC_STOPPED);

 		}

-		#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write enter\n");

-		#endif

-		ActualAccount->LastChecked=now;

-		for (MsgQueuePtr=(HYAMNMAIL)ActualAccount->Mails;MsgQueuePtr != NULL;MsgQueuePtr=MsgQueuePtr->Next) {

+#endif

+		ActualAccount->LastChecked = now;

+		for (MsgQueuePtr = (HYAMNMAIL)ActualAccount->Mails; MsgQueuePtr != NULL; MsgQueuePtr = MsgQueuePtr->Next) {

 			if (MsgQueuePtr->Flags&YAMN_MSG_BODYREQUESTED) {

-				HYAMNMAIL NewMsgsPtr=NULL;

-				for (NewMsgsPtr=(HYAMNMAIL)NewMails;NewMsgsPtr != NULL;NewMsgsPtr=NewMsgsPtr->Next) {

-					if (!strcmp(MsgQueuePtr->ID,NewMsgsPtr->ID)) {

+				HYAMNMAIL NewMsgsPtr = NULL;

+				for (NewMsgsPtr = (HYAMNMAIL)NewMails; NewMsgsPtr != NULL; NewMsgsPtr = NewMsgsPtr->Next) {

+					if (!strcmp(MsgQueuePtr->ID, NewMsgsPtr->ID)) {

 						TCHAR accstatus[512];

 						mir_sntprintf(accstatus, SIZEOF(accstatus), TranslateT("Reading body %s"), NewMsgsPtr->ID);

-						SetAccountStatus(ActualAccount,accstatus);

-						DataRX=MyClient->Top(MsgQueuePtr->Number,100);

-						#ifdef DEBUG_DECODE

+						SetAccountStatus(ActualAccount, accstatus);

+						DataRX = MyClient->Top(MsgQueuePtr->Number, 100);

+#ifdef DEBUG_DECODE

 						DebugLog(DecodeFile,"<Reading body>\n");

 						DebugLog(DecodeFile,"<Header>%s</Header>\n",DataRX);

-						#endif

+#endif

 						if (DataRX != NULL)

 						{

-							Temp=DataRX;

-							while((Temp<DataRX+MyClient->NetClient->Rcv) && (WS(Temp) || ENDLINE(Temp))) Temp++;

-						

+							Temp = DataRX;

+							while ((Temp < DataRX + MyClient->NetClient->Rcv) && (WS(Temp) || ENDLINE(Temp))) Temp++;

+

 							if (OKLINE(DataRX))

-								for (Temp=DataRX;(Temp<DataRX+MyClient->NetClient->Rcv) && (!ENDLINE(Temp));Temp++);

-							while((Temp<DataRX+MyClient->NetClient->Rcv) && ENDLINE(Temp)) Temp++;

+								for (Temp = DataRX; (Temp < DataRX + MyClient->NetClient->Rcv) && (!ENDLINE(Temp)); Temp++);

+							while ((Temp < DataRX + MyClient->NetClient->Rcv) && ENDLINE(Temp)) Temp++;

 						}

 						else

 							continue;

 						//delete all the headers of the old mail MsgQueuePtr->MailData->TranslatedHeader

 						struct CMimeItem *TH = MsgQueuePtr->MailData->TranslatedHeader;

-						if (TH) for (;MsgQueuePtr->MailData->TranslatedHeader != NULL;)

+						if (TH) for (; MsgQueuePtr->MailData->TranslatedHeader != NULL;)

 						{

-							TH=TH->Next;

+							TH = TH->Next;

 							if (MsgQueuePtr->MailData->TranslatedHeader->name != NULL)

 								delete[] MsgQueuePtr->MailData->TranslatedHeader->name;

 							if (MsgQueuePtr->MailData->TranslatedHeader->value != NULL)

 								delete[] MsgQueuePtr->MailData->TranslatedHeader->value;

 							delete MsgQueuePtr->MailData->TranslatedHeader;

-							MsgQueuePtr->MailData->TranslatedHeader=TH;

+							MsgQueuePtr->MailData->TranslatedHeader = TH;

 						}

 

-						TranslateHeader(Temp,MyClient->NetClient->Rcv-(Temp-DataRX),&MsgQueuePtr->MailData->TranslatedHeader);

-						

+						TranslateHeader(Temp, MyClient->NetClient->Rcv - (Temp - DataRX), &MsgQueuePtr->MailData->TranslatedHeader);

+

 

-						#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 						DebugLog(DecodeFile,"</Reading body>\n");

-						#endif

-						MsgQueuePtr->Flags|=YAMN_MSG_BODYRECEIVED;

+#endif

+						MsgQueuePtr->Flags |= YAMN_MSG_BODYRECEIVED;

 

 						if (DataRX != NULL)

 							free(DataRX);

-						DataRX=NULL;

+						DataRX = NULL;

 						break;

 					}

 				}

 			}

 		}

 

-		SynchroMessages(ActualAccount,(HYAMNMAIL *)&ActualAccount->Mails,NULL,(HYAMNMAIL *)&NewMails,NULL);		//we get only new mails on server!

-//		NewMails=NULL;

+		SynchroMessages(ActualAccount, (HYAMNMAIL *)&ActualAccount->Mails, NULL, (HYAMNMAIL *)&NewMails, NULL);		//we get only new mails on server!

+		//		NewMails=NULL;

 

-		#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write done\n");

-		#endif

+#endif

 		MsgsWriteDone(ActualAccount);

-		for (MsgQueuePtr=(HYAMNMAIL)ActualAccount->Mails;MsgQueuePtr != NULL;MsgQueuePtr=MsgQueuePtr->Next) {

+		for (MsgQueuePtr = (HYAMNMAIL)ActualAccount->Mails; MsgQueuePtr != NULL; MsgQueuePtr = MsgQueuePtr->Next) {

 			if ((MsgQueuePtr->Flags&YAMN_MSG_BODYREQUESTED) && (MsgQueuePtr->Flags&YAMN_MSG_BODYRECEIVED)) {

-				MsgQueuePtr->Flags&=~YAMN_MSG_BODYREQUESTED;

+				MsgQueuePtr->Flags &= ~YAMN_MSG_BODYREQUESTED;

 				if (MsgQueuePtr->MsgWindow)

-					SendMessage(MsgQueuePtr->MsgWindow,WM_YAMN_CHANGECONTENT,0,0);

+					SendMessage(MsgQueuePtr->MsgWindow, WM_YAMN_CHANGECONTENT, 0, 0);

 			}

 		}

 

-		for (msgs=0,MsgQueuePtr=NewMails;MsgQueuePtr != NULL;MsgQueuePtr=MsgQueuePtr->Next,msgs++);			//get number of new mails

+		for (msgs = 0, MsgQueuePtr = NewMails; MsgQueuePtr != NULL; MsgQueuePtr = MsgQueuePtr->Next, msgs++);			//get number of new mails

 

 		try

 		{

 			TCHAR accstatus[512];

 

-			for (i=0,MsgQueuePtr=NewMails;MsgQueuePtr != NULL;i++)

+			for (i = 0, MsgQueuePtr = NewMails; MsgQueuePtr != NULL; i++)

 			{

 				BOOL autoretr = (ActualAccount->Flags & YAMN_ACC_BODY) != 0;

-				DataRX=MyClient->Top(MsgQueuePtr->Number,autoretr?100:0);

+				DataRX = MyClient->Top(MsgQueuePtr->Number, autoretr ? 100 : 0);

 				mir_sntprintf(accstatus, SIZEOF(accstatus), TranslateT("Reading new mail messages (%d%% done)"), 100 * i / msgs);

-				SetAccountStatus(ActualAccount,accstatus);

+				SetAccountStatus(ActualAccount, accstatus);

 

-				#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 				DebugLog(DecodeFile,"<New mail>\n");

 				DebugLog(DecodeFile,"<Header>%s</Header>\n",DataRX);

-				#endif

+#endif

 				if (DataRX != NULL)

 				{

-					Temp=DataRX;

-					while((Temp<DataRX+MyClient->NetClient->Rcv) && (WS(Temp) || ENDLINE(Temp))) Temp++;

-				

+					Temp = DataRX;

+					while ((Temp < DataRX + MyClient->NetClient->Rcv) && (WS(Temp) || ENDLINE(Temp))) Temp++;

+

 					if (OKLINE(DataRX))

-						for (Temp=DataRX;(Temp<DataRX+MyClient->NetClient->Rcv) && (!ENDLINE(Temp));Temp++);

-					while((Temp<DataRX+MyClient->NetClient->Rcv) && ENDLINE(Temp)) Temp++;

+						for (Temp = DataRX; (Temp < DataRX + MyClient->NetClient->Rcv) && (!ENDLINE(Temp)); Temp++);

+					while ((Temp < DataRX + MyClient->NetClient->Rcv) && ENDLINE(Temp)) Temp++;

 				}

 				else

 					continue;

-					

-				TranslateHeader(Temp,MyClient->NetClient->Rcv-(Temp-DataRX),&MsgQueuePtr->MailData->TranslatedHeader);

-				

 

-				#ifdef DEBUG_DECODE

+				TranslateHeader(Temp, MyClient->NetClient->Rcv - (Temp - DataRX), &MsgQueuePtr->MailData->TranslatedHeader);

+

+

+#ifdef DEBUG_DECODE

 				DebugLog(DecodeFile,"</New mail>\n");

-				#endif

-				MsgQueuePtr->Flags|=YAMN_MSG_NORMALNEW;

-				if (autoretr) MsgQueuePtr->Flags|=YAMN_MSG_BODYRECEIVED;

+#endif

+				MsgQueuePtr->Flags |= YAMN_MSG_NORMALNEW;

+				if (autoretr) MsgQueuePtr->Flags |= YAMN_MSG_BODYRECEIVED;

 

 				//We are going to filter mail. Warning!- we must not be in read access neither write access to mails when calling this service

 				//This is done, because the "NewMails" queue is not synchronised. It is because it is new queue. Only this thread uses new queue yet, it is not

 				//connected to account mail queue.

 				//				CallService(MS_YAMN_FILTERMAIL,(WPARAM)ActualAccount,(LPARAM)MsgQueuePtr);

-				FilterMailSvc((WPARAM)ActualAccount,(LPARAM)MsgQueuePtr);

+				FilterMailSvc((WPARAM)ActualAccount, (LPARAM)MsgQueuePtr);

 

 				if (DataRX != NULL)

 					free(DataRX);

-				DataRX=NULL;

+				DataRX = NULL;

 

 				//MsgQueuePtr->MailData->Body=MyClient->Retr(MsgQueuePtr->Number);

 

-				MsgQueuePtr=MsgQueuePtr->Next;

+				MsgQueuePtr = MsgQueuePtr->Next;

 

 			}

-			#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 			DebugLog(DecodeFile,"</--------Account checking-------->\n");

-			#endif

+#endif

 

-			#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 			DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write wait\n");

-			#endif

+#endif

 			if (WAIT_OBJECT_0 != MsgsWaitToWrite(ActualAccount))

 			{

-				#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 				DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write wait failed\n");

-				#endif

-				throw (DWORD)ActualAccount->SystemError==EACC_STOPPED;

+#endif

+				throw (DWORD)ActualAccount->SystemError == EACC_STOPPED;

 			}

-			#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 			DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write enter\n");

-			#endif

-			if (ActualAccount->Mails==NULL)

-				ActualAccount->Mails=NewMails;

+#endif

+			if (ActualAccount->Mails == NULL)

+				ActualAccount->Mails = NewMails;

 			else

 			{

-				ActualAccount->LastMail=ActualAccount->LastChecked;

-				AppendQueue((HYAMNMAIL)ActualAccount->Mails,NewMails);

+				ActualAccount->LastMail = ActualAccount->LastChecked;

+				AppendQueue((HYAMNMAIL)ActualAccount->Mails, NewMails);

 			}

-			#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 			DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write done\n");

-			#endif

+#endif

 			MsgsWriteDone(ActualAccount);

 

 			//	we are going to delete mails having SPAM flag level3 and 4 (see m_mails.h) set

 			{

-				struct DeleteParam ParamToDeleteMails={YAMN_DELETEVERSION,INVALID_HANDLE_VALUE,ActualAccount,YAMNParam,(void *)POP3_DELETEFROMCHECK};

+				struct DeleteParam ParamToDeleteMails = { YAMN_DELETEVERSION, INVALID_HANDLE_VALUE, ActualAccount, YAMNParam, (void *)POP3_DELETEFROMCHECK };

 

 				//	Delete mails from server. Here we should not be in write access for account's mails

 				DeleteMailsPOP3(&ParamToDeleteMails);

@@ -854,119 +868,121 @@ DWORD WINAPI SynchroPOP3(struct CheckParam * WhichTemp)
 

 			//	if there is no waiting thread for internet connection close it

 			//	else leave connection open

-			if (0==SCGetNumber(ActualAccount->InternetQueries))

+			if (0 == SCGetNumber(ActualAccount->InternetQueries))

 			{

-				DataRX=MyClient->Quit();

+				DataRX = MyClient->Quit();

 				if (DataRX != NULL)

 					free(DataRX);

-				DataRX=NULL;

+				DataRX = NULL;

 				MyClient->NetClient->Disconnect();

 

-				SetAccountStatus(ActualAccount,TranslateT("Disconnected"));

+				SetAccountStatus(ActualAccount, TranslateT("Disconnected"));

 			}

 

-			UsingInternet=FALSE;

-			#ifdef DEBUG_SYNCHRO

+			UsingInternet = FALSE;

+#ifdef DEBUG_SYNCHRO

 			DebugLog(SynchroFile,"CheckPOP3:InternetFreeEV-done\n");

-			#endif

+#endif

 			SetEvent(ActualAccount->UseInternetFree);

 

-			ActualAccount->LastSChecked=ActualAccount->LastChecked;

-			ActualAccount->LastSynchronised=ActualAccount->LastChecked;

+			ActualAccount->LastSChecked = ActualAccount->LastChecked;

+			ActualAccount->LastSynchronised = ActualAccount->LastChecked;

 		}

-		catch(...)

+		catch (...)

 		{

 			throw;			//go to the main exception handling

 		}

 

 		{

-			YAMN_MAILBROWSERPARAM Param={(HANDLE)0,ActualAccount,ActualCopied.NFlags,ActualCopied.NNFlags,YAMNParam};

+			YAMN_MAILBROWSERPARAM Param = { (HANDLE)0, ActualAccount, ActualCopied.NFlags, ActualCopied.NNFlags, YAMNParam };

 

 			if (CheckFlags & YAMN_FORCECHECK)

 				Param.nnflags |= YAMN_ACC_POP;				//if force check, show popup anyway and if mailbrowser was opened, do not close

 			Param.nnflags |= YAMN_ACC_MSGP; //do not close browser if already open

-			CallService(MS_YAMN_MAILBROWSER,(WPARAM)&Param,(LPARAM)YAMN_MAILBROWSERVERSION);

+			CallService(MS_YAMN_MAILBROWSER, (WPARAM)&Param, (LPARAM)YAMN_MAILBROWSERVERSION);

 		}

-		SetContactStatus(ActualAccount,ActualAccount->isCounting?ID_STATUS_ONLINE:ID_STATUS_OFFLINE);

+		SetContactStatus(ActualAccount, ActualAccount->isCounting ? ID_STATUS_ONLINE : ID_STATUS_OFFLINE);

 	}

-	#ifdef DEBUG_COMM

+#ifdef DEBUG_COMM

 	catch(DWORD ErrorCode)

-	#else

-	catch(DWORD)

-	#endif

+#else

+	catch (DWORD)

+#endif

 	{

-		if (ActualAccount->Client.POP3Error==EPOP3_STOPPED)

-	                ActualAccount->SystemError=EACC_STOPPED;

-		#ifdef DEBUG_COMM

+		if (ActualAccount->Client.POP3Error == EPOP3_STOPPED)

+			ActualAccount->SystemError = EACC_STOPPED;

+#ifdef DEBUG_COMM

 		DebugLog(CommFile,"ERROR: %x\n",ErrorCode);

-		#endif

-		#ifdef DEBUG_SYNCHRO

+#endif

+#ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write wait\n");

-		#endif

-		if (WAIT_OBJECT_0==MsgsWaitToWrite(ActualAccount))

+#endif

+		if (WAIT_OBJECT_0 == MsgsWaitToWrite(ActualAccount))

 		{

-			#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 			DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write enter\n");

-			#endif

-			ActualAccount->LastChecked=now;

-			#ifdef DEBUG_SYNCHRO

+#endif

+			ActualAccount->LastChecked = now;

+#ifdef DEBUG_SYNCHRO

 			DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write done\n");

-			#endif

+#endif

 			MsgsWriteDone(ActualAccount);

 		}

-		#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 		else

 			DebugLog(SynchroFile,"CheckPOP3:ActualAccountMsgsSO-write wait failed\n");

-		#endif

+#endif

 

-		DeleteMIMEQueue(ActualAccount,NewMails);

+		DeleteMIMEQueue(ActualAccount, NewMails);

 

 		if (DataRX != NULL)

 			free(DataRX);

-		DataRX=NULL;

-		switch(ActualAccount->SystemError)

+		DataRX = NULL;

+		switch (ActualAccount->SystemError)

 		{

-			case EACC_QUEUEALLOC:

-			case EACC_STOPPED:

-				ActualAccount->Client.NetClient->Disconnect();

-				break;

-			default:

-				PostErrorProc(ActualAccount,YAMNParam,(DWORD)NULL,MyClient->SSL);	//it closes internet connection too

+		case EACC_QUEUEALLOC:

+		case EACC_STOPPED:

+			ActualAccount->Client.NetClient->Disconnect();

+			break;

+		default:

+			PostErrorProc(ActualAccount, YAMNParam, (DWORD)NULL, MyClient->SSL);	//it closes internet connection too

 		}

 

 		if (UsingInternet)	//if our thread still uses internet

 		{

-			#ifdef DEBUG_SYNCHRO

+#ifdef DEBUG_SYNCHRO

 			DebugLog(SynchroFile,"CheckPOP3:InternetFreeEV-done\n");

-			#endif

+#endif

 			SetEvent(ActualAccount->UseInternetFree);

 		}

-		SetContactStatus(ActualAccount,ID_STATUS_NA);

+		SetContactStatus(ActualAccount, ID_STATUS_NA);

 	}

 	free(ActualCopied.ServerName);

 	free(ActualCopied.ServerLogin);

 	free(ActualCopied.ServerPasswd);

-	#ifdef DEBUG_COMM

+#ifdef DEBUG_COMM

 	DebugLog(CommFile,"</--------Communication-------->\n");

-	#endif

-//	WriteAccounts();

-	#ifdef DEBUG_SYNCHRO

+#endif

+	//	WriteAccounts();

+#ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"CheckPOP3:Decrementing \"using threads\" %x (account %x)\n",ActualAccount->UsingThreads,ActualAccount);

-	#endif

+#endif

 	SCDec(ActualAccount->UsingThreads);

 	return 0;

 }

 

-DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)

+void __cdecl DeleteMailsPOP3(void *param)

 {

+	DeleteParam *WhichTemp = (DeleteParam *)param;

+

 	HPOP3ACCOUNT ActualAccount;

 	LPVOID YAMNParam;

 	UINT_PTR POP3PluginParam;

 	CPop3Client *MyClient;

-	HYAMNMAIL DeleteMails,NewMails=NULL,MsgQueuePtr;

-	char* DataRX=NULL;

-	int mboxsize,msgs,i;

-	BOOL UsingInternet=FALSE;

+	HYAMNMAIL DeleteMails, NewMails = NULL, MsgQueuePtr;

+	char* DataRX = NULL;

+	int mboxsize, msgs, i;

+	BOOL UsingInternet = FALSE;

 	struct {

 		char *ServerName;

 		DWORD ServerPort;

@@ -988,9 +1004,9 @@ DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)
 	//			//and then we can in our GetErrorStringFcn e.g. return string "Uncompatible version of YAMN".

 	//	}

 

-	ActualAccount=(HPOP3ACCOUNT)((struct DeleteParam *)WhichTemp)->AccountParam;			//copy address of structure from calling thread to stack of this thread

-	YAMNParam=((struct DeleteParam *)WhichTemp)->BrowserParam;

-	POP3PluginParam=(UINT_PTR)((struct DeleteParam *)WhichTemp)->CustomParam;

+	ActualAccount = (HPOP3ACCOUNT)((struct DeleteParam *)WhichTemp)->AccountParam;			//copy address of structure from calling thread to stack of this thread

+	YAMNParam = ((struct DeleteParam *)WhichTemp)->BrowserParam;

+	POP3PluginParam = (UINT_PTR)((struct DeleteParam *)WhichTemp)->CustomParam;

 #ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"DeleteMailsPOP3:Incrementing \"using threads\" %x (account %x)\n",ActualAccount->UsingThreads,ActualAccount);

 #endif

@@ -1010,18 +1026,18 @@ DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)
 		DebugLog(SynchroFile,"DeleteMailsPOP3:Decrementing \"using threads\" %x (account %x)\n",ActualAccount->UsingThreads,ActualAccount);

 #endif

 		SCDec(ActualAccount->UsingThreads);

-		return 0;

+		return;

 	}

 #ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"DeleteMailsPOP3:ActualAccountSO-read enter\n");

 #endif

-	if (NULL==(DeleteMails=(HYAMNMAIL)CreateNewDeleteQueue((HYAMNMAIL)ActualAccount->Mails)))	//if there's no mail for deleting, return

+	if (NULL == (DeleteMails = (HYAMNMAIL)CreateNewDeleteQueue((HYAMNMAIL)ActualAccount->Mails)))	//if there's no mail for deleting, return

 	{

 		if (POP3_DELETEFROMCHECK != POP3PluginParam)						//We do not wait for free internet when calling from SynchroPOP3. It is because UseInternetFree is blocked

 		{

-			YAMN_MAILBROWSERPARAM Param={(HANDLE)0,ActualAccount,YAMN_ACC_MSGP,YAMN_ACC_MSGP,YAMNParam};		//Just update the window

+			YAMN_MAILBROWSERPARAM Param = { (HANDLE)0, ActualAccount, YAMN_ACC_MSGP, YAMN_ACC_MSGP, YAMNParam };		//Just update the window

 

-			CallService(MS_YAMN_MAILBROWSER,(WPARAM)&Param,(LPARAM)YAMN_MAILBROWSERVERSION);

+			CallService(MS_YAMN_MAILBROWSER, (WPARAM)&Param, (LPARAM)YAMN_MAILBROWSERVERSION);

 		}

 #ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"DeleteMailsPOP3:ActualAccountSO-read done\n");

@@ -1032,18 +1048,18 @@ DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)
 #endif

 		SCDec(ActualAccount->UsingThreads);

 

-		return NO_MAIL_FOR_DELETE;

+		return;

 	}

-	MyClient=&(ActualAccount->Client);

+	MyClient = &(ActualAccount->Client);

 

-//Now, copy all needed information about account to local variables, so ActualAccount is not blocked in read mode during all connection process, which can last for several minutes.

-	ActualCopied.ServerName=_strdup(ActualAccount->Server->Name);

-	ActualCopied.ServerPort=ActualAccount->Server->Port;

-	ActualCopied.Flags=ActualAccount->Flags;

-	ActualCopied.ServerLogin=_strdup(ActualAccount->Server->Login);

-	ActualCopied.ServerPasswd=_strdup(ActualAccount->Server->Passwd);

-	ActualCopied.NFlags=ActualAccount->NewMailN.Flags;

-	ActualCopied.NNFlags=ActualAccount->NoNewMailN.Flags;

+	//Now, copy all needed information about account to local variables, so ActualAccount is not blocked in read mode during all connection process, which can last for several minutes.

+	ActualCopied.ServerName = _strdup(ActualAccount->Server->Name);

+	ActualCopied.ServerPort = ActualAccount->Server->Port;

+	ActualCopied.Flags = ActualAccount->Flags;

+	ActualCopied.ServerLogin = _strdup(ActualAccount->Server->Login);

+	ActualCopied.ServerPasswd = _strdup(ActualAccount->Server->Passwd);

+	ActualCopied.NFlags = ActualAccount->NewMailN.Flags;

+	ActualCopied.NNFlags = ActualAccount->NoNewMailN.Flags;

 

 #ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"DeleteMailsPOP3:ActualAccountSO-read done\n");

@@ -1056,59 +1072,60 @@ DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)
 #ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"DeleteMailsPOP3:InternetFreeEV-wait\n");

 #endif

-		WaitForSingleObject(ActualAccount->UseInternetFree,INFINITE);

+		WaitForSingleObject(ActualAccount->UseInternetFree, INFINITE);

 #ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"DeleteMailsPOP3:InternetFreeEV-enter\n");

 #endif

 	}

 	SCDec(ActualAccount->InternetQueries);

-	UsingInternet=TRUE;

+	UsingInternet = TRUE;

 

 	try

 	{

-		SetContactStatus(ActualAccount,ID_STATUS_OCCUPIED);

+		SetContactStatus(ActualAccount, ID_STATUS_OCCUPIED);

 #ifdef DEBUG_COMM

 		DebugLog(CommFile,"<--------Communication-------->\n");

 #endif

-		if ((MyClient->NetClient==NULL) || !MyClient->NetClient->Connected())

+		if ((MyClient->NetClient == NULL) || !MyClient->NetClient->Connected())

 		{

-			SetAccountStatus(ActualAccount,TranslateT("Connecting to server"));

-			

-			DataRX=MyClient->Connect(ActualCopied.ServerName,ActualCopied.ServerPort,ActualCopied.Flags & YAMN_ACC_SSL23,ActualCopied.Flags & YAMN_ACC_NOTLS);

+			SetAccountStatus(ActualAccount, TranslateT("Connecting to server"));

+

+			DataRX = MyClient->Connect(ActualCopied.ServerName, ActualCopied.ServerPort, ActualCopied.Flags & YAMN_ACC_SSL23, ActualCopied.Flags & YAMN_ACC_NOTLS);

 

-			char *timestamp=NULL;

+			char *timestamp = NULL;

 			if (DataRX != NULL) {

 				if (ActualAccount->Flags & YAMN_ACC_APOP) {

-					char *lpos=strchr(DataRX,'<');

-					char *rpos=strchr(DataRX,'>');

-					if (lpos && rpos && rpos>lpos) {

-						int sz=(int)(rpos-lpos+2);

-						timestamp=new char[sz];

-						memcpy(timestamp, lpos, sz-1);

-						timestamp[sz-1]='\0';

+					char *lpos = strchr(DataRX, '<');

+					char *rpos = strchr(DataRX, '>');

+					if (lpos && rpos && rpos > lpos) {

+						int sz = (int)(rpos - lpos + 2);

+						timestamp = new char[sz];

+						memcpy(timestamp, lpos, sz - 1);

+						timestamp[sz - 1] = '\0';

 					}

 				}

 				free(DataRX);

-				DataRX=NULL;

+				DataRX = NULL;

 			}

-			SetAccountStatus(ActualAccount,TranslateT("Entering POP3 account"));

+			SetAccountStatus(ActualAccount, TranslateT("Entering POP3 account"));

 

 			if (ActualAccount->Flags & YAMN_ACC_APOP)

 			{

-				DataRX=MyClient->APOP(ActualCopied.ServerLogin,ActualCopied.ServerPasswd,timestamp);

+				DataRX = MyClient->APOP(ActualCopied.ServerLogin, ActualCopied.ServerPasswd, timestamp);

 				if (DataRX != NULL)

 					free(DataRX);

-				DataRX=NULL;

+				DataRX = NULL;

 				delete[] timestamp;

-			} else {

-				DataRX=MyClient->User(ActualCopied.ServerLogin);

+			}

+			else {

+				DataRX = MyClient->User(ActualCopied.ServerLogin);

 				if (DataRX != NULL)

 					free(DataRX);

-				DataRX=NULL;

-				DataRX=MyClient->Pass(ActualCopied.ServerPasswd);

+				DataRX = NULL;

+				DataRX = MyClient->Pass(ActualCopied.ServerPasswd);

 				if (DataRX != NULL)

 					free(DataRX);

-				DataRX=NULL;

+				DataRX = NULL;

 			}

 		}

 

@@ -1117,14 +1134,14 @@ DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)
 #endif

 		if (POP3_DELETEFROMCHECK != POP3PluginParam)	//We do not need to get mails on server as we have already it from check function

 		{

-			SetAccountStatus(ActualAccount,TranslateT("Deleting requested mails"));

+			SetAccountStatus(ActualAccount, TranslateT("Deleting requested mails"));

 

-			DataRX=MyClient->Stat();

+			DataRX = MyClient->Stat();

 

 #ifdef DEBUG_DECODE

 			DebugLog(DecodeFile,"<Extracting stat>\n");

 #endif

-			ExtractStat(DataRX,MyClient->NetClient->Rcv,&mboxsize,&msgs);

+			ExtractStat(DataRX, MyClient->NetClient->Rcv, &mboxsize, &msgs);

 #ifdef DEBUG_DECODE

 			DebugLog(DecodeFile,"<MailBoxSize>%d</MailBoxSize>\n",mboxsize);

 			DebugLog(DecodeFile,"<Msgs>%d</Msgs>\n",msgs);

@@ -1132,43 +1149,43 @@ DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)
 #endif

 			if (DataRX != NULL)

 				free(DataRX);

-			DataRX=NULL;

-			for (i=0;i<msgs;i++)

+			DataRX = NULL;

+			for (i = 0; i < msgs; i++)

 			{

 				if (!i)

-					MsgQueuePtr=NewMails=(HYAMNMAIL)CallService(MS_YAMN_CREATEACCOUNTMAIL,(WPARAM)ActualAccount,(LPARAM)YAMN_MAILVERSION);

+					MsgQueuePtr = NewMails = (HYAMNMAIL)CallService(MS_YAMN_CREATEACCOUNTMAIL, (WPARAM)ActualAccount, (LPARAM)YAMN_MAILVERSION);

 				else

 				{

-					MsgQueuePtr->Next=(HYAMNMAIL)CallService(MS_YAMN_CREATEACCOUNTMAIL,(WPARAM)ActualAccount,(LPARAM)YAMN_MAILVERSION);

-					MsgQueuePtr=MsgQueuePtr->Next;

+					MsgQueuePtr->Next = (HYAMNMAIL)CallService(MS_YAMN_CREATEACCOUNTMAIL, (WPARAM)ActualAccount, (LPARAM)YAMN_MAILVERSION);

+					MsgQueuePtr = MsgQueuePtr->Next;

 				}

-				if (MsgQueuePtr==NULL)

+				if (MsgQueuePtr == NULL)

 				{

-					ActualAccount->SystemError=EPOP3_QUEUEALLOC;

+					ActualAccount->SystemError = EPOP3_QUEUEALLOC;

 					throw (DWORD)ActualAccount->SystemError;

 				}

 			}

-	

+

 			if (msgs)

 			{

 #ifdef DEBUG_DECODE

 				DebugLog(DecodeFile,"<Extracting UIDL>\n");

 #endif

-				DataRX=MyClient->Uidl();

-				ExtractUIDL(DataRX,MyClient->NetClient->Rcv,NewMails);

+				DataRX = MyClient->Uidl();

+				ExtractUIDL(DataRX, MyClient->NetClient->Rcv, NewMails);

 #ifdef DEBUG_DECODE

 				DebugLog(DecodeFile,"</Extracting UIDL>\n");

 #endif

 				if (DataRX != NULL)

 					free(DataRX);

-				DataRX=NULL;

-//	we get "new mails" on server (NewMails will contain all mails on server not found in DeleteMails)

-//	but also in DeleteMails we get only those, which are still on server with their responsable numbers

-				SynchroMessages(ActualAccount,(HYAMNMAIL *)&DeleteMails,NULL,(HYAMNMAIL *)&NewMails,NULL);

+				DataRX = NULL;

+				//	we get "new mails" on server (NewMails will contain all mails on server not found in DeleteMails)

+				//	but also in DeleteMails we get only those, which are still on server with their responsable numbers

+				SynchroMessages(ActualAccount, (HYAMNMAIL *)&DeleteMails, NULL, (HYAMNMAIL *)&NewMails, NULL);

 			}

 		}

 		else

-			SetAccountStatus(ActualAccount,TranslateT("Deleting spam"));

+			SetAccountStatus(ActualAccount, TranslateT("Deleting spam"));

 #ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"DeleteMailsPOP3:ActualAccountMsgsSO-write wait\n");

 #endif

@@ -1182,26 +1199,26 @@ DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)
 #ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"DeleteMailsPOP3:ActualAccountMsgsSO-write enter\n");

 #endif

-		if (msgs || POP3_DELETEFROMCHECK==POP3PluginParam)

+		if (msgs || POP3_DELETEFROMCHECK == POP3PluginParam)

 		{

 			try

 			{

 				HYAMNMAIL Temp;

 

-				for (i=0,MsgQueuePtr=DeleteMails;MsgQueuePtr != NULL;i++)

+				for (i = 0, MsgQueuePtr = DeleteMails; MsgQueuePtr != NULL; i++)

 				{

 					if (!(MsgQueuePtr->Flags & YAMN_MSG_VIRTUAL))	//of course we can only delete real mails, not virtual

 					{

-						DataRX=MyClient->Dele(MsgQueuePtr->Number);

-						Temp=MsgQueuePtr->Next;

-						if (POP3_FOK==MyClient->AckFlag)			//if server answers that mail was deleted

+						DataRX = MyClient->Dele(MsgQueuePtr->Number);

+						Temp = MsgQueuePtr->Next;

+						if (POP3_FOK == MyClient->AckFlag)			//if server answers that mail was deleted

 						{

-							DeleteMIMEMessage((HYAMNMAIL *)&DeleteMails,MsgQueuePtr);

-							HYAMNMAIL DeletedMail=FindMIMEMessageByID((HYAMNMAIL)ActualAccount->Mails,MsgQueuePtr->ID);

+							DeleteMIMEMessage((HYAMNMAIL *)&DeleteMails, MsgQueuePtr);

+							HYAMNMAIL DeletedMail = FindMIMEMessageByID((HYAMNMAIL)ActualAccount->Mails, MsgQueuePtr->ID);

 							if ((MsgQueuePtr->Flags & YAMN_MSG_MEMDELETE))		//if mail should be deleted from memory (or disk)

 							{

-								DeleteMIMEMessage((HYAMNMAIL *)&ActualAccount->Mails,DeletedMail);	//remove from queue

-								CallService(MS_YAMN_DELETEACCOUNTMAIL,(WPARAM)POP3Plugin,(LPARAM)DeletedMail);

+								DeleteMIMEMessage((HYAMNMAIL *)&ActualAccount->Mails, DeletedMail);	//remove from queue

+								CallService(MS_YAMN_DELETEACCOUNTMAIL, (WPARAM)POP3Plugin, (LPARAM)DeletedMail);

 							}

 							else			//else mark it only as "deleted mail"

 							{

@@ -1212,17 +1229,17 @@ DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)
 							delete[] MsgQueuePtr->ID;

 							delete   MsgQueuePtr;

 						}

-						MsgQueuePtr=Temp;

+						MsgQueuePtr = Temp;

 

 						if (DataRX != NULL)

 							free(DataRX);

-						DataRX=NULL;

+						DataRX = NULL;

 					}

 					else

-						MsgQueuePtr=MsgQueuePtr->Next;

+						MsgQueuePtr = MsgQueuePtr->Next;

 				}

 			}

-			catch(...)		//if any exception in the code where we have write-access to account occured, don't forget to leave write-access

+			catch (...)		//if any exception in the code where we have write-access to account occured, don't forget to leave write-access

 			{

 #ifdef DEBUG_SYNCHRO

 				DebugLog(SynchroFile,"DeleteMailsPOP3:ActualAccountMsgsSO-write done\n");

@@ -1232,24 +1249,24 @@ DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)
 			}

 

 			if (NewMails != NULL)

-//	in ActualAccount->Mails we have all mails stored before calling this function

-//	in NewMails we have all mails not found in DeleteMails (in other words: we performed new ID checking and we

-//	stored all mails found on server, then we deleted the ones we wanted to delete in this function

-//	and NewMails queue now contains actual state of mails on server). But we will not use NewMails as actual state, because NewMails does not contain header data (subject, from...)

-//	We perform deleting from ActualAccount->Mails: we remove from original queue (ActualAccount->Mails) all deleted mails

-				SynchroMessages(ActualAccount,(HYAMNMAIL *)&ActualAccount->Mails,NULL,(HYAMNMAIL *)&NewMails,NULL);

-//	Now ActualAccount->Mails contains all mails when calling this function except the ones, we wanted to delete (these are in DeleteMails)

-//	And in NewMails we have new mails (if any)

+				//	in ActualAccount->Mails we have all mails stored before calling this function

+				//	in NewMails we have all mails not found in DeleteMails (in other words: we performed new ID checking and we

+				//	stored all mails found on server, then we deleted the ones we wanted to delete in this function

+				//	and NewMails queue now contains actual state of mails on server). But we will not use NewMails as actual state, because NewMails does not contain header data (subject, from...)

+				//	We perform deleting from ActualAccount->Mails: we remove from original queue (ActualAccount->Mails) all deleted mails

+				SynchroMessages(ActualAccount, (HYAMNMAIL *)&ActualAccount->Mails, NULL, (HYAMNMAIL *)&NewMails, NULL);

+			//	Now ActualAccount->Mails contains all mails when calling this function except the ones, we wanted to delete (these are in DeleteMails)

+			//	And in NewMails we have new mails (if any)

 			else if (POP3_DELETEFROMCHECK != POP3PluginParam)

 			{

-				DeleteMIMEQueue(ActualAccount,(HYAMNMAIL)ActualAccount->Mails);

-				ActualAccount->Mails=NULL;

+				DeleteMIMEQueue(ActualAccount, (HYAMNMAIL)ActualAccount->Mails);

+				ActualAccount->Mails = NULL;

 			}

 		}

 		else

 		{

-			DeleteMIMEQueue(ActualAccount,(HYAMNMAIL)ActualAccount->Mails);

-			ActualAccount->Mails=NULL;

+			DeleteMIMEQueue(ActualAccount, (HYAMNMAIL)ActualAccount->Mails);

+			ActualAccount->Mails = NULL;

 		}

 #ifdef DEBUG_SYNCHRO

 		DebugLog(SynchroFile,"DeleteMailsPOP3:ActualAccountMsgsSO-write done\n");

@@ -1259,58 +1276,58 @@ DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)
 		DebugLog(DecodeFile,"</--------Deleting requested mails-------->\n");

 #endif

 

-//	TODO: now, we have in NewMails new mails. If NewMails is not NULL, we found some new mails, so Checking for new mail should be performed

-//	now, we do not call CheckPOP3

+		//	TODO: now, we have in NewMails new mails. If NewMails is not NULL, we found some new mails, so Checking for new mail should be performed

+		//	now, we do not call CheckPOP3

 

-//	if there is no waiting thread for internet connection close it

-//	else leave connection open

-//	if this functin was called from SynchroPOP3, then do not try to disconnect 

+		//	if there is no waiting thread for internet connection close it

+		//	else leave connection open

+		//	if this functin was called from SynchroPOP3, then do not try to disconnect 

 		if (POP3_DELETEFROMCHECK != POP3PluginParam)

 		{

-			YAMN_MAILBROWSERPARAM Param={(HANDLE)0,ActualAccount,ActualCopied.NFlags,YAMN_ACC_MSGP,YAMNParam};

+			YAMN_MAILBROWSERPARAM Param = { (HANDLE)0, ActualAccount, ActualCopied.NFlags, YAMN_ACC_MSGP, YAMNParam };

 

-			CallService(MS_YAMN_MAILBROWSER,(WPARAM)&Param,(LPARAM)YAMN_MAILBROWSERVERSION);

+			CallService(MS_YAMN_MAILBROWSER, (WPARAM)&Param, (LPARAM)YAMN_MAILBROWSERVERSION);

 

-			if (0==SCGetNumber(ActualAccount->InternetQueries))

+			if (0 == SCGetNumber(ActualAccount->InternetQueries))

 			{

-				DataRX=MyClient->Quit();

+				DataRX = MyClient->Quit();

 				if (DataRX != NULL)

 					free(DataRX);

-				DataRX=NULL;

+				DataRX = NULL;

 				MyClient->NetClient->Disconnect();

 

-				SetAccountStatus(ActualAccount,TranslateT("Disconnected"));

+				SetAccountStatus(ActualAccount, TranslateT("Disconnected"));

 			}

 

-			UsingInternet=FALSE;

+			UsingInternet = FALSE;

 #ifdef DEBUG_SYNCHRO

 			DebugLog(SynchroFile,"DeleteMailsPOP3:InternetFreeEV-done\n");

 #endif

 			SetEvent(ActualAccount->UseInternetFree);

 		}

-		SetContactStatus(ActualAccount,ActualAccount->isCounting?ID_STATUS_ONLINE:ID_STATUS_OFFLINE);

+		SetContactStatus(ActualAccount, ActualAccount->isCounting ? ID_STATUS_ONLINE : ID_STATUS_OFFLINE);

 	}

 #ifdef DEBUG_COMM

 	catch(DWORD ErrorCode)

 #else

-	catch(DWORD)

+	catch (DWORD)

 #endif

 	{

-		if (ActualAccount->Client.POP3Error==EPOP3_STOPPED)

-	                ActualAccount->SystemError=EACC_STOPPED;

+		if (ActualAccount->Client.POP3Error == EPOP3_STOPPED)

+			ActualAccount->SystemError = EACC_STOPPED;

 #ifdef DEBUG_COMM

 		DebugLog(CommFile,"ERROR %x\n",ErrorCode);

 #endif

 		if (DataRX != NULL)

 			free(DataRX);

-		switch(ActualAccount->SystemError)

+		switch (ActualAccount->SystemError)

 		{

-			case EACC_QUEUEALLOC:

-			case EACC_STOPPED:

-				ActualAccount->Client.NetClient->Disconnect();

-				break;

-			default:

-				PostErrorProc(ActualAccount,YAMNParam,POP3PluginParam,MyClient->SSL);	//it closes internet connection too

+		case EACC_QUEUEALLOC:

+		case EACC_STOPPED:

+			ActualAccount->Client.NetClient->Disconnect();

+			break;

+		default:

+			PostErrorProc(ActualAccount, YAMNParam, POP3PluginParam, MyClient->SSL);	//it closes internet connection too

 		}

 

 		if (UsingInternet && (POP3_DELETEFROMCHECK != POP3PluginParam))	//if our thread still uses internet and it is needed to release internet

@@ -1326,169 +1343,169 @@ DWORD WINAPI DeleteMailsPOP3(struct DeleteParam *WhichTemp)
 	free(ActualCopied.ServerLogin);

 	free(ActualCopied.ServerPasswd);

 

-	DeleteMIMEQueue(ActualAccount,NewMails);

-	DeleteMIMEQueue(ActualAccount,DeleteMails);

+	DeleteMIMEQueue(ActualAccount, NewMails);

+	DeleteMIMEQueue(ActualAccount, DeleteMails);

 

 #ifdef DEBUG_COMM

 	DebugLog(CommFile,"</--------Communication-------->\n");

 #endif

-//	WriteAccounts();

+	//	WriteAccounts();

 #ifdef DEBUG_SYNCHRO

 	DebugLog(SynchroFile,"DeleteMailsPOP3:Decrementing \"using threads\" %x (account %x)\n",ActualAccount->UsingThreads,ActualAccount);

 #endif

 	SCDec(ActualAccount->UsingThreads);

-	return 0;

+	return;

 }

 

-void ExtractStat(char *stream,int len,int *mboxsize,int *mails)

+void ExtractStat(char *stream, int len, int *mboxsize, int *mails)

 {

-	char *finder=stream;

-	while(WS(finder) || ENDLINE(finder)) finder++;

+	char *finder = stream;

+	while (WS(finder) || ENDLINE(finder)) finder++;

 	if (ACKLINE(finder))

 	{

-		while(!WS(finder)) finder++;

-		while(WS(finder)) finder++;

+		while (!WS(finder)) finder++;

+		while (WS(finder)) finder++;

 	}

-	if (1 != sscanf(finder,"%d",mails))

+	if (1 != sscanf(finder, "%d", mails))

 		throw (DWORD)EPOP3_STAT;

-	while(!WS(finder)) finder++;

-	while(WS(finder)) finder++;

-	if (1 != sscanf(finder,"%d",mboxsize))

+	while (!WS(finder)) finder++;

+	while (WS(finder)) finder++;

+	if (1 != sscanf(finder, "%d", mboxsize))

 		throw (DWORD)EPOP3_STAT;

 }

-void ExtractMail(char *stream,int len,HYAMNMAIL queue)

+void ExtractMail(char *stream, int len, HYAMNMAIL queue)

 {

-	char *finder=stream;

+	char *finder = stream;

 	char *finderend;

-	int msgnr,i;

-	HYAMNMAIL queueptr=queue;

+	int msgnr, i;

+	HYAMNMAIL queueptr = queue;

 

-	while(WS(finder) || ENDLINE(finder)) finder++;

-	while(!ACKLINE(finder)) finder++;

-	while(!ENDLINE(finder)) finder++;			//now we at the end of first ack line

-	while(finder<=(stream+len))

+	while (WS(finder) || ENDLINE(finder)) finder++;

+	while (!ACKLINE(finder)) finder++;

+	while (!ENDLINE(finder)) finder++;			//now we at the end of first ack line

+	while (finder <= (stream + len))

 	{

-		while(ENDLINE(finder)) finder++;		//go to the new line

-		if (DOTLINE(finder+1))					//at the end of stream

+		while (ENDLINE(finder)) finder++;		//go to the new line

+		if (DOTLINE(finder + 1))					//at the end of stream

 			break;

-		#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<Message>\n");

-		#endif

-		while(WS(finder)) finder++;			//jump whitespace

-		if (1 != sscanf(finder,"%d",&msgnr))

+#endif

+		while (WS(finder)) finder++;			//jump whitespace

+		if (1 != sscanf(finder, "%d", &msgnr))

 			throw (DWORD)EPOP3_UIDL;

-		#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<Nr>%d</Nr>\n",msgnr);

-		#endif

-//		for (i=1,queueptr=queue;(queueptr->Next != NULL) && (i<msgnr);queueptr=queueptr->Next,i++);

-//		if (i != msgnr)

-//			throw (DWORD)EPOP3_UIDL;

-		while(!WS(finder)) finder++;			//jump characters

-		while(WS(finder)) finder++;			//jump whitespace

-		finderend=finder+1;

-		while(!WS(finderend) && !ENDLINE(finderend)) finderend++;

-		queueptr->ID=new char[finderend-finder+1];

-		for (i=0;finder != finderend;finder++,i++)

-			queueptr->MailData->Body[i]=*finder;

-		queueptr->MailData->Body[i]=0;				//ends string

-		queueptr->Number=msgnr;

-		#ifdef DEBUG_DECODE

+#endif

+		//		for (i=1,queueptr=queue;(queueptr->Next != NULL) && (i<msgnr);queueptr=queueptr->Next,i++);

+		//		if (i != msgnr)

+		//			throw (DWORD)EPOP3_UIDL;

+		while (!WS(finder)) finder++;			//jump characters

+		while (WS(finder)) finder++;			//jump whitespace

+		finderend = finder + 1;

+		while (!WS(finderend) && !ENDLINE(finderend)) finderend++;

+		queueptr->ID = new char[finderend - finder + 1];

+		for (i = 0; finder != finderend; finder++, i++)

+			queueptr->MailData->Body[i] = *finder;

+		queueptr->MailData->Body[i] = 0;				//ends string

+		queueptr->Number = msgnr;

+#ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<ID>%s</ID>\n",queueptr->MailData->Body);

 		DebugLog(DecodeFile,"</Message>\n");

-		#endif

-		queueptr=queueptr->Next;

-		while(!ENDLINE(finder)) finder++;

+#endif

+		queueptr = queueptr->Next;

+		while (!ENDLINE(finder)) finder++;

 	}

 }

 

-void ExtractUIDL(char *stream,int len,HYAMNMAIL queue)

+void ExtractUIDL(char *stream, int len, HYAMNMAIL queue)

 {

-	char *finder=stream;

+	char *finder = stream;

 	char *finderend;

-	int msgnr,i;

-	HYAMNMAIL queueptr=queue;

+	int msgnr, i;

+	HYAMNMAIL queueptr = queue;

 

-	while(WS(finder) || ENDLINE(finder)) finder++;

-	while(!ACKLINE(finder)) finder++;

-	while(!ENDLINE(finder)) finder++;			//now we at the end of first ack line

-	while(finder<=(stream+len))

+	while (WS(finder) || ENDLINE(finder)) finder++;

+	while (!ACKLINE(finder)) finder++;

+	while (!ENDLINE(finder)) finder++;			//now we at the end of first ack line

+	while (finder <= (stream + len))

 	{

-		while(ENDLINE(finder)) finder++;		//go to the new line

-		if (DOTLINE(finder+1))					//at the end of stream

+		while (ENDLINE(finder)) finder++;		//go to the new line

+		if (DOTLINE(finder + 1))					//at the end of stream

 			break;

-		#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<Message>\n");

-		#endif

-		while(WS(finder)) finder++;			//jump whitespace

-		if (1 != sscanf(finder,"%d",&msgnr))

+#endif

+		while (WS(finder)) finder++;			//jump whitespace

+		if (1 != sscanf(finder, "%d", &msgnr))

 			throw (DWORD)EPOP3_UIDL;

-		#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<Nr>%d</Nr>\n",msgnr);

-		#endif

-//		for (i=1,queueptr=queue;(queueptr->Next != NULL) && (i<msgnr);queueptr=queueptr->Next,i++);

-//		if (i != msgnr)

-//			throw (DWORD)EPOP3_UIDL;

-		while(!WS(finder)) finder++;			//jump characters

-		while(WS(finder)) finder++;			//jump whitespace

-		finderend=finder+1;

-		while(!WS(finderend) && !ENDLINE(finderend)) finderend++;

-		queueptr->ID=new char[finderend-finder+1];

-		for (i=0;finder != finderend;finder++,i++)

-			queueptr->ID[i]=*finder;

-		queueptr->ID[i]=0;				//ends string

-		queueptr->Number=msgnr;

-		#ifdef DEBUG_DECODE

+#endif

+		//		for (i=1,queueptr=queue;(queueptr->Next != NULL) && (i<msgnr);queueptr=queueptr->Next,i++);

+		//		if (i != msgnr)

+		//			throw (DWORD)EPOP3_UIDL;

+		while (!WS(finder)) finder++;			//jump characters

+		while (WS(finder)) finder++;			//jump whitespace

+		finderend = finder + 1;

+		while (!WS(finderend) && !ENDLINE(finderend)) finderend++;

+		queueptr->ID = new char[finderend - finder + 1];

+		for (i = 0; finder != finderend; finder++, i++)

+			queueptr->ID[i] = *finder;

+		queueptr->ID[i] = 0;				//ends string

+		queueptr->Number = msgnr;

+#ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<ID>%s</ID>\n",queueptr->ID);

 		DebugLog(DecodeFile,"</Message>\n");

-		#endif

-		queueptr=queueptr->Next;

-		while(!ENDLINE(finder)) finder++;

+#endif

+		queueptr = queueptr->Next;

+		while (!ENDLINE(finder)) finder++;

 	}

 }

 

-void ExtractList(char *stream,int len,HYAMNMAIL queue)

+void ExtractList(char *stream, int len, HYAMNMAIL queue)

 {

-	char *finder=stream;

+	char *finder = stream;

 	char *finderend;

-	int msgnr,i;

+	int msgnr, i;

 	HYAMNMAIL queueptr;

 

-	while(WS(finder) || ENDLINE(finder)) finder++;

-	while(!ACKLINE(finder)) finder++;

-	while(!ENDLINE(finder)) finder++;			//now we at the end of first ack line

-	while(finder<=(stream+len))

+	while (WS(finder) || ENDLINE(finder)) finder++;

+	while (!ACKLINE(finder)) finder++;

+	while (!ENDLINE(finder)) finder++;			//now we at the end of first ack line

+	while (finder <= (stream + len))

 	{

-		while(ENDLINE(finder)) finder++;		//go to the new line

-		if (DOTLINE(finder+1))				//at the end of stream

+		while (ENDLINE(finder)) finder++;		//go to the new line

+		if (DOTLINE(finder + 1))				//at the end of stream

 			break;

-		#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<Message>\n",NULL,0);

-		#endif

-		while(WS(finder)) finder++;			//jump whitespace

-		if (1 != sscanf(finder,"%d",&msgnr))		//message nr.

+#endif

+		while (WS(finder)) finder++;			//jump whitespace

+		if (1 != sscanf(finder, "%d", &msgnr))		//message nr.

 			throw (DWORD)EPOP3_LIST;

-		#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<Nr>%d</Nr>\n",msgnr);

-		#endif

+#endif

 

-		for (i=1,queueptr=queue;(queueptr->Next != NULL) && (i<msgnr);queueptr=queueptr->Next,i++);

+		for (i = 1, queueptr = queue; (queueptr->Next != NULL) && (i < msgnr); queueptr = queueptr->Next, i++);

 		if (i != msgnr)

 			throw (DWORD)EPOP3_LIST;

-		while(!WS(finder)) finder++;			//jump characters

-		while(WS(finder)) finder++;			//jump whitespace

-		finderend=finder+1;

-		if (1 != sscanf(finder,"%d",&queueptr->MailData->Size))

+		while (!WS(finder)) finder++;			//jump characters

+		while (WS(finder)) finder++;			//jump whitespace

+		finderend = finder + 1;

+		if (1 != sscanf(finder, "%d", &queueptr->MailData->Size))

 			throw (DWORD)EPOP3_LIST;

-		#ifdef DEBUG_DECODE

+#ifdef DEBUG_DECODE

 		DebugLog(DecodeFile,"<Nr>%d</Nr>\n",queueptr->MailData->Size);

-		#endif

-		while(!ENDLINE(finder)) finder++;

+#endif

+		while (!ENDLINE(finder)) finder++;

 	}

 }

 

 TCHAR* WINAPI GetErrorString(DWORD Code)

 {

-	static TCHAR *POP3Errors[]=

+	static TCHAR *POP3Errors[] =

 	{

 		LPGENT("Memory allocation error."),		//memory allocation

 		LPGENT("Account is about to be stopped."),	//stop account

@@ -1502,7 +1519,7 @@ TCHAR* WINAPI GetErrorString(DWORD Code)
 		LPGENT("Error while executing POP3 command."),

 	};

 

-	static TCHAR *NetlibErrors[]=

+	static TCHAR *NetlibErrors[] =

 	{

 		LPGENT("Cannot connect to server with NetLib."),

 		LPGENT("Cannot send data."),

@@ -1510,7 +1527,7 @@ TCHAR* WINAPI GetErrorString(DWORD Code)
 		LPGENT("Cannot allocate memory for received data."),

 	};

 

-	static TCHAR *SSLErrors[]=

+	static TCHAR *SSLErrors[] =

 	{

 		LPGENT("OpenSSL not loaded."),

 		LPGENT("Windows socket 2.0 init failed."),

@@ -1526,18 +1543,18 @@ TCHAR* WINAPI GetErrorString(DWORD Code)
 	};

 

 	TCHAR *ErrorString = new TCHAR[ERRORSTR_MAXLEN];

-	POP3_ERRORCODE *ErrorCode=(POP3_ERRORCODE *)(UINT_PTR)Code;

+	POP3_ERRORCODE *ErrorCode = (POP3_ERRORCODE *)(UINT_PTR)Code;

 

-	mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, TranslateT("Error %d-%d-%d-%d:"), ErrorCode->AppError, ErrorCode->POP3Error, ErrorCode->NetError,ErrorCode->SystemError);

+	mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, TranslateT("Error %d-%d-%d-%d:"), ErrorCode->AppError, ErrorCode->POP3Error, ErrorCode->NetError, ErrorCode->SystemError);

 	if (ErrorCode->POP3Error)

-		mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, _T("%s\n%s"), ErrorString, TranslateTS(POP3Errors[ErrorCode->POP3Error-1]));

+		mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, _T("%s\n%s"), ErrorString, TranslateTS(POP3Errors[ErrorCode->POP3Error - 1]));

 	if (ErrorCode->NetError) {

 		if (ErrorCode->SSL)

-			mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, _T("%s\n%s"), ErrorString, TranslateTS(SSLErrors[ErrorCode->NetError-1]));

+			mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, _T("%s\n%s"), ErrorString, TranslateTS(SSLErrors[ErrorCode->NetError - 1]));

 		else

-			mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, _T("%s\n%s"), ErrorString, TranslateTS(NetlibErrors[ErrorCode->NetError-4]));

+			mir_sntprintf(ErrorString, ERRORSTR_MAXLEN, _T("%s\n%s"), ErrorString, TranslateTS(NetlibErrors[ErrorCode->NetError - 4]));

 	}

-		

+

 	return ErrorString;

 }