+ stdauth + stdfile;

NEWSTR_ALLOCA / NEWTSTR_ALLOCA / NEWWSTR_ALLOCA moved to m_system.h

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

38 files changed, 1881 insertions, 861 deletions

diff --git a/src/core/miranda.h b/src/core/miranda.h
index c1dcb75f95..7c356dab6d 100644
--- a/src/core/miranda.h
+++ b/src/core/miranda.h
@@ -23,9 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define OPTIONPAGE_OLD_SIZE offsetof(OPTIONSDIALOGPAGE,hLangpack)

 

-#define NEWSTR_ALLOCA(A) (A == NULL)?NULL:strcpy((char*)alloca(strlen(A)+1), A)

-#define NEWTSTR_ALLOCA(A) (A == NULL)?NULL:_tcscpy((TCHAR*)alloca((_tcslen(A)+1)* sizeof(TCHAR)), A)

-

 typedef HMONITOR (WINAPI *pfnMyMonitorFromPoint)(POINT, DWORD);

 extern pfnMyMonitorFromPoint MyMonitorFromPoint;

 

@@ -111,10 +108,6 @@ extern LPFN_FREEADDRINFO MyFreeaddrinfo;
 extern LPFN_WSASTRINGTOADDRESSA MyWSAStringToAddress;

 extern LPFN_WSAADDRESSTOSTRINGA MyWSAAddressToString;

 

-/**** file.cpp *************************************************************************/

-

-void PushFileEvent(HANDLE hContact, HANDLE hdbe, LPARAM lParam);

-

 /**** fontService.cpp ******************************************************************/

 

 void KillModuleFonts(int hLangpack);

diff --git a/src/core/modules.cpp b/src/core/modules.cpp
index 8fa59f8a4d..2077e9ab36 100644
--- a/src/core/modules.cpp
+++ b/src/core/modules.cpp
@@ -42,9 +42,6 @@ int LoadProtocolsModule(void);	// core: protocol manager
 int LoadAccountsModule(void);    // core: account manager

 int LoadIgnoreModule(void);		// protocol filter: ignore

 

-int LoadSendRecvAuthModule(void);	//send/recv

-int LoadSendRecvFileModule(void);	//send/recv

-

 int LoadContactListModule(void);// ui: clist

 int LoadOptionsModule(void);	// ui: options dialog

 int LoadFindAddModule(void);	// ui: search/add users

@@ -144,7 +141,7 @@ int LoadDefaultModules(void)
 	if ( LoadIgnoreModule()) return 1;

 	if ( LoadVisibilityModule()) return 1;

 

-	for (int i=0; i < 3; i++) {

+	for (int i=0; i < 5; i++) {

 		if ( pluginDefault[i].pImpl )

 			continue;

 

@@ -152,8 +149,6 @@ int LoadDefaultModules(void)
 			return 1;

 	}

 

-	if ( !pluginDefault[ 3].pImpl) if ( LoadSendRecvAuthModule()) return 1;

-	if ( !pluginDefault[ 4].pImpl) if ( LoadSendRecvFileModule()) return 1;

 	if ( !pluginDefault[ 5].pImpl) if ( LoadHelpModule()) return 1;

 	if ( !pluginDefault[ 6].pImpl) if ( LoadHistoryModule()) return 1;

 	if ( !pluginDefault[ 7].pImpl) if ( LoadIdleModule()) return 1;

diff --git a/src/modules/srauth/auth.cpp b/src/core/stdauth/auth.cpp
index 1baadfaced..9146653db8 100644
--- a/src/modules/srauth/auth.cpp
+++ b/src/core/stdauth/auth.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "..\..\core\commonheaders.h"

+#include "commonheaders.h"

 

 #define MS_AUTH_SHOWREQUEST	"Auth/ShowRequest"

 #define MS_AUTH_SHOWADDED	"Auth/ShowAdded"

@@ -30,29 +30,26 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 

 INT_PTR ShowReqWindow(WPARAM, LPARAM lParam)

 {

-	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_AUTHREQ), NULL, DlgProcAuthReq, 

-		(LPARAM)((CLISTEVENT *)lParam)->hDbEvent);

+	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_AUTHREQ), NULL, DlgProcAuthReq, (LPARAM)((CLISTEVENT *)lParam)->hDbEvent);

 	return 0;

 }

 

 INT_PTR ShowAddedWindow(WPARAM, LPARAM lParam)

 {

-	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_ADDED), NULL, DlgProcAdded, 

-		(LPARAM)((CLISTEVENT *)lParam)->hDbEvent);

+	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_ADDED), NULL, DlgProcAdded, (LPARAM)((CLISTEVENT *)lParam)->hDbEvent);

 	return 0;

 }

 

 static int AuthEventAdded(WPARAM, LPARAM lParam)

 {

-    TCHAR szUid[128] = _T("");

+	TCHAR szUid[128] = _T("");

 	TCHAR szTooltip[256];

 	const HANDLE hDbEvent = (HANDLE)lParam;

 

 	DBEVENTINFO dbei = {0};

 	dbei.cbSize = sizeof(dbei);

 	CallService(MS_DB_EVENT_GET, (WPARAM)lParam, (LPARAM)&dbei);

-	if (dbei.flags & (DBEF_SENT | DBEF_READ) || 

-		(dbei.eventType != EVENTTYPE_AUTHREQUEST && dbei.eventType != EVENTTYPE_ADDED)) 

+	if (dbei.flags & (DBEF_SENT | DBEF_READ) || (dbei.eventType != EVENTTYPE_AUTHREQUEST && dbei.eventType != EVENTTYPE_ADDED)) 

 		return 0;

 

 	dbei.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, lParam, 0);

@@ -65,50 +62,46 @@ static int AuthEventAdded(WPARAM, LPARAM lParam)
 	cli.cbSize = sizeof(cli);

 	cli.hContact = hContact;

 	cli.ptszTooltip = szTooltip;

-    cli.flags = CLEF_TCHAR;

+	cli.flags = CLEF_TCHAR;

 	cli.lParam = lParam;

 	cli.hDbEvent = hDbEvent;

 

 	CONTACTINFO ci = {0};

-    ci.cbSize = sizeof(ci);

-    ci.hContact = hContact;

-    ci.szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

-    ci.dwFlag = CNF_UNIQUEID | CNF_TCHAR;

-    if ( !CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM)&ci))

-	{

-        switch (ci.type)

-		{

-        case CNFT_ASCIIZ:

-            mir_sntprintf(szUid, SIZEOF(szUid), _T("%s"), ci.pszVal);

-            mir_free(ci.pszVal);

-            break;

-

-        case CNFT_DWORD:

-            mir_sntprintf(szUid, SIZEOF(szUid), _T("%u"), ci.dVal);

-            break;

-        }

-    }

-                    

-	if (dbei.eventType == EVENTTYPE_AUTHREQUEST)

-	{

-        SkinPlaySound("AuthRequest");

-        if (szUid[0])

-            mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%s requests authorization"), szUid);

-        else

-            mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%u requests authorization"), *((PDWORD)dbei.pBlob));

+	ci.cbSize = sizeof(ci);

+	ci.hContact = hContact;

+	ci.szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

+	ci.dwFlag = CNF_UNIQUEID | CNF_TCHAR;

+	if ( !CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM)&ci)) {

+		switch (ci.type) {

+		case CNFT_ASCIIZ:

+			mir_sntprintf(szUid, SIZEOF(szUid), _T("%s"), ci.pszVal);

+			mir_free(ci.pszVal);

+			break;

+

+		case CNFT_DWORD:

+			mir_sntprintf(szUid, SIZEOF(szUid), _T("%u"), ci.dVal);

+			break;

+		}

+	}

+

+	if (dbei.eventType == EVENTTYPE_AUTHREQUEST) {

+		SkinPlaySound("AuthRequest");

+		if (szUid[0])

+			mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%s requests authorization"), szUid);

+		else

+			mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%u requests authorization"), *((PDWORD)dbei.pBlob));

 

 		cli.hIcon = LoadSkinIcon(SKINICON_OTHER_MIRANDA);

 		cli.pszService = MS_AUTH_SHOWREQUEST;

 		CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cli);

 	}

-	else if (dbei.eventType == EVENTTYPE_ADDED)

-	{

-        SkinPlaySound("AddedEvent");

-        if (szUid[0])

-            mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%s added you to their contact list"), szUid);

-        else

-            mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%u added you to their contact list"), *((PDWORD)dbei.pBlob));

-            

+	else if (dbei.eventType == EVENTTYPE_ADDED) {

+		SkinPlaySound("AddedEvent");

+		if (szUid[0])

+			mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%s added you to their contact list"), szUid);

+		else

+			mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("%u added you to their contact list"), *((PDWORD)dbei.pBlob));

+

 		cli.hIcon = LoadSkinIcon(SKINICON_OTHER_MIRANDA);

 		cli.pszService = MS_AUTH_SHOWADDED;

 		CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cli);

@@ -122,8 +115,8 @@ int LoadSendRecvAuthModule(void)
 	CreateServiceFunction(MS_AUTH_SHOWADDED, ShowAddedWindow);

 	HookEvent(ME_DB_EVENT_ADDED, AuthEventAdded);

 

-    SkinAddNewSoundEx("AuthRequest", LPGEN("Alerts"), LPGEN("Authorization request"));

-    SkinAddNewSoundEx("AddedEvent",  LPGEN("Alerts"), LPGEN("Added event"));

+	SkinAddNewSoundEx("AuthRequest", LPGEN("Alerts"), LPGEN("Authorization request"));

+	SkinAddNewSoundEx("AddedEvent",  LPGEN("Alerts"), LPGEN("Added event"));

 

-    return 0;

+	return 0;

 } 

diff --git a/src/modules/srauth/authdialogs.cpp b/src/core/stdauth/authdialogs.cpp
index ae75865ab4..f9aaee1e28 100644
--- a/src/modules/srauth/authdialogs.cpp
+++ b/src/core/stdauth/authdialogs.cpp
@@ -21,14 +21,13 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#include "..\..\core\commonheaders.h"

+#include "commonheaders.h"

 

 INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	HANDLE hDbEvent = (HANDLE)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 

-	switch (msg) 

-	{

+	switch (msg) {

 	case WM_INITDIALOG:

 		{

 			TranslateDialogDefault(hwndDlg);

@@ -52,10 +51,10 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 			char* last = first + strlen(first) + 1;

 			char* email = last  + strlen(last)  + 1;

 

-			SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, CallProtoServiceInt(NULL,dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0));

-			SendMessage(hwndDlg, WM_SETICON, ICON_BIG, CallProtoServiceInt(NULL,dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_LARGE, 0));

+			SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0));

+			SendMessage(hwndDlg, WM_SETICON, ICON_BIG, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_LARGE, 0));

 

-			PROTOACCOUNT* acc = Proto_GetAccount(dbei.szModule);

+			PROTOACCOUNT* acc = ProtoGetAccount(dbei.szModule);

 

 			TCHAR* lastT = dbei.flags & DBEF_UTF ? Utf8DecodeT(last) : mir_a2t(last);

 			TCHAR* firstT = dbei.flags & DBEF_UTF ? Utf8DecodeT(first) : mir_a2t(first);

@@ -103,40 +102,39 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		return TRUE;

 

 	case WM_COMMAND:

-		switch (LOWORD(wParam))

+		switch (LOWORD(wParam)) {

+		case IDC_ADD:

+		{	

+			ADDCONTACTSTRUCT acs = {0};

+			acs.handle = hDbEvent;

+			acs.handleType = HANDLE_EVENT;

+			acs.szProto = "";

+			CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);

+

+			HANDLE hContact = (HANDLE)GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_DETAILS), GWLP_USERDATA);

+               if ((hContact == INVALID_HANDLE_VALUE) || !DBGetContactSettingByte(hContact, "CList", "NotOnList", 0))

+                  ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), FALSE);

+			break;

+		}

+		case IDC_DETAILS:

 		{

-			case IDC_ADD:

-			{	

-				ADDCONTACTSTRUCT acs = {0};

-				acs.handle = hDbEvent;

-				acs.handleType = HANDLE_EVENT;

-				acs.szProto = "";

-				CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);

-

-				HANDLE hContact = (HANDLE)GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_DETAILS), GWLP_USERDATA);

-                if ((hContact == INVALID_HANDLE_VALUE) || !DBGetContactSettingByte(hContact, "CList", "NotOnList", 0))

-                    ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), FALSE);

-				break;

-			}

-			case IDC_DETAILS:

-			{

-				HANDLE hContact = (HANDLE)GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_DETAILS), GWLP_USERDATA);

-				CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)hContact, 0);

-				break;

-			}

+			HANDLE hContact = (HANDLE)GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_DETAILS), GWLP_USERDATA);

+			CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)hContact, 0);

+			break;

+		}

 

-			case IDOK:

-			{	

-				ADDCONTACTSTRUCT acs = {0};

-				acs.handle = hDbEvent;

-				acs.handleType = HANDLE_EVENT;

-				acs.szProto = "";

-				CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);

-			}

-				//fall through

-			case IDCANCEL:

-				DestroyWindow(hwndDlg);

-				break;

+		case IDOK:

+		{	

+			ADDCONTACTSTRUCT acs = {0};

+			acs.handle = hDbEvent;

+			acs.handleType = HANDLE_EVENT;

+			acs.szProto = "";

+			CallService(MS_ADDCONTACT_SHOW, (WPARAM)hwndDlg, (LPARAM)&acs);

+		}

+			//fall through

+		case IDCANCEL:

+			DestroyWindow(hwndDlg);

+			break;

 		}

 		break;

 

@@ -154,40 +152,34 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 {

 	HANDLE hDbEvent = (HANDLE)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 

-	switch (msg) 

-	{

+	switch (msg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

 		Button_SetIcon_IcoLib(hwndDlg, IDC_DETAILS, SKINICON_OTHER_USERDETAILS, LPGEN("View User Details"));

 		Button_SetIcon_IcoLib(hwndDlg, IDC_ADD, SKINICON_OTHER_ADDCONTACT, LPGEN("Add Contact Permanently to List"));

-

 		{

-			DBEVENTINFO dbei = {0};

-			DWORD uin;

-			char *nick, *first, *last, *email, *reason;

-			HANDLE hContact;		

-			

 			hDbEvent = (HANDLE)lParam;

 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 

 			//blob is: uin(DWORD), hcontact(HANDLE), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ), reason(ASCIIZ)

+			DBEVENTINFO dbei = {0};

 			dbei.cbSize = sizeof(dbei);

 			dbei.cbBlob = CallService(MS_DB_EVENT_GETBLOBSIZE, (WPARAM)hDbEvent, 0);

 			dbei.pBlob = (PBYTE)alloca(dbei.cbBlob);

 			CallService(MS_DB_EVENT_GET, (WPARAM)hDbEvent, (LPARAM)&dbei);

 

-			uin = *(PDWORD)dbei.pBlob;

-			hContact = *(HANDLE*)(dbei.pBlob + sizeof(DWORD));

-			nick = (char *)(dbei.pBlob + sizeof(DWORD) + sizeof(HANDLE));

-			first = nick  + strlen(nick)  + 1;

-			last = first + strlen(first) + 1;

-			email = last  + strlen(last)  + 1;

-			reason = email + strlen(email) + 1;

+			DWORD uin = *(PDWORD)dbei.pBlob;

+			HANDLE hContact = *(HANDLE*)(dbei.pBlob + sizeof(DWORD));

+			char *nick = (char *)(dbei.pBlob + sizeof(DWORD) + sizeof(HANDLE));

+			char *first = nick  + strlen(nick)  + 1;

+			char *last = first + strlen(first) + 1;

+			char *email = last  + strlen(last)  + 1;

+			char *reason = email + strlen(email) + 1;

 

-			SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, CallProtoServiceInt(NULL,dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0));

-			SendMessage(hwndDlg, WM_SETICON, ICON_BIG, CallProtoServiceInt(NULL,dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_LARGE, 0));

+			SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_SMALL, 0));

+			SendMessage(hwndDlg, WM_SETICON, ICON_BIG, CallProtoService(dbei.szModule, PS_LOADICON, PLI_PROTOCOL | PLIF_LARGE, 0));

 

-			PROTOACCOUNT* acc = Proto_GetAccount(dbei.szModule);

+			PROTOACCOUNT* acc = ProtoGetAccount(dbei.szModule);

 

 			TCHAR* lastT = dbei.flags & DBEF_UTF ? Utf8DecodeT(last) : mir_a2t(last);

 			TCHAR* firstT = dbei.flags & DBEF_UTF ? Utf8DecodeT(first) : mir_a2t(first);

@@ -203,8 +195,7 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				off = mir_sntprintf(name, SIZEOF(name), _T("%s"), firstT);

 			else if (lastT[0])

 				off = mir_sntprintf(name, SIZEOF(name), _T("%s"), lastT);

-			if (nickT[0])

-			{

+			if (nickT[0]) {

 				if (off)

 					mir_sntprintf(name + off, SIZEOF(name) - off, _T(" (%s)"), nickT);

 				else

@@ -234,26 +225,22 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), FALSE);

 

 			SendDlgItemMessage(hwndDlg, IDC_DENYREASON, EM_LIMITTEXT, 255, 0);

-			if (CallProtoServiceInt(NULL,dbei.szModule, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_NOAUTHDENYREASON)

-			{

+			if (CallProtoService(dbei.szModule, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_NOAUTHDENYREASON) {

 				EnableWindow(GetDlgItem(hwndDlg, IDC_DENYREASON), FALSE);

 				SetDlgItemText(hwndDlg, IDC_DENYREASON, TranslateT("Feature is not supported by protocol"));

 			}

-			if ( !DBGetContactSettingByte(hContact, "CList", "NotOnList", 0))

-			{

+			if ( !DBGetContactSettingByte(hContact, "CList", "NotOnList", 0)) {

 				EnableWindow(GetDlgItem(hwndDlg, IDC_ADDCHECK), FALSE);

 				CheckDlgButton(hwndDlg, IDC_ADDCHECK, BST_UNCHECKED);

 			}

-			else

-				CheckDlgButton(hwndDlg, IDC_ADDCHECK, BST_CHECKED);

+			else CheckDlgButton(hwndDlg, IDC_ADDCHECK, BST_CHECKED);

 

 			SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_DETAILS), GWLP_USERDATA, (LONG_PTR)hContact);

 		}

 		return TRUE;

 

 	case WM_COMMAND:

-		switch (LOWORD(wParam)) 

-		{

+		switch (LOWORD(wParam)) {

 		case IDC_DETAILS:

 			CallService(MS_USERINFO_SHOWDIALOG, GetWindowLongPtr((HWND)lParam, GWLP_USERDATA), 0);

 			break;

@@ -267,7 +254,7 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				DBEVENTINFO dbei = {0};

 				dbei.cbSize = sizeof(dbei);

 				CallService(MS_DB_EVENT_GET, (WPARAM)hDbEvent, (LPARAM)&dbei);

-				CallProtoServiceInt(NULL,dbei.szModule, PS_AUTHALLOW, (WPARAM)hDbEvent, 0);

+				CallProtoService(dbei.szModule, PS_AUTHALLOW, (WPARAM)hDbEvent, 0);

 

 				if (IsDlgButtonChecked(hwndDlg, IDC_ADDCHECK))

 				{

@@ -291,10 +278,10 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				{

 					TCHAR szReason[256];

 					GetDlgItemText(hwndDlg, IDC_DENYREASON, szReason, SIZEOF(szReason));

-					CallProtoServiceInt(NULL,dbei.szModule, PS_AUTHDENYT, (WPARAM)hDbEvent, (LPARAM)szReason);

+					CallProtoService(dbei.szModule, PS_AUTHDENYT, (WPARAM)hDbEvent, (LPARAM)szReason);

 				}

 				else

-					CallProtoServiceInt(NULL,dbei.szModule, PS_AUTHDENYT, (WPARAM)hDbEvent, 0);

+					CallProtoService(dbei.szModule, PS_AUTHDENYT, (WPARAM)hDbEvent, 0);

 			}

 			DestroyWindow(hwndDlg);

 			break;;

diff --git a/src/core/stdauth/commonheaders.cpp b/src/core/stdauth/commonheaders.cpp
new file mode 100644
index 0000000000..95b2201163
--- /dev/null
+++ b/src/core/stdauth/commonheaders.cpp
@@ -0,0 +1,2 @@
+#include "commonheaders.h"

+

diff --git a/src/core/stdauth/commonheaders.h b/src/core/stdauth/commonheaders.h
new file mode 100644
index 0000000000..c9ed5a65d2
--- /dev/null
+++ b/src/core/stdauth/commonheaders.h
@@ -0,0 +1,93 @@
+/*

+

+Miranda IM: the free IM client for Microsoft* Windows*

+

+Copyright 2000-2009 Miranda ICQ/IM project,

+all portions of this codebase are copyrighted to the people

+listed in contributors.txt.

+

+This program is free software; you can redistribute it and/or

+modify it under the terms of the GNU General Public License

+as published by the Free Software Foundation; either version 2

+of the License, or (at your option) any later version.

+

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License

+along with this program; if not, write to the Free Software

+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+*/

+

+// to enable all 0.9.0 core functions

+#define MIRANDA_VER 0x0A00

+

+#define WINVER 0x0700

+#define _WIN32_WINNT 0x0700

+#define _WIN32_IE 0x0601

+

+#include <tchar.h>

+#include <winsock2.h>

+#include <shlobj.h>

+#include <uxtheme.h>

+#include <commctrl.h>

+#include <vssym32.h>

+

+#include <stdio.h>

+#include <time.h>

+#include <stddef.h>

+#include <process.h>

+#include <io.h>

+#include <limits.h>

+#include <string.h>

+#include <locale.h>

+#include <direct.h>

+#include <malloc.h>

+

+#include <win2k.h>

+

+#include <m_system.h>

+#include <m_system_cpp.h>

+#include <m_core.h>

+#include <newpluginapi.h>

+#include <m_database.h>

+#include <m_netlib.h>

+#include <m_clc.h>

+#include <m_clui.h>

+#include <m_crypto.h>

+#include <m_langpack.h>

+#include <m_clist.h>

+#include <m_clistint.h>

+#include <m_avatars.h>

+#include <m_button.h>

+#include <m_protosvc.h>

+#include <m_protomod.h>

+#include <m_protocols.h>

+#include <m_protoint.h>

+#include <m_plugins.h>

+#include <m_options.h>

+#include <m_skin.h>

+#include <m_contacts.h>

+#include <m_message.h>

+#include <m_userinfo.h>

+#include <m_history.h>

+#include <m_addcontact.h>

+#include <m_findadd.h>

+#include <m_file.h>

+#include <m_email.h>

+#include <m_awaymsg.h>

+#include <m_idle.h>

+#include <m_ignore.h>

+#include <m_icolib.h>

+#include <m_modernopt.h>

+#include <m_help.h>

+#include <m_timezones.h>

+

+#include "version.h"

+

+#include "../../resource.h"

+#include "../stdplug.h"

+

+extern HINSTANCE hInst;

diff --git a/src/core/stdauth/main.cpp b/src/core/stdauth/main.cpp
new file mode 100644
index 0000000000..cdb8d8e17b
--- /dev/null
+++ b/src/core/stdauth/main.cpp
@@ -0,0 +1,72 @@
+/*

+

+Standard URL plugin for Myranda IM

+

+Copyright (C) 2012 George Hazan

+

+This program is free software; you can redistribute it and/or modify

+it under the terms of the GNU General Public License as published by

+the Free Software Foundation; either version 2 of the License, or

+(at your option) any later version.

+

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License along

+with this program; if not, write to the Free Software Foundation, Inc.,

+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+*/

+

+#include "commonheaders.h"

+

+int LoadSendRecvAuthModule(void);

+

+HINSTANCE hInst;

+int hLangpack;

+

+PLUGININFOEX pluginInfo = {

+	sizeof(PLUGININFOEX),

+	__PLUGIN_NAME,

+	MIRANDA_VERSION_DWORD,

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

+	UNICODE_AWARE,

+	/* 8d0a046d-8ea9-4c55-b568-38da520564fd */

+	{ 0x8d0a046d, 0x8ea9, 0x4c55, {0xb5, 0x68, 0x38, 0xda, 0x52, 0x05, 0x64, 0xfd}}

+};

+

+static const MUUID interfaces[] = { MIID_SRURL, MIID_LAST };

+

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

+{

+	hInst = hinstDLL;

+	return TRUE;

+}

+

+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

+{

+	return &pluginInfo;

+}

+

+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

+{

+	return interfaces;

+}

+

+extern "C" int __declspec(dllexport) Load(void)

+{

+	mir_getLP(&pluginInfo);

+

+	LoadSendRecvAuthModule();

+	return 0;

+}

+

+extern "C" int __declspec(dllexport) Unload(void)

+{

+	return 0;

+}

diff --git a/src/core/stdauth/resource.rc b/src/core/stdauth/resource.rc
new file mode 100644
index 0000000000..3f7ef0c552
--- /dev/null
+++ b/src/core/stdauth/resource.rc
@@ -0,0 +1,107 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "..\..\resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

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

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include <windows.h>

+#include <winres.h>

+

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

+#undef APSTUDIO_READONLY_SYMBOLS

+

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

+// English (United States) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+

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

+//

+// Dialog

+//

+

+IDD_AUTHREQ DIALOGEX 0, 0, 271, 197

+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION

+EXSTYLE WS_EX_CONTROLPARENT

+CAPTION "Authorization Request"

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    CONTROL         "",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,271,25

+    DEFPUSHBUTTON   "&Authorize",IDOK,17,176,50,14

+    PUSHBUTTON      "&Deny",IDCANCEL,97,176,50,14

+    PUSHBUTTON      "Decide &Later",IDC_DECIDELATER,175,176,74,14

+    CONTROL         "&I",IDC_DETAILS,"MButtonClass",WS_TABSTOP,248,29,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    LTEXT           "Reason:",IDC_STATIC,7,39,101,10,SS_CENTERIMAGE

+    EDITTEXT        IDC_REASON,7,50,257,54,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL | WS_HSCROLL,WS_EX_STATICEDGE

+    LTEXT           "Denial Reason:",IDC_STATIC,7,111,89,10,SS_CENTERIMAGE | SS_REALSIZECONTROL

+    EDITTEXT        IDC_DENYREASON,7,124,257,32,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_STATICEDGE

+    CONTROL         "Add to contact list if authorized",IDC_ADDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,162,239,10

+END

+

+IDD_ADDED DIALOGEX 0, 0, 241, 70

+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

+EXSTYLE WS_EX_CONTROLPARENT

+CAPTION "You Were Added"

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    CONTROL         "",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,241,25

+    PUSHBUTTON      "&Close",IDCANCEL,90,51,60,14

+    CONTROL         "&I",IDC_DETAILS,"MButtonClass",WS_TABSTOP,217,29,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "&U",IDC_ADD,"MButtonClass",WS_TABSTOP,197,29,16,14,WS_EX_NOACTIVATE | 0x10000000L

+END

+

+#endif    // APSTUDIO_INVOKED

+

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

+//

+// DESIGNINFO

+//

+

+#ifdef APSTUDIO_INVOKED

+    IDD_AUTHREQ, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 264

+        BOTTOMMARGIN, 190

+    END

+

+    IDD_ADDED, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 233

+        TOPMARGIN, 3

+        BOTTOMMARGIN, 65

+    END

+#endif    // APSTUDIO_INVOKED

+

+

+#ifdef APSTUDIO_INVOKED

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

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE

+BEGIN

+    "..\..\resource.h\0"

+END

+

+2 TEXTINCLUDE

+BEGIN

+    "#include <windows.h>\r\n"

+    "#include <winres.h>\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE

+BEGIN

+    "\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

diff --git a/src/core/stdauth/stdauth_10.vcxproj b/src/core/stdauth/stdauth_10.vcxproj
new file mode 100644
index 0000000000..1e21ce83a0
--- /dev/null
+++ b/src/core/stdauth/stdauth_10.vcxproj
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectName>stdauth</ProjectName>

+    <ProjectGuid>{86E0715E-C769-11E1-A41D-6CED6188709B}</ProjectGuid>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Core\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Core\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Core\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Core\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <IgnoreImportLibrary>true</IgnoreImportLibrary>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <AdditionalIncludeDirectories>..\..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <FloatingPointModel>Fast</FloatingPointModel>

+      <WarningLevel>Level3</WarningLevel>

+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <BaseAddress>0x3ae00000</BaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

+      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>false</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <BaseAddress>0x3ae00000</BaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

+      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <AdditionalIncludeDirectories>..\..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <FloatingPointModel>Fast</FloatingPointModel>

+      <WarningLevel>Level3</WarningLevel>

+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <BaseAddress>0x3ae00000</BaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

+      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>false</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <BaseAddress>0x3ae00000</BaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

+      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="auth.cpp" />

+    <ClCompile Include="authdialogs.cpp" />

+    <ClCompile Include="commonheaders.cpp">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="main.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\stdplug.h" />

+    <ClInclude Include="commonheaders.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="resource.rc" />

+    <ResourceCompile Include="version.rc" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/src/core/stdauth/stdauth_10.vcxproj.filters b/src/core/stdauth/stdauth_10.vcxproj.filters
new file mode 100644
index 0000000000..cb87b64c31
--- /dev/null
+++ b/src/core/stdauth/stdauth_10.vcxproj.filters
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{5c074c9e-6c66-4233-bbd3-a50170fccf47}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{e30af2c4-42d4-4342-8eb9-2dbca157c6bb}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{9208a050-ffae-47fa-bc98-4ca4f79d37d7}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="commonheaders.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="main.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="auth.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="authdialogs.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\stdplug.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="commonheaders.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <ResourceCompile Include="resource.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/src/core/stdauth/version.h b/src/core/stdauth/version.h
new file mode 100644
index 0000000000..140b61ff66
--- /dev/null
+++ b/src/core/stdauth/version.h
@@ -0,0 +1,14 @@
+

+#include <m_version.h>

+

+#define __FILEVERSION_STRING		MIRANDA_VERSION_FILEVERSION

+#define __VERSION_STRING			MIRANDA_VERSION_STRING

+

+#define __PLUGIN_NAME				"stdauth"

+#define __INTERNAL_NAME				"stdauth"

+#define __FILENAME					"stdauth.dll"

+#define __DESCRIPTION 				"Core module for sending/receiving auth requests."

+#define __AUTHOR                 "Myranda team"

+#define __AUTHOREMAIL				""

+#define __AUTHORWEB					"http://nightly.miranda.im"

+#define __COPYRIGHT					"© 2012 Myranda team"

diff --git a/src/core/stdauth/version.rc b/src/core/stdauth/version.rc
new file mode 100644
index 0000000000..e637f0cb33
--- /dev/null
+++ b/src/core/stdauth/version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "afxres.h"

+#include "version.h"

+

+#ifdef _WIN32

+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

+#endif //_WIN32

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END

diff --git a/src/core/stdfile/commonheaders.cpp b/src/core/stdfile/commonheaders.cpp
new file mode 100644
index 0000000000..95b2201163
--- /dev/null
+++ b/src/core/stdfile/commonheaders.cpp
@@ -0,0 +1,2 @@
+#include "commonheaders.h"

+

diff --git a/src/core/stdfile/commonheaders.h b/src/core/stdfile/commonheaders.h
new file mode 100644
index 0000000000..b1593709c8
--- /dev/null
+++ b/src/core/stdfile/commonheaders.h
@@ -0,0 +1,100 @@
+/*

+

+Miranda IM: the free IM client for Microsoft* Windows*

+

+Copyright 2000-2009 Miranda ICQ/IM project,

+all portions of this codebase are copyrighted to the people

+listed in contributors.txt.

+

+This program is free software; you can redistribute it and/or

+modify it under the terms of the GNU General Public License

+as published by the Free Software Foundation; either version 2

+of the License, or (at your option) any later version.

+

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License

+along with this program; if not, write to the Free Software

+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+*/

+

+// to enable all 0.9.0 core functions

+#define MIRANDA_VER 0x0A00

+

+#define WINVER 0x0700

+#define _WIN32_WINNT 0x0700

+#define _WIN32_IE 0x0601

+

+#include <tchar.h>

+#include <winsock2.h>

+#include <shlobj.h>

+#include <uxtheme.h>

+#include <commctrl.h>

+#include <vssym32.h>

+

+#include <stdio.h>

+#include <time.h>

+#include <stddef.h>

+#include <process.h>

+#include <io.h>

+#include <limits.h>

+#include <string.h>

+#include <locale.h>

+#include <direct.h>

+#include <malloc.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+

+#include <win2k.h>

+

+#include <m_system.h>

+#include <m_system_cpp.h>

+#include <m_core.h>

+#include <newpluginapi.h>

+#include <m_database.h>

+#include <m_netlib.h>

+#include <m_clc.h>

+#include <m_clui.h>

+#include <m_crypto.h>

+#include <m_langpack.h>

+#include <m_clist.h>

+#include <m_clistint.h>

+#include <m_avatars.h>

+#include <m_button.h>

+#include <m_protosvc.h>

+#include <m_protomod.h>

+#include <m_protocols.h>

+#include <m_protoint.h>

+#include <m_plugins.h>

+#include <m_options.h>

+#include <m_skin.h>

+#include <m_contacts.h>

+#include <m_message.h>

+#include <m_userinfo.h>

+#include <m_history.h>

+#include <m_addcontact.h>

+#include <m_findadd.h>

+#include <m_file.h>

+#include <m_email.h>

+#include <m_awaymsg.h>

+#include <m_idle.h>

+#include <m_ignore.h>

+#include <m_icolib.h>

+#include <m_modernopt.h>

+#include <m_help.h>

+#include <m_timezones.h>

+

+#include "version.h"

+

+#include "../../resource.h"

+#include "../stdplug.h"

+

+extern HINSTANCE hInst;

+

+extern ITaskbarList3 * pTaskbarInterface;

+

+typedef HRESULT (STDAPICALLTYPE *pfnSHAutoComplete)(HWND, DWORD);

+extern pfnSHAutoComplete shAutoComplete;

diff --git a/src/modules/srfile/file.cpp b/src/core/stdfile/file.cpp
index 4e1db5c651..45a84aaeaf 100644
--- a/src/modules/srfile/file.cpp
+++ b/src/core/stdfile/file.cpp
@@ -20,7 +20,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "..\..\core\commonheaders.h"

+

+#include "commonheaders.h"

 #include "file.h"

 

 TCHAR* PFTS_StringToTchar(int flags, const PROTOCHAR* s);

@@ -28,6 +29,35 @@ int PFTS_CompareWithTchar(PROTOFILETRANSFERSTATUS* ft, const PROTOCHAR* s, TCHAR
 

 static HANDLE hSRFileMenuItem;

 

+TCHAR *GetContactID(HANDLE hContact)

+{

+	TCHAR *theValue = {0};

+	char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

+	if (DBGetContactSettingByte(hContact, szProto, "ChatRoom", 0) == 1) {

+		DBVARIANT dbv;

+		if ( !DBGetContactSettingTString(hContact, szProto, "ChatRoomID", &dbv)) {

+			theValue = (TCHAR *)mir_tstrdup(dbv.ptszVal);

+			DBFreeVariant(&dbv);

+			return theValue;

+	}	}

+	else {

+		CONTACTINFO ci = {0};

+		ci.cbSize = sizeof(ci);

+		ci.hContact = hContact;

+		ci.szProto = szProto;

+		ci.dwFlag = CNF_UNIQUEID | CNF_TCHAR;

+		if ( !CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM) & ci)) {

+			switch (ci.type) {

+			case CNFT_ASCIIZ:

+				return (TCHAR *)ci.pszVal;

+				break;

+			case CNFT_DWORD:

+				return _itot(ci.dVal, (TCHAR *)mir_alloc(sizeof(TCHAR)*32), 10);

+				break;

+	}	}	}

+	return NULL;

+}

+

 static INT_PTR SendFileCommand(WPARAM wParam, LPARAM)

 {

 	struct FileSendData fsd;

@@ -97,7 +127,7 @@ void PushFileEvent(HANDLE hContact, HANDLE hdbe, LPARAM lParam)
 		SkinPlaySound("RecvFile");

 

 		TCHAR szTooltip[256];

-		mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("File from %s"), cli.pfnGetContactDisplayName(hContact, 0));

+		mir_sntprintf(szTooltip, SIZEOF(szTooltip), TranslateT("File from %s"), pcli->pfnGetContactDisplayName(hContact, 0));

 		cle.ptszTooltip = szTooltip;

 

 		cle.flags |= CLEF_TCHAR;

@@ -284,8 +314,8 @@ static int SRFilePreBuildMenu(WPARAM wParam, LPARAM)
 

 	char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, wParam, 0);

 	if (szProto != NULL) {

-		if (CallProtoServiceInt(NULL,szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_FILESEND) {

-			if (CallProtoServiceInt(NULL,szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_OFFLINEFILES)

+		if ( CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_FILESEND) {

+			if ( CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_OFFLINEFILES)

 				mi.flags = CMIM_FLAGS;

 			else if (DBGetContactSettingWord((HANDLE)wParam, szProto, "Status", ID_STATUS_OFFLINE) != ID_STATUS_OFFLINE)

 				mi.flags = CMIM_FLAGS;

@@ -333,6 +363,92 @@ INT_PTR openRecDir(WPARAM, LPARAM)
 	return 0;

 }

 

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

+

+static void sttRecvCreateBlob(DBEVENTINFO& dbei, int fileCount, char** pszFiles, char* szDescr)

+{

+	dbei.cbBlob = sizeof(DWORD);

+	{

+		for (int i=0; i < fileCount; i++)

+			dbei.cbBlob += lstrlenA(pszFiles[i]) + 1;

+	}

+	

+	dbei.cbBlob += lstrlenA(szDescr) + 1;

+

+	if ((dbei.pBlob = (BYTE*)mir_alloc(dbei.cbBlob)) == 0)

+		return;

+

+	*(DWORD*)dbei.pBlob = 0;

+	BYTE* p = dbei.pBlob + sizeof(DWORD);

+	for (int i=0; i < fileCount; i++) {

+		strcpy((char*)p, pszFiles[i]);

+		p += lstrlenA(pszFiles[i]) + 1;

+	}

+	strcpy((char*)p, (szDescr == NULL) ? "" : szDescr);

+}

+

+static INT_PTR Proto_RecvFile(WPARAM, LPARAM lParam)

+{

+	CCSDATA* ccs = (CCSDATA*)lParam;

+	PROTORECVEVENT* pre = (PROTORECVEVENT*)ccs->lParam;

+	char* szFile = pre->szMessage + sizeof(DWORD);

+	char* szDescr = szFile + strlen(szFile) + 1;

+

+	// Suppress the standard event filter

+	if (pre->lParam != NULL)

+		*(DWORD*)pre->szMessage = 0;

+

+	DBEVENTINFO dbei = { 0 };

+	dbei.cbSize = sizeof(dbei);

+	dbei.szModule = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0);

+	dbei.timestamp = pre->timestamp;

+	dbei.flags = (pre->flags & PREF_CREATEREAD) ? DBEF_READ : 0;

+	dbei.flags |= (pre->flags & PREF_UTF) ? DBEF_UTF : 0;

+	dbei.eventType = EVENTTYPE_FILE;

+	dbei.cbBlob = (DWORD)(sizeof(DWORD) + strlen(szFile) + strlen(szDescr) + 2);

+	dbei.pBlob = (PBYTE)pre->szMessage;

+	HANDLE hdbe = (HANDLE)CallService(MS_DB_EVENT_ADD, (WPARAM)ccs->hContact, (LPARAM)&dbei);

+

+	if (pre->lParam != NULL)

+		PushFileEvent(ccs->hContact, hdbe, pre->lParam);

+	return 0;

+}

+

+static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam)

+{

+	CCSDATA* ccs = (CCSDATA*)lParam;

+	PROTORECVFILET* pre = (PROTORECVFILET*)ccs->lParam;

+	if (pre->fileCount == 0)

+		return 0;

+

+	DBEVENTINFO dbei = { 0 };

+	dbei.cbSize = sizeof(dbei);

+	dbei.szModule = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0);

+	dbei.timestamp = pre->timestamp;

+	dbei.flags = (pre->flags & PREF_CREATEREAD) ? DBEF_READ : 0;

+	dbei.eventType = EVENTTYPE_FILE;

+

+	char** pszFiles = (char**)alloca(pre->fileCount * sizeof(char*));

+	{

+		for (int i=0; i < pre->fileCount; i++)

+			pszFiles[i] = Utf8EncodeT(pre->ptszFiles[i]);

+	}

+	char* szDescr = Utf8EncodeT(pre->tszDescription);

+	dbei.flags |= DBEF_UTF;

+	sttRecvCreateBlob(dbei, pre->fileCount, pszFiles, szDescr);

+	{

+		for (int i=0; i < pre->fileCount; i++)

+			mir_free(pszFiles[i]);

+	}

+	mir_free(szDescr);

+

+	HANDLE hdbe = (HANDLE)CallService(MS_DB_EVENT_ADD, (WPARAM)ccs->hContact, (LPARAM)&dbei);

+

+	PushFileEvent(ccs->hContact, hdbe, pre->lParam);

+	mir_free(dbei.pBlob);

+	return 0;

+}

+

 int LoadSendRecvFileModule(void)

 {

 	CreateServiceFunction("FtMgr/Show", FtMgrShowCommand);

@@ -351,6 +467,9 @@ int LoadSendRecvFileModule(void)
 	HookEvent(ME_OPT_INITIALISE, FileOptInitialise);

 	HookEvent(ME_CLIST_PREBUILDCONTACTMENU, SRFilePreBuildMenu);

 

+	CreateServiceFunction(MS_PROTO_RECVFILE, Proto_RecvFile);

+	CreateServiceFunction(MS_PROTO_RECVFILET, Proto_RecvFileT);

+

 	CreateServiceFunction(MS_FILE_SENDFILE, SendFileCommand);

 	CreateServiceFunction(MS_FILE_SENDSPECIFICFILES, SendSpecificFiles);

 	CreateServiceFunction(MS_FILE_SENDSPECIFICFILEST, SendSpecificFilesT);

diff --git a/src/modules/srfile/file.h b/src/core/stdfile/file.h
index d814e99ab4..d814e99ab4 100644
--- a/src/modules/srfile/file.h
+++ b/src/core/stdfile/file.h
diff --git a/src/modules/srfile/fileexistsdlg.cpp b/src/core/stdfile/fileexistsdlg.cpp
index 3388b692fb..c0592c8b39 100644
--- a/src/modules/srfile/fileexistsdlg.cpp
+++ b/src/core/stdfile/fileexistsdlg.cpp
@@ -20,10 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "..\..\core\commonheaders.h"

-#include <shlobj.h>

-#include <sys/types.h>

-#include <sys/stat.h>

+#include "commonheaders.h"

 #include "file.h"

 

 static void SetControlToUnixTime(HWND hwndDlg, UINT idCtrl, time_t unixTime)

diff --git a/src/modules/srfile/fileopts.cpp b/src/core/stdfile/fileopts.cpp
index 2aec9fa5a1..f24ce4af12 100644
--- a/src/modules/srfile/fileopts.cpp
+++ b/src/core/stdfile/fileopts.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "..\..\core\commonheaders.h"

+#include "commonheaders.h"

 #include "file.h"

 

 #define VSCAN_MCAFEE      1

diff --git a/src/modules/srfile/filerecvdlg.cpp b/src/core/stdfile/filerecvdlg.cpp
index 93ba691266..33a27d80ff 100644
--- a/src/modules/srfile/filerecvdlg.cpp
+++ b/src/core/stdfile/filerecvdlg.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "..\..\core\commonheaders.h"

+#include "commonheaders.h"

 #include "file.h"

 

 #define MAX_MRU_DIRS    5

@@ -228,7 +228,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		Button_SetIcon_IcoLib(hwndDlg, IDC_HISTORY, SKINICON_OTHER_HISTORY, LPGEN("View User's History"));

 		Button_SetIcon_IcoLib(hwndDlg, IDC_USERMENU, SKINICON_OTHER_DOWNARROW, LPGEN("User Menu"));

 

-		contactName = cli.pfnGetContactDisplayName(dat->hContact, 0);

+		contactName = pcli->pfnGetContactDisplayName(dat->hContact, 0);

 		SetDlgItemText(hwndDlg, IDC_FROM, contactName);

 		GetContactReceivedFilesDir(dat->hContact, szPath, SIZEOF(szPath), TRUE);

 		SetDlgItemText(hwndDlg, IDC_FILEDIR, szPath);

@@ -330,7 +330,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				if (szProto) {

 					HICON hIcon;

 

-					hIcon = (HICON)CallProtoServiceInt(NULL,szProto, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0);

+					hIcon = (HICON)CallProtoService(szProto, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0);

 					if (hIcon) {

 						DrawIconEx(dis->hDC, dis->rcItem.left, dis->rcItem.top, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, NULL, DI_NORMAL);

 						DestroyIcon(hIcon);

diff --git a/src/modules/srfile/filesenddlg.cpp b/src/core/stdfile/filesenddlg.cpp
index 7614d38a4e..3551078176 100644
--- a/src/modules/srfile/filesenddlg.cpp
+++ b/src/core/stdfile/filesenddlg.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "..\..\core\commonheaders.h"

+#include "commonheaders.h"

 #include <sys/types.h>

 #include <sys/stat.h>

 #include "file.h"

@@ -229,7 +229,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 		}

 		{

 			char *szProto;

-			TCHAR* contactName = cli.pfnGetContactDisplayName(dat->hContact, 0);

+			TCHAR* contactName = pcli->pfnGetContactDisplayName(dat->hContact, 0);

 			SetDlgItemText(hwndDlg, IDC_TO, contactName);

 

 			szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0);

@@ -281,7 +281,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 

 				szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)dat->hContact, 0);

 				if (szProto) {

-					HICON hIcon = (HICON)CallProtoServiceInt(NULL,szProto, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0);

+					HICON hIcon = (HICON)CallProtoService(szProto, PS_LOADICON, PLI_PROTOCOL|PLIF_SMALL, 0);

 					if (hIcon) {

 						DrawIconEx(dis->hDC, dis->rcItem.left, dis->rcItem.top, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, NULL, DI_NORMAL);

 						DestroyIcon(hIcon);

diff --git a/src/modules/srfile/filexferdlg.cpp b/src/core/stdfile/filexferdlg.cpp
index 3648e2306e..09b2807201 100644
--- a/src/modules/srfile/filexferdlg.cpp
+++ b/src/core/stdfile/filexferdlg.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "..\..\core\commonheaders.h"

+#include "commonheaders.h"

 #include <io.h>

 #include "file.h"

 

@@ -147,20 +147,20 @@ static void SetFilenameControls(HWND hwndDlg, struct FileDlgData *dat, PROTOFILE
 

 	if (fn && (fts->totalFiles > 1)) {

 		mir_sntprintf(msg, SIZEOF(msg), _T("%s: %s (%d %s %d)"), 

-			cli.pfnGetContactDisplayName(fts->hContact, 0), 

+			pcli->pfnGetContactDisplayName(fts->hContact, 0), 

 			fn, fts->currentFileNumber+1, TranslateT("of"), fts->totalFiles);

 

 		SHGetFileInfo(fn, FILE_ATTRIBUTE_DIRECTORY, &shfi, sizeof(shfi), SHGFI_USEFILEATTRIBUTES|SHGFI_ICON|SHGFI_SMALLICON);

 		dat->hIcon = shfi.hIcon;

 	} 

 	else if (fn) {

-		mir_sntprintf(msg, SIZEOF(msg), _T("%s: %s"), cli.pfnGetContactDisplayName(fts->hContact, 0), fn);

+		mir_sntprintf(msg, SIZEOF(msg), _T("%s: %s"), pcli->pfnGetContactDisplayName(fts->hContact, 0), fn);

 

 		SHGetFileInfo(fn, FILE_ATTRIBUTE_NORMAL, &shfi, sizeof(shfi), SHGFI_USEFILEATTRIBUTES|SHGFI_ICON|SHGFI_SMALLICON);

 		dat->hIcon = shfi.hIcon;

 	} 

 	else {

-		lstrcpyn(msg, cli.pfnGetContactDisplayName(fts->hContact, 0), SIZEOF(msg));

+		lstrcpyn(msg, pcli->pfnGetContactDisplayName(fts->hContact, 0), SIZEOF(msg));

 		HICON hIcon = LoadSkinIcon(SKINICON_OTHER_DOWNARROW);

 		dat->hIcon = CopyIcon(hIcon);

 		IcoLib_ReleaseIcon(hIcon, NULL);

@@ -295,7 +295,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		

 			Button_SetIcon_IcoLib(hwndDlg, IDCANCEL, SKINICON_OTHER_DELETE, LPGEN("Cancel"));

 

-			SetDlgItemText(hwndDlg, IDC_CONTACTNAME, cli.pfnGetContactDisplayName(dat->hContact, 0));

+			SetDlgItemText(hwndDlg, IDC_CONTACTNAME, pcli->pfnGetContactDisplayName(dat->hContact, 0));

 

 			if ( !dat->waitingForAcceptance) SetTimer(hwndDlg, 1, 1000, NULL);

 			return TRUE;

@@ -502,7 +502,7 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 					break;

 			}

 			mir_free(szOriginalFilename);

-			CallProtoServiceInt(NULL,szProto, PS_FILERESUMET, (WPARAM)dat->fs, (LPARAM)pfr);

+			CallProtoService(szProto, PS_FILERESUMET, (WPARAM)dat->fs, (LPARAM)pfr);

 			if (pfr->szFilename) mir_free((char*)pfr->szFilename);

 			mir_free(pfr);

 			break;

@@ -762,7 +762,7 @@ void FreeFileDlgData(FileDlgData* dat)
 	FreeFilesMatrix(&dat->files);

 

 	mir_free(dat->fileVirusScanned);

-	Safe_DestroyIcon(dat->hIcon);

-	Safe_DestroyIcon(dat->hIconFolder);

+	if (dat->hIcon) DestroyIcon(dat->hIcon);

+	if (dat->hIconFolder) DestroyIcon(dat->hIconFolder);

 	mir_free(dat);

 }

diff --git a/src/modules/srfile/ftmanager.cpp b/src/core/stdfile/ftmanager.cpp
index 567e038fc6..216798ded7 100644
--- a/src/modules/srfile/ftmanager.cpp
+++ b/src/core/stdfile/ftmanager.cpp
@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software

 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

-#include "..\..\core\commonheaders.h"

+#include "commonheaders.h"

 #include "file.h"

 

 static HWND hwndFtMgr = NULL;

@@ -34,8 +34,8 @@ struct TFtMgrData
 	TBPFLAG         errorState;

 };

 

-

 #define M_CALCPROGRESS (WM_USER + 200)

+

 struct TFtProgressData

 {

 	unsigned int init, run, scan;

@@ -71,14 +71,10 @@ static void LayoutTransfers(HWND hwnd, struct TFtPageData *dat)
 	dat->scrollPos = GetScrollPos(hwnd, SB_VERT);

 	dat->height = rc.bottom - rc.top;

 

-	if (dat->wnds->realCount)

-	{

-		int i;

-		HDWP hdwp;

-

-		hdwp = BeginDeferWindowPos(dat->wnds->realCount);

+	if (dat->wnds->realCount) {

+		HDWP hdwp = BeginDeferWindowPos(dat->wnds->realCount);

 		top -= dat->scrollPos;

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

+		for (int i=0; i < dat->wnds->realCount; ++i)

 		{

 			int height = dat->wnds->items[i]->rc.bottom - dat->wnds->items[i]->rc.top;

 			hdwp = DeferWindowPos(hdwp, dat->wnds->items[i]->hwnd, NULL, 0, top, rc.right, height, SWP_NOZORDER);

@@ -90,174 +86,164 @@ static void LayoutTransfers(HWND hwnd, struct TFtPageData *dat)
 

 	dat->dataHeight = top;

 

-	{

-		SCROLLINFO si = {0};

-		si.cbSize = sizeof(si);

-		si.fMask = SIF_DISABLENOSCROLL|SIF_PAGE|SIF_RANGE;

-		si.nPage = dat->height;

-		si.nMin = 0;

-		si.nMax = dat->dataHeight;

-		SetScrollInfo(hwnd, SB_VERT, &si, TRUE);

-	}

+	SCROLLINFO si = {0};

+	si.cbSize = sizeof(si);

+	si.fMask = SIF_DISABLENOSCROLL|SIF_PAGE|SIF_RANGE;

+	si.nPage = dat->height;

+	si.nMin = 0;

+	si.nMax = dat->dataHeight;

+	SetScrollInfo(hwnd, SB_VERT, &si, TRUE);

 }

 

 static INT_PTR CALLBACK FtMgrPageDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	struct TFtPageData *dat = (struct TFtPageData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);

+	int i;

 

-	switch (msg)

-	{

+	switch (msg) {

 	case WM_INITDIALOG:

-	{

-		// Force scrollbar visibility

-		SCROLLINFO si = {0};

-		si.cbSize = sizeof(si);

-		si.fMask = SIF_DISABLENOSCROLL;

-		SetScrollInfo(hwnd, SB_VERT, &si, TRUE);

-

-		dat = (struct TFtPageData *)mir_alloc(sizeof(struct TFtPageData));

-		dat->wnds = (struct TLayoutWindowList *)List_Create(0, 1);

-		dat->scrollPos = 0;

-		dat->runningCount = 0;

-		SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)dat);

+		{

+			// Force scrollbar visibility

+			SCROLLINFO si = {0};

+			si.cbSize = sizeof(si);

+			si.fMask = SIF_DISABLENOSCROLL;

+			SetScrollInfo(hwnd, SB_VERT, &si, TRUE);

+

+			dat = (struct TFtPageData *)mir_alloc(sizeof(struct TFtPageData));

+			dat->wnds = (struct TLayoutWindowList *)List_Create(0, 1);

+			dat->scrollPos = 0;

+			dat->runningCount = 0;

+			SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)dat);

+		}

 		break;

-	}

 

 	case WM_FT_ADD:

-	{

-		struct TLayoutWindowInfo *wnd = (struct TLayoutWindowInfo *)mir_alloc(sizeof(struct TLayoutWindowInfo));

-		wnd->hwnd = (HWND)lParam;

-		GetWindowRect(wnd->hwnd, &wnd->rc);

-		List_Insert((SortedList *)dat->wnds, wnd, dat->wnds->realCount);

-		LayoutTransfers(hwnd, dat);

-		dat->runningCount++;

-		PostMessage(GetParent(hwnd), WM_TIMER, 1, NULL);

+		{

+			TLayoutWindowInfo *wnd = (struct TLayoutWindowInfo *)mir_alloc(sizeof(struct TLayoutWindowInfo));

+			wnd->hwnd = (HWND)lParam;

+			GetWindowRect(wnd->hwnd, &wnd->rc);

+			List_Insert((SortedList *)dat->wnds, wnd, dat->wnds->realCount);

+			LayoutTransfers(hwnd, dat);

+			dat->runningCount++;

+			PostMessage(GetParent(hwnd), WM_TIMER, 1, NULL);

+		}

 		break;

-	}

 

 	case WM_FT_RESIZE:

-	{

-		int i;

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

-			if (dat->wnds->items[i]->hwnd == (HWND)lParam)

-			{

+			if (dat->wnds->items[i]->hwnd == (HWND)lParam) {

 				GetWindowRect(dat->wnds->items[i]->hwnd, &dat->wnds->items[i]->rc);

 				break;

 			}

 		LayoutTransfers(hwnd, dat);

 		break;

-	}

 

 	case WM_FT_REMOVE:

-	{

-		int i;

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

-			if (dat->wnds->items[i]->hwnd == (HWND)lParam)

-			{

+			if (dat->wnds->items[i]->hwnd == (HWND)lParam) {

 				mir_free(dat->wnds->items[i]);

 				List_Remove((SortedList *)dat->wnds, i);

 				break;

 			}

 		LayoutTransfers(hwnd, dat);

 		break;

-	}

 

 	case WM_FT_COMPLETED:

-	{ //wParam: { ACKRESULT_SUCCESS | ACKRESULT_FAILED | ACKRESULT_DENIED }

+		//wParam: { ACKRESULT_SUCCESS | ACKRESULT_FAILED | ACKRESULT_DENIED }

 		dat->runningCount--;

-		int i=0;

-		while (i < dat->wnds->realCount)

-		{

+		for (i=0; i < dat->wnds->realCount; i++) {

 			// no error when canceling (WM_FT_REMOVE is send first, check if hwnd is still registered)

-			if (dat->wnds->items[i]->hwnd == (HWND)lParam)

-			{

+			if (dat->wnds->items[i]->hwnd == (HWND)lParam) {

 				SendMessage(GetParent(hwnd), WM_TIMER, 1, (LPARAM)wParam);

 				break;

 			}

-			++i;

 		}

 		if (i == dat->wnds->realCount)

 			PostMessage(GetParent(hwnd), WM_TIMER, 1, NULL);

-	

+

 		if(dat->runningCount == 0 && (int)wParam == ACKRESULT_SUCCESS && DBGetContactSettingByte(NULL, "SRFile", "AutoClose", 0))

 			ShowWindow(hwndFtMgr, SW_HIDE);

 		break;

-	}

 

 	case WM_FT_CLEANUP:

-	{

-		int i;

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

 			SendMessage(dat->wnds->items[i]->hwnd, WM_FT_CLEANUP, wParam, lParam);

 		break;

-	}

 

 	case WM_SIZE:

-	{

 		LayoutTransfers(hwnd, dat);

 		break;

-	}

 

 	case WM_MOUSEWHEEL:

-	{

-		int zDelta = GET_WHEEL_DELTA_WPARAM(wParam);

-		if (zDelta)

 		{

-			int i, nScrollLines = 0;

-			SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, (void*)&nScrollLines, 0);

-			for (i=0; i < (nScrollLines + 1) / 2; i++)

-				SendMessage(hwnd, WM_VSCROLL, (zDelta < 0) ? SB_LINEDOWN : SB_LINEUP, 0);

-		}

+			int zDelta = GET_WHEEL_DELTA_WPARAM(wParam);

+			if (zDelta) {

+				int nScrollLines = 0;

+				SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, (void*)&nScrollLines, 0);

+				for (i=0; i < (nScrollLines + 1) / 2; i++)

+					SendMessage(hwnd, WM_VSCROLL, (zDelta < 0) ? SB_LINEDOWN : SB_LINEUP, 0);

+			}

 

-		SetWindowLongPtr(hwnd, DWLP_MSGRESULT, 0);

-		return TRUE;

-	}

+			SetWindowLongPtr(hwnd, DWLP_MSGRESULT, 0);

+			return TRUE;

+		}

 

 	case WM_VSCROLL:

-	{

-		int pos = dat->scrollPos;

-		switch (LOWORD(wParam))

 		{

-		case SB_LINEDOWN:

-			pos += 15;

-			break;

-		case SB_LINEUP:

-			pos -= 15;

-			break;

-		case SB_PAGEDOWN:

-			pos += dat->height - 10;

-			break;

-		case SB_PAGEUP:

-			pos -= dat->height - 10;

-			break;

-		case SB_THUMBTRACK:

-			pos = HIWORD(wParam);

-			break;

-		}

+			int pos = dat->scrollPos;

+			switch (LOWORD(wParam)) {

+			case SB_LINEDOWN:

+				pos += 15;

+				break;

+			case SB_LINEUP:

+				pos -= 15;

+				break;

+			case SB_PAGEDOWN:

+				pos += dat->height - 10;

+				break;

+			case SB_PAGEUP:

+				pos -= dat->height - 10;

+				break;

+			case SB_THUMBTRACK:

+				pos = HIWORD(wParam);

+				break;

+			}

 

-		if (pos > dat->dataHeight - dat->height) pos = dat->dataHeight - dat->height;

-		if (pos < 0) pos = 0;

+			if (pos > dat->dataHeight - dat->height) pos = dat->dataHeight - dat->height;

+			if (pos < 0) pos = 0;

 

-		if (dat->scrollPos != pos)

-		{

-			ScrollWindow(hwnd, 0, dat->scrollPos - pos, NULL, NULL);

-			SetScrollPos(hwnd, SB_VERT, pos, TRUE);

-			dat->scrollPos = pos;

+			if (dat->scrollPos != pos) {

+				ScrollWindow(hwnd, 0, dat->scrollPos - pos, NULL, NULL);

+				SetScrollPos(hwnd, SB_VERT, pos, TRUE);

+				dat->scrollPos = pos;

+			}

+			break;

 		}

-		break;

-	}

 

 	case M_PRESHUTDOWN:

-	{

-		int i;

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

 			PostMessage(dat->wnds->items[i]->hwnd, WM_COMMAND, MAKEWPARAM(IDCANCEL, BN_CLICKED), 0);

 		break;

-	}

+

+	case M_CALCPROGRESS:

+		{

+			TFtProgressData *prg = (TFtProgressData *)wParam;

+			for (i=0; i < dat->wnds->realCount; ++i) {

+				struct FileDlgData *trdat = (struct FileDlgData *)GetWindowLongPtr(dat->wnds->items[i]->hwnd, GWLP_USERDATA);

+				if (trdat->transferStatus.totalBytes && trdat->fs && !trdat->send && (trdat->transferStatus.totalBytes == trdat->transferStatus.totalProgress))

+					prg->scan++;

+				else if (trdat->transferStatus.totalBytes && trdat->fs) { // in progress

+					prg->run++;

+					prg->totalBytes += trdat->transferStatus.totalBytes;

+					prg->totalProgress += trdat->transferStatus.totalProgress;

+				}

+				else if (trdat->fs) // starting

+					prg->init++;

+			}

+		}

+		break;

 

 	case WM_DESTROY:

-	{

-		int i;

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

 			mir_free(dat->wnds->items[i]);

 		List_Destroy((SortedList *)dat->wnds);

@@ -266,30 +252,6 @@ static INT_PTR CALLBACK FtMgrPageDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPA
 		break;

 	}

 

-	case M_CALCPROGRESS:

-	{

-		int i;

-		TFtProgressData * prg = (TFtProgressData *)wParam;

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

-		{

-			struct FileDlgData *trdat = (struct FileDlgData *)GetWindowLongPtr(dat->wnds->items[i]->hwnd, GWLP_USERDATA);

-			if (trdat->transferStatus.totalBytes && trdat->fs && !trdat->send && (trdat->transferStatus.totalBytes == trdat->transferStatus.totalProgress))

-			{

-				prg->scan++;

-			} else if (trdat->transferStatus.totalBytes && trdat->fs)

-			{ // in progress

-				prg->run++;

-				prg->totalBytes += trdat->transferStatus.totalBytes;

-				prg->totalProgress += trdat->transferStatus.totalProgress;

-			} else if (trdat->fs) 

-			{ // starting

-				prg->init++;

-			}

-

-		}

-	}

-	}

-

 	return FALSE;

 }

 

@@ -297,160 +259,151 @@ static INT_PTR CALLBACK FtMgrDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 {

 	struct TFtMgrData *dat = (struct TFtMgrData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);

 

-	switch (msg)

-	{

+	switch (msg) {

 	case WM_INITDIALOG:

-	{

-		TCITEM tci = {0};

-		HWND hwndTab = GetDlgItem(hwnd, IDC_TABS);

+		{

+			TCITEM tci = {0};

+			HWND hwndTab = GetDlgItem(hwnd, IDC_TABS);

 

-		TranslateDialogDefault(hwnd);

-		Window_SetIcon_IcoLib(hwnd, SKINICON_EVENT_FILE);

+			TranslateDialogDefault(hwnd);

+			Window_SetIcon_IcoLib(hwnd, SKINICON_EVENT_FILE);

 

-		dat = (struct TFtMgrData *)mir_calloc(sizeof(struct TFtMgrData));

+			dat = (struct TFtMgrData *)mir_calloc(sizeof(struct TFtMgrData));

 

-		SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)dat);

+			SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)dat);

 

-		dat->hhkPreshutdown = HookEventMessage(ME_SYSTEM_PRESHUTDOWN, hwnd, M_PRESHUTDOWN);

+			dat->hhkPreshutdown = HookEventMessage(ME_SYSTEM_PRESHUTDOWN, hwnd, M_PRESHUTDOWN);

 

-		dat->hwndIncoming = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FTPAGE), hwnd, FtMgrPageDlgProc);

-		dat->hwndOutgoing = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FTPAGE), hwnd, FtMgrPageDlgProc);

-		ShowWindow(dat->hwndIncoming, SW_SHOW);

+			dat->hwndIncoming = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FTPAGE), hwnd, FtMgrPageDlgProc);

+			dat->hwndOutgoing = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FTPAGE), hwnd, FtMgrPageDlgProc);

+			ShowWindow(dat->hwndIncoming, SW_SHOW);

 

-		tci.mask = TCIF_PARAM|TCIF_TEXT;

-		tci.pszText = TranslateT("Incoming");

-		tci.lParam = (LPARAM)dat->hwndIncoming;

-		TabCtrl_InsertItem(hwndTab, 0, &tci);

-		tci.pszText = TranslateT("Outgoing");

-		tci.lParam = (LPARAM)dat->hwndOutgoing;

-		TabCtrl_InsertItem(hwndTab, 1, &tci);

+			tci.mask = TCIF_PARAM|TCIF_TEXT;

+			tci.pszText = TranslateT("Incoming");

+			tci.lParam = (LPARAM)dat->hwndIncoming;

+			TabCtrl_InsertItem(hwndTab, 0, &tci);

+			tci.pszText = TranslateT("Outgoing");

+			tci.lParam = (LPARAM)dat->hwndOutgoing;

+			TabCtrl_InsertItem(hwndTab, 1, &tci);

 

-		// Utils_RestoreWindowPosition(hwnd, NULL, "SRFile", "FtMgrDlg_");

-		SAVEWINDOWPOS swp;

-		swp.hwnd = hwnd; swp.hContact = NULL; swp.szModule = "SRFile"; swp.szNamePrefix = "FtMgrDlg_";

-		CallService(MS_UTILS_RESTOREWINDOWPOSITION, RWPF_NOACTIVATE, (LPARAM)&swp);

+			// Utils_RestoreWindowPosition(hwnd, NULL, "SRFile", "FtMgrDlg_");

+			SAVEWINDOWPOS swp;

+			swp.hwnd = hwnd; swp.hContact = NULL; swp.szModule = "SRFile"; swp.szNamePrefix = "FtMgrDlg_";

+			CallService(MS_UTILS_RESTOREWINDOWPOSITION, RWPF_NOACTIVATE, (LPARAM)&swp);

 

-		// Fall through to setup initial placement

-	}

+			// Fall through to setup initial placement

+		}

 	case WM_SIZE:

-	{

-		RECT rc, rcButton;

-		HDWP hdwp;

-		HWND hwndTab = GetDlgItem(hwnd, IDC_TABS);

+		{

+			RECT rc, rcButton;

+			HDWP hdwp;

+			HWND hwndTab = GetDlgItem(hwnd, IDC_TABS);

 

-		GetWindowRect(GetDlgItem(hwnd, IDCANCEL), &rcButton);

-		OffsetRect(&rcButton, -rcButton.left, -rcButton.top);

+			GetWindowRect(GetDlgItem(hwnd, IDCANCEL), &rcButton);

+			OffsetRect(&rcButton, -rcButton.left, -rcButton.top);

 

-		GetClientRect(hwnd, &rc);

-		InflateRect(&rc, -6, -6);

+			GetClientRect(hwnd, &rc);

+			InflateRect(&rc, -6, -6);

 

-		hdwp = BeginDeferWindowPos(3);

+			hdwp = BeginDeferWindowPos(3);

 

-		hdwp = DeferWindowPos(hdwp, GetDlgItem(hwnd, IDC_CLEAR), NULL, rc.left, rc.bottom-rcButton.bottom, 0, 0, SWP_NOZORDER|SWP_NOSIZE);

-		hdwp = DeferWindowPos(hdwp, GetDlgItem(hwnd, IDCANCEL), NULL, rc.right-rcButton.right, rc.bottom-rcButton.bottom, 0, 0, SWP_NOZORDER|SWP_NOSIZE);

+			hdwp = DeferWindowPos(hdwp, GetDlgItem(hwnd, IDC_CLEAR), NULL, rc.left, rc.bottom-rcButton.bottom, 0, 0, SWP_NOZORDER|SWP_NOSIZE);

+			hdwp = DeferWindowPos(hdwp, GetDlgItem(hwnd, IDCANCEL), NULL, rc.right-rcButton.right, rc.bottom-rcButton.bottom, 0, 0, SWP_NOZORDER|SWP_NOSIZE);

 

-		rc.bottom -= rcButton.bottom + 5;

+			rc.bottom -= rcButton.bottom + 5;

 

-		hdwp = DeferWindowPos(hdwp, hwndTab, NULL, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, SWP_NOZORDER);

+			hdwp = DeferWindowPos(hdwp, hwndTab, NULL, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, SWP_NOZORDER);

 

-		EndDeferWindowPos(hdwp);

+			EndDeferWindowPos(hdwp);

 

-		GetWindowRect(hwndTab, &rc);

-		MapWindowPoints(NULL, hwnd, (LPPOINT)&rc, 2);

-		TabCtrl_AdjustRect(hwndTab, FALSE, &rc);

-		InflateRect(&rc, -5, -5);

+			GetWindowRect(hwndTab, &rc);

+			MapWindowPoints(NULL, hwnd, (LPPOINT)&rc, 2);

+			TabCtrl_AdjustRect(hwndTab, FALSE, &rc);

+			InflateRect(&rc, -5, -5);

 

-		hdwp = BeginDeferWindowPos(2);

+			hdwp = BeginDeferWindowPos(2);

 

-		hdwp = DeferWindowPos(hdwp, dat->hwndIncoming, HWND_TOP, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, 0);

-		hdwp = DeferWindowPos(hdwp, dat->hwndOutgoing, HWND_TOP, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, 0);

+			hdwp = DeferWindowPos(hdwp, dat->hwndIncoming, HWND_TOP, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, 0);

+			hdwp = DeferWindowPos(hdwp, dat->hwndOutgoing, HWND_TOP, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, 0);

 

-		EndDeferWindowPos(hdwp);

+			EndDeferWindowPos(hdwp);

 

-		break;

-	}

+			break;

+		}

 

 	case WM_MOUSEWHEEL:

-	{

 		if (IsWindowVisible(dat->hwndIncoming)) SendMessage(dat->hwndIncoming, msg, wParam, lParam);

 		if (IsWindowVisible(dat->hwndOutgoing)) SendMessage(dat->hwndOutgoing, msg, wParam, lParam);

 		break;

-	}

 

 	case WM_FT_SELECTPAGE:

-	{

-		TCITEM tci = {0};

-		HWND hwndTab = GetDlgItem(hwnd, IDC_TABS);

-

-		if (TabCtrl_GetCurSel(hwndTab) == (int)wParam) break;

+		{

+			TCITEM tci = {0};

+			HWND hwndTab = GetDlgItem(hwnd, IDC_TABS);

 

-		tci.mask = TCIF_PARAM;

+			if (TabCtrl_GetCurSel(hwndTab) == (int)wParam) break;

 

-		TabCtrl_GetItem(hwndTab, TabCtrl_GetCurSel(hwndTab), &tci);

-		ShowWindow((HWND)tci.lParam, SW_HIDE);

+			tci.mask = TCIF_PARAM;

 

-		TabCtrl_SetCurSel(hwndTab, wParam);

+			TabCtrl_GetItem(hwndTab, TabCtrl_GetCurSel(hwndTab), &tci);

+			ShowWindow((HWND)tci.lParam, SW_HIDE);

 

-		TabCtrl_GetItem(hwndTab, TabCtrl_GetCurSel(hwndTab), &tci);

-		ShowWindow((HWND)tci.lParam, SW_SHOW);

+			TabCtrl_SetCurSel(hwndTab, wParam);

 

+			TabCtrl_GetItem(hwndTab, TabCtrl_GetCurSel(hwndTab), &tci);

+			ShowWindow((HWND)tci.lParam, SW_SHOW);

+		}

 		break;

-	}

 

 	case WM_GETMINMAXINFO:

-	{

-		LPMINMAXINFO lpmmi = (LPMINMAXINFO)lParam;

-		lpmmi->ptMinTrackSize.x = 300;

-		lpmmi->ptMinTrackSize.y = 400;

-		return 0;

-	}

+		{

+			LPMINMAXINFO lpmmi = (LPMINMAXINFO)lParam;

+			lpmmi->ptMinTrackSize.x = 300;

+			lpmmi->ptMinTrackSize.y = 400;

+			return 0;

+		}

 

 	case WM_COMMAND:

-		switch (LOWORD(wParam))

-		{

-			case IDCANCEL:

-				PostMessage(hwnd, WM_CLOSE , 0, 0);

-				break;

+		switch (LOWORD(wParam)) {

+		case IDCANCEL:

+			PostMessage(hwnd, WM_CLOSE , 0, 0);

+			break;

 

-			case IDC_CLEAR:

-				PostMessage(dat->hwndIncoming, WM_FT_CLEANUP, 0, 0);

-				PostMessage(dat->hwndOutgoing, WM_FT_CLEANUP, 0, 0);

-				break;

+		case IDC_CLEAR:

+			PostMessage(dat->hwndIncoming, WM_FT_CLEANUP, 0, 0);

+			PostMessage(dat->hwndOutgoing, WM_FT_CLEANUP, 0, 0);

+			break;

 		}

 		break;

 

 	case WM_NOTIFY:

-	{

-		switch (((LPNMHDR)lParam)->idFrom)

-		{

+		switch (((LPNMHDR)lParam)->idFrom) {

 		case IDC_TABS:

-		{

-			HWND hwndTab = GetDlgItem(hwnd, IDC_TABS);

-			switch (((LPNMHDR)lParam)->code)

-			{

-			case TCN_SELCHANGING:

-			{

-				TCITEM tci = {0};

-				tci.mask = TCIF_PARAM;

-				TabCtrl_GetItem(hwndTab, TabCtrl_GetCurSel(hwndTab), &tci);

-				ShowWindow((HWND)tci.lParam, SW_HIDE);

-				break;

-			}

-

-			case TCN_SELCHANGE:

 			{

-				TCITEM tci = {0};

-				tci.mask = TCIF_PARAM;

-				TabCtrl_GetItem(hwndTab, TabCtrl_GetCurSel(hwndTab), &tci);

-				ShowWindow((HWND)tci.lParam, SW_SHOW);

+				HWND hwndTab = GetDlgItem(hwnd, IDC_TABS);

+				switch (((LPNMHDR)lParam)->code) {

+				case TCN_SELCHANGING:

+					{

+						TCITEM tci = {0};

+						tci.mask = TCIF_PARAM;

+						TabCtrl_GetItem(hwndTab, TabCtrl_GetCurSel(hwndTab), &tci);

+						ShowWindow((HWND)tci.lParam, SW_HIDE);

+						break;

+					}

+

+				case TCN_SELCHANGE:

+					{

+						TCITEM tci = {0};

+						tci.mask = TCIF_PARAM;

+						TabCtrl_GetItem(hwndTab, TabCtrl_GetCurSel(hwndTab), &tci);

+						ShowWindow((HWND)tci.lParam, SW_SHOW);

+						break;

+					}

+				}

 				break;

 			}

-			}

-			break;

-		}

 		}

 		break;

-	}

 

 	case M_PRESHUTDOWN:

 		SendMessage(dat->hwndIncoming, M_PRESHUTDOWN, 0, 0);

@@ -477,23 +430,19 @@ static INT_PTR CALLBACK FtMgrDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 		break;

 

 	case WM_ACTIVATE:

-	{

 		dat->errorState = TBPF_NOPROGRESS;

 		wParam = 1;

-	} break;

+		break;

+

 	case WM_SHOWWINDOW:

-	{

-		if ( !wParam) // hiding

-		{

+		if ( !wParam) { // hiding

 			KillTimer(hwnd, 1);

 			break;

 		}

 		lParam = 0;

-	}

+

 	case WM_TIMER:

-	{

-		if (pTaskbarInterface)

-		{

+		if (pTaskbarInterface) {

 			SetTimer(hwnd, 1, 400, NULL);

 			if ((lParam == ACKRESULT_FAILED) || (lParam == ACKRESULT_DENIED))

 				dat->errorState = TBPF_ERROR;

@@ -501,30 +450,24 @@ static INT_PTR CALLBACK FtMgrDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			TFtProgressData prg = {0};

 			SendMessage(dat->hwndIncoming, M_CALCPROGRESS, (WPARAM)&prg, 0);

 			SendMessage(dat->hwndOutgoing, M_CALCPROGRESS, (WPARAM)&prg, 0);

-			if (dat->errorState)

-			{

+			if (dat->errorState) {

 				pTaskbarInterface->SetProgressState(hwnd, dat->errorState);

 				if ( !prg.run)

 					pTaskbarInterface->SetProgressValue(hwnd, 1, 1);

-			} else if (prg.run) 

-			{

+			}

+			else if (prg.run) 

 				pTaskbarInterface->SetProgressState(hwnd, TBPF_NORMAL);

-			} else if (prg.init || prg.scan)

-			{

+			else if (prg.init || prg.scan)

 				pTaskbarInterface->SetProgressState(hwnd, TBPF_INDETERMINATE);

-			} else {

+			else {

 				pTaskbarInterface->SetProgressState(hwnd, TBPF_NOPROGRESS);

 				KillTimer(hwnd, 1);

 			}

 

 			if (prg.run)

-			{

 				pTaskbarInterface->SetProgressValue(hwnd, prg.totalProgress, prg.totalBytes);	

-			}				

-

 		}

-	} break;

-

+		break;

 	}

 

 	return FALSE;

@@ -536,24 +479,20 @@ HWND FtMgr_Show(bool bForceActivate, bool bFromMenu)
 

 	bool bJustCreated = (hwndFtMgr == NULL);

 	if (bJustCreated)

-	{

 		hwndFtMgr = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FTMGR), NULL, FtMgrDlgProc);

-	}

-	if (bFromMenu) /* lqbe */

-	{

+

+	if (bFromMenu) { /* lqbe */

 		ShowWindow(hwndFtMgr, SW_RESTORE);

 		ShowWindow(hwndFtMgr, SW_SHOW);

 		SetForegroundWindow(hwndFtMgr);

 		return hwndFtMgr;

 	}

-	else if (bAutoMin && bJustCreated) /* lqbe */

-	{

+	if (bAutoMin && bJustCreated) { /* lqbe */

 		ShowWindow(hwndFtMgr, SW_HIDE);

 		ShowWindow(hwndFtMgr, SW_MINIMIZE);

 		return hwndFtMgr;

 	}

-	else if (bForceActivate) /* lqbe */

-	{

+	if (bForceActivate) { /* lqbe */

 		ShowWindow(hwndFtMgr, SW_RESTORE);

 		ShowWindow(hwndFtMgr, SW_SHOWNOACTIVATE);

 		SetForegroundWindow(hwndFtMgr);

@@ -582,11 +521,13 @@ HWND FtMgr_AddTransfer(FileDlgData *fdd)
 {

 	bool bForceActivate = fdd->send || !DBGetContactSettingByte(NULL, "SRFile", "AutoAccept", 0);

 	TFtMgrData *dat = (TFtMgrData*)GetWindowLongPtr(FtMgr_Show(bForceActivate, false), GWLP_USERDATA);

-	if (dat == NULL) return NULL;

+	if (dat == NULL)

+		return NULL;

+

 	HWND hwndBox = fdd->send ? dat->hwndOutgoing : dat->hwndIncoming;

 	HWND hwndFt = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_FILETRANSFERINFO), hwndBox, DlgProcFileTransfer, (LPARAM)fdd);

 	ShowWindow(hwndFt, SW_SHOWNA);

 	SendMessage(hwndBox, WM_FT_ADD, 0, (LPARAM)hwndFt);

 	FtMgr_ShowPage(fdd->send ? 1 : 0);

 	return hwndFt;

-}
\ No newline at end of file
+}

diff --git a/src/core/stdfile/main.cpp b/src/core/stdfile/main.cpp
new file mode 100644
index 0000000000..ff38be0e8b
--- /dev/null
+++ b/src/core/stdfile/main.cpp
@@ -0,0 +1,88 @@
+/*

+

+Standard URL plugin for Myranda IM

+

+Copyright (C) 2012 George Hazan

+

+This program is free software; you can redistribute it and/or modify

+it under the terms of the GNU General Public License as published by

+the Free Software Foundation; either version 2 of the License, or

+(at your option) any later version.

+

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License along

+with this program; if not, write to the Free Software Foundation, Inc.,

+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

+*/

+

+#include "commonheaders.h"

+

+int LoadSendRecvFileModule(void);

+

+CLIST_INTERFACE* pcli;

+TIME_API tmi;

+HINSTANCE hInst;

+int hLangpack;

+

+pfnSHAutoComplete shAutoComplete;

+ITaskbarList3 * pTaskbarInterface;

+

+PLUGININFOEX pluginInfo = {

+	sizeof(PLUGININFOEX),

+	__PLUGIN_NAME,

+	MIRANDA_VERSION_DWORD,

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

+	UNICODE_AWARE,

+	/* 8d0a046d-8ea9-4c55-b568-38da520564fd */

+	{ 0x8d0a046d, 0x8ea9, 0x4c55, {0xb5, 0x68, 0x38, 0xda, 0x52, 0x05, 0x64, 0xfd}}

+};

+

+static const MUUID interfaces[] = { MIID_SRFILE, MIID_LAST };

+

+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

+{

+	hInst = hinstDLL;

+	return TRUE;

+}

+

+extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)

+{

+	return &pluginInfo;

+}

+

+extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)

+{

+	return interfaces;

+}

+

+extern "C" int __declspec(dllexport) Load(void)

+{

+	mir_getLP(&pluginInfo);

+	mir_getTMI(&tmi);

+

+	pcli = ( CLIST_INTERFACE* )CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, (LPARAM)hInst);

+

+	if ( IsWinVer7Plus())

+		CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_ALL, IID_ITaskbarList3, (void**)&pTaskbarInterface);

+

+	shAutoComplete = (pfnSHAutoComplete)GetProcAddress(GetModuleHandleA("shlwapi"), "SHAutoComplete");

+

+	LoadSendRecvFileModule();

+	return 0;

+}

+

+extern "C" int __declspec(dllexport) Unload(void)

+{

+	if (pTaskbarInterface)

+		pTaskbarInterface->Release();

+

+	return 0;

+}

diff --git a/src/core/stdfile/resource.rc b/src/core/stdfile/resource.rc
new file mode 100644
index 0000000000..10272edbbb
--- /dev/null
+++ b/src/core/stdfile/resource.rc
@@ -0,0 +1,293 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "..\..\resource.h"

+

+#define APSTUDIO_READONLY_SYMBOLS

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

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include <windows.h>

+#include <winres.h>

+

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

+#undef APSTUDIO_READONLY_SYMBOLS

+

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

+// English (United States) resources

+

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+

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

+//

+// Dialog

+//

+

+IDD_FILESEND DIALOGEX 0, 0, 256, 177

+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU

+EXSTYLE WS_EX_CONTROLPARENT

+CAPTION "Send File(s)"

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    EDITTEXT        IDC_MSG,6,102,245,46,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

+    DEFPUSHBUTTON   "&Send",IDOK,67,157,50,15

+    PUSHBUTTON      "Cancel",IDCANCEL,140,157,50,15

+    LTEXT           "To:",IDC_STATIC,6,23,24,9,SS_CENTERIMAGE

+    CONTROL         "",IDC_TO,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,43,24,159,9

+    LTEXT           "File(s):",IDC_STATIC,7,39,30,8

+    EDITTEXT        IDC_FILE,38,38,213,31,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY

+    PUSHBUTTON      "&Choose Again...",IDC_CHOOSE,39,74,77,14

+    RTEXT           "Total size:",IDC_STATIC,119,76,68,8

+    CONTROL         "",IDC_TOTALSIZE,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,191,76,58,8

+    LTEXT           "Description:",IDC_STATIC,6,93,96,8

+    CONTROL         "6",IDC_USERMENU,"MButtonClass",WS_TABSTOP,195,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "&D",IDC_DETAILS,"MButtonClass",WS_TABSTOP,213,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "&H",IDC_HISTORY,"MButtonClass",WS_TABSTOP,231,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "",IDC_PROTOCOL,"Button",BS_OWNERDRAW | WS_TABSTOP,5,7,12,12

+    LTEXT           "",IDC_NAME,19,7,151,9,SS_NOPREFIX | SS_CENTERIMAGE

+END

+

+IDD_FILERECV DIALOGEX 0, 0, 256, 174

+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU

+EXSTYLE WS_EX_CONTROLPARENT

+CAPTION "Incoming File Transfer"

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    DEFPUSHBUTTON   "A&ccept",IDOK,68,155,50,14

+    PUSHBUTTON      "&Decline",IDCANCEL,138,155,50,14

+    LTEXT           "From:",IDC_STATIC,6,20,24,9,SS_CENTERIMAGE

+    CONTROL         "",IDC_FROM,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,39,21,159,9

+    LTEXT           "Date:",IDC_STATIC,6,35,28,9,SS_CENTERIMAGE

+    CONTROL         "",IDC_DATE,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,39,34,159,9

+    LTEXT           "Files:",IDC_STATIC,6,50,28,8

+    EDITTEXT        IDC_FILENAMES,39,50,210,16,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER

+    LTEXT           "Description:",IDC_STATIC,6,69,64,8

+    EDITTEXT        IDC_MSG,6,79,243,45,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY

+    LTEXT           "Save to:",IDC_STATIC,6,131,34,8

+    PUSHBUTTON      "...",IDC_FILEDIRBROWSE,235,130,14,10

+    COMBOBOX        IDC_FILEDIR,45,129,187,108,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP

+    CONTROL         "&A",IDC_ADD,"MButtonClass",WS_TABSTOP,177,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "6",IDC_USERMENU,"MButtonClass",WS_TABSTOP,195,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "&D",IDC_DETAILS,"MButtonClass",WS_TABSTOP,213,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "&H",IDC_HISTORY,"MButtonClass",WS_TABSTOP,231,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "",IDC_PROTOCOL,"Button",BS_OWNERDRAW | WS_TABSTOP,5,7,12,12

+    LTEXT           "",IDC_NAME,19,7,151,9,SS_NOPREFIX | SS_CENTERIMAGE

+END

+

+IDD_FILETRANSFERINFO DIALOGEX 0, 0, 256, 44

+STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    CONTROL         "Contact menu",IDC_CONTACT,"MButtonClass",WS_TABSTOP,5,1,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "",IDC_CONTACTNAME,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_WORDELLIPSIS | WS_GROUP,25,1,174,14

+    CONTROL         "Open...",IDC_OPENFILE,"MButtonClass",WS_DISABLED | WS_TABSTOP,203,1,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "Open folder",IDC_OPENFOLDER,"MButtonClass",WS_TABSTOP,219,1,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "Cancel",IDCANCEL,"MButtonClass",WS_TABSTOP,235,1,16,14,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "",IDC_ALLFILESPROGRESS,"msctls_progress32",PBS_SMOOTH | NOT WS_VISIBLE | WS_DISABLED,25,16,190,12

+    CONTROL         "",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,25,17,190,10

+    ICON            "",IDC_FILEICON,25,15,16,14,SS_CENTERIMAGE | SS_REALSIZEIMAGE

+    CONTROL         "Transfer completed, open file(s).",IDC_TRANSFERCOMPLETED,

+                    "Hyperlink",NOT WS_VISIBLE | WS_TABSTOP,42,17,173,10

+    LTEXT           "No data transferred",IDC_ALLTRANSFERRED,25,29,226,14,SS_NOPREFIX | SS_CENTERIMAGE

+    RTEXT           "",IDC_ALLSPEED,25,29,226,14,SS_NOPREFIX | SS_CENTERIMAGE

+    LTEXT           "",IDC_ALLPRECENTS,218,14,33,14,SS_CENTERIMAGE

+    CONTROL         "",IDC_FRAME,"Static",SS_ETCHEDHORZ,1,43,254,1

+END

+

+IDD_FILEEXISTS DIALOGEX 0, 0, 288, 181

+STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

+EXSTYLE WS_EX_CONTROLPARENT

+CAPTION "File Already Exists"

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    PUSHBUTTON      "Resume",IDC_RESUME,5,144,65,14

+    PUSHBUTTON      "Resume all",IDC_RESUMEALL,5,162,65,14

+    PUSHBUTTON      "Overwrite",IDC_OVERWRITE,76,144,65,14

+    PUSHBUTTON      "Overwrite all",IDC_OVERWRITEALL,76,162,65,14

+    PUSHBUTTON      "Save as...",IDC_SAVEAS,147,144,65,14

+    PUSHBUTTON      "Auto rename",IDC_AUTORENAME,147,162,65,14

+    PUSHBUTTON      "Skip",IDC_SKIP,218,144,65,14

+    PUSHBUTTON      "Cancel transfer",IDCANCEL,218,162,65,14

+    LTEXT           "You are about to receive the file",IDC_STATIC,5,5,278,8

+    EDITTEXT        IDC_FILENAME,15,16,268,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER

+    GROUPBOX        "Existing file",IDC_STATIC,5,29,278,61

+    ICON            "",IDC_EXISTINGICON,14,45,20,20,SS_NOTIFY

+    LTEXT           "Size:",IDC_STATIC,40,42,27,8

+    LTEXT           "",IDC_EXISTINGSIZE,67,42,35,8

+    RTEXT           "Last modified:",IDC_STATIC,103,42,58,8

+    LTEXT           "",IDC_EXISTINGDATE,166,42,115,8

+    LTEXT           "Type:",IDC_STATIC,40,55,27,8

+    LTEXT           "",IDC_EXISTINGTYPE,67,55,214,8

+    PUSHBUTTON      "Open file",IDC_OPENFILE,12,70,62,13

+    PUSHBUTTON      "Open folder",IDC_OPENFOLDER,82,70,62,13

+    PUSHBUTTON      "File properties",IDC_PROPERTIES,201,70,74,13

+    GROUPBOX        "File being received",IDC_STATIC,5,95,278,42

+    ICON            "",IDC_NEWICON,14,110,20,20,SS_NOTIFY

+    LTEXT           "Size:",IDC_STATIC,40,108,27,8

+    LTEXT           "",IDC_NEWSIZE,67,108,35,8

+    RTEXT           "Last modified:",IDC_STATIC,103,108,58,8

+    LTEXT           "",IDC_NEWDATE,166,108,115,8

+    LTEXT           "Type:",IDC_STATIC,40,121,27,8

+    LTEXT           "",IDC_NEWTYPE,67,121,214,8

+END

+

+IDD_FTMGR DIALOGEX 0, 0, 276, 255

+STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

+CAPTION "File Transfers"

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+    CONTROL         "",IDC_TABS,"SysTabControl32",0x0,7,7,262,224

+    PUSHBUTTON      "Clear completed",IDC_CLEAR,7,234,100,14

+    PUSHBUTTON      "Close",IDCANCEL,219,234,50,14

+END

+

+IDD_FTPAGE DIALOGEX 0, 0, 320, 183

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VSCROLL | WS_SYSMENU

+EXSTYLE WS_EX_CONTROLPARENT | WS_EX_STATICEDGE

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+END

+

+IDD_OPT_FILETRANSFER DIALOGEX 0, 0, 313, 232

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

+EXSTYLE WS_EX_CONTROLPARENT

+FONT 8, "MS Shell Dlg", 0, 0, 0x1

+BEGIN

+    GROUPBOX        "Receiving files",IDC_STATIC,0,0,313,90

+    LTEXT           "Received files folder:",IDC_STATIC,8,15,82,8

+    EDITTEXT        IDC_FILEDIR,92,13,190,12,ES_AUTOHSCROLL

+    PUSHBUTTON      "...",IDC_FILEDIRBROWSE,287,14,15,11

+    LTEXT           "Variables Allowed: %userid%, %nick%, %proto%, %miranda_path%, %userprofile%",IDC_STATIC,8,27,294,11,WS_DISABLED

+    CONTROL         "Auto-accept incoming files from people on my contact list",IDC_AUTOACCEPT,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,39,294,10

+    CONTROL         "Minimize the file transfer window",IDC_AUTOMIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,52,285,10

+    CONTROL         "Close window when transfer completes",IDC_AUTOCLOSE,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,65,294,10

+    CONTROL         "Clear completed transfers on window closing",IDC_AUTOCLEAR,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,76,294,10

+    GROUPBOX        "Virus scanner",IDC_VIRUSSCANNERGROUP,0,90,313,93

+    LTEXT           "Scan files:",IDC_STATIC,8,102,43,9,SS_CENTERIMAGE

+    CONTROL         "Never, do not use virus scanning",IDC_NOSCANNER,"Button",BS_AUTORADIOBUTTON,52,102,250,10

+    CONTROL         "When all files have been downloaded",IDC_SCANAFTERDL,

+                    "Button",BS_AUTORADIOBUTTON,52,114,250,10

+    CONTROL         "As each file finishes downloading",IDC_SCANDURINGDL,

+                    "Button",BS_AUTORADIOBUTTON,52,126,250,10

+    LTEXT           "Command line:",IDC_ST_CMDLINE,7,142,62,8

+    COMBOBOX        IDC_SCANCMDLINE,70,141,213,71,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP

+    PUSHBUTTON      "...",IDC_SCANCMDLINEBROWSE,287,142,15,11

+    LTEXT           "%f will be replaced by the file or folder name to be scanned",IDC_ST_CMDLINEHELP,70,155,232,8

+    CONTROL         "Warn me before opening a file that has not been scanned",IDC_WARNBEFOREOPENING,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,168,294,10

+    GROUPBOX        "If incoming files already exist",IDC_STATIC,0,187,313,41

+    CONTROL         "Ask me",IDC_ASK,"Button",BS_AUTORADIOBUTTON,8,200,73,10

+    CONTROL         "Resume",IDC_RESUME,"Button",BS_AUTORADIOBUTTON,82,200,125,10

+    CONTROL         "Overwrite",IDC_OVERWRITE,"Button",BS_AUTORADIOBUTTON,8,212,73,10

+    CONTROL         "Rename (append "" (1)"", etc.)",IDC_RENAME,"Button",BS_AUTORADIOBUTTON,82,212,125,10

+    LTEXT           "You will always be asked about files from people not on your contact list",IDC_STATIC,212,198,90,24

+END

+

+#endif    // APSTUDIO_INVOKED

+

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

+//

+// DESIGNINFO

+//

+

+#ifdef APSTUDIO_INVOKED

+    IDD_FILESEND, DIALOG

+    BEGIN

+        LEFTMARGIN, 5

+        RIGHTMARGIN, 251

+        VERTGUIDE, 7

+        VERTGUIDE, 249

+        TOPMARGIN, 5

+        BOTTOMMARGIN, 172

+    END

+

+    IDD_FILERECV, DIALOG

+    BEGIN

+        LEFTMARGIN, 5

+        RIGHTMARGIN, 249

+        VERTGUIDE, 7

+        VERTGUIDE, 249

+        TOPMARGIN, 5

+        BOTTOMMARGIN, 169

+    END

+

+    IDD_FILETRANSFERINFO, DIALOG

+    BEGIN

+        VERTGUIDE, 5

+        VERTGUIDE, 25

+        VERTGUIDE, 36

+        VERTGUIDE, 120

+        VERTGUIDE, 180

+        VERTGUIDE, 215

+        VERTGUIDE, 218

+        VERTGUIDE, 235

+        VERTGUIDE, 251

+        BOTTOMMARGIN, 43

+        HORZGUIDE, 14

+        HORZGUIDE, 28

+        HORZGUIDE, 42

+    END

+

+    IDD_FILEEXISTS, DIALOG

+    BEGIN

+        LEFTMARGIN, 5

+        RIGHTMARGIN, 283

+        TOPMARGIN, 5

+        BOTTOMMARGIN, 176

+    END

+

+    IDD_FTPAGE, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 303

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 176

+    END

+

+    IDD_OPT_KEYWORDFILTER, DIALOG

+    BEGIN

+        LEFTMARGIN, 4

+        RIGHTMARGIN, 247

+        TOPMARGIN, 4

+        BOTTOMMARGIN, 69

+    END

+

+    IDD_OPT_FILETRANSFER, DIALOG

+    BEGIN

+        VERTGUIDE, 8

+        VERTGUIDE, 302

+    END

+

+#endif    // APSTUDIO_INVOKED

+

+#ifdef APSTUDIO_INVOKED

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

+//

+// TEXTINCLUDE

+//

+

+1 TEXTINCLUDE

+BEGIN

+    "..\..\resource.h\0"

+END

+

+2 TEXTINCLUDE

+BEGIN

+    "#include <windows.h>\r\n"

+    "#include <winres.h>\r\n"

+    "\0"

+END

+

+3 TEXTINCLUDE

+BEGIN

+    "\r\n"

+    "\0"

+END

+

+#endif    // APSTUDIO_INVOKED

diff --git a/src/core/stdfile/stdfile_10.vcxproj b/src/core/stdfile/stdfile_10.vcxproj
new file mode 100644
index 0000000000..30433fab97
--- /dev/null
+++ b/src/core/stdfile/stdfile_10.vcxproj
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup Label="ProjectConfigurations">

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectName>stdfile</ProjectName>

+    <ProjectGuid>{6022990D-3FD5-46A9-8AB5-E444C51646F3}</ProjectGuid>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Core\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Core\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Core\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Core\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>

+    <IgnoreImportLibrary>true</IgnoreImportLibrary>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <AdditionalIncludeDirectories>..\..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <FloatingPointModel>Fast</FloatingPointModel>

+      <WarningLevel>Level3</WarningLevel>

+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <BaseAddress>0x3ae00000</BaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

+      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>false</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <BaseAddress>0x3ae00000</BaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

+      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <AdditionalIncludeDirectories>..\..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>true</StringPooling>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <FloatingPointModel>Fast</FloatingPointModel>

+      <WarningLevel>Level3</WarningLevel>

+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <BaseAddress>0x3ae00000</BaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

+      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>..\..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;ADDCONTACTPLUS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <StringPooling>false</StringPooling>

+      <MinimalRebuild>true</MinimalRebuild>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

+      <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <BaseAddress>0x3ae00000</BaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <SubSystem>Windows</SubSystem>

+      <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="commonheaders.cpp">

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="file.cpp" />

+    <ClCompile Include="fileexistsdlg.cpp" />

+    <ClCompile Include="fileopts.cpp" />

+    <ClCompile Include="filerecvdlg.cpp" />

+    <ClCompile Include="filesenddlg.cpp" />

+    <ClCompile Include="filexferdlg.cpp" />

+    <ClCompile Include="ftmanager.cpp" />

+    <ClCompile Include="main.cpp" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\stdplug.h" />

+    <ClInclude Include="commonheaders.h" />

+    <ClInclude Include="file.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="resource.rc" />

+    <ResourceCompile Include="version.rc" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/src/core/stdfile/stdfile_10.vcxproj.filters b/src/core/stdfile/stdfile_10.vcxproj.filters
new file mode 100644
index 0000000000..596bc83397
--- /dev/null
+++ b/src/core/stdfile/stdfile_10.vcxproj.filters
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{5c074c9e-6c66-4233-bbd3-a50170fccf47}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{e30af2c4-42d4-4342-8eb9-2dbca157c6bb}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{9208a050-ffae-47fa-bc98-4ca4f79d37d7}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="commonheaders.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="main.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="file.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="fileexistsdlg.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="fileopts.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="filerecvdlg.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="filesenddlg.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="filexferdlg.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ftmanager.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\stdplug.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="commonheaders.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="file.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <ResourceCompile Include="resource.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/src/core/stdfile/version.h b/src/core/stdfile/version.h
new file mode 100644
index 0000000000..244194696b
--- /dev/null
+++ b/src/core/stdfile/version.h
@@ -0,0 +1,14 @@
+

+#include <m_version.h>

+

+#define __FILEVERSION_STRING		MIRANDA_VERSION_FILEVERSION

+#define __VERSION_STRING			MIRANDA_VERSION_STRING

+

+#define __PLUGIN_NAME				"stdfile"

+#define __INTERNAL_NAME				"stdfile"

+#define __FILENAME					"stdfile.dll"

+#define __DESCRIPTION 				"Core module for sending/receiving file transfer requests."

+#define __AUTHOR                 "Myranda team"

+#define __AUTHOREMAIL				""

+#define __AUTHORWEB					"http://nightly.miranda.im"

+#define __COPYRIGHT					"© 2012 Myranda team"

diff --git a/src/core/stdfile/version.rc b/src/core/stdfile/version.rc
new file mode 100644
index 0000000000..e637f0cb33
--- /dev/null
+++ b/src/core/stdfile/version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "afxres.h"

+#include "version.h"

+

+#ifdef _WIN32

+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

+#endif //_WIN32

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END

diff --git a/src/mir_core/miranda.h b/src/mir_core/miranda.h
index af71276ac4..a83d6e2c2f 100644
--- a/src/mir_core/miranda.h
+++ b/src/mir_core/miranda.h
@@ -2,8 +2,8 @@
 

 Miranda IM: the free IM client for Microsoft* Windows*

 

-Copyright 2000-2009 Miranda ICQ/IM project, 

-all portions of this codebase are copyrighted to the people 

+Copyright 2000-2009 Miranda ICQ/IM project,

+all portions of this codebase are copyrighted to the people

 listed in contributors.txt.

 

 This program is free software; you can redistribute it and/or

@@ -11,7 +11,7 @@ modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2

 of the License, or (at your option) any later version.

 

-This program is distributed in the hope that it will be useful, 

+This program is distributed in the hope that it will be useful,

 but WITHOUT ANY WARRANTY; without even the implied warranty of

 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 GNU General Public License for more details.

@@ -21,10 +21,7 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

 */

 

-#define NEWSTR_ALLOCA(A) (A == NULL)?NULL:strcpy((char*)alloca(strlen(A)+1), A)

-#define NEWTSTR_ALLOCA(A) (A == NULL)?NULL:_tcscpy((TCHAR*)alloca((_tcslen(A)+1)* sizeof(TCHAR)), A)

-

-extern "C" 

+extern "C"

 {

 	MIR_CORE_DLL(int) Langpack_MarkPluginLoaded(PLUGININFOEX* pInfo);

 };

diff --git a/src/miranda32_10.vcxproj b/src/miranda32_10.vcxproj
index 7e4bbd5983..4f6985d55d 100644
--- a/src/miranda32_10.vcxproj
+++ b/src/miranda32_10.vcxproj
@@ -269,7 +269,6 @@
     <ClInclude Include="..\include\m_protoint.h" />

     <ClInclude Include="modules\plugins\plugins.h" />

     <ClInclude Include="modules\skin\skin.h" />

-    <ClInclude Include="modules\srfile\file.h" />

     <ClInclude Include="modules\clist\clc.h" />

     <ClInclude Include="modules\clist\genmenu.h" />

     <ClInclude Include="modules\fonts\FontService.h" />

@@ -458,39 +457,12 @@
     <ClCompile Include="modules\skin\sounds.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="modules\srauth\auth.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\srauth\authdialogs.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

     <ClCompile Include="modules\srawaymsg\awaymsg.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

     <ClCompile Include="modules\srawaymsg\sendmsg.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

-    <ClCompile Include="modules\srfile\file.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\fileexistsdlg.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\fileopts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\filerecvdlg.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\filesenddlg.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\filexferdlg.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\ftmanager.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

     <ClCompile Include="modules\updatenotify\updatenotify.cpp">

       <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

     </ClCompile>

diff --git a/src/miranda32_10.vcxproj.filters b/src/miranda32_10.vcxproj.filters
index e7ef18e256..2cd789a1ad 100644
--- a/src/miranda32_10.vcxproj.filters
+++ b/src/miranda32_10.vcxproj.filters
@@ -58,15 +58,9 @@
     <Filter Include="Modules\skin">

       <UniqueIdentifier>{474a2558-48fd-45d5-b8e8-3a07d780f02a}</UniqueIdentifier>

     </Filter>

-    <Filter Include="Modules\srauth">

-      <UniqueIdentifier>{ec3937ae-458b-400e-a9de-8f1923e993ed}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Modules\srawaymsg">

       <UniqueIdentifier>{ede3d43b-a5cf-462a-90df-4ddd7a091234}</UniqueIdentifier>

     </Filter>

-    <Filter Include="Modules\srfile">

-      <UniqueIdentifier>{3fbbdcec-4a5c-4c83-8e94-724103f35d47}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Modules\updater">

       <UniqueIdentifier>{9074e889-f17c-4c90-a3cf-1cfb2e513491}</UniqueIdentifier>

     </Filter>

@@ -228,9 +222,6 @@
     <ClInclude Include="..\include\m_protoint.h">

       <Filter>Modules\protocols</Filter>

     </ClInclude>

-    <ClInclude Include="modules\srfile\file.h">

-      <Filter>Modules\srfile</Filter>

-    </ClInclude>

     <ClInclude Include="modules\clist\clc.h">

       <Filter>Modules\clist</Filter>

     </ClInclude>

@@ -440,39 +431,12 @@
     <ClCompile Include="modules\skin\sounds.cpp">

       <Filter>Modules\skin</Filter>

     </ClCompile>

-    <ClCompile Include="modules\srauth\auth.cpp">

-      <Filter>Modules\srauth</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\srauth\authdialogs.cpp">

-      <Filter>Modules\srauth</Filter>

-    </ClCompile>

     <ClCompile Include="modules\srawaymsg\awaymsg.cpp">

       <Filter>Modules\srawaymsg</Filter>

     </ClCompile>

     <ClCompile Include="modules\srawaymsg\sendmsg.cpp">

       <Filter>Modules\srawaymsg</Filter>

     </ClCompile>

-    <ClCompile Include="modules\srfile\file.cpp">

-      <Filter>Modules\srfile</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\fileexistsdlg.cpp">

-      <Filter>Modules\srfile</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\fileopts.cpp">

-      <Filter>Modules\srfile</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\filerecvdlg.cpp">

-      <Filter>Modules\srfile</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\filesenddlg.cpp">

-      <Filter>Modules\srfile</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\filexferdlg.cpp">

-      <Filter>Modules\srfile</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\srfile\ftmanager.cpp">

-      <Filter>Modules\srfile</Filter>

-    </ClCompile>

     <ClCompile Include="modules\updatenotify\updatenotify.cpp">

       <Filter>Modules\updater</Filter>

     </ClCompile>

diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp
index d9299c6c5d..2a8acd4a37 100644
--- a/src/modules/database/database.cpp
+++ b/src/modules/database/database.cpp
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 #include "..\..\core\commonheaders.h"

 #include "profilemanager.h"

-#include "../srfile/file.h"

 

 // contains the location of mirandaboot.ini

 extern TCHAR mirandabootini[MAX_PATH];

diff --git a/src/modules/database/dbini.cpp b/src/modules/database/dbini.cpp
index d8da15eac6..c065949ee4 100644
--- a/src/modules/database/dbini.cpp
+++ b/src/modules/database/dbini.cpp
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "..\..\core\commonheaders.h"

-#include "../srfile/file.h"

 

 static bool bModuleInitialized = false;

 static HANDLE hIniChangeNotification;

diff --git a/src/modules/netlib/netliblog.cpp b/src/modules/netlib/netliblog.cpp
index ff352b5b55..bdfd57295f 100644
--- a/src/modules/netlib/netliblog.cpp
+++ b/src/modules/netlib/netliblog.cpp
@@ -23,7 +23,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "..\..\core\commonheaders.h"

 #include "netlib.h"

-#include "../srfile/file.h"

 

 #define MS_NETLIB_LOGWIN "Netlib/Log/Win"

 

diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp
index 8a12239c48..b490b0188c 100644
--- a/src/modules/protocols/protocols.cpp
+++ b/src/modules/protocols/protocols.cpp
@@ -144,92 +144,6 @@ static INT_PTR Proto_RegisterModule(WPARAM, LPARAM lParam)
 /////////////////////////////////////////////////////////////////////////////////////////

 // Basic core services

 

-static INT_PTR Proto_RecvFile(WPARAM, LPARAM lParam)

-{

-	CCSDATA* ccs = (CCSDATA*)lParam;

-	PROTORECVEVENT* pre = (PROTORECVEVENT*)ccs->lParam;

-	char* szFile = pre->szMessage + sizeof(DWORD);

-	char* szDescr = szFile + strlen(szFile) + 1;

-

-	// Suppress the standard event filter

-	if (pre->lParam != NULL)

-		*(DWORD*)pre->szMessage = 0;

-

-	DBEVENTINFO dbei = { 0 };

-	dbei.cbSize = sizeof(dbei);

-	dbei.szModule = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0);

-	dbei.timestamp = pre->timestamp;

-	dbei.flags = (pre->flags & PREF_CREATEREAD) ? DBEF_READ : 0;

-	dbei.flags |= (pre->flags & PREF_UTF) ? DBEF_UTF : 0;

-	dbei.eventType = EVENTTYPE_FILE;

-	dbei.cbBlob = (DWORD)(sizeof(DWORD) + strlen(szFile) + strlen(szDescr) + 2);

-	dbei.pBlob = (PBYTE)pre->szMessage;

-	HANDLE hdbe = (HANDLE)CallService(MS_DB_EVENT_ADD, (WPARAM)ccs->hContact, (LPARAM)&dbei);

-

-	if (pre->lParam != NULL)

-		PushFileEvent(ccs->hContact, hdbe, pre->lParam);

-	return 0;

-}

-

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

-

-static void sttRecvCreateBlob(DBEVENTINFO& dbei, int fileCount, char** pszFiles, char* szDescr)

-{

-	dbei.cbBlob = sizeof(DWORD);

-	{

-		for (int i=0; i < fileCount; i++)

-			dbei.cbBlob += lstrlenA(pszFiles[i]) + 1;

-	}

-	

-	dbei.cbBlob += lstrlenA(szDescr) + 1;

-

-	if ((dbei.pBlob = (BYTE*)mir_alloc(dbei.cbBlob)) == 0)

-		return;

-

-	*(DWORD*)dbei.pBlob = 0;

-	BYTE* p = dbei.pBlob + sizeof(DWORD);

-	for (int i=0; i < fileCount; i++) {

-		strcpy((char*)p, pszFiles[i]);

-		p += lstrlenA(pszFiles[i]) + 1;

-	}

-	strcpy((char*)p, (szDescr == NULL) ? "" : szDescr);

-}

-

-static INT_PTR Proto_RecvFileT(WPARAM, LPARAM lParam)

-{

-	CCSDATA* ccs = (CCSDATA*)lParam;

-	PROTORECVFILET* pre = (PROTORECVFILET*)ccs->lParam;

-	if (pre->fileCount == 0)

-		return 0;

-

-	DBEVENTINFO dbei = { 0 };

-	dbei.cbSize = sizeof(dbei);

-	dbei.szModule = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0);

-	dbei.timestamp = pre->timestamp;

-	dbei.flags = (pre->flags & PREF_CREATEREAD) ? DBEF_READ : 0;

-	dbei.eventType = EVENTTYPE_FILE;

-

-	char** pszFiles = (char**)alloca(pre->fileCount * sizeof(char*));

-	{

-		for (int i=0; i < pre->fileCount; i++)

-			pszFiles[i] = Utf8EncodeT(pre->ptszFiles[i]);

-	}

-	char* szDescr = Utf8EncodeT(pre->tszDescription);

-	dbei.flags |= DBEF_UTF;

-	sttRecvCreateBlob(dbei, pre->fileCount, pszFiles, szDescr);

-	{

-		for (int i=0; i < pre->fileCount; i++)

-			mir_free(pszFiles[i]);

-	}

-	mir_free(szDescr);

-

-	HANDLE hdbe = (HANDLE)CallService(MS_DB_EVENT_ADD, (WPARAM)ccs->hContact, (LPARAM)&dbei);

-

-	PushFileEvent(ccs->hContact, hdbe, pre->lParam);

-	mir_free(dbei.pBlob);

-	return 0;

-}

-

 static INT_PTR Proto_RecvMessage(WPARAM, LPARAM lParam)

 {

 	CCSDATA *ccs = (CCSDATA*)lParam;

@@ -766,7 +680,6 @@ int LoadProtocolsModule(void)
 	InsertServiceListItem(109, PS_SEARCHBYNAMEW);

 	InsertServiceListItem(110, PS_SEARCHBYEMAILW);

 

-

 	hAckEvent = CreateHookableEvent(ME_PROTO_ACK);

 	hTypeEvent = CreateHookableEvent(ME_PROTO_CONTACTISTYPING);

 	hAccListChanged = CreateHookableEvent(ME_PROTO_ACCLISTCHANGED);

@@ -778,8 +691,6 @@ int LoadProtocolsModule(void)
 	CreateServiceFunction(MS_PROTO_SELFISTYPING,     Proto_SelfIsTyping);

 	CreateServiceFunction(MS_PROTO_CONTACTISTYPING,  Proto_ContactIsTyping);

 

-	CreateServiceFunction(MS_PROTO_RECVFILE,         Proto_RecvFile);

-	CreateServiceFunction(MS_PROTO_RECVFILET,        Proto_RecvFileT);

 	CreateServiceFunction(MS_PROTO_RECVMSG,          Proto_RecvMessage);

 

 	CreateServiceFunction("Proto/EnumProtocols",     Proto_EnumAccounts);

diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp
index 8470ef308a..041132c1f5 100644
--- a/src/modules/protocols/protoint.cpp
+++ b/src/modules/protocols/protoint.cpp
@@ -24,7 +24,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "..\..\core\commonheaders.h"

 

 char** __fastcall Proto_FilesMatrixA(TCHAR **files);

-void FreeFilesMatrix(TCHAR ***files);

+

+void FreeFilesMatrix(TCHAR ***files)

+{

+	if (*files == NULL)

+		return;

+

+	// Free each filename in the pointer array

+	TCHAR **pFile = *files;

+	while (*pFile != NULL)

+	{

+		mir_free(*pFile);

+		*pFile = NULL;

+		pFile++;

+	}

+

+	// Free the array itself

+	mir_free(*files);

+	*files = NULL;

+}

 

 INT_PTR __fastcall MyCallProtoService(const char *szModule, const char *szService, WPARAM wParam, LPARAM lParam)

 {

diff --git a/src/modules/utils/path.cpp b/src/modules/utils/path.cpp
index 7ce014725d..0ce1eae95a 100644
--- a/src/modules/utils/path.cpp
+++ b/src/modules/utils/path.cpp
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 #include "..\..\core\commonheaders.h"

 #include "../database/profilemanager.h"

-#include "../srfile/file.h"

 

 extern TCHAR g_profileDir[MAX_PATH];

 

diff --git a/src/resource.rc b/src/resource.rc
index 833b4260ce..9efc5754b2 100644
--- a/src/resource.rc
+++ b/src/resource.rc
@@ -40,24 +40,6 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,148,98,50,14

 END

 

-IDD_AUTHREQ DIALOGEX 0, 0, 271, 197

-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION

-EXSTYLE WS_EX_CONTROLPARENT

-CAPTION "Authorization Request"

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    CONTROL         "",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,271,25

-    DEFPUSHBUTTON   "&Authorize",IDOK,17,176,50,14

-    PUSHBUTTON      "&Deny",IDCANCEL,97,176,50,14

-    PUSHBUTTON      "Decide &Later",IDC_DECIDELATER,175,176,74,14

-    CONTROL         "&I",IDC_DETAILS,"MButtonClass",WS_TABSTOP,248,29,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    LTEXT           "Reason:",IDC_STATIC,7,39,101,10,SS_CENTERIMAGE

-    EDITTEXT        IDC_REASON,7,50,257,54,ES_MULTILINE | ES_READONLY | NOT WS_BORDER | WS_VSCROLL | WS_HSCROLL,WS_EX_STATICEDGE

-    LTEXT           "Denial Reason:",IDC_STATIC,7,111,89,10,SS_CENTERIMAGE | SS_REALSIZECONTROL

-    EDITTEXT        IDC_DENYREASON,7,124,257,32,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | NOT WS_BORDER,WS_EX_STATICEDGE

-    CONTROL         "Add to contact list if authorized",IDC_ADDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,162,239,10

-END

-

 IDD_ADDCONTACT DIALOGEX 0, 0, 230, 151

 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

 EXSTYLE WS_EX_CONTROLPARENT

@@ -77,18 +59,6 @@ BEGIN
     EDITTEXT        IDC_AUTHREQ,13,89,204,29,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

 END

 

-IDD_ADDED DIALOGEX 0, 0, 241, 70

-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-CAPTION "You Were Added"

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    CONTROL         "",IDC_HEADERBAR,"MHeaderbarCtrl",0x0,0,0,241,25

-    PUSHBUTTON      "&Close",IDCANCEL,90,51,60,14

-    CONTROL         "&I",IDC_DETAILS,"MButtonClass",WS_TABSTOP,217,29,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&U",IDC_ADD,"MButtonClass",WS_TABSTOP,197,29,16,14,WS_EX_NOACTIVATE | 0x10000000L

-END

-

 IDD_ABOUT DIALOGEX 0, 0, 212, 131

 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

 EXSTYLE WS_EX_CONTROLPARENT

@@ -335,115 +305,6 @@ BEGIN
     LTEXT           "Find What:",IDC_STATIC,7,13,39,9

 END

 

-IDD_FILESEND DIALOGEX 0, 0, 256, 177

-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-CAPTION "Send File(s)"

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    EDITTEXT        IDC_MSG,6,102,245,46,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

-    DEFPUSHBUTTON   "&Send",IDOK,67,157,50,15

-    PUSHBUTTON      "Cancel",IDCANCEL,140,157,50,15

-    LTEXT           "To:",IDC_STATIC,6,23,24,9,SS_CENTERIMAGE

-    CONTROL         "",IDC_TO,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,43,24,159,9

-    LTEXT           "File(s):",IDC_STATIC,7,39,30,8

-    EDITTEXT        IDC_FILE,38,38,213,31,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY

-    PUSHBUTTON      "&Choose Again...",IDC_CHOOSE,39,74,77,14

-    RTEXT           "Total size:",IDC_STATIC,119,76,68,8

-    CONTROL         "",IDC_TOTALSIZE,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,191,76,58,8

-    LTEXT           "Description:",IDC_STATIC,6,93,96,8

-    CONTROL         "6",IDC_USERMENU,"MButtonClass",WS_TABSTOP,195,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&D",IDC_DETAILS,"MButtonClass",WS_TABSTOP,213,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&H",IDC_HISTORY,"MButtonClass",WS_TABSTOP,231,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "",IDC_PROTOCOL,"Button",BS_OWNERDRAW | WS_TABSTOP,5,7,12,12

-    LTEXT           "",IDC_NAME,19,7,151,9,SS_NOPREFIX | SS_CENTERIMAGE

-END

-

-IDD_FILERECV DIALOGEX 0, 0, 256, 174

-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-CAPTION "Incoming File Transfer"

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    DEFPUSHBUTTON   "A&ccept",IDOK,68,155,50,14

-    PUSHBUTTON      "&Decline",IDCANCEL,138,155,50,14

-    LTEXT           "From:",IDC_STATIC,6,20,24,9,SS_CENTERIMAGE

-    CONTROL         "",IDC_FROM,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,39,21,159,9

-    LTEXT           "Date:",IDC_STATIC,6,35,28,9,SS_CENTERIMAGE

-    CONTROL         "",IDC_DATE,"Static",SS_SIMPLE | SS_NOPREFIX | WS_GROUP,39,34,159,9

-    LTEXT           "Files:",IDC_STATIC,6,50,28,8

-    EDITTEXT        IDC_FILENAMES,39,50,210,16,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | NOT WS_BORDER

-    LTEXT           "Description:",IDC_STATIC,6,69,64,8

-    EDITTEXT        IDC_MSG,6,79,243,45,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY

-    LTEXT           "Save to:",IDC_STATIC,6,131,34,8

-    PUSHBUTTON      "...",IDC_FILEDIRBROWSE,235,130,14,10

-    COMBOBOX        IDC_FILEDIR,45,129,187,108,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP

-    CONTROL         "&A",IDC_ADD,"MButtonClass",WS_TABSTOP,177,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "6",IDC_USERMENU,"MButtonClass",WS_TABSTOP,195,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&D",IDC_DETAILS,"MButtonClass",WS_TABSTOP,213,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&H",IDC_HISTORY,"MButtonClass",WS_TABSTOP,231,5,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "",IDC_PROTOCOL,"Button",BS_OWNERDRAW | WS_TABSTOP,5,7,12,12

-    LTEXT           "",IDC_NAME,19,7,151,9,SS_NOPREFIX | SS_CENTERIMAGE

-END

-

-IDD_FILETRANSFERINFO DIALOGEX 0, 0, 256, 44

-STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    CONTROL         "Contact menu",IDC_CONTACT,"MButtonClass",WS_TABSTOP,5,1,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "",IDC_CONTACTNAME,"Static",SS_LEFTNOWORDWRAP | SS_CENTERIMAGE | SS_WORDELLIPSIS | WS_GROUP,25,1,174,14

-    CONTROL         "Open...",IDC_OPENFILE,"MButtonClass",WS_DISABLED | WS_TABSTOP,203,1,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "Open folder",IDC_OPENFOLDER,"MButtonClass",WS_TABSTOP,219,1,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "Cancel",IDCANCEL,"MButtonClass",WS_TABSTOP,235,1,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "",IDC_ALLFILESPROGRESS,"msctls_progress32",PBS_SMOOTH | NOT WS_VISIBLE | WS_DISABLED,25,16,190,12

-    CONTROL         "",IDC_STATUS,"Static",SS_LEFTNOWORDWRAP | SS_NOPREFIX | WS_GROUP,25,17,190,10

-    ICON            "",IDC_FILEICON,25,15,16,14,SS_CENTERIMAGE | SS_REALSIZEIMAGE

-    CONTROL         "Transfer completed, open file(s).",IDC_TRANSFERCOMPLETED,

-                    "Hyperlink",NOT WS_VISIBLE | WS_TABSTOP,42,17,173,10

-    LTEXT           "No data transferred",IDC_ALLTRANSFERRED,25,29,226,14,SS_NOPREFIX | SS_CENTERIMAGE

-    RTEXT           "",IDC_ALLSPEED,25,29,226,14,SS_NOPREFIX | SS_CENTERIMAGE

-    LTEXT           "",IDC_ALLPRECENTS,218,14,33,14,SS_CENTERIMAGE

-    CONTROL         "",IDC_FRAME,"Static",SS_ETCHEDHORZ,1,43,254,1

-END

-

-IDD_FILEEXISTS DIALOGEX 0, 0, 288, 181

-STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT

-CAPTION "File Already Exists"

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    PUSHBUTTON      "Resume",IDC_RESUME,5,144,65,14

-    PUSHBUTTON      "Resume all",IDC_RESUMEALL,5,162,65,14

-    PUSHBUTTON      "Overwrite",IDC_OVERWRITE,76,144,65,14

-    PUSHBUTTON      "Overwrite all",IDC_OVERWRITEALL,76,162,65,14

-    PUSHBUTTON      "Save as...",IDC_SAVEAS,147,144,65,14

-    PUSHBUTTON      "Auto rename",IDC_AUTORENAME,147,162,65,14

-    PUSHBUTTON      "Skip",IDC_SKIP,218,144,65,14

-    PUSHBUTTON      "Cancel transfer",IDCANCEL,218,162,65,14

-    LTEXT           "You are about to receive the file",IDC_STATIC,5,5,278,8

-    EDITTEXT        IDC_FILENAME,15,16,268,8,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER

-    GROUPBOX        "Existing file",IDC_STATIC,5,29,278,61

-    ICON            "",IDC_EXISTINGICON,14,45,20,20,SS_NOTIFY

-    LTEXT           "Size:",IDC_STATIC,40,42,27,8

-    LTEXT           "",IDC_EXISTINGSIZE,67,42,35,8

-    RTEXT           "Last modified:",IDC_STATIC,103,42,58,8

-    LTEXT           "",IDC_EXISTINGDATE,166,42,115,8

-    LTEXT           "Type:",IDC_STATIC,40,55,27,8

-    LTEXT           "",IDC_EXISTINGTYPE,67,55,214,8

-    PUSHBUTTON      "Open file",IDC_OPENFILE,12,70,62,13

-    PUSHBUTTON      "Open folder",IDC_OPENFOLDER,82,70,62,13

-    PUSHBUTTON      "File properties",IDC_PROPERTIES,201,70,74,13

-    GROUPBOX        "File being received",IDC_STATIC,5,95,278,42

-    ICON            "",IDC_NEWICON,14,110,20,20,SS_NOTIFY

-    LTEXT           "Size:",IDC_STATIC,40,108,27,8

-    LTEXT           "",IDC_NEWSIZE,67,108,35,8

-    RTEXT           "Last modified:",IDC_STATIC,103,108,58,8

-    LTEXT           "",IDC_NEWDATE,166,108,115,8

-    LTEXT           "Type:",IDC_STATIC,40,121,27,8

-    LTEXT           "",IDC_NEWTYPE,67,121,214,8

-END

-

 IDD_HISTORY DIALOGEX 0, 0, 296, 166

 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

 EXSTYLE WS_EX_CONTROLPARENT

@@ -605,44 +466,6 @@ BEGIN
     CTEXT           "You will need to reconnect for the changes you have made on this page to take effect.",IDC_RECONNECTREQD,4,224,307,8,NOT WS_VISIBLE

 END

 

-IDD_OPT_FILETRANSFER DIALOGEX 0, 0, 313, 232

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    GROUPBOX        "Receiving files",IDC_STATIC,0,0,313,90

-    LTEXT           "Received files folder:",IDC_STATIC,8,15,82,8

-    EDITTEXT        IDC_FILEDIR,92,13,190,12,ES_AUTOHSCROLL

-    PUSHBUTTON      "...",IDC_FILEDIRBROWSE,287,14,15,11

-    LTEXT           "Variables Allowed: %userid%, %nick%, %proto%, %miranda_path%, %userprofile%",IDC_STATIC,8,27,294,11,WS_DISABLED

-    CONTROL         "Auto-accept incoming files from people on my contact list",IDC_AUTOACCEPT,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,39,294,10

-    CONTROL         "Minimize the file transfer window",IDC_AUTOMIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,52,285,10

-    CONTROL         "Close window when transfer completes",IDC_AUTOCLOSE,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,65,294,10

-    CONTROL         "Clear completed transfers on window closing",IDC_AUTOCLEAR,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,76,294,10

-    GROUPBOX        "Virus scanner",IDC_VIRUSSCANNERGROUP,0,90,313,93

-    LTEXT           "Scan files:",IDC_STATIC,8,102,43,9,SS_CENTERIMAGE

-    CONTROL         "Never, do not use virus scanning",IDC_NOSCANNER,"Button",BS_AUTORADIOBUTTON,52,102,250,10

-    CONTROL         "When all files have been downloaded",IDC_SCANAFTERDL,

-                    "Button",BS_AUTORADIOBUTTON,52,114,250,10

-    CONTROL         "As each file finishes downloading",IDC_SCANDURINGDL,

-                    "Button",BS_AUTORADIOBUTTON,52,126,250,10

-    LTEXT           "Command line:",IDC_ST_CMDLINE,7,142,62,8

-    COMBOBOX        IDC_SCANCMDLINE,70,141,213,71,CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-    PUSHBUTTON      "...",IDC_SCANCMDLINEBROWSE,287,142,15,11

-    LTEXT           "%f will be replaced by the file or folder name to be scanned",IDC_ST_CMDLINEHELP,70,155,232,8

-    CONTROL         "Warn me before opening a file that has not been scanned",IDC_WARNBEFOREOPENING,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,168,294,10

-    GROUPBOX        "If incoming files already exist",IDC_STATIC,0,187,313,41

-    CONTROL         "Ask me",IDC_ASK,"Button",BS_AUTORADIOBUTTON,8,200,73,10

-    CONTROL         "Resume",IDC_RESUME,"Button",BS_AUTORADIOBUTTON,82,200,125,10

-    CONTROL         "Overwrite",IDC_OVERWRITE,"Button",BS_AUTORADIOBUTTON,8,212,73,10

-    CONTROL         "Rename (append "" (1)"", etc.)",IDC_RENAME,"Button",BS_AUTORADIOBUTTON,82,212,125,10

-    LTEXT           "You will always be asked about files from people not on your contact list",IDC_STATIC,212,198,90,24

-END

-

 IDD_OPT_IDLE DIALOGEX 0, 0, 312, 193

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_BORDER

 EXSTYLE WS_EX_CONTROLPARENT

@@ -924,23 +747,6 @@ BEGIN
     PUSHBUTTON      "Close",IDCANCEL,110,49,50,14

 END

 

-IDD_FTMGR DIALOGEX 0, 0, 276, 255

-STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

-CAPTION "File Transfers"

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    CONTROL         "",IDC_TABS,"SysTabControl32",0x0,7,7,262,224

-    PUSHBUTTON      "Clear completed",IDC_CLEAR,7,234,100,14

-    PUSHBUTTON      "Close",IDCANCEL,219,234,50,14

-END

-

-IDD_FTPAGE DIALOGEX 0, 0, 320, 183

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VSCROLL | WS_SYSMENU

-EXSTYLE WS_EX_CONTROLPARENT | WS_EX_STATICEDGE

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-END

-

 IDD_OPT_KEYWORDFILTER DIALOGEX 0, 0, 251, 73

 STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

@@ -1111,13 +917,6 @@ END
 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO

 BEGIN

-    IDD_AUTHREQ, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 264

-        BOTTOMMARGIN, 190

-    END

-

     IDD_ADDCONTACT, DIALOG

     BEGIN

         LEFTMARGIN, 7

@@ -1126,14 +925,6 @@ BEGIN
         BOTTOMMARGIN, 144

     END

 

-    IDD_ADDED, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 233

-        TOPMARGIN, 3

-        BOTTOMMARGIN, 65

-    END

-

     IDD_ABOUT, DIALOG

     BEGIN

         LEFTMARGIN, 5

@@ -1269,51 +1060,6 @@ BEGIN
         HORZGUIDE, 17

     END

 

-    IDD_FILESEND, DIALOG

-    BEGIN

-        LEFTMARGIN, 5

-        RIGHTMARGIN, 251

-        VERTGUIDE, 7

-        VERTGUIDE, 249

-        TOPMARGIN, 5

-        BOTTOMMARGIN, 172

-    END

-

-    IDD_FILERECV, DIALOG

-    BEGIN

-        LEFTMARGIN, 5

-        RIGHTMARGIN, 249

-        VERTGUIDE, 7

-        VERTGUIDE, 249

-        TOPMARGIN, 5

-        BOTTOMMARGIN, 169

-    END

-

-    IDD_FILETRANSFERINFO, DIALOG

-    BEGIN

-        VERTGUIDE, 5

-        VERTGUIDE, 25

-        VERTGUIDE, 36

-        VERTGUIDE, 120

-        VERTGUIDE, 180

-        VERTGUIDE, 215

-        VERTGUIDE, 218

-        VERTGUIDE, 235

-        VERTGUIDE, 251

-        BOTTOMMARGIN, 43

-        HORZGUIDE, 14

-        HORZGUIDE, 28

-        HORZGUIDE, 42

-    END

-

-    IDD_FILEEXISTS, DIALOG

-    BEGIN

-        LEFTMARGIN, 5

-        RIGHTMARGIN, 283

-        TOPMARGIN, 5

-        BOTTOMMARGIN, 176

-    END

-

     IDD_HISTORY, DIALOG

     BEGIN

         LEFTMARGIN, 7

@@ -1384,12 +1130,6 @@ BEGIN
         HORZGUIDE, 113

     END

 

-    IDD_OPT_FILETRANSFER, DIALOG

-    BEGIN

-        VERTGUIDE, 8

-        VERTGUIDE, 302

-    END

-

     IDD_PROFILE_NEW, DIALOG

     BEGIN

         LEFTMARGIN, 7

@@ -1464,22 +1204,6 @@ BEGIN
         BOTTOMMARGIN, 248

     END

 

-    IDD_FTPAGE, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 303

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 176

-    END

-

-    IDD_OPT_KEYWORDFILTER, DIALOG

-    BEGIN

-        LEFTMARGIN, 4

-        RIGHTMARGIN, 247

-        TOPMARGIN, 4

-        BOTTOMMARGIN, 69

-    END

-

     IDD_MODERNOPT_FONTS, DIALOG

     BEGIN

         VERTGUIDE, 10