- miranda32.exe now does nothing bug extends PATH to %miranda_root%\libs and loads mir_app.dll;

- everything that was in miranda32.exe (including resources) moved to mir_app.dll;
- exports from mir_app.dll now available for using directly, without perversions;
- src/stdplug.h deleted;

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

370 files changed, 1257 insertions, 4399 deletions

diff --git a/bin10/lib/Miranda32.lib b/bin10/lib/Miranda32.lib
deleted file mode 100644
index 8aad2f9a60..0000000000
--- a/bin10/lib/Miranda32.lib
+++ /dev/null
diff --git a/bin10/lib/Miranda64.lib b/bin10/lib/Miranda64.lib
deleted file mode 100644
index 8d77f2648a..0000000000
--- a/bin10/lib/Miranda64.lib
+++ /dev/null
diff --git a/bin10/lib/mir_app.lib b/bin10/lib/mir_app.lib
new file mode 100644
index 0000000000..c9e7c318f4
--- /dev/null
+++ b/bin10/lib/mir_app.lib
diff --git a/bin10/lib/mir_app64.lib b/bin10/lib/mir_app64.lib
new file mode 100644
index 0000000000..5095803ba9
--- /dev/null
+++ b/bin10/lib/mir_app64.lib
diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib
index 8110b799c5..6b2d344649 100644
--- a/bin10/lib/mir_core.lib
+++ b/bin10/lib/mir_core.lib
diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib
index c478e222db..ac62d6a362 100644
--- a/bin10/lib/mir_core64.lib
+++ b/bin10/lib/mir_core64.lib
diff --git a/bin10/mir_dev.sln b/bin10/mir_dev.sln
index 18b8190648..21a246d4ef 100644
--- a/bin10/mir_dev.sln
+++ b/bin10/mir_dev.sln
@@ -1,10 +1,5 @@
 Microsoft Visual Studio Solution File, Format Version 11.00

 # Visual Studio 2010

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32_10.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"

-	ProjectSection(ProjectDependencies) = postProject

-		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60} = {D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}

-	EndProjectSection

-EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_core", "..\src\mir_core\mir_core_10.vcxproj", "{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVS", "..\plugins\AVS\avs.vcxproj", "{7711F563-6473-4ABD-B5E3-477CE8384AD6}"

@@ -426,6 +421,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MessageState", "..\plugins\
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MirLua", "..\plugins\MirLua\MirLua.vcxproj", "{27D41D81-991F-4DC6-8749-B0321C87E694}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mir_app", "..\src\mir_app\mir_app.vcxproj", "{538E451F-E667-4D07-BCE6-976ECC7BB8D1}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -434,14 +433,6 @@ Global
 		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|Win32.ActiveCfg = Debug|Win32

-		{F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|Win32.Build.0 = Debug|Win32

-		{F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|x64.ActiveCfg = Debug|x64

-		{F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|x64.Build.0 = Debug|x64

-		{F9916510-9055-4C9F-997A-3755DEC1511B}.Release|Win32.ActiveCfg = Release|Win32

-		{F9916510-9055-4C9F-997A-3755DEC1511B}.Release|Win32.Build.0 = Release|Win32

-		{F9916510-9055-4C9F-997A-3755DEC1511B}.Release|x64.ActiveCfg = Release|x64

-		{F9916510-9055-4C9F-997A-3755DEC1511B}.Release|x64.Build.0 = Release|x64

 		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Debug|Win32.ActiveCfg = Debug|Win32

 		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Debug|Win32.Build.0 = Debug|Win32

 		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}.Debug|x64.ActiveCfg = Debug|x64

@@ -1944,6 +1935,22 @@ Global
 		{27D41D81-991F-4DC6-8749-B0321C87E694}.Release|Win32.Build.0 = Release|Win32

 		{27D41D81-991F-4DC6-8749-B0321C87E694}.Release|x64.ActiveCfg = Release|x64

 		{27D41D81-991F-4DC6-8749-B0321C87E694}.Release|x64.Build.0 = Release|x64

+		{538E451F-E667-4D07-BCE6-976ECC7BB8D1}.Debug|Win32.ActiveCfg = Debug|Win32

+		{538E451F-E667-4D07-BCE6-976ECC7BB8D1}.Debug|Win32.Build.0 = Debug|Win32

+		{538E451F-E667-4D07-BCE6-976ECC7BB8D1}.Debug|x64.ActiveCfg = Debug|x64

+		{538E451F-E667-4D07-BCE6-976ECC7BB8D1}.Debug|x64.Build.0 = Debug|x64

+		{538E451F-E667-4D07-BCE6-976ECC7BB8D1}.Release|Win32.ActiveCfg = Release|Win32

+		{538E451F-E667-4D07-BCE6-976ECC7BB8D1}.Release|Win32.Build.0 = Release|Win32

+		{538E451F-E667-4D07-BCE6-976ECC7BB8D1}.Release|x64.ActiveCfg = Release|x64

+		{538E451F-E667-4D07-BCE6-976ECC7BB8D1}.Release|x64.Build.0 = Release|x64

+		{F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|Win32.ActiveCfg = Debug|Win32

+		{F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|Win32.Build.0 = Debug|Win32

+		{F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|x64.ActiveCfg = Debug|x64

+		{F9916510-9055-4C9F-997A-3755DEC1511B}.Debug|x64.Build.0 = Debug|x64

+		{F9916510-9055-4C9F-997A-3755DEC1511B}.Release|Win32.ActiveCfg = Release|Win32

+		{F9916510-9055-4C9F-997A-3755DEC1511B}.Release|Win32.Build.0 = Release|Win32

+		{F9916510-9055-4C9F-997A-3755DEC1511B}.Release|x64.ActiveCfg = Release|x64

+		{F9916510-9055-4C9F-997A-3755DEC1511B}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/bin12/lib/Miranda32.lib b/bin12/lib/Miranda32.lib
deleted file mode 100644
index 8aad2f9a60..0000000000
--- a/bin12/lib/Miranda32.lib
+++ /dev/null
diff --git a/bin12/lib/Miranda64.lib b/bin12/lib/Miranda64.lib
deleted file mode 100644
index 8d77f2648a..0000000000
--- a/bin12/lib/Miranda64.lib
+++ /dev/null
diff --git a/bin12/lib/mir_app.lib b/bin12/lib/mir_app.lib
new file mode 100644
index 0000000000..c9e7c318f4
--- /dev/null
+++ b/bin12/lib/mir_app.lib
diff --git a/bin12/lib/mir_app64.lib b/bin12/lib/mir_app64.lib
new file mode 100644
index 0000000000..5095803ba9
--- /dev/null
+++ b/bin12/lib/mir_app64.lib
diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib
index 8110b799c5..6b2d344649 100644
--- a/bin12/lib/mir_core.lib
+++ b/bin12/lib/mir_core.lib
diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib
index c478e222db..ac62d6a362 100644
--- a/bin12/lib/mir_core64.lib
+++ b/bin12/lib/mir_core64.lib
diff --git a/build/vc.common/lib.props b/build/vc.common/lib.props
new file mode 100644
index 0000000000..dcc90eae91
--- /dev/null
+++ b/build/vc.common/lib.props
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

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

+  <ImportGroup Label="PropertySheets">

+  </ImportGroup>

+  <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>

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

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

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

+  </PropertyGroup>

+  <Import Project="common.props"/>

+</Project>

diff --git a/copylib.cmd b/copylib.cmd
index 6378049b2d..dd205a0435 100644
--- a/copylib.cmd
+++ b/copylib.cmd
@@ -1,5 +1,12 @@
 @echo off

-copy /Y .\Bin10\Debug\Obj\mir_core\mir_core.lib .\Bin10\lib

-copy /Y .\Bin10\Debug64\Obj\mir_core\mir_core64.lib .\Bin10\lib

+copy /Y .\Bin12\Debug\Obj\mir_core\mir_core.lib .\Bin10\lib

+copy /Y .\Bin12\Debug64\Obj\mir_core\mir_core64.lib .\Bin10\lib

+

 copy /Y .\Bin12\Debug\Obj\mir_core\mir_core.lib .\Bin12\lib

-copy /Y .\Bin12\Debug64\Obj\mir_core\mir_core64.lib .\Bin12\lib
\ No newline at end of file
+copy /Y .\Bin12\Debug64\Obj\mir_core\mir_core64.lib .\Bin12\lib

+

+copy /Y .\Bin12\Debug\Obj\mir_app\mir_app.lib .\Bin10\lib\mir_app.lib

+copy /Y .\Bin12\Debug64\Obj\mir_app\mir_app.lib .\Bin10\lib\mir_app64.lib

+

+copy /Y .\Bin12\Debug\Obj\mir_app\mir_app.lib .\Bin12\lib\mir_app.lib

+copy /Y .\Bin12\Debug64\Obj\mir_app\mir_app.lib .\Bin12\lib\mir_app64.lib

diff --git a/include/m_clist.h b/include/m_clist.h
index b4d2ae16e5..86c98c8326 100644
--- a/include/m_clist.h
+++ b/include/m_clist.h
@@ -35,7 +35,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 extern int hLangpack;

 

-#if defined _STATIC

+#if defined MIR_APP_EXPORTS

 	typedef struct _tagIntMenuItem* HGENMENU;

 #else

 	DECLARE_HANDLE(HGENMENU);

diff --git a/include/m_core.h b/include/m_core.h
index 1d5639ed75..788d82e96d 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -40,6 +40,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MIR_CORE_DLL(T) MIR_CORE_EXPORT T __stdcall

 #define MIR_C_CORE_DLL(T) MIR_CORE_EXPORT T __cdecl

 

+#ifdef MIR_APP_EXPORTS

+	#define MIR_APP_EXPORT

+#else

+	#define MIR_APP_EXPORT __declspec(dllimport)

+#endif

+

+#define MIR_APP_DLL(T) MIR_APP_EXPORT T __stdcall

+

 #pragma warning(disable:4201 4127 4706)

 

 #if defined(__cplusplus)

@@ -113,11 +121,9 @@ MIR_CORE_DLL(int)     CallFunctionAsync(void (__stdcall *func)(void *), void *ar
 MIR_CORE_DLL(void)    KillModuleServices(HINSTANCE hInst);

 MIR_CORE_DLL(void)    KillObjectServices(void* pObject);

 

-#if !defined(_STATIC)

-MIR_C_CORE_DLL(int)     ProtoServiceExists(LPCSTR szModule, const char *szService);

-MIR_C_CORE_DLL(INT_PTR) CallContactService(MCONTACT, const char *, WPARAM, LPARAM);

-MIR_C_CORE_DLL(INT_PTR) CallProtoService(LPCSTR szModule, const char *szService, WPARAM wParam, LPARAM lParam);

-#endif

+MIR_APP_DLL(int)      ProtoServiceExists(LPCSTR szModule, const char *szService);

+MIR_APP_DLL(INT_PTR)  CallContactService(MCONTACT, const char*, WPARAM, LPARAM);

+MIR_APP_DLL(INT_PTR)  CallProtoService(LPCSTR szModule, const char *szService, WPARAM wParam, LPARAM lParam);

 

 ///////////////////////////////////////////////////////////////////////////////

 // exceptions

@@ -722,6 +728,8 @@ MIR_CORE_DLL(BOOL)    IsFullScreen();
 MIR_CORE_DLL(BOOL)    IsWorkstationLocked();

 MIR_CORE_DLL(BOOL)    IsScreenSaverRunning();

 

+MIR_APP_DLL(int)      GetPluginLangByInstance(HINSTANCE hInstance);

+

 ///////////////////////////////////////////////////////////////////////////////

 

 MIR_CORE_DLL(void) UnloadCoreModule(void);

@@ -760,11 +768,19 @@ inline int mir_vsnwprintf(wchar_t(&buffer)[_Size], const wchar_t* fmt, va_list v
 #endif

 

 #ifndef MIR_CORE_EXPORTS

-	#if !defined( _WIN64 )

+	#if !defined(_WIN64)

 		#pragma comment(lib, "mir_core.lib")

 	#else

 		#pragma comment(lib, "mir_core64.lib")

 	#endif

 #endif

 

+#ifndef MIR_APP_EXPORTS

+	#if !defined(_WIN64)

+		#pragma comment(lib, "mir_app.lib")

+	#else

+		#pragma comment(lib, "mir_app64.lib")

+	#endif

+#endif

+

 #endif // M_CORE_H

diff --git a/include/m_icolib.h b/include/m_icolib.h
index de1c388b53..e738df1d89 100644
--- a/include/m_icolib.h
+++ b/include/m_icolib.h
@@ -27,6 +27,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 extern int hLangpack;

 

+#ifndef M_CORE_H__

+#include <m_core.h>

+#endif

+

 ///////////////////////////////////////////////////////////////////////////////

 // WARNING: do not use Translate(TS) for p(t)szSection or p(t)szDescription as they

 // are translated by the core, which may lead to double translation.

@@ -58,6 +62,24 @@ typedef struct {
   #define SIDF_ALL_TCHAR  0

 #endif

 

+MIR_APP_DLL(HICON)  LoadSkinProtoIcon(const char *szProto, int status, bool big = false);

+MIR_APP_DLL(HICON)  LoadSkinIcon(int idx, bool big = false);

+MIR_APP_DLL(HANDLE) GetSkinIconHandle(int idx);

+

+MIR_APP_DLL(HANDLE) IcoLib_AddNewIcon(int hLangpack, SKINICONDESC *sid);

+MIR_APP_DLL(HICON)  IcoLib_GetIcon(const char* pszIconName, bool big);

+MIR_APP_DLL(HANDLE) IcoLib_GetIconHandle(const char* pszIconName);

+MIR_APP_DLL(HICON)  IcoLib_GetIconByHandle(HANDLE hItem, bool big);

+MIR_APP_DLL(HANDLE) IcoLib_IsManaged(HICON hIcon);

+MIR_APP_DLL(int)    IcoLib_ReleaseIcon(HICON hIcon, char* szIconName, bool big = false);

+

+MIR_APP_DLL(void)   Button_SetIcon_IcoLib(HWND hDlg, int itemId, int iconId, const char* tooltip);

+MIR_APP_DLL(void)   Button_FreeIcon_IcoLib(HWND hDlg, int itemId);

+

+MIR_APP_DLL(void)   Window_SetIcon_IcoLib(HWND hWnd, int iconId);

+MIR_APP_DLL(void)   Window_SetProtoIcon_IcoLib(HWND hWnd, const char *szProto, int iconId);

+MIR_APP_DLL(void)   Window_FreeIcon_IcoLib(HWND hWnd);

+

 ///////////////////////////////////////////////////////////////////////////////

 //  Adds an icon into options UI

 //

diff --git a/plugins/Clist_blind/res/resource.rc b/plugins/Clist_blind/res/resource.rc
index 175d58206c..a9388733bd 100644
--- a/plugins/Clist_blind/res/resource.rc
+++ b/plugins/Clist_blind/res/resource.rc
@@ -299,7 +299,7 @@ END
 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

 IDI_RENAME              ICON                    "rename.ico"

-IDI_BLANK               ICON                    "..\\..\\..\\src\\res\\_blank.ico"

+IDI_BLANK               ICON                    "..\\..\\..\\src\\mir_app\\res\\_blank.ico"

 IDI_DELETE              ICON                    "delete.ico"

 

 /////////////////////////////////////////////////////////////////////////////

@@ -307,9 +307,9 @@ IDI_DELETE              ICON                    "delete.ico"
 // Cursor

 //

 

-IDC_HYPERLINKHAND       CURSOR                  "..\\..\\..\\src\\res\\cursor_hyperlink.cur"

-IDC_DROP                CURSOR                  "..\\..\\..\\src\\res\\cursor_drag_copy.cur"

-IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\res\\cursor_drop_user.cur"

+IDC_HYPERLINKHAND       CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_hyperlink.cur"

+IDC_DROP                CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_drag_copy.cur"

+IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_drop_user.cur"

 

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
index 512f145f69..63c5f5ef09 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonprototypes.h
@@ -56,7 +56,7 @@ extern BYTE g_bCalledFromShowHide;
 extern HICON g_hListeningToIcon;

 extern HWND g_hCLUIOptionsWnd;

 extern BOOL g_bTransparentFlag;

-extern HINSTANCE g_hInst;

+extern HINSTANCE g_hInst, g_hMirApp;

 extern BOOL g_mutex_bChangingMode;

 extern UINT g_dwMainThreadID;

 extern HANDLE g_hAwayMsgThread, g_hGetTextAsyncThread, g_hSmoothAnimationThread;

diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp
index 870ac56431..a676957105 100644
--- a/plugins/Clist_modern/src/init.cpp
+++ b/plugins/Clist_modern/src/init.cpp
@@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #define CHECKRES(sub) if (sub != S_OK) return S_FALSE;

 

-HINSTANCE g_hInst = 0;

+HINSTANCE g_hInst = 0, g_hMirApp = 0;

 CLIST_INTERFACE *pcli = NULL;

 CLIST_INTERFACE corecli = { 0 };

 CLUIDATA g_CluiData = { 0 };

@@ -80,6 +80,7 @@ extern "C" __declspec(dllexport) int CListInitialise()
 	mir_getTMI(&tmi);

 

 	g_dwMainThreadID = GetCurrentThreadId();

+	g_hMirApp = GetModuleHandleA("mir_app.dll");

 

 	CHECKRES(PreLoadContactListModule());

 	CHECKRES(SubclassClistInterface());

diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index a6cb44c833..2f3a6d4313 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1011,7 +1011,7 @@ static LRESULT clcOnMouseMove(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPAR
 				break;
 			if (contSour->type == CLCIT_CONTACT && mir_strcmp(contSour->proto, META_PROTO)) {
 				if (!contSour->isSubcontact)
-					hNewCursor = LoadCursor(GetModuleHandle(NULL), MAKEINTRESOURCE(IDC_DROPUSER));  /// Add to meta
+					hNewCursor = LoadCursor(g_hMirApp, MAKEINTRESOURCE(IDC_DROPUSER));  /// Add to meta
 				else
 					hNewCursor = LoadCursor(g_hInst, MAKEINTRESOURCE(IDC_DROPMETA));
 			}
@@ -1024,7 +1024,7 @@ static LRESULT clcOnMouseMove(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPAR
 				break;
 			if (contSour->type == CLCIT_CONTACT && mir_strcmp(contSour->proto, META_PROTO)) {
 				if (!contSour->isSubcontact)
-					hNewCursor = LoadCursor(GetModuleHandle(NULL), MAKEINTRESOURCE(IDC_DROPUSER));  /// Add to meta
+					hNewCursor = LoadCursor(g_hMirApp, MAKEINTRESOURCE(IDC_DROPUSER));  /// Add to meta
 				else if (contSour->subcontacts == contDest)
 					hNewCursor = LoadCursor(g_hInst, MAKEINTRESOURCE(IDC_DEFAULTSUB)); ///MakeDefault
 				else
@@ -1039,7 +1039,7 @@ static LRESULT clcOnMouseMove(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPAR
 				break;
 			if (contSour->type == CLCIT_CONTACT && mir_strcmp(contSour->proto, META_PROTO)) {
 				if (!contSour->isSubcontact)
-					hNewCursor = LoadCursor(GetModuleHandle(NULL), MAKEINTRESOURCE(IDC_DROPUSER));  /// Add to meta
+					hNewCursor = LoadCursor(g_hMirApp, MAKEINTRESOURCE(IDC_DROPUSER));  /// Add to meta
 				else if (contDest->subcontacts == contSour->subcontacts)
 					break;
 				else
@@ -1048,11 +1048,11 @@ static LRESULT clcOnMouseMove(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPAR
 			break;
 
 		case DROPTARGET_ONGROUP:
-			hNewCursor = LoadCursor(GetModuleHandle(NULL), MAKEINTRESOURCE(IDC_DROPUSER));
+			hNewCursor = LoadCursor(g_hMirApp, MAKEINTRESOURCE(IDC_DROPUSER));
 			break;
 
 		case DROPTARGET_INSERTION:
-			hNewCursor = LoadCursor(GetModuleHandle(NULL), MAKEINTRESOURCE(IDC_DROP));
+			hNewCursor = LoadCursor(g_hMirApp, MAKEINTRESOURCE(IDC_DROP));
 			break;
 
 		case DROPTARGET_OUTSIDE:
@@ -1088,7 +1088,7 @@ static LRESULT clcOnMouseMove(ClcData *dat, HWND hwnd, UINT, WPARAM wParam, LPAR
 				ClcContact *contSour;
 				cliGetRowByIndex(dat, dat->iDragItem, &contSour, NULL);
 				if (!contSour->isSubcontact)
-					hNewCursor = LoadCursor(GetModuleHandle(NULL), MAKEINTRESOURCE(IDC_DROPUSER));
+					hNewCursor = LoadCursor(g_hMirApp, MAKEINTRESOURCE(IDC_DROPUSER));
 			}
 			break;
 		}
diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index 6460bdab29..d2afb5b63c 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -351,7 +351,7 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC)
 		ske_DrawText(hDC, szName, -1, &rc, DT_VCENTER | DT_SINGLELINE);

 	}

 	else {

-		HICON hIcon = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_BLANK), IMAGE_ICON, 16, 16, 0);

+		HICON hIcon = (HICON)LoadImage(g_hMirApp, MAKEINTRESOURCE(IDI_BLANK), IMAGE_ICON, 16, 16, 0);

 		TCHAR *ptszEvents = TranslateT("No events");

 		ske_DrawText(hDC, ptszEvents, (int)mir_tstrlen(ptszEvents), &rc, DT_VCENTER | DT_SINGLELINE);

 		ske_DrawIconEx(hDC, 4, (rc.bottom + rc.top - 16) / 2, hIcon, 16, 16, 0, 0, DI_NORMAL | DI_COMPAT);

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index b1ea419cb8..adb904fab5 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -896,7 +896,7 @@ static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)
 

 	if (!tszFolderPath[0]) {

 		TCHAR szRelativePath[MAX_PATH];

-		GetModuleFileName(GetModuleHandle(NULL), szRelativePath, MAX_PATH);

+		GetModuleFileName(NULL, szRelativePath, MAX_PATH);

 		TCHAR *str = _tcsrchr(szRelativePath, '\\');

 		if (str != NULL)

 			*str = 0;

diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp
index c2908ede3a..2e2d8ec652 100644
--- a/plugins/Clist_modern/src/modern_skinbutton.cpp
+++ b/plugins/Clist_modern/src/modern_skinbutton.cpp
@@ -488,14 +488,11 @@ HWND SetToolTip(HWND hwnd, TCHAR * tip)
 	if (!tip) return 0;
 	mir_cslock lck(csTips);
 	if (!hwndToolTips) {
-		//  hwndToolTips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, _T(""), WS_POPUP, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);
-
 		hwndToolTips = CreateWindowEx(0, TOOLTIPS_CLASS, NULL,
 			WS_POPUP | TTS_NOPREFIX | TTS_ALWAYSTIP,
 			CW_USEDEFAULT, CW_USEDEFAULT,
 			CW_USEDEFAULT, CW_USEDEFAULT,
-			hwnd, NULL, GetModuleHandle(NULL),
-			NULL);
+			hwnd, NULL, g_hMirApp, NULL);
 
 		SetWindowPos(hwndToolTips, HWND_TOPMOST, 0, 0, 0, 0,
 			SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE);
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index f776ccf551..cd53b1e77b 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -649,7 +649,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				Skin_ReleaseIcon(hIcon);

 			}

 

-			HICON hIcon = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_SMALLDOT), IMAGE_ICON, 16, 16, 0);

+			HICON hIcon = (HICON)LoadImage(g_hMirApp, MAKEINTRESOURCE(IDI_SMALLDOT), IMAGE_ICON, 16, 16, 0);

 			nullImage = ImageList_AddIcon(himlViewModes, hIcon);

 			DestroyIcon(hIcon);

 

diff --git a/plugins/Clist_nicer/res/resource.rc b/plugins/Clist_nicer/res/resource.rc
index 77f029667b..e2ec27705c 100644
--- a/plugins/Clist_nicer/res/resource.rc
+++ b/plugins/Clist_nicer/res/resource.rc
@@ -542,7 +542,7 @@ IDI_CLIST               ICON                    "clist.ico"
 IDI_DELETE              ICON                    "delete.ico"

 IDI_CLVM_OPTIONS        ICON                    "options_clvm.ico"

 IDI_CLVM_SELECT         ICON                    "arrow-down.ico"

-IDI_BLANK               ICON                    "..\\..\\..\\src\\res\\_blank.ico"

+IDI_BLANK               ICON                    "..\\..\\..\\src\\mir_app\\res\\_blank.ico"

 IDI_OVL_OFFLINE         ICON                    "overlay/offline.ico"

 IDI_OVL_ONLINE          ICON                    "overlay/online.ico"

 IDI_OVL_AWAY            ICON                    "overlay/away.ico"

@@ -570,9 +570,9 @@ IDI_TBACCOUNTS          ICON                    "accounts.ico"
 // Cursor

 //

 

-IDC_HYPERLINKHAND       CURSOR                  "..\\..\\..\\src\\res\\cursor_hyperlink.cur"

-IDC_DROP                CURSOR                  "..\\..\\..\\src\\res\\cursor_drag_copy.cur"

-IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\res\\cursor_drop_user.cur"

+IDC_HYPERLINKHAND       CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_hyperlink.cur"

+IDC_DROP                CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_drag_copy.cur"

+IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_drop_user.cur"

 

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/plugins/Folders/src/services.cpp b/plugins/Folders/src/services.cpp
index c09446f9d7..dfd24f6b59 100644
--- a/plugins/Folders/src/services.cpp
+++ b/plugins/Folders/src/services.cpp
@@ -83,7 +83,7 @@ int InitServices()
 	CallService(MS_DB_GETPROFILENAMET, SIZEOF(szCurrentProfile), (LPARAM)szCurrentProfile);

 	TCHAR *pos = _tcsrchr(szCurrentProfile, '.'); if (pos) *pos = 0;

 

-	GetModuleFileName(GetModuleHandle(NULL), szMirandaPath, SIZEOF(szMirandaPath));

+	GetModuleFileName(GetModuleHandleA("mir_app.dll"), szMirandaPath, SIZEOF(szMirandaPath));

 	pos = _tcsrchr(szMirandaPath, '\\'); if (pos) *pos = 0;

 

 	TCHAR *szTemp = Utils_ReplaceVarsT(_T("%miranda_userdata%"));

diff --git a/plugins/MirFox/MirFoxNG_10.vcxproj b/plugins/MirFox/MirFoxNG_10.vcxproj
index ef0a414871..30b94c3d67 100644
--- a/plugins/MirFox/MirFoxNG_10.vcxproj
+++ b/plugins/MirFox/MirFoxNG_10.vcxproj
@@ -117,7 +117,7 @@
     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

-      <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;mir_core64.lib;Miranda64.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;mir_core64.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SubSystem>Windows</SubSystem>

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

     </Link>

@@ -173,7 +173,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

-      <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;mir_core64.lib;Miranda64.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;mir_core64.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SubSystem>Windows</SubSystem>

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

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

diff --git a/plugins/MirFox/MirFoxNG_12.vcxproj b/plugins/MirFox/MirFoxNG_12.vcxproj
index f805b939dc..00e267c6a3 100644
--- a/plugins/MirFox/MirFoxNG_12.vcxproj
+++ b/plugins/MirFox/MirFoxNG_12.vcxproj
@@ -122,7 +122,7 @@
     <Link>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

-      <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;mir_core64.lib;Miranda64.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;mir_core64.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SubSystem>Windows</SubSystem>

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

     </Link>

@@ -177,7 +177,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

-      <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;mir_core64.lib;Miranda64.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <AdditionalDependencies>src\lib\$(PlatformToolset)\MirFoxCommons$(Configuration)$(PlatformArchitecture).lib;mir_core64.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <SubSystem>Windows</SubSystem>

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

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

diff --git a/plugins/ModernOpt/src/commonheaders.h b/plugins/ModernOpt/src/commonheaders.h
index 839233870d..51e6bc386c 100644
--- a/plugins/ModernOpt/src/commonheaders.h
+++ b/plugins/ModernOpt/src/commonheaders.h
@@ -44,4 +44,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "resource.h"

 #include "version.h"

 #include "modernopt.h"

-#include "..\..\..\src\resource.h"

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

diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp
index 39ad214e9e..8f70efaf24 100644
--- a/plugins/NewAwaySysMod/src/AwayOpt.cpp
+++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp
@@ -552,7 +552,7 @@ INT_PTR CALLBACK AutoreplyOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				IDC_MOREOPTDLG_EVNTURL, LPGENT("URL"),

 				IDC_MOREOPTDLG_EVNTFILE, LPGENT("File")

 			};

-			hWndTooltips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, _T(""), WS_POPUP | TTS_NOPREFIX, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);

+			hWndTooltips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, _T(""), WS_POPUP | TTS_NOPREFIX, 0, 0, 0, 0, NULL, NULL, GetModuleHandleA("mir_app.dll"), NULL);

 			TOOLINFO ti = { 0 };

 			ti.cbSize = sizeof(ti);

 			ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS;

diff --git a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
index b3f1478f5e..3cf2276d51 100644
--- a/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/src/SetAwayMsg.cpp
@@ -609,7 +609,7 @@ INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA
 

 			// init tooltips

 			TOOLINFO ti = { 0 };

-			hWndTooltips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, _T(""), WS_POPUP, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);

+			hWndTooltips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, _T(""), WS_POPUP, 0, 0, 0, 0, NULL, NULL, GetModuleHandleA("mir_app.dll"), NULL);

 			ti.cbSize = sizeof(ti);

 			ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS;

 			for (int i = 0; i < SIZEOF(Tooltips); i++) {

diff --git a/plugins/OpenSSL/OpenSSL_10.vcxproj b/plugins/OpenSSL/OpenSSL_10.vcxproj
index 29a81f0130..0ffca79075 100644
--- a/plugins/OpenSSL/OpenSSL_10.vcxproj
+++ b/plugins/OpenSSL/OpenSSL_10.vcxproj
@@ -93,7 +93,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi;..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -127,7 +127,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi;..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -158,7 +158,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi;..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -191,7 +191,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi;..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

diff --git a/plugins/OpenSSL/OpenSSL_12.vcxproj b/plugins/OpenSSL/OpenSSL_12.vcxproj
index b2095a7d1c..20708138ac 100644
--- a/plugins/OpenSSL/OpenSSL_12.vcxproj
+++ b/plugins/OpenSSL/OpenSSL_12.vcxproj
@@ -97,7 +97,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi;..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -131,7 +131,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi;..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -162,7 +162,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi;..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -195,7 +195,7 @@
       <AdditionalIncludeDirectories>..\..\include\msapi;..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

diff --git a/plugins/Popup/src/actions.cpp b/plugins/Popup/src/actions.cpp
index 291d2f10f8..9e33df9586 100644
--- a/plugins/Popup/src/actions.cpp
+++ b/plugins/Popup/src/actions.cpp
@@ -35,19 +35,19 @@ void LoadActions()
 {

 	POPUPACTION actions[] =

 	{

-		{ sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_REPLY, 0), LPGEN("General")"/"LPGEN("Quick reply"), 0 },

-		{ sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_MESS, 0), LPGEN("General")"/"LPGEN("Send message"), 0 },

-		{ sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_INFO, 0), LPGEN("General")"/"LPGEN("User details"), 0 },

-		{ sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_MENU, 0), LPGEN("General")"/"LPGEN("Contact menu"), 0 },

-		{ sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_ADD, 0), LPGEN("General")"/"LPGEN("Add permanently"), 0 },

-		{ sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_PIN, 0), LPGEN("General")"/"LPGEN("Pin popup"), 0 },

-		{ sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_CLOSE, 0), LPGEN("General")"/"LPGEN("Dismiss popup"), 0 },

-		{ sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_COPY, 0), LPGEN("General")"/"LPGEN("Copy to clipboard"), 0 },

+		{ sizeof(POPUPACTION), Skin_GetIcon(ICO_ACT_REPLY, 0), LPGEN("General")"/"LPGEN("Quick reply"), 0 },

+		{ sizeof(POPUPACTION), Skin_GetIcon(ICO_ACT_MESS, 0), LPGEN("General")"/"LPGEN("Send message"), 0 },

+		{ sizeof(POPUPACTION), Skin_GetIcon(ICO_ACT_INFO, 0), LPGEN("General")"/"LPGEN("User details"), 0 },

+		{ sizeof(POPUPACTION), Skin_GetIcon(ICO_ACT_MENU, 0), LPGEN("General")"/"LPGEN("Contact menu"), 0 },

+		{ sizeof(POPUPACTION), Skin_GetIcon(ICO_ACT_ADD, 0), LPGEN("General")"/"LPGEN("Add permanently"), 0 },

+		{ sizeof(POPUPACTION), Skin_GetIcon(ICO_ACT_PIN, 0), LPGEN("General")"/"LPGEN("Pin popup"), 0 },

+		{ sizeof(POPUPACTION), Skin_GetIcon(ICO_ACT_CLOSE, 0), LPGEN("General")"/"LPGEN("Dismiss popup"), 0 },

+		{ sizeof(POPUPACTION), Skin_GetIcon(ICO_ACT_COPY, 0), LPGEN("General")"/"LPGEN("Copy to clipboard"), 0 },

 

 		// remove popup action

 #if defined(_DEBUG)

-		{ sizeof(POPUPACTION), IcoLib_GetIcon(ICO_POPUP_ON, 0), "Popup Plus/Test action", PAF_ENABLED },

-		{ sizeof(POPUPACTION), IcoLib_GetIcon(ICO_ACT_CLOSE, 0), "Popup Plus/Second test action", 0 },

+		{ sizeof(POPUPACTION), Skin_GetIcon(ICO_POPUP_ON, 0), "Popup Plus/Test action", PAF_ENABLED },

+		{ sizeof(POPUPACTION), Skin_GetIcon(ICO_ACT_CLOSE, 0), "Popup Plus/Second test action", 0 },

 		{ sizeof(POPUPACTION), LoadSkinnedIcon(SKINICON_OTHER_MIRANDA), "Popup Plus/One more action", PAF_ENABLED },

 #endif

 	};

@@ -189,7 +189,7 @@ INT_PTR CALLBACK DlgProcPopupActions(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 

 		TranslateDialogDefault(hwnd);

 

-		SendDlgItemMessage(hwnd, IDC_ICO_INFO, STM_SETICON, (WPARAM)IcoLib_GetIcon(ICO_MISC_NOTIFY, 0), 0);

+		SendDlgItemMessage(hwnd, IDC_ICO_INFO, STM_SETICON, (WPARAM)Skin_GetIcon(ICO_MISC_NOTIFY, 0), 0);

 

 		CheckDlgButton(hwnd, IDC_CHK_ENABLEACTIONS, PopupOptions.actions & ACT_ENABLE ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwnd, IDC_CHK_IMCONTACTSONLY, PopupOptions.actions & ACT_DEF_IMONLY ? BST_CHECKED : BST_UNCHECKED);

diff --git a/plugins/Popup/src/history.cpp b/plugins/Popup/src/history.cpp
index b2c2d0473b..2f01e420a6 100644
--- a/plugins/Popup/src/history.cpp
+++ b/plugins/Popup/src/history.cpp
@@ -129,8 +129,8 @@ static INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM, LPARAM lPara
 			HWND hwndList = GetDlgItem(hwnd, IDC_POPUP_LIST);

 			for (int i = 0; i < arPopupHistory.getCount(); ++i)

 				ListBox_SetItemData(hwndList, ListBox_AddString(hwndList, _T("")), 0);

-			SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon(ICO_HISTORY, 0));

-			SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIcon(ICO_HISTORY, 1));

+			SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Skin_GetIcon(ICO_HISTORY, 0));

+			SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)Skin_GetIcon(ICO_HISTORY, 1));

 

 			if (gbHppInstalled && PopupOptions.UseHppHistoryLog) {

 				logType = LOG_HPP;

diff --git a/plugins/Popup/src/icons.cpp b/plugins/Popup/src/icons.cpp
index 321e62d569..de297c46c8 100644
--- a/plugins/Popup/src/icons.cpp
+++ b/plugins/Popup/src/icons.cpp
@@ -59,18 +59,6 @@ static IconItem iconList[] =
 	{ LPGEN("Copy to clipboard"), ICO_ACT_COPY, IDI_ACT_COPY }

 };

 

-/**

- * Returns a icon, identified by a name

- * @param	pszIcon		- name of the icon

- * @param	big			- bool big icon (default = false)

- * @return:	HICON if the icon is loaded, NULL otherwise

- **/

-

-HICON IcoLib_GetIcon(LPCSTR pszIcon, bool big)

-{

-	return (pszIcon) ? Skin_GetIcon(pszIcon, big) : NULL;

-}

-

 void InitIcons()

 {

 	Icon_Register(hInst, SECT_TOLBAR, iconList, 2);

diff --git a/plugins/Popup/src/icons.h b/plugins/Popup/src/icons.h
index 06b873b71b..40e502686d 100644
--- a/plugins/Popup/src/icons.h
+++ b/plugins/Popup/src/icons.h
@@ -65,6 +65,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define ICO_OPT_BLOCK		MODULNAME"_opt_block"

 

 void	InitIcons();

-HICON	IcoLib_GetIcon(LPCSTR pszIcon, bool big = false);

 

 #endif // __icons_h__

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 302fe6f860..56c2277fd9 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -113,17 +113,17 @@ static int IconsChanged(WPARAM, LPARAM)
 	CLISTMENUITEM mi = { sizeof(mi) };

 	if (PopupOptions.ModuleIsEnabled == TRUE) { // The module is enabled.

 		// The action to do is "disable popups" (show disabled) and we must write "enable popup" in the new item.

-		mi.hIcon = IcoLib_GetIcon(ICO_POPUP_ON, 0);

+		mi.hIcon = Skin_GetIcon(ICO_POPUP_ON, 0);

 	}

 	else { // The module is disabled.

 		// The action to do is enable popups (show enabled), then write "disable popup" in the new item.

-		mi.hIcon = IcoLib_GetIcon(ICO_POPUP_OFF, 0);

+		mi.hIcon = Skin_GetIcon(ICO_POPUP_OFF, 0);

 	}

 	mi.flags = CMIM_ICON;

 	Menu_ModifyItem(hMenuItem, &mi);

 	Menu_ModifyItem(hMenuRoot, &mi);

 

-	mi.hIcon = IcoLib_GetIcon(ICO_HISTORY, 0);

+	mi.hIcon = Skin_GetIcon(ICO_HISTORY, 0);

 	mi.flags = CMIM_ICON;

 	Menu_ModifyItem(hMenuItemHistory, &mi);

 	return 0;

@@ -156,7 +156,7 @@ INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM)
 		PopupOptions.ModuleIsEnabled = FALSE;

 		db_set_b(NULL, "Popup", "ModuleIsEnabled", FALSE);

 		mi.ptszName = LPGENT("Enable Popups");

-		mi.hIcon = IcoLib_GetIcon(ICO_POPUP_OFF, 0);

+		mi.hIcon = Skin_GetIcon(ICO_POPUP_OFF, 0);

 	}

 	else {

 		// The module is disabled.

@@ -164,7 +164,7 @@ INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM)
 		PopupOptions.ModuleIsEnabled = TRUE;

 		db_set_b(NULL, "Popup", "ModuleIsEnabled", TRUE);

 		mi.ptszName = LPGENT("Disable Popups");

-		mi.hIcon = IcoLib_GetIcon(ICO_POPUP_ON, 0);

+		mi.hIcon = Skin_GetIcon(ICO_POPUP_ON, 0);

 	}

 	mi.flags = CMIM_NAME | CMIM_ICON | CMIF_TCHAR;

 	Menu_ModifyItem(hMenuItem, &mi);

@@ -193,7 +193,7 @@ void InitMenuItems(void)
 	// Build main menu

 	mi.position = -1000000000 /*1000001*/;

 	mi.ptszName = LPGENT(MODULNAME_PLU);

-	mi.hIcon = IcoLib_GetIcon(PopupOptions.ModuleIsEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF, 0);

+	mi.hIcon = Skin_GetIcon(PopupOptions.ModuleIsEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF, 0);

 	hMenuRoot = Menu_AddMainMenuItem(&mi);

 

 	// Add item to main menu

@@ -209,7 +209,7 @@ void InitMenuItems(void)
 	mi.position = 1000000000;

 	mi.popupPosition = 1999990000;

 	mi.ptszName = LPGENT("Popup History");

-	mi.hIcon = IcoLib_GetIcon(ICO_HISTORY, 0);

+	mi.hIcon = Skin_GetIcon(ICO_HISTORY, 0);

 	mi.pszService = MENUCOMMAND_HISTORY;

 	hMenuItemHistory = Menu_AddMainMenuItem(&mi);

 }

diff --git a/plugins/Popup/src/opt_adv.cpp b/plugins/Popup/src/opt_adv.cpp
index 1183fa07d6..ee594e7494 100644
--- a/plugins/Popup/src/opt_adv.cpp
+++ b/plugins/Popup/src/opt_adv.cpp
@@ -112,7 +112,7 @@ INT_PTR CALLBACK DlgProcPopupAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			HWND hCtrl = GetDlgItem(hwnd, IDC_SHOWHISTORY);

 			SendMessage(hCtrl, BUTTONSETASFLATBTN, TRUE, 0);

 			SendMessage(hCtrl, BUTTONADDTOOLTIP, (WPARAM)Translate("Popup History"), 0);

-			SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_HISTORY, 0));

+			SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_HISTORY, 0));

 

 			EnableWindow(GetDlgItem(hwnd, IDC_HISTORY_STATIC1), PopupOptions.EnableHistory);

 			EnableWindow(GetDlgItem(hwnd, IDC_HISTORYSIZE), PopupOptions.EnableHistory);

diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp
index 35bd585ed0..f2f427c551 100644
--- a/plugins/Popup/src/opt_class.cpp
+++ b/plugins/Popup/src/opt_class.cpp
@@ -183,14 +183,14 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 			TreeView_DeleteAllItems(hwndTree);

 			// Treeview create image list

 			HIMAGELIST hImgLst = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR | ILC_COLOR32 | ILC_MASK, 5, num_classes + 1);

-			ImageList_ReplaceIcon(hImgLst, -1, IcoLib_GetIcon(ICO_OPT_GROUP, 0));

+			ImageList_ReplaceIcon(hImgLst, -1, Skin_GetIcon(ICO_OPT_GROUP, 0));

 			TreeView_SetImageList(hwndTree, hImgLst, TVSIL_NORMAL);

 

 			for (i = 0; i < gTreeData.getCount(); ++i) {

 				switch (gTreeData[i]->typ) {

 				case 1: // Treeview part for typ 1 (notification)

 					mir_snprintf(iconName, SIZEOF(iconName), "%s_%S_%S", MODULNAME, gTreeData[i]->pszTreeRoot, gTreeData[i]->pszDescription);

-					iconIndex = ImageList_ReplaceIcon(hImgLst, -1, IcoLib_GetIcon(iconName));

+					iconIndex = ImageList_ReplaceIcon(hImgLst, -1, Skin_GetIcon(iconName));

 					mir_sntprintf(itemName, SIZEOF(itemName), _T("%s/%s"), gTreeData[i]->pszTreeRoot, gTreeData[i]->pszDescription);

 					break;

 				case 2: // Treeview part typ 2 (popup class api)

@@ -223,7 +223,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 					(WPARAM)Translate(statusButtons[i].title), 0);

 			}

 			// info icon

-			SendDlgItemMessage(hwnd, IDC_ICO_INFO, STM_SETICON, (WPARAM)IcoLib_GetIcon(ICO_MISC_NOTIFY, 0), 0);

+			SendDlgItemMessage(hwnd, IDC_ICO_INFO, STM_SETICON, (WPARAM)Skin_GetIcon(ICO_MISC_NOTIFY, 0), 0);

 			// more button

 			EnableWindow(GetDlgItem(hwnd, IDC_MORE), FALSE);

 			// preview button

diff --git a/plugins/Popup/src/opt_contacts.cpp b/plugins/Popup/src/opt_contacts.cpp
index 31041c357a..e51aefe49e 100644
--- a/plugins/Popup/src/opt_contacts.cpp
+++ b/plugins/Popup/src/opt_contacts.cpp
@@ -35,7 +35,7 @@ static void sttSetAllContactIcons(HWND hwndList)
 		DWORD dwMode = db_get_b(hContact, MODULNAME, "ShowMode", 0);

 		for (int i = 0; i < 4 /*SIZEOF(sttIcons)*/; ++i)

 			// hIml element [0]    = SKINICON_OTHER_SMALLDOT

-			// hIml element [1..5] = IcoLib_GetIcon(....)   ~ old sttIcons

+			// hIml element [1..5] = Skin_GetIcon(....)   ~ old sttIcons

 			SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, ((int)dwMode == i) ? i + 1 : 0));

 	}

 }

@@ -46,17 +46,17 @@ INT_PTR CALLBACK DlgProcContactOpts(HWND hwnd, UINT msg, WPARAM, LPARAM lParam)
 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwnd);

 

-		SendDlgItemMessage(hwnd, IDC_ICO_AUTO, STM_SETICON, (WPARAM)IcoLib_GetIcon(ICO_OPT_DEF, 0), 0);

-		SendDlgItemMessage(hwnd, IDC_ICO_FAVORITE, STM_SETICON, (WPARAM)IcoLib_GetIcon(ICO_OPT_FAV, 0), 0);

-		SendDlgItemMessage(hwnd, IDC_ICO_FULLSCREEN, STM_SETICON, (WPARAM)IcoLib_GetIcon(ICO_OPT_FULLSCREEN, 0), 0);

-		SendDlgItemMessage(hwnd, IDC_ICO_BLOCK, STM_SETICON, (WPARAM)IcoLib_GetIcon(ICO_OPT_BLOCK, 0), 0);

+		SendDlgItemMessage(hwnd, IDC_ICO_AUTO, STM_SETICON, (WPARAM)Skin_GetIcon(ICO_OPT_DEF, 0), 0);

+		SendDlgItemMessage(hwnd, IDC_ICO_FAVORITE, STM_SETICON, (WPARAM)Skin_GetIcon(ICO_OPT_FAV, 0), 0);

+		SendDlgItemMessage(hwnd, IDC_ICO_FULLSCREEN, STM_SETICON, (WPARAM)Skin_GetIcon(ICO_OPT_FULLSCREEN, 0), 0);

+		SendDlgItemMessage(hwnd, IDC_ICO_BLOCK, STM_SETICON, (WPARAM)Skin_GetIcon(ICO_OPT_BLOCK, 0), 0);

 		{

 			HIMAGELIST hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR32 | ILC_MASK, 5, 5);

 			ImageList_AddIcon(hIml, LoadSkinnedIcon(SKINICON_OTHER_SMALLDOT));

-			ImageList_AddIcon(hIml, IcoLib_GetIcon(ICO_OPT_DEF, 0));

-			ImageList_AddIcon(hIml, IcoLib_GetIcon(ICO_OPT_FAV, 0));

-			ImageList_AddIcon(hIml, IcoLib_GetIcon(ICO_OPT_FULLSCREEN, 0));

-			ImageList_AddIcon(hIml, IcoLib_GetIcon(ICO_OPT_BLOCK, 0));

+			ImageList_AddIcon(hIml, Skin_GetIcon(ICO_OPT_DEF, 0));

+			ImageList_AddIcon(hIml, Skin_GetIcon(ICO_OPT_FAV, 0));

+			ImageList_AddIcon(hIml, Skin_GetIcon(ICO_OPT_FULLSCREEN, 0));

+			ImageList_AddIcon(hIml, Skin_GetIcon(ICO_OPT_BLOCK, 0));

 			SendDlgItemMessage(hwnd, IDC_LIST, CLM_SETEXTRAIMAGELIST, 0, (LPARAM)hIml);

 			SendDlgItemMessage(hwnd, IDC_LIST, CLM_SETEXTRACOLUMNS, 4 /*SIZEOF(sttIcons)*/, 0);

 			sttResetListOptions(GetDlgItem(hwnd, IDC_LIST));

@@ -88,7 +88,7 @@ INT_PTR CALLBACK DlgProcContactOpts(HWND hwnd, UINT msg, WPARAM, LPARAM lParam)
 				if (iImage != EMPTY_EXTRA_ICON) {

 					for (int i = 0; i < 4 /*SIZEOF(sttIcons)*/; ++i)

 						// hIml element [0]    = SKINICON_OTHER_SMALLDOT

-						// hIml element [1..5] = IcoLib_GetIcon(....)   ~ old sttIcons

+						// hIml element [1..5] = Skin_GetIcon(....)   ~ old sttIcons

 						SendDlgItemMessage(hwnd, IDC_LIST, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, (i == nm->iColumn) ? i + 1 : 0));

 				}

 				SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);

diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp
index 9d11296629..234216ca39 100644
--- a/plugins/Popup/src/opt_gen.cpp
+++ b/plugins/Popup/src/opt_gen.cpp
@@ -182,7 +182,7 @@ INT_PTR CALLBACK DlgProcPopupGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			HWND hCtrl = GetDlgItem(hwnd, IDC_CUSTOMPOS);

 			SendMessage(hCtrl, BUTTONSETASFLATBTN, TRUE, 0);

 			SendMessage(hCtrl, BUTTONADDTOOLTIP, (WPARAM)_T("Popup area"), BATF_TCHAR);

-			SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_OPT_RESIZE, 0));

+			SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_OPT_RESIZE, 0));

 		}

 		// Spreading combobox

 		{

@@ -627,11 +627,11 @@ INT_PTR CALLBACK PositionBoxDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 		SendDlgItemMessage(hwndDlg, IDOK, BUTTONSETASFLATBTN, TRUE, 0);

 		SendDlgItemMessage(hwndDlg, IDOK, BUTTONADDTOOLTIP, (WPARAM)_T("OK"), BATF_TCHAR);

-		SendDlgItemMessage(hwndDlg, IDOK, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_OPT_OK, 0));

+		SendDlgItemMessage(hwndDlg, IDOK, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_OPT_OK, 0));

 

 		SendDlgItemMessage(hwndDlg, IDCANCEL, BUTTONSETASFLATBTN, TRUE, 0);

 		SendDlgItemMessage(hwndDlg, IDCANCEL, BUTTONADDTOOLTIP, (WPARAM)_T("Cancel"), BATF_TCHAR);

-		SendDlgItemMessage(hwndDlg, IDCANCEL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_OPT_CANCEL, 0));

+		SendDlgItemMessage(hwndDlg, IDCANCEL, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_OPT_CANCEL, 0));

 

 		SetDlgItemInt(hwndDlg, IDC_TXT_TOP, PopupOptions.gapTop, FALSE);

 		SetDlgItemInt(hwndDlg, IDC_TXT_BOTTOM, PopupOptions.gapBottom, FALSE);

diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp
index 52ac9b6ddc..041607951c 100644
--- a/plugins/Popup/src/opt_skins.cpp
+++ b/plugins/Popup/src/opt_skins.cpp
@@ -361,7 +361,7 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 

 			// Skin List reload button

 			SendDlgItemMessage(hwndDlg, IDC_BTN_RELOAD, BUTTONSETASFLATBTN, TRUE, 0);

-			SendDlgItemMessage(hwndDlg, IDC_BTN_RELOAD, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_OPT_RELOAD, 0));

+			SendDlgItemMessage(hwndDlg, IDC_BTN_RELOAD, BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon(ICO_OPT_RELOAD, 0));

 			SendDlgItemMessage(hwndDlg, IDC_BTN_RELOAD, BUTTONADDTOOLTIP, (WPARAM)Translate("Refresh List"), 0);

 

 			// Skin Option List

@@ -544,7 +544,7 @@ static void BoxPreview_OnPaint(HWND hwnd, HDC mydc, int mode)
 			HFONT hfnt = (HFONT)SelectObject(mydc, fonts.title);

 			GetClientRect(hwnd, &rc);

 			FillRect(mydc, &rc, hbr);

-			DrawIconEx(mydc, 10, (rc.bottom - rc.top - 16) / 2, IcoLib_GetIcon(ICO_POPUP_ON, 0), 16, 16, 0, hbr, DI_NORMAL);

+			DrawIconEx(mydc, 10, (rc.bottom - rc.top - 16) / 2, Skin_GetIcon(ICO_POPUP_ON, 0), 16, 16, 0, hbr, DI_NORMAL);

 			SetBkMode(mydc, TRANSPARENT);

 			GetClientRect(hwnd, &rc);

 			rc.left += 30; //  10+16+4 -- icon

diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index 1dd02de909..e99ec235a0 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -578,7 +578,7 @@ int PopupWnd2::fixActions(POPUPACTION *theActions, int count)
 

 		if (enableDefaultUsr && isIm && IsActionEnabled("General/Quick reply")) {

 			m_actions[iAction].actionA.cbSize = sizeof(POPUPACTION);

-			m_actions[iAction].actionA.lchIcon = IcoLib_GetIcon(ICO_ACT_REPLY, iconSize);

+			m_actions[iAction].actionA.lchIcon = Skin_GetIcon(ICO_ACT_REPLY, iconSize);

 			mir_strcpy(m_actions[iAction].actionA.lpzTitle, "General/Quick reply");

 			m_actions[iAction].actionA.wParam = 0;

 			m_actions[iAction].actionA.lParam = ACT_DEF_REPLY;

@@ -587,7 +587,7 @@ int PopupWnd2::fixActions(POPUPACTION *theActions, int count)
 

 		if (enableDefaultUsr && isIm && IsActionEnabled("General/Send message")) {

 			m_actions[iAction].actionA.cbSize = sizeof(POPUPACTION);

-			m_actions[iAction].actionA.lchIcon = IcoLib_GetIcon(ICO_ACT_MESS, iconSize);

+			m_actions[iAction].actionA.lchIcon = Skin_GetIcon(ICO_ACT_MESS, iconSize);

 			mir_strcpy(m_actions[iAction].actionA.lpzTitle, "General/Send message");

 			m_actions[iAction].actionA.wParam = 0;

 			m_actions[iAction].actionA.lParam = ACT_DEF_MESSAGE;

@@ -596,7 +596,7 @@ int PopupWnd2::fixActions(POPUPACTION *theActions, int count)
 

 		if (enableDefaultUsr && IsActionEnabled("General/User details")) {

 			m_actions[iAction].actionA.cbSize = sizeof(POPUPACTION);

-			m_actions[iAction].actionA.lchIcon = IcoLib_GetIcon(ICO_ACT_INFO, iconSize);

+			m_actions[iAction].actionA.lchIcon = Skin_GetIcon(ICO_ACT_INFO, iconSize);

 			mir_strcpy(m_actions[iAction].actionA.lpzTitle, "General/User details");

 			m_actions[iAction].actionA.wParam = 0;

 			m_actions[iAction].actionA.lParam = ACT_DEF_DETAILS;

@@ -605,7 +605,7 @@ int PopupWnd2::fixActions(POPUPACTION *theActions, int count)
 

 		if (enableDefaultUsr && IsActionEnabled("General/Contact menu")) {

 			m_actions[iAction].actionA.cbSize = sizeof(POPUPACTION);

-			m_actions[iAction].actionA.lchIcon = IcoLib_GetIcon(ICO_ACT_MENU, iconSize);

+			m_actions[iAction].actionA.lchIcon = Skin_GetIcon(ICO_ACT_MENU, iconSize);

 			mir_strcpy(m_actions[iAction].actionA.lpzTitle, "General/Contact menu");

 			m_actions[iAction].actionA.wParam = 0;

 			m_actions[iAction].actionA.lParam = ACT_DEF_MENU;

@@ -614,7 +614,7 @@ int PopupWnd2::fixActions(POPUPACTION *theActions, int count)
 

 		if (enableDefaultUsr && db_get_b(m_hContact, "CList", "NotOnList", 0) && IsActionEnabled("General/Add permanently")) {

 			m_actions[iAction].actionA.cbSize = sizeof(POPUPACTION);

-			m_actions[iAction].actionA.lchIcon = IcoLib_GetIcon(ICO_ACT_ADD, iconSize);

+			m_actions[iAction].actionA.lchIcon = Skin_GetIcon(ICO_ACT_ADD, iconSize);

 			mir_strcpy(m_actions[iAction].actionA.lpzTitle, "General/Add permanently");

 			m_actions[iAction].actionA.wParam = 0;

 			m_actions[iAction].actionA.lParam = ACT_DEF_ADD;

@@ -623,7 +623,7 @@ int PopupWnd2::fixActions(POPUPACTION *theActions, int count)
 

 		if (enableDefaultGen && (m_iTimeout != -1) && IsActionEnabled("General/Pin popup")) {

 			m_actions[iAction].actionA.cbSize = sizeof(POPUPACTION);

-			m_actions[iAction].actionA.lchIcon = m_bIsPinned ? IcoLib_GetIcon(ICO_ACT_PINNED, iconSize) : IcoLib_GetIcon(ICO_ACT_PIN, iconSize);

+			m_actions[iAction].actionA.lchIcon = m_bIsPinned ? Skin_GetIcon(ICO_ACT_PINNED, iconSize) : Skin_GetIcon(ICO_ACT_PIN, iconSize);

 			mir_strcpy(m_actions[iAction].actionA.lpzTitle, "General/Pin popup");

 			m_actions[iAction].actionA.wParam = 0;

 			m_actions[iAction].actionA.lParam = ACT_DEF_PIN;

@@ -632,7 +632,7 @@ int PopupWnd2::fixActions(POPUPACTION *theActions, int count)
 

 		if (enableDefaultGen && IsActionEnabled("General/Dismiss popup")) {

 			m_actions[iAction].actionA.cbSize = sizeof(POPUPACTION);

-			m_actions[iAction].actionA.lchIcon = IcoLib_GetIcon(ICO_ACT_CLOSE, iconSize);

+			m_actions[iAction].actionA.lchIcon = Skin_GetIcon(ICO_ACT_CLOSE, iconSize);

 			mir_strcpy(m_actions[iAction].actionA.lpzTitle, "General/Dismiss popup");

 			m_actions[iAction].actionA.wParam = 0;

 			m_actions[iAction].actionA.lParam = ACT_DEF_DISMISS;

@@ -641,7 +641,7 @@ int PopupWnd2::fixActions(POPUPACTION *theActions, int count)
 

 		if (enableDefaultGen && IsActionEnabled("General/Copy to clipboard")) {

 			m_actions[iAction].actionA.cbSize = sizeof(POPUPACTION);

-			m_actions[iAction].actionA.lchIcon = IcoLib_GetIcon(ICO_ACT_COPY, iconSize);

+			m_actions[iAction].actionA.lchIcon = Skin_GetIcon(ICO_ACT_COPY, iconSize);

 			mir_strcpy(m_actions[iAction].actionA.lpzTitle, "General/Copy to clipboard");

 			m_actions[iAction].actionA.wParam = 0;

 			m_actions[iAction].actionA.lParam = ACT_DEF_COPY;

@@ -988,7 +988,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara
 			m_bIsPinned = !m_bIsPinned;

 			{

 				bool iconSize = PopupOptions.actions&ACT_LARGE ? TRUE : FALSE;

-				PUModifyActionIcon(m_hwnd, wParam, lParam, m_bIsPinned ? IcoLib_GetIcon(ICO_ACT_PINNED, iconSize) : IcoLib_GetIcon(ICO_ACT_PIN, iconSize));

+				PUModifyActionIcon(m_hwnd, wParam, lParam, m_bIsPinned ? Skin_GetIcon(ICO_ACT_PINNED, iconSize) : Skin_GetIcon(ICO_ACT_PIN, iconSize));

 			}

 			break;

 

diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp
index b77c87a75a..c5da930c89 100644
--- a/plugins/Popup/src/services.cpp
+++ b/plugins/Popup/src/services.cpp
@@ -240,21 +240,21 @@ INT_PTR Popup_ShowMessageW(WPARAM wParam, LPARAM lParam)
 	ppd2.lptzText = (TCHAR*)wParam;

 	switch (lParam & 0x7fffffff) {

 	case SM_ERROR:

-		ppd2.lchIcon = IcoLib_GetIcon(ICO_MISC_ERROR, 0);

+		ppd2.lchIcon = Skin_GetIcon(ICO_MISC_ERROR, 0);

 		ppd2.colorBack = RGB(191, 0, 0);

 		ppd2.colorText = RGB(255, 245, 225);

 		ppd2.lchNotification = g_hntfError;

 		ppd2.lptzTitle = TranslateT("Error");

 		break;

 	case SM_WARNING:

-		ppd2.lchIcon = IcoLib_GetIcon(ICO_MISC_WARNING, 0);

+		ppd2.lchIcon = Skin_GetIcon(ICO_MISC_WARNING, 0);

 		ppd2.colorBack = RGB(210, 210, 150);

 		ppd2.colorText = RGB(0, 0, 0);

 		ppd2.lchNotification = g_hntfWarning;

 		ppd2.lptzTitle = TranslateT("Warning");

 		break;

 	case SM_NOTIFY:

-		ppd2.lchIcon = IcoLib_GetIcon(ICO_MISC_NOTIFY, 0);

+		ppd2.lchIcon = Skin_GetIcon(ICO_MISC_NOTIFY, 0);

 		ppd2.colorBack = RGB(230, 230, 230);

 		ppd2.colorText = RGB(0, 0, 0);

 		ppd2.lchNotification = g_hntfNotification;

diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp
index c8b0c7289f..00c2451c84 100644
--- a/plugins/Popup/src/srmm_menu.cpp
+++ b/plugins/Popup/src/srmm_menu.cpp
@@ -109,22 +109,22 @@ void SrmmMenu_Load()
 

 	sid.dwId = 0;

 	sid.szTooltip = LPGEN("Popup Mode: Auto");

-	sid.hIcon = sid.hIconDisabled = IcoLib_GetIcon(ICO_POPUP_ON, 0);

+	sid.hIcon = sid.hIconDisabled = Skin_GetIcon(ICO_POPUP_ON, 0);

 	Srmm_AddIcon(&sid);

 

 	sid.dwId = 1;

 	sid.szTooltip = LPGEN("Popup Mode: Favorite");

-	sid.hIcon = sid.hIconDisabled = IcoLib_GetIcon(ICO_FAV, 0);

+	sid.hIcon = sid.hIconDisabled = Skin_GetIcon(ICO_FAV, 0);

 	Srmm_AddIcon(&sid);

 

 	sid.dwId = 2;

 	sid.szTooltip = LPGEN("Popup Mode: Ignore fullscreen");

-	sid.hIcon = sid.hIconDisabled = IcoLib_GetIcon(ICO_FULLSCREEN, 0);

+	sid.hIcon = sid.hIconDisabled = Skin_GetIcon(ICO_FULLSCREEN, 0);

 	Srmm_AddIcon(&sid);

 

 	sid.dwId = 3;

 	sid.szTooltip = LPGEN("Popup Mode: Block contact");

-	sid.hIcon = sid.hIconDisabled = IcoLib_GetIcon(ICO_POPUP_OFF, 0);

+	sid.hIcon = sid.hIconDisabled = Skin_GetIcon(ICO_POPUP_OFF, 0);

 	Srmm_AddIcon(&sid);

 

 	HookEvent(ME_MSG_ICONPRESSED, SrmmMenu_ProcessIconClick);

diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index d33d32ea4c..57c50a8670 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -693,9 +693,9 @@ END
 // Cursor

 //

 

-IDC_HYPERLINKHAND       CURSOR                  "..\\..\\..\\src\\res\\cursor_hyperlink.cur"

-IDC_DROP                CURSOR                  "..\\..\\..\\src\\res\\cursor_drag_copy.cur"

-IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\res\\cursor_drop_user.cur"

+IDC_HYPERLINKHAND       CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_hyperlink.cur"

+IDC_DROP                CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_drag_copy.cur"

+IDC_DROPUSER            CURSOR                  "..\\..\\..\\src\\mir_app\\res\\cursor_drop_user.cur"

 

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/plugins/TopToolBar/res/main.rc b/plugins/TopToolBar/res/main.rc
index 5f2191cc3f..1344c89e5c 100644
--- a/plugins/TopToolBar/res/main.rc
+++ b/plugins/TopToolBar/res/main.rc
@@ -128,8 +128,8 @@ IDI_GROUPSOFF           ICON                    "Groups On_Off_UP.ico"
 IDI_GROUPSON            ICON                    "Groups On_Off_DN.ico"

 IDI_SOUNDSOFF           ICON                    "Sounds Enable_Disable_DN.ico"

 IDI_SOUNDSON            ICON                    "Sounds Enable_Disable_UP.ico"

-IDI_METAON              ICON                    "..\\..\\..\\src\\res\\meta_menu.ico"

-IDI_METAOFF             ICON                    "..\\..\\..\\src\\res\\meta_menuof.ico"

+IDI_METAON              ICON                    "..\\..\\..\\src\\mir_app\\res\\meta_menu.ico"

+IDI_METAOFF             ICON                    "..\\..\\..\\src\\mir_app\\res\\meta_menuof.ico"

 #endif    // Neutral resources

 /////////////////////////////////////////////////////////////////////////////

 

diff --git a/plugins/UserInfoEx/src/ctrl_button.cpp b/plugins/UserInfoEx/src/ctrl_button.cpp
index 6d85de3475..45670de8a2 100644
--- a/plugins/UserInfoEx/src/ctrl_button.cpp
+++ b/plugins/UserInfoEx/src/ctrl_button.cpp
@@ -504,7 +504,7 @@ static LRESULT CALLBACK Button_WndProc(HWND hwndBtn, UINT uMsg, WPARAM wParam, L
 		if (wParam) {			

 			mir_cslock lck(csTips);

 			if (!hwndToolTips)

-				hwndToolTips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, WS_POPUP, 0, 0, 0, 0, NULL, NULL, GetModuleHandle(NULL), NULL);

+				hwndToolTips = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL, WS_POPUP, 0, 0, 0, 0, NULL, NULL, GetModuleHandleA("mir_app.dll"), NULL);

 

 			if (lParam == MBBF_UNICODE) {

 				TOOLINFOW ti;

diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
index 4bd3fad8f2..7093d5770f 100644
--- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
+++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp
@@ -61,7 +61,7 @@ static void InitAlteredPlacesBar()
 			dwFolderID = 17; RegSetValueEx(hkPlacesBar, _T("Place2"), 0, REG_DWORD, (PBYTE)&dwFolderID, sizeof(DWORD));

 

 			// Miranda's installation path

-			GetModuleFileNameA(GetModuleHandle(NULL), szMirandaPath, SIZEOF(szMirandaPath)); 

+			GetModuleFileNameA(GetModuleHandleA("mir_app.dll"), szMirandaPath, SIZEOF(szMirandaPath));

 			p = mir_strrchr(szMirandaPath, '\\');

 			if (p) 

 			{

diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp
index 7830e6fa46..597501892f 100644
--- a/protocols/AimOscar/src/ui.cpp
+++ b/protocols/AimOscar/src/ui.cpp
@@ -26,45 +26,40 @@ COLORREF custColours[16]={0};
 

 static int CALLBACK EnumFontsProc(ENUMLOGFONTEX *lpelfe, NEWTEXTMETRICEX* /*lpntme*/, int /*FontType*/, LPARAM lParam)

 {

-	if (!IsWindow((HWND) lParam))

+	if (!IsWindow((HWND)lParam))

 		return FALSE;

-	if (SendMessage((HWND) lParam, CB_FINDSTRINGEXACT, 1, (LPARAM) lpelfe->elfLogFont.lfFaceName) == CB_ERR)

-		SendMessage((HWND) lParam, CB_ADDSTRING, 0, (LPARAM) lpelfe->elfLogFont.lfFaceName);

+	if (SendMessage((HWND)lParam, CB_FINDSTRINGEXACT, 1, (LPARAM)lpelfe->elfLogFont.lfFaceName) == CB_ERR)

+		SendMessage((HWND)lParam, CB_ADDSTRING, 0, (LPARAM)lpelfe->elfLogFont.lfFaceName);

 	return TRUE;

 }

 

 void DrawMyControl(HDC hDC, HWND /*hwndButton*/, HANDLE hTheme, UINT iState, RECT rect)

 {

 	BOOL bIsPressed = (iState & ODS_SELECTED);

-	BOOL bIsFocused  = (iState & ODS_FOCUS);

-	if (hTheme)

-	{

-		DWORD state = (bIsPressed)?PBS_PRESSED:PBS_NORMAL;

-		if (state == PBS_NORMAL)

-		{

+	BOOL bIsFocused = (iState & ODS_FOCUS);

+	if (hTheme) {

+		DWORD state = (bIsPressed) ? PBS_PRESSED : PBS_NORMAL;

+		if (state == PBS_NORMAL) {

 			if (bIsFocused)

 				state = PBS_DEFAULTED;

 		}

-		rect.top-=1;

-		rect.left-=1;

-		DrawThemeBackground(hTheme, hDC, BP_PUSHBUTTON,state, &rect, NULL);

+		rect.top -= 1;

+		rect.left -= 1;

+		DrawThemeBackground(hTheme, hDC, BP_PUSHBUTTON, state, &rect, NULL);

 	}

-	else

-	{

-		if (bIsFocused)

-		{

-			HBRUSH br = CreateSolidBrush(RGB(0,0,0));

+	else {

+		if (bIsFocused) {

+			HBRUSH br = CreateSolidBrush(RGB(0, 0, 0));

 			FrameRect(hDC, &rect, br);

 			InflateRect(&rect, -1, -1);

 			DeleteObject(br);

 		} // if

 		COLORREF crColor = GetSysColor(COLOR_BTNFACE);

 		HBRUSH	brBackground = CreateSolidBrush(crColor);

-		FillRect(hDC,&rect, brBackground);

+		FillRect(hDC, &rect, brBackground);

 		DeleteObject(brBackground);

 		// Draw pressed button

-		if (bIsPressed)

-		{

+		if (bIsPressed) {

 			HBRUSH brBtnShadow = CreateSolidBrush(GetSysColor(COLOR_BTNSHADOW));

 			FrameRect(hDC, &rect, brBtnShadow);

 			DeleteObject(brBtnShadow);

@@ -84,19 +79,18 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 {

 	CAimProto* ppro = (CAimProto*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 

-	switch (msg)

-	{

+	switch (msg) {

 	case WM_INITDIALOG:

 		{

 			SendDlgItemMessage(hwndDlg, IDC_BOLD, BUTTONSETASPUSHBTN, TRUE, 0);

-			SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_SETEVENTMASK, 0, ENM_CHANGE|ENM_SELCHANGE|ENM_REQUESTRESIZE);

+			SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_SETEVENTMASK, 0, ENM_CHANGE | ENM_SELCHANGE | ENM_REQUESTRESIZE);

 			SendDlgItemMessage(hwndDlg, IDC_BACKGROUNDCOLORPICKER, CPM_SETCOLOUR, 0, 0x00ffffff);

-			LOGFONT lf ={0};

+			LOGFONT lf = { 0 };

 			HDC hdc = GetDC(hwndDlg);

 			lf.lfCharSet = DEFAULT_CHARSET;

 			lf.lfFaceName[0] = 0;

 			lf.lfPitchAndFamily = 0;

-			EnumFontFamiliesEx(hdc, &lf, (FONTENUMPROC) EnumFontsProc, (LPARAM) GetDlgItem(hwndDlg, IDC_TYPEFACE), 0);

+			EnumFontFamiliesEx(hdc, &lf, (FONTENUMPROC)EnumFontsProc, (LPARAM)GetDlgItem(hwndDlg, IDC_TYPEFACE), 0);

 			ReleaseDC(hwndDlg, hdc);

 			SendDlgItemMessage(hwndDlg, IDC_FONTSIZE, CB_ADDSTRING, 0, (LPARAM)TEXT("8"));

 			SendDlgItemMessage(hwndDlg, IDC_FONTSIZE, CB_ADDSTRING, 0, (LPARAM)TEXT("10"));

@@ -106,21 +100,19 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			SendDlgItemMessage(hwndDlg, IDC_FONTSIZE, CB_ADDSTRING, 0, (LPARAM)TEXT("24"));

 			SendDlgItemMessage(hwndDlg, IDC_FONTSIZE, CB_ADDSTRING, 0, (LPARAM)TEXT("36"));

 			SendDlgItemMessage(hwndDlg, IDC_FONTSIZE, CB_SETCURSEL, 2, 0);

-			if (SendDlgItemMessage(hwndDlg, IDC_TYPEFACE, CB_SELECTSTRING, 1, (LPARAM)TEXT("Arial"))!=CB_ERR)

-			{

+			if (SendDlgItemMessage(hwndDlg, IDC_TYPEFACE, CB_SELECTSTRING, 1, (LPARAM)TEXT("Arial")) != CB_ERR) {

 				CHARFORMAT2 cf;

 				cf.cbSize = sizeof(cf);

-				cf.yHeight=12*20;

-				cf.dwMask=CFM_SIZE|CFM_FACE;

+				cf.yHeight = 12 * 20;

+				cf.dwMask = CFM_SIZE | CFM_FACE;

 				mir_tstrcpy(cf.szFaceName, TEXT("Arial"));

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 			}

-			else

-			{

+			else {

 				CHARFORMAT2 cf;

 				cf.cbSize = sizeof(cf);

-				cf.yHeight=12*20;

-				cf.dwMask=CFM_SIZE;

+				cf.yHeight = 12 * 20;

+				cf.dwMask = CFM_SIZE;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 			}

 			break;

@@ -131,57 +123,50 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 	case WM_SIZING:

 		{

-			RECT* rect=(RECT*)lParam;

+			RECT* rect = (RECT*)lParam;

 #define MIN_HEIGHT 200

 #define MIN_WIDTH 400

-			if (WMSZ_RIGHT==wParam||WMSZ_TOPRIGHT==wParam||WMSZ_BOTTOMRIGHT==wParam)

-			{

-				if (rect->right-rect->left<MIN_WIDTH)

-					rect->right=rect->left+MIN_WIDTH;

+			if (WMSZ_RIGHT == wParam || WMSZ_TOPRIGHT == wParam || WMSZ_BOTTOMRIGHT == wParam) {

+				if (rect->right - rect->left < MIN_WIDTH)

+					rect->right = rect->left + MIN_WIDTH;

 			}

-			if (WMSZ_LEFT==wParam||WMSZ_TOPLEFT==wParam||WMSZ_BOTTOMLEFT==wParam)

-			{

-				if (rect->right-rect->left<MIN_WIDTH)

-					rect->left=rect->right-MIN_WIDTH;

+			if (WMSZ_LEFT == wParam || WMSZ_TOPLEFT == wParam || WMSZ_BOTTOMLEFT == wParam) {

+				if (rect->right - rect->left < MIN_WIDTH)

+					rect->left = rect->right - MIN_WIDTH;

 			}

-			if (WMSZ_TOP==wParam||WMSZ_TOPRIGHT==wParam||WMSZ_TOPLEFT==wParam)

-			{

-				if (rect->bottom-rect->top<MIN_HEIGHT)

-					rect->top=rect->bottom-MIN_HEIGHT;

+			if (WMSZ_TOP == wParam || WMSZ_TOPRIGHT == wParam || WMSZ_TOPLEFT == wParam) {

+				if (rect->bottom - rect->top < MIN_HEIGHT)

+					rect->top = rect->bottom - MIN_HEIGHT;

 			}

-			if (WMSZ_BOTTOM==wParam||WMSZ_BOTTOMLEFT==wParam||WMSZ_BOTTOMRIGHT==wParam)

-			{

-				if (rect->bottom-rect->top<MIN_HEIGHT)

-					rect->bottom=rect->top+MIN_HEIGHT;

+			if (WMSZ_BOTTOM == wParam || WMSZ_BOTTOMLEFT == wParam || WMSZ_BOTTOMRIGHT == wParam) {

+				if (rect->bottom - rect->top < MIN_HEIGHT)

+					rect->bottom = rect->top + MIN_HEIGHT;

 			}

 			break;

 		}

 

 	case WM_SIZE:

 		{

-			int width=LOWORD(lParam);

-			int height=HIWORD(lParam);

-			SetWindowPos(GetDlgItem(hwndDlg, IDC_PROFILE),HWND_TOP,6,60,width-12,height-67,0);	// this 'case' should go away

-			SetWindowPos(GetDlgItem(hwndDlg, IDC_SETPROFILE),HWND_TOP,width-97,height-224,0,0,SWP_NOSIZE);	// since there's no profile window resize anymore

+			int width = LOWORD(lParam);

+			int height = HIWORD(lParam);

+			SetWindowPos(GetDlgItem(hwndDlg, IDC_PROFILE), HWND_TOP, 6, 60, width - 12, height - 67, 0);	// this 'case' should go away

+			SetWindowPos(GetDlgItem(hwndDlg, IDC_SETPROFILE), HWND_TOP, width - 97, height - 224, 0, 0, SWP_NOSIZE);	// since there's no profile window resize anymore

 			break;

 		}

 	case WM_NOTIFY:

-		switch (LOWORD(wParam))

-		{

+		switch (LOWORD(wParam)) {

 		case IDC_PROFILE:

-			if (((LPNMHDR)lParam)->code==EN_SELCHANGE)

-			{

+			if (((LPNMHDR)lParam)->code == EN_SELCHANGE) {

 				CHARFORMAT2 cfOld;

 				cfOld.cbSize = sizeof(CHARFORMAT2);

 				cfOld.dwMask = CFM_FACE | CFM_SIZE;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cfOld);

-				if (SendDlgItemMessage(hwndDlg, IDC_TYPEFACE, CB_SELECTSTRING, 1, (LPARAM)cfOld.szFaceName)==-1)

-				{

+				if (SendDlgItemMessage(hwndDlg, IDC_TYPEFACE, CB_SELECTSTRING, 1, (LPARAM)cfOld.szFaceName) == -1) {

 					SendDlgItemMessage(hwndDlg, IDC_TYPEFACE, CB_ADDSTRING, 0, (LPARAM)cfOld.szFaceName);

 					SendDlgItemMessage(hwndDlg, IDC_TYPEFACE, CB_SELECTSTRING, 1, (LPARAM)cfOld.szFaceName);

 				}

 				char size[10];

-				_itoa(cfOld.yHeight/20,size,sizeof(size));

+				_itoa(cfOld.yHeight / 20, size, sizeof(size));

 				//SetDlgItemText(hwndDlg, IDC_FONTSIZE, size);

 				SendDlgItemMessage(hwndDlg, IDC_FONTSIZE, CB_SELECTSTRING, 1, (LPARAM)size);

 				InvalidateRect(GetDlgItem(hwndDlg, IDC_SUPERSCRIPT), NULL, FALSE);

@@ -191,22 +176,19 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 				InvalidateRect(GetDlgItem(hwndDlg, IDC_ITALIC), NULL, FALSE);

 				InvalidateRect(GetDlgItem(hwndDlg, IDC_UNDERLINE), NULL, FALSE);

 			}

-			else if (((LPNMHDR)lParam)->code==EN_REQUESTRESIZE)

-			{

+			else if (((LPNMHDR)lParam)->code == EN_REQUESTRESIZE) {

 				//	REQRESIZE* rr= (REQRESIZE*)lParam;

 				//SetWindowPos(GetDlgItem(hwndDlg, IDC_PROFILE),HWND_TOP,rr->rc.left,rr->rc.top,rr->rc.right,rr->rc.bottom,0);

 			}

 			break;

 

 		default:

-			if (((LPNMHDR)lParam)->code == PSN_PARAMCHANGED)

-			{

+			if (((LPNMHDR)lParam)->code == PSN_PARAMCHANGED) {

 				ppro = (CAimProto*)((PSHNOTIFY*)lParam)->lParam;

 				SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)ppro);

 

 				DBVARIANT dbv;

-				if (!db_get_utf(NULL, ppro->m_szModuleName, AIM_KEY_PR, &dbv))

-				{

+				if (!db_get_utf(NULL, ppro->m_szModuleName, AIM_KEY_PR, &dbv)) {

 					html_decode(dbv.pszVal);

 					TCHAR *txt = mir_utf8decodeT(dbv.pszVal);

 					SetDlgItemText(hwndDlg, IDC_PROFILE, txt);

@@ -221,197 +203,175 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 		{

 			CloseThemeData(hThemeButton);

 			hThemeButton = OpenThemeData(GetDlgItem(hwndDlg, IDC_BOLD), L"Button");

-			LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT) lParam;

-			if (lpDIS->CtlID == IDC_SUPERSCRIPT)

-			{

+			LPDRAWITEMSTRUCT lpDIS = (LPDRAWITEMSTRUCT)lParam;

+			if (lpDIS->CtlID == IDC_SUPERSCRIPT) {

 				CHARFORMAT2 cfOld;

 				cfOld.cbSize = sizeof(CHARFORMAT2);

 				cfOld.dwMask = CFM_SUPERSCRIPT;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cfOld);

 				BOOL isSuper = (cfOld.dwEffects & CFE_SUPERSCRIPT) && (cfOld.dwMask & CFM_SUPERSCRIPT);

-				if (isSuper)

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_BOLD),hThemeButton,lpDIS->itemState|ODS_SELECTED, lpDIS->rcItem);

+				if (isSuper) {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_BOLD), hThemeButton, lpDIS->itemState | ODS_SELECTED, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("sup_scrpt"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("sup_scrpt");

 				}

-				else

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_BOLD),hThemeButton,lpDIS->itemState, lpDIS->rcItem);

+				else {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_BOLD), hThemeButton, lpDIS->itemState, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("nsup_scrpt"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("nsup_scrpt");

 				}

 			}

-			else if (lpDIS->CtlID == IDC_NORMALSCRIPT)

-			{

+			else if (lpDIS->CtlID == IDC_NORMALSCRIPT) {

 				CHARFORMAT2 cfOld;

 				cfOld.cbSize = sizeof(CHARFORMAT2);

-				cfOld.dwMask = CFM_SUBSCRIPT|CFM_SUPERSCRIPT;

+				cfOld.dwMask = CFM_SUBSCRIPT | CFM_SUPERSCRIPT;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cfOld);

 				BOOL isSub = (cfOld.dwEffects & CFE_SUBSCRIPT) && (cfOld.dwMask & CFM_SUBSCRIPT);

 				BOOL isSuper = (cfOld.dwEffects & CFE_SUPERSCRIPT) && (cfOld.dwMask & CFM_SUPERSCRIPT);

-				if (!isSub&&!isSuper)

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_BOLD),hThemeButton,lpDIS->itemState|ODS_SELECTED, lpDIS->rcItem);

+				if (!isSub&&!isSuper) {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_BOLD), hThemeButton, lpDIS->itemState | ODS_SELECTED, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("norm_scrpt"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("norm_scrpt");

 				}

-				else

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_BOLD),hThemeButton,lpDIS->itemState, lpDIS->rcItem);

+				else {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_BOLD), hThemeButton, lpDIS->itemState, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("nnorm_scrpt"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("nnorm_scrpt");

 				}

 			}

-			else if (lpDIS->CtlID == IDC_SUBSCRIPT)

-			{

+			else if (lpDIS->CtlID == IDC_SUBSCRIPT) {

 				CHARFORMAT2 cfOld;

 				cfOld.cbSize = sizeof(CHARFORMAT2);

 				cfOld.dwMask = CFM_SUBSCRIPT;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cfOld);

 				BOOL isSub = (cfOld.dwEffects & CFE_SUBSCRIPT) && (cfOld.dwMask & CFM_SUBSCRIPT);

-				if (isSub)

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_BOLD),hThemeButton,lpDIS->itemState|ODS_SELECTED, lpDIS->rcItem);

+				if (isSub) {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_BOLD), hThemeButton, lpDIS->itemState | ODS_SELECTED, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("sub_scrpt"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("sub_scrpt");

 				}

-				else

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_BOLD),hThemeButton,lpDIS->itemState, lpDIS->rcItem);

+				else {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_BOLD), hThemeButton, lpDIS->itemState, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("nsub_scrpt"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("nsub_scrpt");

 				}

 			}

-			else if (lpDIS->CtlID == IDC_BOLD)

-			{

+			else if (lpDIS->CtlID == IDC_BOLD) {

 				CHARFORMAT2 cfOld;

 				cfOld.cbSize = sizeof(CHARFORMAT2);

 				cfOld.dwMask = CFM_BOLD;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cfOld);

 				BOOL isBold = (cfOld.dwEffects & CFE_BOLD) && (cfOld.dwMask & CFM_BOLD);

-				if (!isBold)

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_BOLD),hThemeButton,lpDIS->itemState, lpDIS->rcItem);

+				if (!isBold) {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_BOLD), hThemeButton, lpDIS->itemState, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("nbold"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("nbold");

 				}

-				else

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_BOLD),hThemeButton,lpDIS->itemState|ODS_SELECTED, lpDIS->rcItem);

+				else {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_BOLD), hThemeButton, lpDIS->itemState | ODS_SELECTED, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("bold"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("bold");

 				}

 			}

-			else if (lpDIS->CtlID == IDC_ITALIC)

-			{

+			else if (lpDIS->CtlID == IDC_ITALIC) {

 				CHARFORMAT2 cfOld;

 				cfOld.cbSize = sizeof(CHARFORMAT2);

 				cfOld.dwMask = CFM_ITALIC;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cfOld);

 				BOOL isItalic = (cfOld.dwEffects & CFE_ITALIC) && (cfOld.dwMask & CFM_ITALIC);

-				if (!isItalic)

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_ITALIC),hThemeButton,lpDIS->itemState, lpDIS->rcItem);

+				if (!isItalic) {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_ITALIC), hThemeButton, lpDIS->itemState, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("nitalic"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("nitalic");

 				}

-				else

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_ITALIC),hThemeButton,lpDIS->itemState|ODS_SELECTED, lpDIS->rcItem);

+				else {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_ITALIC), hThemeButton, lpDIS->itemState | ODS_SELECTED, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("italic"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("italic");

 				}

 			}

-			else if (lpDIS->CtlID == IDC_UNDERLINE)

-			{

+			else if (lpDIS->CtlID == IDC_UNDERLINE) {

 				CHARFORMAT2 cfOld;

 				cfOld.cbSize = sizeof(CHARFORMAT2);

 				cfOld.dwMask = CFM_UNDERLINE;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cfOld);

 				BOOL isUnderline = (cfOld.dwEffects & CFE_UNDERLINE) && (cfOld.dwMask & CFM_UNDERLINE);

-				if (!isUnderline)

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_UNDERLINE),hThemeButton,lpDIS->itemState, lpDIS->rcItem);

+				if (!isUnderline) {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_UNDERLINE), hThemeButton, lpDIS->itemState, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("nundrln"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("nundrln");

 				}

-				else

-				{

-					DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_UNDERLINE),hThemeButton,lpDIS->itemState|ODS_SELECTED, lpDIS->rcItem);

+				else {

+					DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_UNDERLINE), hThemeButton, lpDIS->itemState | ODS_SELECTED, lpDIS->rcItem);

 					DrawIconEx(lpDIS->hDC, 4, 5, LoadIconEx("undrln"), 16, 16, 0, 0, DI_NORMAL);

 					ReleaseIconEx("undrln");

 				}

 			}

-			else if (lpDIS->CtlID == IDC_FOREGROUNDCOLOR)

-			{

-				DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_FOREGROUNDCOLOR),hThemeButton,lpDIS->itemState, lpDIS->rcItem);

+			else if (lpDIS->CtlID == IDC_FOREGROUNDCOLOR) {

+				DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_FOREGROUNDCOLOR), hThemeButton, lpDIS->itemState, lpDIS->rcItem);

 				DrawIconEx(lpDIS->hDC, 4, 2, LoadIconEx("foreclr"), 16, 16, 0, 0, DI_NORMAL);

 				ReleaseIconEx("foreclr");

 				HBRUSH	hbr = CreateSolidBrush(foreground);

-				HPEN hp = CreatePen(PS_SOLID, 1, ~foreground&0x00ffffff);

-				SelectObject(lpDIS->hDC,hp);

-				RECT rect=lpDIS->rcItem;

-				rect.top+=18;

-				rect.bottom-=4;

-				rect.left+=5;

-				rect.right-=5;

-				Rectangle(lpDIS->hDC,rect.left-1,rect.top-1,rect.right+1,rect.bottom+1);

-				FillRect(lpDIS->hDC,&rect, hbr);

+				HPEN hp = CreatePen(PS_SOLID, 1, ~foreground & 0x00ffffff);

+				SelectObject(lpDIS->hDC, hp);

+				RECT rect = lpDIS->rcItem;

+				rect.top += 18;

+				rect.bottom -= 4;

+				rect.left += 5;

+				rect.right -= 5;

+				Rectangle(lpDIS->hDC, rect.left - 1, rect.top - 1, rect.right + 1, rect.bottom + 1);

+				FillRect(lpDIS->hDC, &rect, hbr);

 				DeleteObject(hbr);

 				DeleteObject(hp);

 			}

-			else if (lpDIS->CtlID == IDC_FOREGROUNDCOLORPICKER)

-			{

-				DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_FOREGROUNDCOLORPICKER),hThemeButton,lpDIS->itemState, lpDIS->rcItem);

+			else if (lpDIS->CtlID == IDC_FOREGROUNDCOLORPICKER) {

+				DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_FOREGROUNDCOLORPICKER), hThemeButton, lpDIS->itemState, lpDIS->rcItem);

 				HBRUSH	hbr = CreateSolidBrush(foreground);

-				HPEN hp = CreatePen(PS_SOLID, 1,~foreground&0x00ffffff);

-				SelectObject(lpDIS->hDC,hbr);

-				SelectObject(lpDIS->hDC,hp);

+				HPEN hp = CreatePen(PS_SOLID, 1, ~foreground & 0x00ffffff);

+				SelectObject(lpDIS->hDC, hbr);

+				SelectObject(lpDIS->hDC, hp);

 				POINT tri[3];

-				tri[0].x=3;

-				tri[0].y=10;

-				tri[1].x=9;

-				tri[1].y=10;

-				tri[2].x=6;

-				tri[2].y=15;

-				Polygon(lpDIS->hDC,tri,3);

+				tri[0].x = 3;

+				tri[0].y = 10;

+				tri[1].x = 9;

+				tri[1].y = 10;

+				tri[2].x = 6;

+				tri[2].y = 15;

+				Polygon(lpDIS->hDC, tri, 3);

 				DeleteObject(hbr);

 				DeleteObject(hp);

 			}

-			else if (lpDIS->CtlID == IDC_BACKGROUNDCOLOR)

-			{

-				DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_BACKGROUNDCOLOR),hThemeButton,lpDIS->itemState, lpDIS->rcItem);

+			else if (lpDIS->CtlID == IDC_BACKGROUNDCOLOR) {

+				DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_BACKGROUNDCOLOR), hThemeButton, lpDIS->itemState, lpDIS->rcItem);

 				DrawIconEx(lpDIS->hDC, 4, 2, LoadIconEx("backclr"), 16, 16, 0, 0, DI_NORMAL);

 				ReleaseIconEx("backclr");

 				HBRUSH	hbr = CreateSolidBrush(background);

-				HPEN hp = CreatePen(PS_SOLID, 1, ~background&0x00ffffff);

-				SelectObject(lpDIS->hDC,hp);

-				RECT rect=lpDIS->rcItem;

-				rect.top+=18;

-				rect.bottom-=4;

-				rect.left+=5;

-				rect.right-=5;

-				Rectangle(lpDIS->hDC,rect.left-1,rect.top-1,rect.right+1,rect.bottom+1);

-				FillRect(lpDIS->hDC,&rect, hbr);

+				HPEN hp = CreatePen(PS_SOLID, 1, ~background & 0x00ffffff);

+				SelectObject(lpDIS->hDC, hp);

+				RECT rect = lpDIS->rcItem;

+				rect.top += 18;

+				rect.bottom -= 4;

+				rect.left += 5;

+				rect.right -= 5;

+				Rectangle(lpDIS->hDC, rect.left - 1, rect.top - 1, rect.right + 1, rect.bottom + 1);

+				FillRect(lpDIS->hDC, &rect, hbr);

 				DeleteObject(hbr);

 				DeleteObject(hp);

 			}

-			else if (lpDIS->CtlID == IDC_BACKGROUNDCOLORPICKER)

-			{

-				DrawMyControl(lpDIS->hDC,GetDlgItem(hwndDlg, IDC_BACKGROUNDCOLORPICKER),hThemeButton,lpDIS->itemState, lpDIS->rcItem);

+			else if (lpDIS->CtlID == IDC_BACKGROUNDCOLORPICKER) {

+				DrawMyControl(lpDIS->hDC, GetDlgItem(hwndDlg, IDC_BACKGROUNDCOLORPICKER), hThemeButton, lpDIS->itemState, lpDIS->rcItem);

 				HBRUSH	hbr = CreateSolidBrush(background);

-				HPEN hp = CreatePen(PS_SOLID, 1,~background&0x00ffffff);

-				SelectObject(lpDIS->hDC,hbr);

-				SelectObject(lpDIS->hDC,hp);

+				HPEN hp = CreatePen(PS_SOLID, 1, ~background & 0x00ffffff);

+				SelectObject(lpDIS->hDC, hbr);

+				SelectObject(lpDIS->hDC, hp);

 				POINT tri[3];

-				tri[0].x=3;

-				tri[0].y=10;

-				tri[1].x=9;

-				tri[1].y=10;

-				tri[2].x=6;

-				tri[2].y=15;

-				Polygon(lpDIS->hDC,tri,3);

+				tri[0].x = 3;

+				tri[0].y = 10;

+				tri[1].x = 9;

+				tri[1].y = 10;

+				tri[2].x = 6;

+				tri[2].y = 15;

+				Polygon(lpDIS->hDC, tri, 3);

 				DeleteObject(hbr);

 				DeleteObject(hp);

 			}

@@ -419,8 +379,7 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 		}

 

 	case WM_COMMAND:

-		switch (LOWORD(wParam))

-		{

+		switch (LOWORD(wParam)) {

 		case IDC_PROFILE:

 			if (HIWORD(wParam) == EN_CHANGE)

 				EnableWindow(GetDlgItem(hwndDlg, IDC_SETPROFILE), TRUE);

@@ -430,7 +389,7 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			{

 				char* buf = rtf_to_html(hwndDlg, IDC_PROFILE);

 				db_set_utf(NULL, ppro->m_szModuleName, AIM_KEY_PR, buf);

-				if (ppro->state==1)

+				if (ppro->state == 1)

 					ppro->aim_set_profile(ppro->hServerConn, ppro->seqno, buf);//also see set caps for profile setting

 

 				mir_free(buf);

@@ -439,12 +398,11 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			break;

 

 		case IDC_SUPERSCRIPT:

-			if (HIWORD(wParam) == BN_CLICKED)

-			{

+			if (HIWORD(wParam) == BN_CLICKED) {

 				CHARFORMAT2 cf;

 				cf.cbSize = sizeof(CHARFORMAT2);

-				cf.dwMask=CFM_SUPERSCRIPT;

-				cf.dwEffects=CFE_SUPERSCRIPT;

+				cf.dwMask = CFM_SUPERSCRIPT;

+				cf.dwEffects = CFE_SUPERSCRIPT;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 				SetFocus(GetDlgItem(hwndDlg, IDC_PROFILE));

 				InvalidateRect(GetDlgItem(hwndDlg, IDC_NORMALSCRIPT), NULL, FALSE);

@@ -453,11 +411,10 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			break;

 

 		case IDC_NORMALSCRIPT:

-			if (HIWORD(wParam) == BN_CLICKED)

-			{

+			if (HIWORD(wParam) == BN_CLICKED) {

 				CHARFORMAT2 cf;

 				cf.cbSize = sizeof(CHARFORMAT2);

-				cf.dwMask=CFM_SUPERSCRIPT;

+				cf.dwMask = CFM_SUPERSCRIPT;

 				cf.dwEffects &= ~CFE_SUPERSCRIPT;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 				SetFocus(GetDlgItem(hwndDlg, IDC_PROFILE));

@@ -467,12 +424,11 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			break;

 

 		case IDC_SUBSCRIPT:

-			if (HIWORD(wParam) == BN_CLICKED)

-			{

+			if (HIWORD(wParam) == BN_CLICKED) {

 				CHARFORMAT2 cf;

 				cf.cbSize = sizeof(CHARFORMAT2);

-				cf.dwMask=CFM_SUBSCRIPT;

-				cf.dwEffects=CFE_SUBSCRIPT;

+				cf.dwMask = CFM_SUBSCRIPT;

+				cf.dwEffects = CFE_SUBSCRIPT;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 				SetFocus(GetDlgItem(hwndDlg, IDC_PROFILE));

 				InvalidateRect(GetDlgItem(hwndDlg, IDC_SUPERSCRIPT), NULL, FALSE);

@@ -481,8 +437,7 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			break;

 

 		case IDC_BOLD:

-			if (HIWORD(wParam) == BN_CLICKED)

-			{

+			if (HIWORD(wParam) == BN_CLICKED) {

 				CHARFORMAT2 cfOld;

 				cfOld.cbSize = sizeof(CHARFORMAT2);

 				cfOld.dwMask = CFM_BOLD;

@@ -499,8 +454,7 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			break;

 

 		case IDC_ITALIC:

-			if (HIWORD(wParam) == BN_CLICKED)

-			{

+			if (HIWORD(wParam) == BN_CLICKED) {

 				CHARFORMAT2 cfOld;

 				cfOld.cbSize = sizeof(CHARFORMAT2);

 				cfOld.dwMask = CFM_ITALIC;

@@ -517,8 +471,7 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			break;

 

 		case IDC_UNDERLINE:

-			if (HIWORD(wParam)==BN_CLICKED)

-			{

+			if (HIWORD(wParam) == BN_CLICKED) {

 				CHARFORMAT2 cfOld;

 				cfOld.cbSize = sizeof(CHARFORMAT2);

 				cfOld.dwMask = CFM_UNDERLINE;

@@ -535,33 +488,30 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			break;

 

 		case IDC_FOREGROUNDCOLOR:

-			if (HIWORD(wParam) == BN_CLICKED)

-			{

+			if (HIWORD(wParam) == BN_CLICKED) {

 				CHARFORMAT2 cf;

 				cf.cbSize = sizeof(CHARFORMAT2);

-				cf.dwMask=CFM_COLOR;

-				cf.dwEffects=0;

-				cf.crTextColor=foreground;

+				cf.dwMask = CFM_COLOR;

+				cf.dwEffects = 0;

+				cf.crTextColor = foreground;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

-				SetWindowPos(GetDlgItem(hwndDlg, IDC_FOREGROUNDCOLORPICKER),GetDlgItem(hwndDlg, IDC_FOREGROUNDCOLOR),0,0,0,0,SWP_NOMOVE|SWP_NOSIZE);

+				SetWindowPos(GetDlgItem(hwndDlg, IDC_FOREGROUNDCOLORPICKER), GetDlgItem(hwndDlg, IDC_FOREGROUNDCOLOR), 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);

 				SetFocus(GetDlgItem(hwndDlg, IDC_PROFILE));

 			}

 			break;

 

 		case IDC_FOREGROUNDCOLORPICKER:

-			if (HIWORD(wParam) == BN_CLICKED)

-			{

-				CHOOSECOLOR cc={0};

-				custColours[0]=foreground;

-				custColours[1]=background;

-				cc.lStructSize=sizeof(CHOOSECOLOR);

-				cc.hwndOwner=hwndDlg;

-				cc.hInstance=(HWND)GetModuleHandle(NULL);

-				cc.lpCustColors=custColours;

-				cc.Flags=CC_ANYCOLOR|CC_FULLOPEN|CC_RGBINIT;

-				if (ChooseColor(&cc))

-				{

-					foreground=cc.rgbResult;

+			if (HIWORD(wParam) == BN_CLICKED) {

+				CHOOSECOLOR cc = { 0 };

+				custColours[0] = foreground;

+				custColours[1] = background;

+				cc.lStructSize = sizeof(CHOOSECOLOR);

+				cc.hwndOwner = hwndDlg;

+				cc.hInstance = (HWND)GetModuleHandleA("mir_app.dll");

+				cc.lpCustColors = custColours;

+				cc.Flags = CC_ANYCOLOR | CC_FULLOPEN | CC_RGBINIT;

+				if (ChooseColor(&cc)) {

+					foreground = cc.rgbResult;

 					InvalidateRect(GetDlgItem(hwndDlg, IDC_FOREGROUNDCOLOR), NULL, FALSE);

 				}

 				SetFocus(GetDlgItem(hwndDlg, IDC_PROFILE));

@@ -569,32 +519,29 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			break;

 

 		case IDC_BACKGROUNDCOLOR:

-			if (HIWORD(wParam) == BN_CLICKED)

-			{

+			if (HIWORD(wParam) == BN_CLICKED) {

 				CHARFORMAT2 cf;

 				cf.cbSize = sizeof(CHARFORMAT2);

-				cf.dwMask=CFM_BACKCOLOR;

-				cf.dwEffects=0;

-				cf.crBackColor=background;

+				cf.dwMask = CFM_BACKCOLOR;

+				cf.dwEffects = 0;

+				cf.crBackColor = background;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 				SetFocus(GetDlgItem(hwndDlg, IDC_PROFILE));

 			}

 			break;

 

 		case IDC_BACKGROUNDCOLORPICKER:

-			if (HIWORD(wParam)==BN_CLICKED)

-			{

-				CHOOSECOLOR cc={0};

-				custColours[0]=foreground;

-				custColours[1]=background;

-				cc.lStructSize=sizeof(CHOOSECOLOR);

-				cc.hwndOwner=hwndDlg;

-				cc.hInstance=(HWND)GetModuleHandle(NULL);

-				cc.lpCustColors=custColours;

-				cc.Flags=CC_ANYCOLOR|CC_FULLOPEN|CC_RGBINIT;

-				if (ChooseColor(&cc))

-				{

-					background=cc.rgbResult;

+			if (HIWORD(wParam) == BN_CLICKED) {

+				CHOOSECOLOR cc = { 0 };

+				custColours[0] = foreground;

+				custColours[1] = background;

+				cc.lStructSize = sizeof(CHOOSECOLOR);

+				cc.hwndOwner = hwndDlg;

+				cc.hInstance = (HWND)GetModuleHandle(NULL);

+				cc.lpCustColors = custColours;

+				cc.Flags = CC_ANYCOLOR | CC_FULLOPEN | CC_RGBINIT;

+				if (ChooseColor(&cc)) {

+					background = cc.rgbResult;

 					InvalidateRect(GetDlgItem(hwndDlg, IDC_BACKGROUNDCOLOR), NULL, FALSE);

 				}

 				SetFocus(GetDlgItem(hwndDlg, IDC_PROFILE));

@@ -602,13 +549,12 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			break;

 

 		case IDC_TYPEFACE:

-			if (HIWORD(wParam)==CBN_SELENDOK)

-			{

+			if (HIWORD(wParam) == CBN_SELENDOK) {

 				CHARFORMAT2A cf;

 				cf.cbSize = sizeof(cf);

-				cf.dwMask=CFM_FACE;

-				cf.dwEffects=0;

-				SendDlgItemMessage(hwndDlg, IDC_TYPEFACE, CB_GETLBTEXT, SendDlgItemMessage(hwndDlg, IDC_TYPEFACE, CB_GETCURSEL, 0, 0),(LPARAM)cf.szFaceName);

+				cf.dwMask = CFM_FACE;

+				cf.dwEffects = 0;

+				SendDlgItemMessage(hwndDlg, IDC_TYPEFACE, CB_GETLBTEXT, SendDlgItemMessage(hwndDlg, IDC_TYPEFACE, CB_GETCURSEL, 0, 0), (LPARAM)cf.szFaceName);

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 				SetFocus(GetDlgItem(hwndDlg, IDC_PROFILE));

 				break;

@@ -616,16 +562,15 @@ static INT_PTR CALLBACK userinfo_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			break;

 

 		case IDC_FONTSIZE:

-			if (HIWORD(wParam)==CBN_SELENDOK)

-			{

+			if (HIWORD(wParam) == CBN_SELENDOK) {

 				CHARFORMAT2 cf;

 				cf.cbSize = sizeof(CHARFORMAT2);

-				cf.dwMask=CFM_SIZE;

-				cf.dwEffects=0;

+				cf.dwMask = CFM_SIZE;

+				cf.dwEffects = 0;

 				char chsize[5] = "";

-				SendDlgItemMessage(hwndDlg, IDC_FONTSIZE, CB_GETLBTEXT, SendDlgItemMessage(hwndDlg, IDC_FONTSIZE, CB_GETCURSEL, 0, 0),(LPARAM)chsize);

+				SendDlgItemMessage(hwndDlg, IDC_FONTSIZE, CB_GETLBTEXT, SendDlgItemMessage(hwndDlg, IDC_FONTSIZE, CB_GETCURSEL, 0, 0), (LPARAM)chsize);

 				//strlcpy(cf.szFaceName,size,mir_strlen(size)+1);

-				cf.yHeight=atoi(chsize)*20;

+				cf.yHeight = atoi(chsize) * 20;

 				SendDlgItemMessage(hwndDlg, IDC_PROFILE, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf);

 				SetFocus(GetDlgItem(hwndDlg, IDC_PROFILE));

 				break;

@@ -645,8 +590,7 @@ INT_PTR CALLBACK admin_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 	CAimProto* ppro = (CAimProto*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 	DBVARIANT dbv;

 

-	switch (msg)

-	{

+	switch (msg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

 		SendDlgItemMessage(hwndDlg, IDC_FNAME, EM_LIMITTEXT, 63, 0);

@@ -657,26 +601,23 @@ INT_PTR CALLBACK admin_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		break;

 

 	case WM_NOTIFY:

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

-		{

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

 		case PSN_PARAMCHANGED:

 			ppro = (CAimProto*)((LPPSHNOTIFY)lParam)->lParam;

 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)ppro);

 

 			if (ppro->wait_conn(ppro->hAdminConn, ppro->hAdminEvent, 0x07))             // Make a connection

 			{

-				ppro->aim_admin_request_info(ppro->hAdminConn,ppro->admin_seqno,0x01);	// Get our screenname

-				ppro->aim_admin_request_info(ppro->hAdminConn,ppro->admin_seqno,0x11);	// Get our email

+				ppro->aim_admin_request_info(ppro->hAdminConn, ppro->admin_seqno, 0x01);	// Get our screenname

+				ppro->aim_admin_request_info(ppro->hAdminConn, ppro->admin_seqno, 0x11);	// Get our email

 			}

 

 		case PSN_INFOCHANGED:

-			if (!ppro->getString(AIM_KEY_SN, &dbv))

-			{

+			if (!ppro->getString(AIM_KEY_SN, &dbv)) {

 				SetDlgItemTextA(hwndDlg, IDC_FNAME, dbv.pszVal);

 				db_free(&dbv);

 			}

-			if (!ppro->getString(AIM_KEY_EM, &dbv))

-			{

+			if (!ppro->getString(AIM_KEY_EM, &dbv)) {

 				SetDlgItemTextA(hwndDlg, IDC_CEMAIL, dbv.pszVal);

 				db_free(&dbv);

 			}

@@ -685,17 +626,15 @@ INT_PTR CALLBACK admin_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		break;

 

 	case WM_COMMAND:

-		if  (LOWORD(wParam) == IDC_SAVECHANGES)

-		{

+		if (LOWORD(wParam) == IDC_SAVECHANGES) {

 			if (!ppro->wait_conn(ppro->hAdminConn, ppro->hAdminEvent, 0x07))             // Make a connection

 				break;

 

 			char name[64];

 			GetDlgItemTextA(hwndDlg, IDC_FNAME, name, SIZEOF(name));

-			if (mir_strlen(trim_str(name)) > 0 && !ppro->getString(AIM_KEY_SN, &dbv))

-			{

+			if (mir_strlen(trim_str(name)) > 0 && !ppro->getString(AIM_KEY_SN, &dbv)) {

 				if (mir_strcmp(name, dbv.pszVal))

-					ppro->aim_admin_format_name(ppro->hAdminConn,ppro->admin_seqno,name);

+					ppro->aim_admin_format_name(ppro->hAdminConn, ppro->admin_seqno, name);

 				db_free(&dbv);

 			}

 

@@ -704,7 +643,7 @@ INT_PTR CALLBACK admin_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 			if (mir_strlen(trim_str(email)) > 1 && !ppro->getString(AIM_KEY_EM, &dbv)) // Must be greater than 1 or a SNAC error is thrown.

 			{

 				if (mir_strcmp(email, dbv.pszVal))

-					ppro->aim_admin_change_email(ppro->hAdminConn,ppro->admin_seqno,email);

+					ppro->aim_admin_change_email(ppro->hAdminConn, ppro->admin_seqno, email);

 				db_free(&dbv);

 			}

 

@@ -714,17 +653,14 @@ INT_PTR CALLBACK admin_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 			GetDlgItemTextA(hwndDlg, IDC_CPW, cpw, SIZEOF(cpw));

 			GetDlgItemTextA(hwndDlg, IDC_NPW1, npw1, SIZEOF(npw1));

 			GetDlgItemTextA(hwndDlg, IDC_NPW2, npw2, SIZEOF(npw2));

-			if (cpw[0] != 0 && npw1[0] != 0 && npw2[0] != 0)

-			{

+			if (cpw[0] != 0 && npw1[0] != 0 && npw2[0] != 0) {

 				// AOL only requires that you send the current password and a (single) new password.

 				// Let's allow the client to type (two) new passwords incase they make a mistake so we

 				// can handle any input error locally.

-				if (mir_strcmp(npw1,npw2) == 0)

-				{

-					ppro->aim_admin_change_password(ppro->hAdminConn,ppro->admin_seqno,cpw,npw1);

+				if (mir_strcmp(npw1, npw2) == 0) {

+					ppro->aim_admin_change_password(ppro->hAdminConn, ppro->admin_seqno, cpw, npw1);

 				}

-				else

-				{

+				else {

 					SetDlgItemTextA(hwndDlg, IDC_CPW, "");

 					SetDlgItemTextA(hwndDlg, IDC_NPW1, "");

 					SetDlgItemTextA(hwndDlg, IDC_NPW2, "");

@@ -735,14 +671,14 @@ INT_PTR CALLBACK admin_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		else if (LOWORD(wParam) == IDC_CONFIRM)	// Confirmation

 		{

 			if (ppro->wait_conn(ppro->hAdminConn, ppro->hAdminEvent, 0x07))             // Make a connection

-				ppro->aim_admin_account_confirm(ppro->hAdminConn,ppro->admin_seqno);

+				ppro->aim_admin_account_confirm(ppro->hAdminConn, ppro->admin_seqno);

 		}

 		break;

 	}

 	return FALSE;

 }

 

-int CAimProto::OnUserInfoInit(WPARAM wParam,LPARAM lParam)

+int CAimProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam)

 {

 	if (!lParam)//hContact

 	{

@@ -829,8 +765,7 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		break;

 

 	case WM_COMMAND:

-		switch (LOWORD(wParam))

-		{

+		switch (LOWORD(wParam)) {

 		case IDC_DSSL:

 			{

 				bool dssl = IsDlgButtonChecked(hwndDlg, IDC_DSSL) != 0;

@@ -842,7 +777,7 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		case IDC_SVRRESET:

 			SetDlgItemTextA(hwndDlg, IDC_HN,

 				IsDlgButtonChecked(hwndDlg, IDC_DSSL) ? AIM_DEFAULT_SERVER_NS : AIM_DEFAULT_SERVER);

-			SetDlgItemInt(hwndDlg, IDC_PN,ppro->get_default_port(), FALSE);

+			SetDlgItemInt(hwndDlg, IDC_PN, ppro->get_default_port(), FALSE);

 			break;

 

 		case IDC_SN:

@@ -850,7 +785,7 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		case IDC_NK:

 		case IDC_PW:

 		case IDC_HN:

-			if (HIWORD(wParam) != EN_CHANGE || (HWND) lParam != GetFocus())

+			if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())

 				return 0;

 			break;

 		}

@@ -858,8 +793,7 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		break;

 

 	case WM_NOTIFY:

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

-		{

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

 		case PSN_APPLY:

 			{

 				char str[128];

@@ -874,8 +808,7 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				//NK

 				if (GetDlgItemTextA(hwndDlg, IDC_NK, str, SIZEOF(str)))

 					ppro->setString(AIM_KEY_NK, str);

-				else

-				{

+				else {

 					GetDlgItemTextA(hwndDlg, IDC_SN, str, SIZEOF(str));

 					ppro->setString(AIM_KEY_NK, str);

 				}

@@ -926,15 +859,13 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				//END PN

 

 				//Disable Account Type Icons

-				if (IsDlgButtonChecked(hwndDlg, IDC_AT))

-				{

+				if (IsDlgButtonChecked(hwndDlg, IDC_AT)) {

 					int acc_disabled = ppro->getByte(AIM_KEY_AT, 0);

 					if (!acc_disabled)

 						remove_AT_icons(ppro);

 					ppro->setByte(AIM_KEY_AT, 1);

 				}

-				else

-				{

+				else {

 					int acc_disabled = ppro->getByte(AIM_KEY_AT, 0);

 					if (acc_disabled)

 						add_AT_icons(ppro);

@@ -942,15 +873,13 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				}

 				//END

 				//Disable Extra Status Icons

-				if (IsDlgButtonChecked(hwndDlg, IDC_ES))

-				{

+				if (IsDlgButtonChecked(hwndDlg, IDC_ES)) {

 					int es_disabled = ppro->getByte(AIM_KEY_ES, 0);

 					ppro->setByte(AIM_KEY_ES, 1);

 					if (!es_disabled)

 						remove_ES_icons(ppro);

 				}

-				else

-				{

+				else {

 					int es_disabled = ppro->getByte(AIM_KEY_ES, 0);

 					ppro->setByte(AIM_KEY_ES, 0);

 					if (es_disabled)

@@ -959,15 +888,13 @@ static INT_PTR CALLBACK options_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				//End

 

 				//Fake Hiptop

-				if (IsDlgButtonChecked(hwndDlg, IDC_HF))

-				{

+				if (IsDlgButtonChecked(hwndDlg, IDC_HF)) {

 					int hf = ppro->getByte(AIM_KEY_HF, 0);

 					if (!hf)

 						ShowWindow(GetDlgItem(hwndDlg, IDC_MASQ), SW_SHOW);

 					ppro->setByte(AIM_KEY_HF, 1);

 				}

-				else

-				{

+				else {

 					int hf = ppro->getByte(AIM_KEY_HF, 0);

 					if (hf)

 						ShowWindow(GetDlgItem(hwndDlg, IDC_MASQ), SW_SHOW);

@@ -1011,45 +938,40 @@ static INT_PTR CALLBACK privacy_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 	CAimProto* ppro = (CAimProto*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 	int i;

 

-	switch (msg)

-	{

+	switch (msg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

 

 		SetWindowLongPtr(hwndDlg, GWLP_USERDATA, lParam);

 		ppro = (CAimProto*)lParam;

 

-		CheckRadioButton(hwndDlg, IDC_ALLOWALL, IDC_BLOCKBELOW, btns[ppro->pd_mode-1]);

+		CheckRadioButton(hwndDlg, IDC_ALLOWALL, IDC_BLOCKBELOW, btns[ppro->pd_mode - 1]);

 

-		for (i=0; i<ppro->allow_list.getCount(); ++i)

+		for (i = 0; i < ppro->allow_list.getCount(); ++i)

 			SendDlgItemMessageA(hwndDlg, IDC_ALLOWLIST, LB_ADDSTRING, 0, (LPARAM)ppro->allow_list[i].name);

 

-		for (i=0; i<ppro->block_list.getCount(); ++i)

+		for (i = 0; i < ppro->block_list.getCount(); ++i)

 			SendDlgItemMessageA(hwndDlg, IDC_BLOCKLIST, LB_ADDSTRING, 0, (LPARAM)ppro->block_list[i].name);

 

 		CheckDlgButton(hwndDlg, IDC_SIS, (ppro->pref1_flags & 0x400) ? BST_CHECKED : BST_CHECKED);

 		break;

 

 	case WM_COMMAND:

-		if (LOWORD(wParam) == IDC_ALLOWADD)

-		{

+		if (LOWORD(wParam) == IDC_ALLOWADD) {

 			char nick[80];

 			GetDlgItemTextA(hwndDlg, IDC_ALLOWEDIT, nick, SIZEOF(nick));

 			SendDlgItemMessageA(hwndDlg, IDC_ALLOWLIST, LB_ADDSTRING, 0, (LPARAM)trim_str(nick));

 		}

-		else if (LOWORD(wParam) == IDC_BLOCKADD)

-		{

+		else if (LOWORD(wParam) == IDC_BLOCKADD) {

 			char nick[80];

 			GetDlgItemTextA(hwndDlg, IDC_BLOCKEDIT, nick, SIZEOF(nick));

 			SendDlgItemMessageA(hwndDlg, IDC_BLOCKLIST, LB_ADDSTRING, 0, (LPARAM)trim_str(nick));

 		}

-		else if (LOWORD(wParam) == IDC_ALLOWREMOVE)

-		{

+		else if (LOWORD(wParam) == IDC_ALLOWREMOVE) {

 			i = SendDlgItemMessage(hwndDlg, IDC_ALLOWLIST, LB_GETCURSEL, 0, 0);

 			SendDlgItemMessage(hwndDlg, IDC_ALLOWLIST, LB_DELETESTRING, i, 0);

 		}

-		else if (LOWORD(wParam) == IDC_BLOCKREMOVE)

-		{

+		else if (LOWORD(wParam) == IDC_BLOCKREMOVE) {

 			i = SendDlgItemMessage(hwndDlg, IDC_BLOCKLIST, LB_GETCURSEL, 0, 0);

 			SendDlgItemMessage(hwndDlg, IDC_BLOCKLIST, LB_DELETESTRING, i, 0);

 		}

@@ -1058,64 +980,52 @@ static INT_PTR CALLBACK privacy_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		break;

 

 	case WM_NOTIFY:

-		if (((LPNMHDR) lParam)->code == PSN_APPLY)

-		{

+		if (((LPNMHDR)lParam)->code == PSN_APPLY) {

 			ppro->aim_ssi_update(ppro->hServerConn, ppro->seqno, true);

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

-			{

-				if (IsDlgButtonChecked(hwndDlg, btns[i]) && ppro->pd_mode != i + 1)

-				{

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

+				if (IsDlgButtonChecked(hwndDlg, btns[i]) && ppro->pd_mode != i + 1) {

 					ppro->pd_mode = (char)(i + 1);

 					ppro->pd_flags = 1;

 					ppro->aim_set_pd_info(ppro->hServerConn, ppro->seqno);

 					break;

 				}

 			}

-			for (i=0; i<ppro->block_list.getCount(); ++i)

-			{

+			for (i = 0; i < ppro->block_list.getCount(); ++i) {

 				BdListItem& pd = ppro->block_list[i];

-				if (SendDlgItemMessageA(hwndDlg, IDC_BLOCKLIST, LB_FINDSTRING, (WPARAM)-1, (LPARAM)pd.name) == LB_ERR)

-				{

+				if (SendDlgItemMessageA(hwndDlg, IDC_BLOCKLIST, LB_FINDSTRING, (WPARAM)-1, (LPARAM)pd.name) == LB_ERR) {

 					ppro->aim_delete_contact(ppro->hServerConn, ppro->seqno, pd.name, pd.item_id, 0, 3, false);

 					ppro->block_list.remove(i--);

 				}

 			}

 			i = SendDlgItemMessage(hwndDlg, IDC_BLOCKLIST, LB_GETCOUNT, 0, 0);

-			for (; i--;)

-			{

+			for (; i--;) {

 				char nick[80];

 				SendDlgItemMessageA(hwndDlg, IDC_BLOCKLIST, LB_GETTEXT, i, (LPARAM)nick);

-				if (ppro->block_list.find_id(nick) == 0)

-				{

+				if (ppro->block_list.find_id(nick) == 0) {

 					unsigned short id = ppro->block_list.add(nick);

 					ppro->aim_add_contact(ppro->hServerConn, ppro->seqno, nick, id, 0, 3);

 				}

 			}

 

-			for (i=0; i<ppro->allow_list.getCount(); ++i)

-			{

+			for (i = 0; i < ppro->allow_list.getCount(); ++i) {

 				BdListItem& pd = ppro->allow_list[i];

-				if (SendDlgItemMessageA(hwndDlg, IDC_ALLOWLIST, LB_FINDSTRING, (WPARAM)-1, (LPARAM)pd.name) == LB_ERR)

-				{

+				if (SendDlgItemMessageA(hwndDlg, IDC_ALLOWLIST, LB_FINDSTRING, (WPARAM)-1, (LPARAM)pd.name) == LB_ERR) {

 					ppro->aim_delete_contact(ppro->hServerConn, ppro->seqno, pd.name, pd.item_id, 0, 2, false);

 					ppro->allow_list.remove(i--);

 				}

 			}

 			i = SendDlgItemMessage(hwndDlg, IDC_ALLOWLIST, LB_GETCOUNT, 0, 0);

-			for (; i--;)

-			{

+			for (; i--;) {

 				char nick[80];

 				SendDlgItemMessageA(hwndDlg, IDC_ALLOWLIST, LB_GETTEXT, i, (LPARAM)nick);

-				if (ppro->allow_list.find_id(nick) == 0)

-				{

+				if (ppro->allow_list.find_id(nick) == 0) {

 					unsigned short id = ppro->allow_list.add(nick);

 					ppro->aim_add_contact(ppro->hServerConn, ppro->seqno, nick, id, 0, 2);

 				}

 			}

 

 			unsigned mask = (IsDlgButtonChecked(hwndDlg, IDC_SIS) == BST_CHECKED) << 10;

-			if ((ppro->pref1_flags & 0x400) ^ mask)

-			{

+			if ((ppro->pref1_flags & 0x400) ^ mask) {

 				ppro->pref1_flags = (ppro->pref1_flags & ~0x400) | mask;

 				ppro->aim_ssi_update_preferences(ppro->hServerConn, ppro->seqno);

 			}

@@ -1138,14 +1048,14 @@ int CAimProto::OnOptionsInit(WPARAM wParam, LPARAM)
 	odp.dwInitParam = LPARAM(this);

 	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE;

 

-	odp.ptszTab   = LPGENT("Basic");

+	odp.ptszTab = LPGENT("Basic");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_AIM);

 	odp.pfnDlgProc = options_dialog;

 	Options_AddPage(wParam, &odp);

 

-	odp.ptszTab     = LPGENT("Privacy");

+	odp.ptszTab = LPGENT("Privacy");

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_PRIVACY);

-	odp.pfnDlgProc  = privacy_dialog;

+	odp.pfnDlgProc = privacy_dialog;

 	Options_AddPage(wParam, &odp);

 	return 0;

 }

@@ -1185,7 +1095,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		}

 

 		if (HIWORD(wParam) == EN_CHANGE && (HWND)lParam == GetFocus()) {

-			switch(LOWORD(wParam)) {

+			switch (LOWORD(wParam)) {

 			case IDC_SN:

 			case IDC_PW:

 				SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

@@ -1211,8 +1121,8 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 INT_PTR CAimProto::SvcCreateAccMgrUI(WPARAM, LPARAM lParam)

 {

-	return (INT_PTR)CreateDialogParam (hInstance, MAKEINTRESOURCE(IDD_AIMACCOUNT),

-		 (HWND)lParam, first_run_dialog, (LPARAM)this);

+	return (INT_PTR)CreateDialogParam(hInstance, MAKEINTRESOURCE(IDD_AIMACCOUNT),

+		(HWND)lParam, first_run_dialog, (LPARAM)this);

 }

 

 

@@ -1234,8 +1144,8 @@ INT_PTR CALLBACK instant_idle_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			unsigned long it = ppro->getDword(AIM_KEY_IIT, 0);

 			unsigned long hours = it / 60;

 			unsigned long minutes = it % 60;

-			SetDlgItemInt(hwndDlg, IDC_IIH, hours,0);

-			SetDlgItemInt(hwndDlg, IDC_IIM, minutes,0);

+			SetDlgItemInt(hwndDlg, IDC_IIH, hours, 0);

+			SetDlgItemInt(hwndDlg, IDC_IIM, minutes, 0);

 		}

 		break;

 

@@ -1249,25 +1159,25 @@ INT_PTR CALLBACK instant_idle_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 

 	case WM_COMMAND:

 		{

-			unsigned long hours=GetDlgItemInt(hwndDlg, IDC_IIH,0,0);

-			unsigned short minutes=(unsigned short)GetDlgItemInt(hwndDlg, IDC_IIM,0,0);

+			unsigned long hours = GetDlgItemInt(hwndDlg, IDC_IIH, 0, 0);

+			unsigned short minutes = (unsigned short)GetDlgItemInt(hwndDlg, IDC_IIM, 0, 0);

 			if (minutes > 59)

 				minutes = 59;

 

-			ppro->setDword(AIM_KEY_IIT, hours*60+minutes);

+			ppro->setDword(AIM_KEY_IIT, hours * 60 + minutes);

 			switch (LOWORD(wParam)) {

 			case IDOK:

 				//Instant Idle

 				if (ppro->state == 1) {

-					ppro->aim_set_idle(ppro->hServerConn,ppro->seqno,hours * 60 * 60 + minutes * 60);

-					ppro->instantidle=1;

+					ppro->aim_set_idle(ppro->hServerConn, ppro->seqno, hours * 60 * 60 + minutes * 60);

+					ppro->instantidle = 1;

 				}

 				EndDialog(hwndDlg, IDOK);

 				break;

 

 			case IDCANCEL:

-				ppro->aim_set_idle(ppro->hServerConn,ppro->seqno,0);

-				ppro->instantidle=0;

+				ppro->aim_set_idle(ppro->hServerConn, ppro->seqno, 0);

+				ppro->instantidle = 0;

 				EndDialog(hwndDlg, IDCANCEL);

 				break;

 			}

@@ -1366,7 +1276,7 @@ static void clist_chat_invite_send(MCONTACT hItem, HWND hwndList, chat_list_item
 static void clist_validate_contact(MCONTACT hItem, HWND hwndList, CAimProto* ppro)

 {

 	if (!ppro->is_my_contact(hItem) || ppro->isChatRoom(hItem) ||

-			ppro->getWord(hItem, AIM_KEY_ST, ID_STATUS_OFFLINE) == ID_STATUS_ONTHEPHONE)

+		ppro->getWord(hItem, AIM_KEY_ST, ID_STATUS_OFFLINE) == ID_STATUS_ONTHEPHONE)

 		SendMessage(hwndList, CLM_DELETEITEM, (WPARAM)hItem, 0);

 }

 

@@ -1386,7 +1296,7 @@ static void clist_chat_prepare(MCONTACT hItem, HWND hwndList, CAimProto* ppro)
 			clist_validate_contact(hItem, hwndList, ppro);

 

 		hItem = hItemN;

-   }

+	}

 }

 

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

@@ -1415,37 +1325,33 @@ INT_PTR CALLBACK invite_to_chat_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 		break;

 

 	case WM_NOTIFY:

-	{

-		NMCLISTCONTROL* nmc = (NMCLISTCONTROL*)lParam;

-		if (nmc->hdr.idFrom == IDC_CCLIST)

 		{

-			switch (nmc->hdr.code)

-			{

-			case CLN_NEWCONTACT:

-				if (param && (nmc->flags & (CLNF_ISGROUP | CLNF_ISINFO)) == 0)

-					clist_validate_contact((MCONTACT)nmc->hItem, nmc->hdr.hwndFrom, param->ppro);

-				break;

+			NMCLISTCONTROL *nmc = (NMCLISTCONTROL*)lParam;

+			if (nmc->hdr.idFrom == IDC_CCLIST) {

+				switch (nmc->hdr.code) {

+				case CLN_NEWCONTACT:

+					if (param && (nmc->flags & (CLNF_ISGROUP | CLNF_ISINFO)) == 0)

+						clist_validate_contact((MCONTACT)nmc->hItem, nmc->hdr.hwndFrom, param->ppro);

+					break;

 

-			case CLN_LISTREBUILT:

-				if (param)

-					clist_chat_prepare(NULL, nmc->hdr.hwndFrom, param->ppro);

-				break;

+				case CLN_LISTREBUILT:

+					if (param)

+						clist_chat_prepare(NULL, nmc->hdr.hwndFrom, param->ppro);

+					break;

+				}

 			}

 		}

-	}

-	break;

+		break;

 

 	case WM_COMMAND:

 		{

-			switch (LOWORD(wParam))

-			{

+			switch (LOWORD(wParam)) {

 			case IDC_ADDSCR:

-				if (param->ppro->state == 1)

-				{

+				if (param->ppro->state == 1) {

 					TCHAR sn[64];

 					GetDlgItemText(hwndDlg, IDC_EDITSCR, sn, SIZEOF(sn));

 

-					CLCINFOITEM cii = {0};

+					CLCINFOITEM cii = { 0 };

 					cii.cbSize = sizeof(cii);

 					cii.flags = CLCIIF_CHECKBOX | CLCIIF_BELOWCONTACTS;

 					cii.pszText = sn;

@@ -1458,8 +1364,7 @@ INT_PTR CALLBACK invite_to_chat_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			case IDOK:

 				{

 					chat_list_item* item = param->ppro->find_chat_by_id(param->id);

-					if (item)

-					{

+					if (item) {

 						char msg[1024];

 						GetDlgItemTextA(hwndDlg, IDC_MSG, msg, SIZEOF(msg));

 

@@ -1487,8 +1392,7 @@ INT_PTR CALLBACK chat_request_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 {

 	invite_chat_req_param* param = (invite_chat_req_param*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

 

-	switch (msg)

-	{

+	switch (msg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwndDlg);

 

@@ -1497,8 +1401,8 @@ INT_PTR CALLBACK chat_request_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 

 		WindowSetIcon(hwndDlg, "aol");

 

-		SetDlgItemTextA(hwndDlg, IDC_ROOMNAME, strrchr(param->cnp->id, '-')+1);

-		SetDlgItemTextA(hwndDlg, IDC_SCREENNAME,  param->name);

+		SetDlgItemTextA(hwndDlg, IDC_ROOMNAME, strrchr(param->cnp->id, '-') + 1);

+		SetDlgItemTextA(hwndDlg, IDC_SCREENNAME, param->name);

 		SetDlgItemTextA(hwndDlg, IDC_MSG, param->message);

 		break;

 

@@ -1512,20 +1416,17 @@ INT_PTR CALLBACK chat_request_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		break;

 

 	case WM_COMMAND:

-		{

-			switch (LOWORD(wParam))

-			{

-			case IDOK:

-				param->ppro->ForkThread(&CAimProto::chatnav_request_thread, param->cnp);

-				EndDialog(hwndDlg, IDOK);

-				break;

+		switch (LOWORD(wParam)) {

+		case IDOK:

+			param->ppro->ForkThread(&CAimProto::chatnav_request_thread, param->cnp);

+			EndDialog(hwndDlg, IDOK);

+			break;

 

-			case IDCANCEL:

-				param->ppro->aim_chat_deny(param->ppro->hServerConn,param->ppro->seqno,param->name,param->icbm_cookie);

-				delete param->cnp;

-				EndDialog(hwndDlg, IDCANCEL);

-				break;

-			}

+		case IDCANCEL:

+			param->ppro->aim_chat_deny(param->ppro->hServerConn, param->ppro->seqno, param->name, param->icbm_cookie);

+			delete param->cnp;

+			EndDialog(hwndDlg, IDCANCEL);

+			break;

 		}

 		break;

 	}

@@ -1535,6 +1436,6 @@ INT_PTR CALLBACK chat_request_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 

 void CALLBACK chat_request_cb(PVOID dwParam)

 {

-	CreateDialogParam (hInstance, MAKEINTRESOURCE(IDD_CHATROOM_INVITE_REQ),

-		 NULL, chat_request_dialog, (LPARAM)dwParam);

+	CreateDialogParam(hInstance, MAKEINTRESOURCE(IDD_CHATROOM_INVITE_REQ),

+		NULL, chat_request_dialog, (LPARAM)dwParam);

 }

diff --git a/src/core/stdauth/res/resource.rc b/src/core/stdauth/res/resource.rc
index 56c32d6d3f..d909dfcb98 100644
--- a/src/core/stdauth/res/resource.rc
+++ b/src/core/stdauth/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -91,7 +91,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "..\..\resource.h\0"

+	"..\..\mir_app\src\resource.h\0"

 END

 

 2 TEXTINCLUDE

diff --git a/src/core/stdauth/src/commonheaders.h b/src/core/stdauth/src/commonheaders.h
index 5ad3618b5c..1ba20c8690 100644
--- a/src/core/stdauth/src/commonheaders.h
+++ b/src/core/stdauth/src/commonheaders.h
@@ -69,7 +69,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 extern HINSTANCE hInst;

diff --git a/src/core/stdauth/stdauth_10.vcxproj b/src/core/stdauth/stdauth_10.vcxproj
index c5a14dc7e2..7c0a70f0a1 100644
--- a/src/core/stdauth/stdauth_10.vcxproj
+++ b/src/core/stdauth/stdauth_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -207,7 +207,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdauth/stdauth_10.vcxproj.filters b/src/core/stdauth/stdauth_10.vcxproj.filters
index fc99a6f1b1..cbb7778662 100644
--- a/src/core/stdauth/stdauth_10.vcxproj.filters
+++ b/src/core/stdauth/stdauth_10.vcxproj.filters
@@ -29,9 +29,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdauth/stdauth_12.vcxproj b/src/core/stdauth/stdauth_12.vcxproj
index ff5b5fca31..8032a71d0e 100644
--- a/src/core/stdauth/stdauth_12.vcxproj
+++ b/src/core/stdauth/stdauth_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -210,7 +210,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdauth/stdauth_12.vcxproj.filters b/src/core/stdauth/stdauth_12.vcxproj.filters
index fc99a6f1b1..cbb7778662 100644
--- a/src/core/stdauth/stdauth_12.vcxproj.filters
+++ b/src/core/stdauth/stdauth_12.vcxproj.filters
@@ -29,9 +29,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdautoaway/res/resource.rc b/src/core/stdautoaway/res/resource.rc
index 5bb57eb276..16038b37b3 100644
--- a/src/core/stdautoaway/res/resource.rc
+++ b/src/core/stdautoaway/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -47,7 +47,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "..\..\resource.h\0"

+	"..\..\mir_app\src\resource.h\0"

 END

 

 2 TEXTINCLUDE

diff --git a/src/core/stdautoaway/src/commonheaders.h b/src/core/stdautoaway/src/commonheaders.h
index ac2017ea37..efdb7396e7 100644
--- a/src/core/stdautoaway/src/commonheaders.h
+++ b/src/core/stdautoaway/src/commonheaders.h
@@ -67,7 +67,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 extern HINSTANCE hInst;

diff --git a/src/core/stdautoaway/stdautoaway_10.vcxproj b/src/core/stdautoaway/stdautoaway_10.vcxproj
index 5179cb23f3..7c901602a8 100644
--- a/src/core/stdautoaway/stdautoaway_10.vcxproj
+++ b/src/core/stdautoaway/stdautoaway_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -206,7 +206,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdautoaway/stdautoaway_10.vcxproj.filters b/src/core/stdautoaway/stdautoaway_10.vcxproj.filters
index 92dada9114..c3fdd336cf 100644
--- a/src/core/stdautoaway/stdautoaway_10.vcxproj.filters
+++ b/src/core/stdautoaway/stdautoaway_10.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdautoaway/stdautoaway_12.vcxproj b/src/core/stdautoaway/stdautoaway_12.vcxproj
index a99c2eff28..c3aeb1fa86 100644
--- a/src/core/stdautoaway/stdautoaway_12.vcxproj
+++ b/src/core/stdautoaway/stdautoaway_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -209,7 +209,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdautoaway/stdautoaway_12.vcxproj.filters b/src/core/stdautoaway/stdautoaway_12.vcxproj.filters
index 92dada9114..c3fdd336cf 100644
--- a/src/core/stdautoaway/stdautoaway_12.vcxproj.filters
+++ b/src/core/stdautoaway/stdautoaway_12.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdaway/res/resource.rc b/src/core/stdaway/res/resource.rc
index 85efa99e84..f064664603 100644
--- a/src/core/stdaway/res/resource.rc
+++ b/src/core/stdaway/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -138,7 +138,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "..\..\resource.h\0"

+	"..\..\mir_app\src\resource.h\0"

 END

 

 2 TEXTINCLUDE

diff --git a/src/core/stdaway/src/commonheaders.h b/src/core/stdaway/src/commonheaders.h
index bb73a7f7df..ea2707e767 100644
--- a/src/core/stdaway/src/commonheaders.h
+++ b/src/core/stdaway/src/commonheaders.h
@@ -69,7 +69,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 extern HINSTANCE hInst;

diff --git a/src/core/stdaway/stdaway_10.vcxproj b/src/core/stdaway/stdaway_10.vcxproj
index 92d3ed1187..f597108572 100644
--- a/src/core/stdaway/stdaway_10.vcxproj
+++ b/src/core/stdaway/stdaway_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -207,7 +207,6 @@
     <ClCompile Include="src\sendmsg.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdaway/stdaway_10.vcxproj.filters b/src/core/stdaway/stdaway_10.vcxproj.filters
index 7d169c18e9..3f952c05b5 100644
--- a/src/core/stdaway/stdaway_10.vcxproj.filters
+++ b/src/core/stdaway/stdaway_10.vcxproj.filters
@@ -29,9 +29,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdaway/stdaway_12.vcxproj b/src/core/stdaway/stdaway_12.vcxproj
index 36587fd1c1..a4363fedf7 100644
--- a/src/core/stdaway/stdaway_12.vcxproj
+++ b/src/core/stdaway/stdaway_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -210,7 +210,6 @@
     <ClCompile Include="src\sendmsg.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdaway/stdaway_12.vcxproj.filters b/src/core/stdaway/stdaway_12.vcxproj.filters
index 7d169c18e9..3f952c05b5 100644
--- a/src/core/stdaway/stdaway_12.vcxproj.filters
+++ b/src/core/stdaway/stdaway_12.vcxproj.filters
@@ -29,9 +29,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdcrypt/res/resource.rc b/src/core/stdcrypt/res/resource.rc
index 5bb57eb276..16038b37b3 100644
--- a/src/core/stdcrypt/res/resource.rc
+++ b/src/core/stdcrypt/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -47,7 +47,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "..\..\resource.h\0"

+	"..\..\mir_app\src\resource.h\0"

 END

 

 2 TEXTINCLUDE

diff --git a/src/core/stdcrypt/src/commonheaders.h b/src/core/stdcrypt/src/commonheaders.h
index 19eea8147c..43da7d6c65 100644
--- a/src/core/stdcrypt/src/commonheaders.h
+++ b/src/core/stdcrypt/src/commonheaders.h
@@ -67,8 +67,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 #include "stdcrypt.h"

 

diff --git a/src/core/stdcrypt/stdcrypt_10.vcxproj b/src/core/stdcrypt/stdcrypt_10.vcxproj
index 4bb55e0958..dc9387bae3 100644
--- a/src/core/stdcrypt/stdcrypt_10.vcxproj
+++ b/src/core/stdcrypt/stdcrypt_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -209,7 +209,6 @@
   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\include\m_crypto.h" />

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\Rijndael.h" />

     <ClInclude Include="src\stdcrypt.h" />

diff --git a/src/core/stdcrypt/stdcrypt_10.vcxproj.filters b/src/core/stdcrypt/stdcrypt_10.vcxproj.filters
index 4ac4b666d6..d1ef9ab89a 100644
--- a/src/core/stdcrypt/stdcrypt_10.vcxproj.filters
+++ b/src/core/stdcrypt/stdcrypt_10.vcxproj.filters
@@ -32,9 +32,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdcrypt/stdcrypt_12.vcxproj b/src/core/stdcrypt/stdcrypt_12.vcxproj
index f75771d2e6..82478c5b2e 100644
--- a/src/core/stdcrypt/stdcrypt_12.vcxproj
+++ b/src/core/stdcrypt/stdcrypt_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -212,7 +212,6 @@
   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\include\m_crypto.h" />

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\Rijndael.h" />

     <ClInclude Include="src\stdcrypt.h" />

diff --git a/src/core/stdcrypt/stdcrypt_12.vcxproj.filters b/src/core/stdcrypt/stdcrypt_12.vcxproj.filters
index 4ac4b666d6..d1ef9ab89a 100644
--- a/src/core/stdcrypt/stdcrypt_12.vcxproj.filters
+++ b/src/core/stdcrypt/stdcrypt_12.vcxproj.filters
@@ -32,9 +32,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdemail/res/resource.rc b/src/core/stdemail/res/resource.rc
index 5bb57eb276..16038b37b3 100644
--- a/src/core/stdemail/res/resource.rc
+++ b/src/core/stdemail/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -47,7 +47,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "..\..\resource.h\0"

+	"..\..\mir_app\src\resource.h\0"

 END

 

 2 TEXTINCLUDE

diff --git a/src/core/stdemail/src/commonheaders.h b/src/core/stdemail/src/commonheaders.h
index 87f368b0ee..537c6293fa 100644
--- a/src/core/stdemail/src/commonheaders.h
+++ b/src/core/stdemail/src/commonheaders.h
@@ -66,7 +66,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 extern HINSTANCE hInst;

diff --git a/src/core/stdemail/stdemail_10.vcxproj b/src/core/stdemail/stdemail_10.vcxproj
index 234e74e475..981945533c 100644
--- a/src/core/stdemail/stdemail_10.vcxproj
+++ b/src/core/stdemail/stdemail_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -206,7 +206,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdemail/stdemail_10.vcxproj.filters b/src/core/stdemail/stdemail_10.vcxproj.filters
index 052e412801..e37505cf51 100644
--- a/src/core/stdemail/stdemail_10.vcxproj.filters
+++ b/src/core/stdemail/stdemail_10.vcxproj.filters
@@ -26,9 +26,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdemail/stdemail_12.vcxproj b/src/core/stdemail/stdemail_12.vcxproj
index 40b5e5ed57..c95c9c008b 100644
--- a/src/core/stdemail/stdemail_12.vcxproj
+++ b/src/core/stdemail/stdemail_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -209,7 +209,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdemail/stdemail_12.vcxproj.filters b/src/core/stdemail/stdemail_12.vcxproj.filters
index 052e412801..e37505cf51 100644
--- a/src/core/stdemail/stdemail_12.vcxproj.filters
+++ b/src/core/stdemail/stdemail_12.vcxproj.filters
@@ -26,9 +26,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdfile/res/resource.rc b/src/core/stdfile/res/resource.rc
index caa64ce5c7..a3fa9d6dc7 100644
--- a/src/core/stdfile/res/resource.rc
+++ b/src/core/stdfile/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -268,7 +268,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "..\..\resource.h\0"

+	"..\..\mir_app\src\resource.h\0"

 END

 

 2 TEXTINCLUDE

diff --git a/src/core/stdfile/src/commonheaders.h b/src/core/stdfile/src/commonheaders.h
index 9da5dfb390..b476a77cf1 100644
--- a/src/core/stdfile/src/commonheaders.h
+++ b/src/core/stdfile/src/commonheaders.h
@@ -76,8 +76,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 extern HINSTANCE hInst;

 

diff --git a/src/core/stdfile/stdfile_10.vcxproj b/src/core/stdfile/stdfile_10.vcxproj
index 9a0a5214fb..a13322874b 100644
--- a/src/core/stdfile/stdfile_10.vcxproj
+++ b/src/core/stdfile/stdfile_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -212,7 +212,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\file.h" />

     <ClInclude Include="src\version.h" />

diff --git a/src/core/stdfile/stdfile_10.vcxproj.filters b/src/core/stdfile/stdfile_10.vcxproj.filters
index b87e47dbdd..4b1bc4e70d 100644
--- a/src/core/stdfile/stdfile_10.vcxproj.filters
+++ b/src/core/stdfile/stdfile_10.vcxproj.filters
@@ -44,9 +44,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdfile/stdfile_12.vcxproj b/src/core/stdfile/stdfile_12.vcxproj
index 9794c5d412..2622993274 100644
--- a/src/core/stdfile/stdfile_12.vcxproj
+++ b/src/core/stdfile/stdfile_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -215,7 +215,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\file.h" />

     <ClInclude Include="src\version.h" />

diff --git a/src/core/stdfile/stdfile_12.vcxproj.filters b/src/core/stdfile/stdfile_12.vcxproj.filters
index b87e47dbdd..4b1bc4e70d 100644
--- a/src/core/stdfile/stdfile_12.vcxproj.filters
+++ b/src/core/stdfile/stdfile_12.vcxproj.filters
@@ -44,9 +44,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdhelp/res/resource.rc b/src/core/stdhelp/res/resource.rc
index 98a5334dca..e3f8728481 100644
--- a/src/core/stdhelp/res/resource.rc
+++ b/src/core/stdhelp/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -76,7 +76,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "..\..\resource.h\0"

+	"..\..\mir_app\src\resource.h\0"

 END

 

 2 TEXTINCLUDE

diff --git a/src/core/stdhelp/src/commonheaders.h b/src/core/stdhelp/src/commonheaders.h
index 83c8ce38b1..e1763c4cc8 100644
--- a/src/core/stdhelp/src/commonheaders.h
+++ b/src/core/stdhelp/src/commonheaders.h
@@ -66,8 +66,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 extern HINSTANCE hInst;

 

diff --git a/src/core/stdhelp/stdhelp_10.vcxproj b/src/core/stdhelp/stdhelp_10.vcxproj
index ac4df7abec..92a51e53f1 100644
--- a/src/core/stdhelp/stdhelp_10.vcxproj
+++ b/src/core/stdhelp/stdhelp_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -207,7 +207,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdhelp/stdhelp_10.vcxproj.filters b/src/core/stdhelp/stdhelp_10.vcxproj.filters
index d783a2d94c..896fa3dd73 100644
--- a/src/core/stdhelp/stdhelp_10.vcxproj.filters
+++ b/src/core/stdhelp/stdhelp_10.vcxproj.filters
@@ -32,9 +32,6 @@
     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdhelp/stdhelp_12.vcxproj b/src/core/stdhelp/stdhelp_12.vcxproj
index 67af883c0b..ae8167a6b1 100644
--- a/src/core/stdhelp/stdhelp_12.vcxproj
+++ b/src/core/stdhelp/stdhelp_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -210,7 +210,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdhelp/stdhelp_12.vcxproj.filters b/src/core/stdhelp/stdhelp_12.vcxproj.filters
index d783a2d94c..896fa3dd73 100644
--- a/src/core/stdhelp/stdhelp_12.vcxproj.filters
+++ b/src/core/stdhelp/stdhelp_12.vcxproj.filters
@@ -32,9 +32,6 @@
     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdidle/res/resource.rc b/src/core/stdidle/res/resource.rc
index bf68917cc7..a87378990a 100644
--- a/src/core/stdidle/res/resource.rc
+++ b/src/core/stdidle/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -115,7 +115,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "..\..\resource.h\0"

+	"..\..\mir_app\src\resource.h\0"

 END

 

 2 TEXTINCLUDE

diff --git a/src/core/stdidle/src/commonheaders.h b/src/core/stdidle/src/commonheaders.h
index e4f831a73d..4294473f85 100644
--- a/src/core/stdidle/src/commonheaders.h
+++ b/src/core/stdidle/src/commonheaders.h
@@ -68,7 +68,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 extern HINSTANCE hInst;

diff --git a/src/core/stdidle/stdidle_10.vcxproj b/src/core/stdidle/stdidle_10.vcxproj
index b525a6ed4f..41bb96c640 100644
--- a/src/core/stdidle/stdidle_10.vcxproj
+++ b/src/core/stdidle/stdidle_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -206,7 +206,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdidle/stdidle_10.vcxproj.filters b/src/core/stdidle/stdidle_10.vcxproj.filters
index 33719e104e..05a611456f 100644
--- a/src/core/stdidle/stdidle_10.vcxproj.filters
+++ b/src/core/stdidle/stdidle_10.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdidle/stdidle_12.vcxproj b/src/core/stdidle/stdidle_12.vcxproj
index 798f60887c..e5ad5b4c8b 100644
--- a/src/core/stdidle/stdidle_12.vcxproj
+++ b/src/core/stdidle/stdidle_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -209,7 +209,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stdidle/stdidle_12.vcxproj.filters b/src/core/stdidle/stdidle_12.vcxproj.filters
index 33719e104e..05a611456f 100644
--- a/src/core/stdidle/stdidle_12.vcxproj.filters
+++ b/src/core/stdidle/stdidle_12.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 5b04d948dc..1f86aba0ec 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -604,25 +604,6 @@ static void NotifyTyping(SrmmWindowData *dat, int mode)
 	CallService(MS_PROTO_SELFISTYPING, (WPARAM)dat->hContact, dat->nTypeMode);

 }

 

-void Button_SetIcon_IcoLib(HWND hwndDlg, int itemId, int iconId, const char* tooltip)

-{

-	HWND hWnd = GetDlgItem(hwndDlg, itemId);

-	SendMessage(hWnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadSkinnedIcon(iconId));

-	SendMessage(hWnd, BUTTONSETASFLATBTN, TRUE, 0);

-	SendMessage(hWnd, BUTTONADDTOOLTIP, (WPARAM)tooltip, 0);

-}

-

-void Button_FreeIcon_IcoLib(HWND hwndDlg, int itemId)

-{

-	Skin_ReleaseIcon((HICON)SendDlgItemMessage(hwndDlg, itemId, BM_SETIMAGE, IMAGE_ICON, 0));

-}

-

-void Window_FreeIcon_IcoLib(HWND hwndDlg)

-{

-	Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_BIG, 0));

-	Skin_ReleaseIcon((HICON)SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, 0));

-}

-

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

 {

 	SrmmWindowData *dat = (SrmmWindowData *)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

diff --git a/src/core/stdplug.h b/src/core/stdplug.h
deleted file mode 100644
index 9a6f751829..0000000000
--- a/src/core/stdplug.h
+++ /dev/null
@@ -1,25 +0,0 @@
-

-#ifdef _STATIC

-	#define MIRANDA_EXE_FUNC(T) extern "C" T

-#else

-	#define MIRANDA_EXE_FUNC(T) extern "C" T __declspec(dllimport)

-#endif

-

-MIRANDA_EXE_FUNC(HICON)  LoadSkinProtoIcon(const char *szProto, int status, bool big = false);

-MIRANDA_EXE_FUNC(HICON)  LoadSkinIcon(int idx, bool big = false);

-MIRANDA_EXE_FUNC(HANDLE) GetSkinIconHandle(int idx);

-

-MIRANDA_EXE_FUNC(HANDLE) IcoLib_AddNewIcon(int hLangpack, SKINICONDESC* sid);

-MIRANDA_EXE_FUNC(HICON)  IcoLib_GetIcon(const char* pszIconName, bool big);

-MIRANDA_EXE_FUNC(HICON)  IcoLib_GetIconByHandle(HANDLE hItem, bool big);

-MIRANDA_EXE_FUNC(HANDLE) IcoLib_IsManaged(HICON hIcon);

-MIRANDA_EXE_FUNC(int)    IcoLib_ReleaseIcon(HICON hIcon, char* szIconName, bool big=false);

-

-MIRANDA_EXE_FUNC(void)   Button_SetIcon_IcoLib(HWND hDlg, int itemId, int iconId, const char* tooltip);

-MIRANDA_EXE_FUNC(void)   Button_FreeIcon_IcoLib(HWND hDlg, int itemId);

-

-MIRANDA_EXE_FUNC(void)   Window_SetIcon_IcoLib(HWND hWnd, int iconId);

-MIRANDA_EXE_FUNC(void)   Window_SetProtoIcon_IcoLib(HWND hWnd, const char *szProto, int iconId);

-MIRANDA_EXE_FUNC(void)   Window_FreeIcon_IcoLib(HWND hWnd);

-

-MIRANDA_EXE_FUNC(int)    GetPluginLangByInstance(HINSTANCE hInstance);

diff --git a/src/core/stduihist/res/resource.rc b/src/core/stduihist/res/resource.rc
index 1c0884e4a2..333634df8e 100644
--- a/src/core/stduihist/res/resource.rc
+++ b/src/core/stduihist/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -88,7 +88,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "..\..\resource.h\0"

+	"..\..\mir_app\src\resource.h\0"

 END

 

 2 TEXTINCLUDE

diff --git a/src/core/stduihist/src/commonheaders.h b/src/core/stduihist/src/commonheaders.h
index d6c986c227..93fb17ecb2 100644
--- a/src/core/stduihist/src/commonheaders.h
+++ b/src/core/stduihist/src/commonheaders.h
@@ -67,8 +67,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 extern HINSTANCE hInst;

 

diff --git a/src/core/stduihist/stduihist_10.vcxproj b/src/core/stduihist/stduihist_10.vcxproj
index 0ff5edc20d..9df049cd1c 100644
--- a/src/core/stduihist/stduihist_10.vcxproj
+++ b/src/core/stduihist/stduihist_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -206,7 +206,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stduihist/stduihist_10.vcxproj.filters b/src/core/stduihist/stduihist_10.vcxproj.filters
index c2a89081c1..d26cc3ef70 100644
--- a/src/core/stduihist/stduihist_10.vcxproj.filters
+++ b/src/core/stduihist/stduihist_10.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stduihist/stduihist_12.vcxproj b/src/core/stduihist/stduihist_12.vcxproj
index cb0e16ee03..06b30d28ef 100644
--- a/src/core/stduihist/stduihist_12.vcxproj
+++ b/src/core/stduihist/stduihist_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -209,7 +209,6 @@
     <ClCompile Include="src\main.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stduihist/stduihist_12.vcxproj.filters b/src/core/stduihist/stduihist_12.vcxproj.filters
index c2a89081c1..d26cc3ef70 100644
--- a/src/core/stduihist/stduihist_12.vcxproj.filters
+++ b/src/core/stduihist/stduihist_12.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stdurl/commonheaders.h b/src/core/stdurl/commonheaders.h
index 9cbb9b1c20..90c3c440d5 100644
--- a/src/core/stdurl/commonheaders.h
+++ b/src/core/stdurl/commonheaders.h
@@ -68,7 +68,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 extern HINSTANCE hInst;

diff --git a/src/core/stdurl/resource.rc b/src/core/stdurl/resource.rc
index 5bb57eb276..8006315d61 100644
--- a/src/core/stdurl/resource.rc
+++ b/src/core/stdurl/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -47,7 +47,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "..\..\resource.h\0"

+    "..\..\mir_app\src\resource.h\0"

 END

 

 2 TEXTINCLUDE

diff --git a/src/core/stdurl/stdurl_10.vcxproj b/src/core/stdurl/stdurl_10.vcxproj
index 240ed7addb..adea018b75 100644
--- a/src/core/stdurl/stdurl_10.vcxproj
+++ b/src/core/stdurl/stdurl_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

diff --git a/src/core/stdurl/stdurl_12.vcxproj b/src/core/stdurl/stdurl_12.vcxproj
index 972ca7532f..7943d30dd1 100644
--- a/src/core/stdurl/stdurl_12.vcxproj
+++ b/src/core/stdurl/stdurl_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -213,7 +213,6 @@
     <ClCompile Include="urldialogs.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="commonheaders.h" />

     <ClInclude Include="url.h" />

   </ItemGroup>

diff --git a/src/core/stdurl/stdurl_12.vcxproj.filters b/src/core/stdurl/stdurl_12.vcxproj.filters
index 046e56322f..2706f9b2f2 100644
--- a/src/core/stdurl/stdurl_12.vcxproj.filters
+++ b/src/core/stdurl/stdurl_12.vcxproj.filters
@@ -29,9 +29,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stduserinfo/res/resource.rc b/src/core/stduserinfo/res/resource.rc
index 63b5fd52eb..c91b0a1c03 100644
--- a/src/core/stduserinfo/res/resource.rc
+++ b/src/core/stduserinfo/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

@@ -285,7 +285,7 @@ END
 

 1 TEXTINCLUDE

 BEGIN

-    "..\..\resource.h\0"

+	"..\..\mir_app\src\resource.h\0"

 END

 

 2 TEXTINCLUDE

diff --git a/src/core/stduserinfo/src/commonheaders.h b/src/core/stduserinfo/src/commonheaders.h
index d7e900ffae..ec79f2ea84 100644
--- a/src/core/stduserinfo/src/commonheaders.h
+++ b/src/core/stduserinfo/src/commonheaders.h
@@ -68,7 +68,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 extern HINSTANCE hInst;

diff --git a/src/core/stduserinfo/stduserinfo_10.vcxproj b/src/core/stduserinfo/stduserinfo_10.vcxproj
index d04fcf9a96..50062a45d6 100644
--- a/src/core/stduserinfo/stduserinfo_10.vcxproj
+++ b/src/core/stduserinfo/stduserinfo_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -208,7 +208,6 @@
     <ClCompile Include="src\userinfo.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters b/src/core/stduserinfo/stduserinfo_10.vcxproj.filters
index dd6ca7bfcf..17fb965c79 100644
--- a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters
+++ b/src/core/stduserinfo/stduserinfo_10.vcxproj.filters
@@ -32,9 +32,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stduserinfo/stduserinfo_12.vcxproj b/src/core/stduserinfo/stduserinfo_12.vcxproj
index d6df81b469..2119bb3812 100644
--- a/src/core/stduserinfo/stduserinfo_12.vcxproj
+++ b/src/core/stduserinfo/stduserinfo_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -211,7 +211,6 @@
     <ClCompile Include="src\userinfo.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stduserinfo/stduserinfo_12.vcxproj.filters b/src/core/stduserinfo/stduserinfo_12.vcxproj.filters
index dd6ca7bfcf..17fb965c79 100644
--- a/src/core/stduserinfo/stduserinfo_12.vcxproj.filters
+++ b/src/core/stduserinfo/stduserinfo_12.vcxproj.filters
@@ -32,9 +32,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stduseronline/res/resource.rc b/src/core/stduseronline/res/resource.rc
index 5bb57eb276..8213a2958c 100644
--- a/src/core/stduseronline/res/resource.rc
+++ b/src/core/stduseronline/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\..\resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

diff --git a/src/core/stduseronline/src/commonheaders.h b/src/core/stduseronline/src/commonheaders.h
index 366035a334..774e7c6dcc 100644
--- a/src/core/stduseronline/src/commonheaders.h
+++ b/src/core/stduseronline/src/commonheaders.h
@@ -66,7 +66,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "version.h"

 

-#include "../../resource.h"

-#include "../stdplug.h"

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

 

 extern HINSTANCE hInst;

diff --git a/src/core/stduseronline/stduseronline_10.vcxproj b/src/core/stduseronline/stduseronline_10.vcxproj
index 97b35f4967..5b4bb67288 100644
--- a/src/core/stduseronline/stduseronline_10.vcxproj
+++ b/src/core/stduseronline/stduseronline_10.vcxproj
@@ -91,7 +91,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -125,7 +125,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -156,7 +156,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -189,7 +189,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -206,7 +206,6 @@
     <ClCompile Include="src\useronline.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stduseronline/stduseronline_10.vcxproj.filters b/src/core/stduseronline/stduseronline_10.vcxproj.filters
index f47f70fc21..91dcd67d73 100644
--- a/src/core/stduseronline/stduseronline_10.vcxproj.filters
+++ b/src/core/stduseronline/stduseronline_10.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/core/stduseronline/stduseronline_12.vcxproj b/src/core/stduseronline/stduseronline_12.vcxproj
index f6bbbae09c..f7e58ca675 100644
--- a/src/core/stduseronline/stduseronline_12.vcxproj
+++ b/src/core/stduseronline/stduseronline_12.vcxproj
@@ -95,7 +95,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -128,7 +128,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -160,7 +160,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\..\..\include\msapi;..\..\..\include</AdditionalIncludeDirectories>

     </ResourceCompile>

     <Link>

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

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

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <BaseAddress>0x3ae00000</BaseAddress>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

@@ -209,7 +209,6 @@
     <ClCompile Include="src\useronline.cpp" />

   </ItemGroup>

   <ItemGroup>

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

     <ClInclude Include="src\commonheaders.h" />

     <ClInclude Include="src\version.h" />

   </ItemGroup>

diff --git a/src/core/stduseronline/stduseronline_12.vcxproj.filters b/src/core/stduseronline/stduseronline_12.vcxproj.filters
index f47f70fc21..91dcd67d73 100644
--- a/src/core/stduseronline/stduseronline_12.vcxproj.filters
+++ b/src/core/stduseronline/stduseronline_12.vcxproj.filters
@@ -29,9 +29,6 @@
     <ClInclude Include="src\commonheaders.h">

       <Filter>Header Files</Filter>

     </ClInclude>

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

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

diff --git a/src/mir_app/mir_app.vcxproj b/src/mir_app/mir_app.vcxproj
new file mode 100644
index 0000000000..66bd019032
--- /dev/null
+++ b/src/mir_app/mir_app.vcxproj
@@ -0,0 +1,47 @@
+<?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">

+    <ProjectGuid>{538E451F-E667-4D07-BCE6-976ECC7BB8D1}</ProjectGuid>

+    <ProjectName>mir_app</ProjectName>

+  </PropertyGroup>

+  <ImportGroup Label="PropertySheets">

+    <Import Project="$(ProjectDir)..\..\build\vc.common\lib.props" />

+  </ImportGroup>

+  <ItemDefinitionGroup>

+    <ClCompile>

+      <PreprocessorDefinitions Condition="'$(Configuration)'=='Debug'">MIR_APP_EXPORTS;DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions Condition="'$(Configuration)'=='Release'">MIR_APP_EXPORTS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <Link>

+      <ModuleDefinitionFile>src/mir_app.def</ModuleDefinitionFile>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ProjectReference Condition="'$(VisualStudioVersion)' == '10.0'" Include="..\..\plugins\zlib\zlib_10.vcxproj">

+      <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+    <ProjectReference Condition="'$(VisualStudioVersion)' == '12.0'" Include="..\..\plugins\zlib\zlib_12.vcxproj">

+      <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>

+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

+    </ProjectReference>

+  </ItemGroup>

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

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

+  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+</Project>
\ No newline at end of file
diff --git a/src/res/Icon_exit.ico b/src/mir_app/res/Icon_exit.ico
index 1d4579a29b..1d4579a29b 100644
--- a/src/res/Icon_exit.ico
+++ b/src/mir_app/res/Icon_exit.ico
diff --git a/src/res/Icon_show_hide.ico b/src/mir_app/res/Icon_show_hide.ico
index 4e76501b02..4e76501b02 100644
--- a/src/res/Icon_show_hide.ico
+++ b/src/mir_app/res/Icon_show_hide.ico
diff --git a/src/res/Off.ico b/src/mir_app/res/Off.ico
index 5917d0f1e4..5917d0f1e4 100644
--- a/src/res/Off.ico
+++ b/src/mir_app/res/Off.ico
diff --git a/src/res/On.ico b/src/mir_app/res/On.ico
index e5f5b8157a..e5f5b8157a 100644
--- a/src/res/On.ico
+++ b/src/mir_app/res/On.ico
diff --git a/src/res/_blank.ico b/src/mir_app/res/_blank.ico
index d8a5b3d80d..d8a5b3d80d 100644
--- a/src/res/_blank.ico
+++ b/src/mir_app/res/_blank.ico
diff --git a/src/res/always_visible.ico b/src/mir_app/res/always_visible.ico
index 1bc8480355..1bc8480355 100644
--- a/src/res/always_visible.ico
+++ b/src/mir_app/res/always_visible.ico
diff --git a/src/res/auth_add.ico b/src/mir_app/res/auth_add.ico
index 90c6b83639..90c6b83639 100644
--- a/src/res/auth_add.ico
+++ b/src/mir_app/res/auth_add.ico
diff --git a/src/res/auth_grant.ico b/src/mir_app/res/auth_grant.ico
index 58acccb83f..58acccb83f 100644
--- a/src/res/auth_grant.ico
+++ b/src/mir_app/res/auth_grant.ico
diff --git a/src/res/auth_request.ico b/src/mir_app/res/auth_request.ico
index 85ea50a284..85ea50a284 100644
--- a/src/res/auth_request.ico
+++ b/src/mir_app/res/auth_request.ico
diff --git a/src/res/auth_revoke.ico b/src/mir_app/res/auth_revoke.ico
index e91ee67dc9..e91ee67dc9 100644
--- a/src/res/auth_revoke.ico
+++ b/src/mir_app/res/auth_revoke.ico
diff --git a/src/res/chat_channel.ico b/src/mir_app/res/chat_channel.ico
index d2a23e3798..d2a23e3798 100644
--- a/src/res/chat_channel.ico
+++ b/src/mir_app/res/chat_channel.ico
diff --git a/src/res/chat_join.ico b/src/mir_app/res/chat_join.ico
index 5bbc6c5643..5bbc6c5643 100644
--- a/src/res/chat_join.ico
+++ b/src/mir_app/res/chat_join.ico
diff --git a/src/res/chat_leave.ico b/src/mir_app/res/chat_leave.ico
index 01b2cc66a2..01b2cc66a2 100644
--- a/src/res/chat_leave.ico
+++ b/src/mir_app/res/chat_leave.ico
diff --git a/src/res/check_off.ico b/src/mir_app/res/check_off.ico
index 2a78c302df..2a78c302df 100644
--- a/src/res/check_off.ico
+++ b/src/mir_app/res/check_off.ico
diff --git a/src/res/check_on.ico b/src/mir_app/res/check_on.ico
index 0ba1d546f3..0ba1d546f3 100644
--- a/src/res/check_on.ico
+++ b/src/mir_app/res/check_on.ico
diff --git a/src/res/contact_add.ico b/src/mir_app/res/contact_add.ico
index fcfa03a6ad..fcfa03a6ad 100644
--- a/src/res/contact_add.ico
+++ b/src/mir_app/res/contact_add.ico
diff --git a/src/res/contact_delete.ico b/src/mir_app/res/contact_delete.ico
index 086b3574e7..086b3574e7 100644
--- a/src/res/contact_delete.ico
+++ b/src/mir_app/res/contact_delete.ico
diff --git a/src/res/contact_groups.ico b/src/mir_app/res/contact_groups.ico
index 3429a768b6..3429a768b6 100644
--- a/src/res/contact_groups.ico
+++ b/src/mir_app/res/contact_groups.ico
diff --git a/src/res/contact_rename.ico b/src/mir_app/res/contact_rename.ico
index 928d569c90..928d569c90 100644
--- a/src/res/contact_rename.ico
+++ b/src/mir_app/res/contact_rename.ico
diff --git a/src/res/contact_view_details.ico b/src/mir_app/res/contact_view_details.ico
index d0af928496..d0af928496 100644
--- a/src/res/contact_view_details.ico
+++ b/src/mir_app/res/contact_view_details.ico
diff --git a/src/res/cursor_drag_copy.cur b/src/mir_app/res/cursor_drag_copy.cur
index 89c7c960d5..89c7c960d5 100644
--- a/src/res/cursor_drag_copy.cur
+++ b/src/mir_app/res/cursor_drag_copy.cur
diff --git a/src/res/cursor_drop_user.cur b/src/mir_app/res/cursor_drop_user.cur
index a84b19e28b..a84b19e28b 100644
--- a/src/res/cursor_drop_user.cur
+++ b/src/mir_app/res/cursor_drop_user.cur
diff --git a/src/res/cursor_hyperlink.cur b/src/mir_app/res/cursor_hyperlink.cur
index f0f548c828..f0f548c828 100644
--- a/src/res/cursor_hyperlink.cur
+++ b/src/mir_app/res/cursor_hyperlink.cur
diff --git a/src/res/female.ico b/src/mir_app/res/female.ico
index feb57cd26c..feb57cd26c 100644
--- a/src/res/female.ico
+++ b/src/mir_app/res/female.ico
diff --git a/src/res/group_closed.ico b/src/mir_app/res/group_closed.ico
index 71a0020637..71a0020637 100644
--- a/src/res/group_closed.ico
+++ b/src/mir_app/res/group_closed.ico
diff --git a/src/res/group_opened.ico b/src/mir_app/res/group_opened.ico
index 2f6641c564..2f6641c564 100644
--- a/src/res/group_opened.ico
+++ b/src/mir_app/res/group_opened.ico
diff --git a/src/res/icon_accmgr.ico b/src/mir_app/res/icon_accmgr.ico
index c1d3f44606..c1d3f44606 100644
--- a/src/res/icon_accmgr.ico
+++ b/src/mir_app/res/icon_accmgr.ico
diff --git a/src/res/icon_all.ico b/src/mir_app/res/icon_all.ico
index 0d1e5ac373..0d1e5ac373 100644
--- a/src/res/icon_all.ico
+++ b/src/mir_app/res/icon_all.ico
diff --git a/src/res/icon_ansi.ico b/src/mir_app/res/icon_ansi.ico
index 879f84c164..879f84c164 100644
--- a/src/res/icon_ansi.ico
+++ b/src/mir_app/res/icon_ansi.ico
diff --git a/src/res/icon_auth_request.ico b/src/mir_app/res/icon_auth_request.ico
index 7cb1691367..7cb1691367 100644
--- a/src/res/icon_auth_request.ico
+++ b/src/mir_app/res/icon_auth_request.ico
diff --git a/src/res/icon_changefont.ico b/src/mir_app/res/icon_changefont.ico
index 9901568e67..9901568e67 100644
--- a/src/res/icon_changefont.ico
+++ b/src/mir_app/res/icon_changefont.ico
diff --git a/src/res/icon_connecting.ico b/src/mir_app/res/icon_connecting.ico
index df6c8fc04e..df6c8fc04e 100644
--- a/src/res/icon_connecting.ico
+++ b/src/mir_app/res/icon_connecting.ico
diff --git a/src/res/icon_down_arrow.ico b/src/mir_app/res/icon_down_arrow.ico
index 79ec3929df..79ec3929df 100644
--- a/src/res/icon_down_arrow.ico
+++ b/src/mir_app/res/icon_down_arrow.ico
diff --git a/src/res/icon_error.ico b/src/mir_app/res/icon_error.ico
index a566cf9917..a566cf9917 100644
--- a/src/res/icon_error.ico
+++ b/src/mir_app/res/icon_error.ico
diff --git a/src/res/icon_fatal.ico b/src/mir_app/res/icon_fatal.ico
index 3212038565..3212038565 100644
--- a/src/res/icon_fatal.ico
+++ b/src/mir_app/res/icon_fatal.ico
diff --git a/src/res/icon_file.ico b/src/mir_app/res/icon_file.ico
index 098a7cc0e4..098a7cc0e4 100644
--- a/src/res/icon_file.ico
+++ b/src/mir_app/res/icon_file.ico
diff --git a/src/res/icon_find_user.ico b/src/mir_app/res/icon_find_user.ico
index ca7c3d5547..ca7c3d5547 100644
--- a/src/res/icon_find_user.ico
+++ b/src/mir_app/res/icon_find_user.ico
diff --git a/src/res/icon_frame.ico b/src/mir_app/res/icon_frame.ico
index 342d3dd641..342d3dd641 100644
--- a/src/res/icon_frame.ico
+++ b/src/mir_app/res/icon_frame.ico
diff --git a/src/res/icon_help.ico b/src/mir_app/res/icon_help.ico
index 7d7fe6d402..7d7fe6d402 100644
--- a/src/res/icon_help.ico
+++ b/src/mir_app/res/icon_help.ico
diff --git a/src/res/icon_history.ico b/src/mir_app/res/icon_history.ico
index 10bbd7aaf7..10bbd7aaf7 100644
--- a/src/res/icon_history.ico
+++ b/src/mir_app/res/icon_history.ico
diff --git a/src/res/icon_loaded.ico b/src/mir_app/res/icon_loaded.ico
index 85f450977c..85f450977c 100644
--- a/src/res/icon_loaded.ico
+++ b/src/mir_app/res/icon_loaded.ico
diff --git a/src/res/icon_loaded_gray.ico b/src/mir_app/res/icon_loaded_gray.ico
index d213f0c34f..d213f0c34f 100644
--- a/src/res/icon_loaded_gray.ico
+++ b/src/mir_app/res/icon_loaded_gray.ico
diff --git a/src/res/icon_mail.ico b/src/mir_app/res/icon_mail.ico
index 7a5e461f6f..7a5e461f6f 100644
--- a/src/res/icon_mail.ico
+++ b/src/mir_app/res/icon_mail.ico
diff --git a/src/res/icon_mainmenu.ico b/src/mir_app/res/icon_mainmenu.ico
index 82807dbbab..82807dbbab 100644
--- a/src/res/icon_mainmenu.ico
+++ b/src/mir_app/res/icon_mainmenu.ico
diff --git a/src/res/icon_message.ico b/src/mir_app/res/icon_message.ico
index 5d758744c0..5d758744c0 100644
--- a/src/res/icon_message.ico
+++ b/src/mir_app/res/icon_message.ico
diff --git a/src/res/icon_notify.ico b/src/mir_app/res/icon_notify.ico
index a116a1631c..a116a1631c 100644
--- a/src/res/icon_notify.ico
+++ b/src/mir_app/res/icon_notify.ico
diff --git a/src/res/icon_notloaded.ico b/src/mir_app/res/icon_notloaded.ico
index 071e527d95..071e527d95 100644
--- a/src/res/icon_notloaded.ico
+++ b/src/mir_app/res/icon_notloaded.ico
diff --git a/src/res/icon_notloaded_gray.ico b/src/mir_app/res/icon_notloaded_gray.ico
index f70074c878..f70074c878 100644
--- a/src/res/icon_notloaded_gray.ico
+++ b/src/mir_app/res/icon_notloaded_gray.ico
diff --git a/src/res/icon_options.ico b/src/mir_app/res/icon_options.ico
index 245a4185ab..245a4185ab 100644
--- a/src/res/icon_options.ico
+++ b/src/mir_app/res/icon_options.ico
diff --git a/src/res/icon_search_all.ico b/src/mir_app/res/icon_search_all.ico
index a88bc841fa..a88bc841fa 100644
--- a/src/res/icon_search_all.ico
+++ b/src/mir_app/res/icon_search_all.ico
diff --git a/src/res/icon_small_dot.ico b/src/mir_app/res/icon_small_dot.ico
index faade362bf..faade362bf 100644
--- a/src/res/icon_small_dot.ico
+++ b/src/mir_app/res/icon_small_dot.ico
diff --git a/src/res/icon_sms.ico b/src/mir_app/res/icon_sms.ico
index 98bd33e6d9..98bd33e6d9 100644
--- a/src/res/icon_sms.ico
+++ b/src/mir_app/res/icon_sms.ico
diff --git a/src/res/icon_typing.ico b/src/mir_app/res/icon_typing.ico
index 6264e76a93..6264e76a93 100644
--- a/src/res/icon_typing.ico
+++ b/src/mir_app/res/icon_typing.ico
diff --git a/src/res/icon_undo.ico b/src/mir_app/res/icon_undo.ico
index 3479bceb4c..3479bceb4c 100644
--- a/src/res/icon_undo.ico
+++ b/src/mir_app/res/icon_undo.ico
diff --git a/src/res/icon_unicode.ico b/src/mir_app/res/icon_unicode.ico
index ae62c85e23..ae62c85e23 100644
--- a/src/res/icon_unicode.ico
+++ b/src/mir_app/res/icon_unicode.ico
diff --git a/src/res/icon_url.ico b/src/mir_app/res/icon_url.ico
index dbf58aeb04..dbf58aeb04 100644
--- a/src/res/icon_url.ico
+++ b/src/mir_app/res/icon_url.ico
diff --git a/src/res/icon_warning.ico b/src/mir_app/res/icon_warning.ico
index dfa6fed1b3..dfa6fed1b3 100644
--- a/src/res/icon_warning.ico
+++ b/src/mir_app/res/icon_warning.ico
diff --git a/src/res/icon_window.ico b/src/mir_app/res/icon_window.ico
index 5d4cb7e9fd..5d4cb7e9fd 100644
--- a/src/res/icon_window.ico
+++ b/src/mir_app/res/icon_window.ico
diff --git a/src/res/icon_windows.ico b/src/mir_app/res/icon_windows.ico
index ffb6c440bf..ffb6c440bf 100644
--- a/src/res/icon_windows.ico
+++ b/src/mir_app/res/icon_windows.ico
diff --git a/src/res/male.ico b/src/mir_app/res/male.ico
index 9b478e2412..9b478e2412 100644
--- a/src/res/male.ico
+++ b/src/mir_app/res/male.ico
diff --git a/src/res/meta_add.ico b/src/mir_app/res/meta_add.ico
index 814383341c..814383341c 100644
--- a/src/res/meta_add.ico
+++ b/src/mir_app/res/meta_add.ico
diff --git a/src/res/meta_convert.ico b/src/mir_app/res/meta_convert.ico
index 51417bdb8c..51417bdb8c 100644
--- a/src/res/meta_convert.ico
+++ b/src/mir_app/res/meta_convert.ico
diff --git a/src/res/meta_edit.ico b/src/mir_app/res/meta_edit.ico
index 9696507f31..9696507f31 100644
--- a/src/res/meta_edit.ico
+++ b/src/mir_app/res/meta_edit.ico
diff --git a/src/res/meta_menu.ico b/src/mir_app/res/meta_menu.ico
index 2e1fdcdf78..2e1fdcdf78 100644
--- a/src/res/meta_menu.ico
+++ b/src/mir_app/res/meta_menu.ico
diff --git a/src/res/meta_menuof.ico b/src/mir_app/res/meta_menuof.ico
index 779fe3db15..779fe3db15 100644
--- a/src/res/meta_menuof.ico
+++ b/src/mir_app/res/meta_menuof.ico
diff --git a/src/res/meta_remove2.ico b/src/mir_app/res/meta_remove2.ico
index c05c19eb8f..c05c19eb8f 100644
--- a/src/res/meta_remove2.ico
+++ b/src/mir_app/res/meta_remove2.ico
diff --git a/src/res/meta_set_as_default.ico b/src/mir_app/res/meta_set_as_default.ico
index e880efd0d1..e880efd0d1 100644
--- a/src/res/meta_set_as_default.ico
+++ b/src/mir_app/res/meta_set_as_default.ico
diff --git a/src/res/miranda_home.ico b/src/mir_app/res/miranda_home.ico
index b4bf45aacb..b4bf45aacb 100644
--- a/src/res/miranda_home.ico
+++ b/src/mir_app/res/miranda_home.ico
diff --git a/src/res/miranda_logo.ico b/src/mir_app/res/miranda_logo.ico
index 768612f041..768612f041 100644
--- a/src/res/miranda_logo.ico
+++ b/src/mir_app/res/miranda_logo.ico
diff --git a/src/res/miranda_manager.ico b/src/mir_app/res/miranda_manager.ico
index 92a6224751..92a6224751 100644
--- a/src/res/miranda_manager.ico
+++ b/src/mir_app/res/miranda_manager.ico
diff --git a/src/res/never_visible.ico b/src/mir_app/res/never_visible.ico
index 12a69a5807..12a69a5807 100644
--- a/src/res/never_visible.ico
+++ b/src/mir_app/res/never_visible.ico
diff --git a/src/resource.rc b/src/mir_app/res/resource.rc
index 68db7557f6..75136e9e14 100644
--- a/src/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -1,6 +1,6 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "resource.h"

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

 

 #define APSTUDIO_READONLY_SYMBOLS

 /////////////////////////////////////////////////////////////////////////////

diff --git a/src/res/status_DND.ico b/src/mir_app/res/status_DND.ico
index 8183404bb1..8183404bb1 100644
--- a/src/res/status_DND.ico
+++ b/src/mir_app/res/status_DND.ico
diff --git a/src/res/status_NA.ico b/src/mir_app/res/status_NA.ico
index ccaa4b0d60..ccaa4b0d60 100644
--- a/src/res/status_NA.ico
+++ b/src/mir_app/res/status_NA.ico
diff --git a/src/res/status_away.ico b/src/mir_app/res/status_away.ico
index f24af50a75..f24af50a75 100644
--- a/src/res/status_away.ico
+++ b/src/mir_app/res/status_away.ico
diff --git a/src/res/status_free4chat.ico b/src/mir_app/res/status_free4chat.ico
index c3b0e7d064..c3b0e7d064 100644
--- a/src/res/status_free4chat.ico
+++ b/src/mir_app/res/status_free4chat.ico
diff --git a/src/res/status_invisible.ico b/src/mir_app/res/status_invisible.ico
index c19554b9e8..c19554b9e8 100644
--- a/src/res/status_invisible.ico
+++ b/src/mir_app/res/status_invisible.ico
diff --git a/src/res/status_locked.ico b/src/mir_app/res/status_locked.ico
index eb9f58e35f..eb9f58e35f 100644
--- a/src/res/status_locked.ico
+++ b/src/mir_app/res/status_locked.ico
diff --git a/src/res/status_occupied.ico b/src/mir_app/res/status_occupied.ico
index 0f57945ebf..0f57945ebf 100644
--- a/src/res/status_occupied.ico
+++ b/src/mir_app/res/status_occupied.ico
diff --git a/src/res/status_offline.ico b/src/mir_app/res/status_offline.ico
index 018ee8fddf..018ee8fddf 100644
--- a/src/res/status_offline.ico
+++ b/src/mir_app/res/status_offline.ico
diff --git a/src/res/status_on_the_phone.ico b/src/mir_app/res/status_on_the_phone.ico
index d0af832234..d0af832234 100644
--- a/src/res/status_on_the_phone.ico
+++ b/src/mir_app/res/status_on_the_phone.ico
diff --git a/src/res/status_online.ico b/src/mir_app/res/status_online.ico
index 226b9c195a..226b9c195a 100644
--- a/src/res/status_online.ico
+++ b/src/mir_app/res/status_online.ico
diff --git a/src/res/status_out2lunch.ico b/src/mir_app/res/status_out2lunch.ico
index 16c5e5a366..16c5e5a366 100644
--- a/src/res/status_out2lunch.ico
+++ b/src/mir_app/res/status_out2lunch.ico
diff --git a/src/res/status_user_online.ico b/src/mir_app/res/status_user_online.ico
index e42e88c44e..e42e88c44e 100644
--- a/src/res/status_user_online.ico
+++ b/src/mir_app/res/status_user_online.ico
diff --git a/src/version.rc b/src/mir_app/res/version.rc
index 5343337365..5343337365 100644
--- a/src/version.rc
+++ b/src/mir_app/res/version.rc
diff --git a/src/modules/extraicons/BaseExtraIcon.cpp b/src/mir_app/src/BaseExtraIcon.cpp
index eb56429bbf..2de3a6874c 100644
--- a/src/modules/extraicons/BaseExtraIcon.cpp
+++ b/src/mir_app/src/BaseExtraIcon.cpp
@@ -19,7 +19,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.

 */

 

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

+#include "stdafx.h"

 

 #include "extraicons.h"

 

diff --git a/src/modules/extraicons/CallbackExtraIcon.cpp b/src/mir_app/src/CallbackExtraIcon.cpp
index 712e8e3b86..a4f04b22a7 100644
--- a/src/modules/extraicons/CallbackExtraIcon.cpp
+++ b/src/mir_app/src/CallbackExtraIcon.cpp
@@ -19,7 +19,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.

 */

 

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

+#include "stdafx.h"

 

 #include "extraicons.h"

 

@@ -69,7 +69,7 @@ int CallbackExtraIcon::setIcon(int id, MCONTACT hContact, HANDLE icon)
 	return ClistSetExtraIcon(hContact, icon);

 }

 

-int CallbackExtraIcon::setIconByName(int id, MCONTACT hContact, const char *icon)

+int CallbackExtraIcon::setIconByName(int, MCONTACT, const char*)

 {

 	return -1;

 }

diff --git a/src/modules/extraicons/DefaultExtraIcons.cpp b/src/mir_app/src/DefaultExtraIcons.cpp
index dc1833d00f..0b41f377e3 100644
--- a/src/modules/extraicons/DefaultExtraIcons.cpp
+++ b/src/mir_app/src/DefaultExtraIcons.cpp
@@ -19,7 +19,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.

 */

 

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

+#include "stdafx.h"

 

 #include "m_cluiframes.h"

 

@@ -109,14 +109,14 @@ struct Info
 	HANDLE hIcolib, hExtraIcon;

 };

 

-static void EmailOnClick(Info *info, const char *text)

+static void EmailOnClick(Info*, const char *text)

 {

 	char cmd[1024];

 	mir_snprintf(cmd, SIZEOF(cmd), "mailto:%s", text);

 	ShellExecuteA(NULL, "open", cmd, NULL, NULL, SW_SHOW);

 }

 

-static void HomepageOnClick(Info *info, const char *text)

+static void HomepageOnClick(Info*, const char *text)

 {

 	ShellExecuteA(NULL, "open", text, NULL, NULL, SW_SHOW);

 }

@@ -202,7 +202,7 @@ static int SettingChanged(WPARAM hContact, LPARAM lParam)
 	return 0;

 }

 

-static int DefaultOnClick(WPARAM hContact, LPARAM lParam, LPARAM param)

+static int DefaultOnClick(WPARAM hContact, LPARAM, LPARAM param)

 {

 	Info *p = (Info*)param;

 	if (p == NULL)

@@ -250,7 +250,7 @@ static int CompareProtos(const ProtoInfo *p1, const ProtoInfo *p2)
 

 OBJLIST<ProtoInfo> arProtos(10, CompareProtos);

 

-static int ProtocolRebuildIcons(WPARAM wParam, LPARAM lParam)

+static int ProtocolRebuildIcons(WPARAM, LPARAM)

 {

 	arProtos.destroy();

 	return 0;

@@ -275,7 +275,7 @@ static ProtoInfo* FindProto(const char *proto)
 	return p;

 }

 

-static int ProtocolApplyIcon(WPARAM hContact, LPARAM lParam)

+static int ProtocolApplyIcon(WPARAM hContact, LPARAM)

 {

 	char *proto = GetContactProto(hContact);

 	if (IsEmpty(proto))

@@ -290,7 +290,7 @@ static int ProtocolApplyIcon(WPARAM hContact, LPARAM lParam)
 	return 0;

 }

 

-static int ProtocolOnClick(WPARAM wParam, LPARAM lParam, LPARAM param)

+static int ProtocolOnClick(WPARAM wParam, LPARAM, LPARAM)

 {

 	if (wParam)

 		CallService(MS_USERINFO_SHOWDIALOG, wParam, 0);

diff --git a/src/modules/clist/Docking.cpp b/src/mir_app/src/Docking.cpp
index 7d9fbd62c6..c4b163dda1 100644
--- a/src/modules/clist/Docking.cpp
+++ b/src/mir_app/src/Docking.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 #define WM_DOCKCALLBACK   (WM_USER+121)

diff --git a/src/modules/extraicons/ExtraIcon.cpp b/src/mir_app/src/ExtraIcon.cpp
index 4a841423f3..166f337383 100644
--- a/src/modules/extraicons/ExtraIcon.cpp
+++ b/src/mir_app/src/ExtraIcon.cpp
@@ -19,7 +19,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.

 */

 

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

+#include "stdafx.h"

 

 #include "extraicons.h"

 

diff --git a/src/modules/extraicons/ExtraIcon.h b/src/mir_app/src/ExtraIcon.h
index 3f4c34d8e0..b5c8c1e617 100644
--- a/src/modules/extraicons/ExtraIcon.h
+++ b/src/mir_app/src/ExtraIcon.h
@@ -40,7 +40,7 @@ public:
 

 	virtual int  setIcon(int id, MCONTACT hContact, HANDLE icon) = 0;

 	virtual int  setIconByName(int id, MCONTACT hContact, const char* icon) = 0;

-	virtual void storeIcon(MCONTACT hContact, void *icon) {};

+	virtual void storeIcon(MCONTACT, void*) {};

 

 	virtual const char *getName() const;

 	virtual const TCHAR *getDescription() const = 0;

diff --git a/src/modules/extraicons/ExtraIconGroup.cpp b/src/mir_app/src/ExtraIconGroup.cpp
index 26704a0cfa..d8e4c0974d 100644
--- a/src/modules/extraicons/ExtraIconGroup.cpp
+++ b/src/mir_app/src/ExtraIconGroup.cpp
@@ -19,7 +19,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.

 */

 

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

+#include "stdafx.h"

 

 #include "extraicons.h"

 

diff --git a/src/modules/fonts/FontOptions.cpp b/src/mir_app/src/FontOptions.cpp
index a028f0d9cc..982fb25e2e 100644
--- a/src/modules/fonts/FontOptions.cpp
+++ b/src/mir_app/src/FontOptions.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "FontService.h"

 

 // *_w2 is working copy of list

@@ -228,7 +228,7 @@ void OptionsChanged()
 TOOLINFO ti;

 int x, y;

 

-UINT_PTR CALLBACK CFHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)

+UINT_PTR CALLBACK CFHookProc(HWND hdlg, UINT uiMsg, WPARAM, LPARAM lParam)

 {

 	if (uiMsg == WM_INITDIALOG) {

 		CHOOSEFONT* cf = (CHOOSEFONT *)lParam;

@@ -989,7 +989,7 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam,
 				EffectInternal& E = effect_id_list_w2[itemData->effect_id];

 

 				FONTEFFECT es = E.value;

-				if (IDOK == DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_CHOOSE_FONT_EFFECT), hwndDlg, ChooseEffectDlgProc, (LPARAM)&es)) {

+				if (IDOK == DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_CHOOSE_FONT_EFFECT), hwndDlg, ChooseEffectDlgProc, (LPARAM)&es)) {

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

 						FSUIListItemData *itemData = (FSUIListItemData *)SendDlgItemMessage(hwndDlg, IDC_FONTLIST, LB_GETITEMDATA, selItems[i], 0);

 						if (itemData->effect_id < 0)

@@ -1191,7 +1191,7 @@ int OptInit(WPARAM wParam, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = -790000000;

-	odp.hInstance = hInst;

+	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FONTS);

 	odp.pszTitle = LPGEN("Fonts and colors");

 	odp.pszGroup = LPGEN("Customize");

@@ -1253,7 +1253,6 @@ static INT_PTR CALLBACK DlgProcModernOptions(HWND hwndDlg, UINT msg, WPARAM wPar
 				break;

 

 			HFONT hFont = NULL, hoFont = NULL;

-			COLORREF clText = GetSysColor(COLOR_WINDOWTEXT);

 			CreateFromFontSettings(&pf->value, &lf);

 			hFont = CreateFontIndirect(&lf);

 			hoFont = (HFONT)SelectObject(dis->hDC, hFont);

@@ -1343,7 +1342,7 @@ static INT_PTR CALLBACK DlgProcModernOptions(HWND hwndDlg, UINT msg, WPARAM wPar
 INT_PTR CALLBACK AccMgrDlgProc(HWND, UINT, WPARAM, LPARAM);

 INT_PTR CALLBACK DlgPluginOpt(HWND, UINT, WPARAM, LPARAM);

 

-int FontsModernOptInit(WPARAM wParam, LPARAM lParam)

+int FontsModernOptInit(WPARAM wParam, LPARAM)

 {

 	static int iBoldControls[] =

 	{

@@ -1355,7 +1354,7 @@ int FontsModernOptInit(WPARAM wParam, LPARAM lParam)
 	obj.cbSize = sizeof(obj);

 	obj.dwFlags = MODEROPT_FLG_TCHAR|MODEROPT_FLG_NORESIZE;

 	obj.hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

-	obj.hInstance = hInst;

+	obj.hInstance = g_hInst;

 	obj.iSection = MODERNOPT_PAGE_SKINS;

 	obj.iType = MODERNOPT_TYPE_SUBSECTIONPAGE;

 	obj.iBoldControls = iBoldControls;

diff --git a/src/modules/fonts/FontService.cpp b/src/mir_app/src/FontService.cpp
index 166110f2a8..417597d8de 100644
--- a/src/modules/fonts/FontService.cpp
+++ b/src/mir_app/src/FontService.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "FontService.h"

 

 int code_page = CP_ACP;

diff --git a/src/modules/fonts/FontService.h b/src/mir_app/src/FontService.h
index 970fd25090..970fd25090 100644
--- a/src/modules/fonts/FontService.h
+++ b/src/mir_app/src/FontService.h
diff --git a/src/modules/icolib/IcoLib.h b/src/mir_app/src/IcoLib.h
index e8bd131b1d..e8bd131b1d 100644
--- a/src/modules/icolib/IcoLib.h
+++ b/src/mir_app/src/IcoLib.h
diff --git a/src/modules/extraicons/IcolibExtraIcon.cpp b/src/mir_app/src/IcolibExtraIcon.cpp
index 3a9521f4d4..cdcd5a3d4a 100644
--- a/src/modules/extraicons/IcolibExtraIcon.cpp
+++ b/src/mir_app/src/IcolibExtraIcon.cpp
@@ -19,12 +19,12 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.

 */

 

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

+#include "stdafx.h"

 

 #include "extraicons.h"

 #include "usedIcons.h"

 

-#include "..\icolib\IcoLib.h"

+#include "IcoLib.h"

 

 IcolibExtraIcon::IcolibExtraIcon(int _id, const char *_name, const TCHAR *_description, const char *_descIcon,

 		MIRANDAHOOKPARAM _OnClick, LPARAM _param) :

diff --git a/src/modules/addcontact/addcontact.cpp b/src/mir_app/src/addcontact.cpp
index 9379e3f283..ce8557285e 100644
--- a/src/modules/addcontact/addcontact.cpp
+++ b/src/mir_app/src/addcontact.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 class CAddContactDlg : public CDlgBase

 {

@@ -35,7 +35,7 @@ class CAddContactDlg : public CDlgBase
 

 public:

 	CAddContactDlg(ADDCONTACTSTRUCT *acs) :

-		CDlgBase(hInst, IDD_ADDCONTACT),

+		CDlgBase(g_hInst, IDD_ADDCONTACT),

 		m_chkAdded(this, IDC_ADDED),

 		m_chkAuth(this, IDC_AUTH),

 		m_chkOpen(this, IDC_OPEN_WINDOW),

diff --git a/src/modules/button/button.cpp b/src/mir_app/src/button.cpp
index 483c85b0b4..6b69ff1e2d 100644
--- a/src/modules/button/button.cpp
+++ b/src/mir_app/src/button.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 #include <m_button_int.h>

 

@@ -472,7 +472,7 @@ static LRESULT CALLBACK MButtonWndProc(HWND hwnd, UINT msg,  WPARAM wParam, LPAR
 				else {

 					TTooltips *ptt = (TTooltips*)mir_alloc(sizeof(TTooltips));

 					ptt->ThreadId = tt.ThreadId;

-					ptt->hwnd = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, _T(""), TTS_ALWAYSTIP, 0, 0, 0, 0, NULL, NULL, hInst, NULL);

+					ptt->hwnd = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, _T(""), TTS_ALWAYSTIP, 0, 0, 0, 0, NULL, NULL, g_hInst, NULL);

 					lToolTips.insert(ptt);

 					bct->hwndToolTips = ptt->hwnd;

 				}

diff --git a/src/modules/chat/chat.h b/src/mir_app/src/chat.h
index a84ed5cf54..a84ed5cf54 100644
--- a/src/modules/chat/chat.h
+++ b/src/mir_app/src/chat.h
diff --git a/src/modules/chat/clist.cpp b/src/mir_app/src/chat_clist.cpp
index 4306806568..26dbd2ed74 100644
--- a/src/modules/chat/clist.cpp
+++ b/src/mir_app/src/chat_clist.cpp
@@ -18,7 +18,7 @@ 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 "stdafx.h"

 

 #include "chat.h"

 

@@ -71,7 +71,7 @@ MCONTACT AddRoom(const char *pszModule, const TCHAR *pszRoom, const TCHAR *pszDi
 	return hContact;

 }

 

-BOOL SetOffline(MCONTACT hContact, BOOL bHide)

+BOOL SetOffline(MCONTACT hContact, BOOL)

 {

 	if (hContact) {

 		char *szProto = GetContactProto(hContact);

@@ -83,7 +83,7 @@ BOOL SetOffline(MCONTACT hContact, BOOL bHide)
 	return FALSE;

 }

 

-BOOL SetAllOffline(BOOL bHide, const char *pszModule)

+BOOL SetAllOffline(BOOL, const char *pszModule)

 {

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

 		char *szProto = GetContactProto(hContact);

@@ -101,7 +101,7 @@ BOOL SetAllOffline(BOOL bHide, const char *pszModule)
 	return TRUE;

 }

 

-int RoomDoubleclicked(WPARAM hContact, LPARAM lParam)

+int RoomDoubleclicked(WPARAM hContact, LPARAM)

 {

 	if (!hContact)

 		return 0;

@@ -133,7 +133,7 @@ int RoomDoubleclicked(WPARAM hContact, LPARAM lParam)
 	return 1;

 }

 

-INT_PTR EventDoubleclicked(WPARAM wParam,LPARAM lParam)

+INT_PTR EventDoubleclicked(WPARAM,LPARAM lParam)

 {

 	return RoomDoubleclicked((WPARAM)((CLISTEVENT*)lParam)->hContact, 0);

 }

diff --git a/src/modules/chat/log.cpp b/src/mir_app/src/chat_log.cpp
index 4ad98b44eb..79b608953c 100644
--- a/src/modules/chat/log.cpp
+++ b/src/mir_app/src/chat_log.cpp
@@ -18,7 +18,7 @@ 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 "stdafx.h"

 

 #include "chat.h"

 

diff --git a/src/modules/chat/manager.cpp b/src/mir_app/src/chat_manager.cpp
index bbc846c89f..cde5bc8437 100644
--- a/src/modules/chat/manager.cpp
+++ b/src/mir_app/src/chat_manager.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"

 

 #include "chat.h"

 

diff --git a/src/modules/chat/chat_opts.cpp b/src/mir_app/src/chat_opts.cpp
index dd889280c2..3497d5b22b 100644
--- a/src/modules/chat/chat_opts.cpp
+++ b/src/mir_app/src/chat_opts.cpp
@@ -18,7 +18,7 @@ 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 "stdafx.h"

 

 #include "chat.h"

 

@@ -301,7 +301,7 @@ int GetTextPixelSize(TCHAR* pszText, HFONT hFont, BOOL bWidth)
 	HFONT hOldFont = (HFONT)SelectObject(hdc, hFont);

 

 	RECT rc = { 0 };

-	int i = DrawText(hdc, pszText, -1, &rc, DT_CALCRECT);

+	DrawText(hdc, pszText, -1, &rc, DT_CALCRECT);

 	SelectObject(hdc, hOldFont);

 	ReleaseDC(NULL, hdc);

 	return bWidth ? rc.right - rc.left : rc.bottom - rc.top;

diff --git a/src/modules/chat/chat_rtf.cpp b/src/mir_app/src/chat_rtf.cpp
index 255a051ef9..d7ce42dbf3 100644
--- a/src/modules/chat/chat_rtf.cpp
+++ b/src/mir_app/src/chat_rtf.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"
 
 #include "chat.h"
 
diff --git a/src/modules/chat/chat_svc.cpp b/src/mir_app/src/chat_svc.cpp
index 31b0fc9080..5d56b3729b 100644
--- a/src/modules/chat/chat_svc.cpp
+++ b/src/mir_app/src/chat_svc.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"
 
 INT_PTR SvcGetChatManager(WPARAM, LPARAM);
 
diff --git a/src/modules/chat/tools.cpp b/src/mir_app/src/chat_tools.cpp
index b91686d538..a19bff68d9 100644
--- a/src/modules/chat/tools.cpp
+++ b/src/mir_app/src/chat_tools.cpp
@@ -20,10 +20,12 @@ 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 "stdafx.h"

 

 #include "chat.h"

 

+#pragma comment(lib, "Shlwapi.lib")

+

 int GetRichTextLength(HWND hwnd)

 {

 	GETTEXTLENGTHEX gtl;

@@ -161,7 +163,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
 	return DefWindowProc(hWnd, message, wParam, lParam);

 }

 

-int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char* pszProtoName, TCHAR* pszRoomName, COLORREF crBkg, const TCHAR* fmt, ...)

+int ShowPopup(MCONTACT hContact, SESSION_INFO *si, HICON hIcon, char *pszProtoName, TCHAR*, COLORREF crBkg, const TCHAR *fmt, ...)

 {

 	static TCHAR szBuf[4 * 1024];

 

diff --git a/src/modules/clist/clc.cpp b/src/mir_app/src/clc.cpp
index 6ab8f89aa0..6863694d05 100644
--- a/src/modules/clist/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 int InitGenMenu(void);

diff --git a/src/modules/clist/clc.h b/src/mir_app/src/clc.h
index 3a79db0804..3a79db0804 100644
--- a/src/modules/clist/clc.h
+++ b/src/mir_app/src/clc.h
diff --git a/src/modules/clist/clcfiledrop.cpp b/src/mir_app/src/clcfiledrop.cpp
index 4a8f5e33fc..da3ab82e47 100644
--- a/src/modules/clist/clcfiledrop.cpp
+++ b/src/mir_app/src/clcfiledrop.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 #include <shlobj.h>

 

diff --git a/src/modules/clist/clcidents.cpp b/src/mir_app/src/clcidents.cpp
index 606b2ecf4c..20669f4e54 100644
--- a/src/modules/clist/clcidents.cpp
+++ b/src/mir_app/src/clcidents.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 /* the CLC uses 3 different ways to identify elements in its list, this file

diff --git a/src/modules/clist/clcitems.cpp b/src/mir_app/src/clcitems.cpp
index c298d6b3d8..533c45aa8b 100644
--- a/src/modules/clist/clcitems.cpp
+++ b/src/mir_app/src/clcitems.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"
 #include "clc.h"
 
 //routines for managing adding/removal of items in the list, including sorting
diff --git a/src/modules/clist/clcmsgs.cpp b/src/mir_app/src/clcmsgs.cpp
index 557c48c8cd..2706c6780b 100644
--- a/src/modules/clist/clcmsgs.cpp
+++ b/src/mir_app/src/clcmsgs.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 //processing of all the CLM_ messages incoming

diff --git a/src/modules/clist/clcutils.cpp b/src/mir_app/src/clcutils.cpp
index f82cfa27a7..fa0c1ad919 100644
--- a/src/modules/clist/clcutils.cpp
+++ b/src/mir_app/src/clcutils.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 //loads of stuff that didn't really fit anywhere else

diff --git a/src/modules/clist/clistcore.cpp b/src/mir_app/src/clistcore.cpp
index 976525e4a2..b4f5442bf9 100644
--- a/src/modules/clist/clistcore.cpp
+++ b/src/mir_app/src/clistcore.cpp
@@ -22,10 +22,10 @@ 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 "stdafx.h"

 #include "clc.h"

 #include "genmenu.h"

-#include "..\extraicons\extraicons.h"

+#include "extraicons.h"

 

 CLIST_INTERFACE cli = { 0 };

 

diff --git a/src/modules/clist/clistevents.cpp b/src/mir_app/src/clistevents.cpp
index defb917c23..29b71a2a5a 100644
--- a/src/modules/clist/clistevents.cpp
+++ b/src/mir_app/src/clistevents.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 struct CListEvent

diff --git a/src/modules/clist/clistmenus.cpp b/src/mir_app/src/clistmenus.cpp
index a2ab028c3a..78eb3a8433 100644
--- a/src/modules/clist/clistmenus.cpp
+++ b/src/mir_app/src/clistmenus.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #pragma hdrstop

 

 #include "m_hotkeys.h"

@@ -58,13 +58,13 @@ bool prochotkey;
 HANDLE hPreBuildMainMenuEvent, hStatusModeChangeEvent, hPreBuildContactMenuEvent;

 

 static HMENU hMainMenu, hStatusMenu = 0;

-static const int statusModeList[MAX_STATUS_COUNT] =

+const int statusModeList[MAX_STATUS_COUNT] =

 {

 	ID_STATUS_OFFLINE, ID_STATUS_ONLINE, ID_STATUS_AWAY, ID_STATUS_NA, ID_STATUS_OCCUPIED,

 	ID_STATUS_DND, ID_STATUS_FREECHAT, ID_STATUS_INVISIBLE, ID_STATUS_ONTHEPHONE, ID_STATUS_OUTTOLUNCH

 };

 

-static const int skinIconStatusList[MAX_STATUS_COUNT] =

+const int skinIconStatusList[MAX_STATUS_COUNT] =

 {

 	SKINICON_STATUS_OFFLINE, SKINICON_STATUS_ONLINE, SKINICON_STATUS_AWAY, SKINICON_STATUS_NA, SKINICON_STATUS_OCCUPIED,

 	SKINICON_STATUS_DND, SKINICON_STATUS_FREE4CHAT, SKINICON_STATUS_INVISIBLE, SKINICON_STATUS_ONTHEPHONE, SKINICON_STATUS_OUTTOLUNCH

@@ -1215,7 +1215,7 @@ static INT_PTR AddStatusMenuItem(WPARAM wParam, LPARAM lParam)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-static INT_PTR HotkeySetStatus(WPARAM wParam, LPARAM lParam)

+static INT_PTR HotkeySetStatus(WPARAM, LPARAM lParam)

 {

 	return SetStatusMode(lParam, 0);

 }

diff --git a/src/modules/clist/clistmod.cpp b/src/mir_app/src/clistmod.cpp
index 81be885ba7..a2c1aae495 100644
--- a/src/modules/clist/clistmod.cpp
+++ b/src/mir_app/src/clistmod.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 INT_PTR ContactChangeGroup(WPARAM wParam, LPARAM lParam);

diff --git a/src/modules/clist/clistsettings.cpp b/src/mir_app/src/clistsettings.cpp
index fee76ff9eb..66792adb9a 100644
--- a/src/modules/clist/clistsettings.cpp
+++ b/src/mir_app/src/clistsettings.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 static LIST<ClcCacheEntry> clistCache(50, NumericKeySortT);

diff --git a/src/modules/clist/clisttray.cpp b/src/mir_app/src/clisttray.cpp
index 4a2d495b6d..93bde38516 100644
--- a/src/modules/clist/clisttray.cpp
+++ b/src/mir_app/src/clisttray.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 #define TOOLTIP_TOLERANCE 5

diff --git a/src/modules/clist/clui.cpp b/src/mir_app/src/clui.cpp
index 50a3b3f8d6..0d4443782b 100644
--- a/src/modules/clist/clui.cpp
+++ b/src/mir_app/src/clui.cpp
@@ -22,8 +22,8 @@ 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 "../database/profilemanager.h"

+#include "stdafx.h"

+#include "profilemanager.h"

 #include "clc.h"

 

 #define TM_AUTOALPHA  1

@@ -166,7 +166,7 @@ static INT_PTR MenuItem_DeleteContact(WPARAM wParam, LPARAM lParam)
 

 	if (db_get_b(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) && !(GetKeyState(VK_SHIFT) & 0x8000))

 		// Ask user for confirmation, and if the contact should be archived (hidden, not deleted)

-		action = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_DELETECONTACT), (HWND) lParam, AskForConfirmationDlgProc, wParam);

+		action = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_DELETECONTACT), (HWND)lParam, AskForConfirmationDlgProc, wParam);

 	else

 		action = IDYES;

 

diff --git a/src/modules/clist/cluiservices.cpp b/src/mir_app/src/cluiservices.cpp
index b9bf086843..e5f08af088 100644
--- a/src/modules/clist/cluiservices.cpp
+++ b/src/mir_app/src/cluiservices.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 static INT_PTR GetHwnd(WPARAM, LPARAM)

diff --git a/src/modules/chat/colorchooser.cpp b/src/mir_app/src/colorchooser.cpp
index f81012b527..56dd57c3a9 100644
--- a/src/modules/chat/colorchooser.cpp
+++ b/src/mir_app/src/colorchooser.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"

 

 #include "chat.h"

 

@@ -280,5 +280,5 @@ void ColorChooser(SESSION_INFO *si, BOOL bFG, HWND hwndDlg, HWND hwndTarget, HWN
 	pCC->bForeground = bFG;

 	pCC->hWndChooser = hwndChooser;

 	pCC->si = si;

-	CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_COLORCHOOSER), hwndDlg, DlgProcColorToolWindow, (LPARAM)pCC);

+	CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_COLORCHOOSER), hwndDlg, DlgProcColorToolWindow, (LPARAM)pCC);

 }

diff --git a/src/modules/utils/colourpicker.cpp b/src/mir_app/src/colourpicker.cpp
index e93a1c90b7..3c30393f11 100644
--- a/src/modules/utils/colourpicker.cpp
+++ b/src/mir_app/src/colourpicker.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 static LRESULT CALLBACK ColourPickerWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)

 {

@@ -49,7 +49,7 @@ static LRESULT CALLBACK ColourPickerWndProc(HWND hwnd, UINT message, WPARAM wPar
 			custColours[0] = GetWindowLongPtr(hwnd, sizeof(COLORREF));

 			cc.lStructSize = sizeof(CHOOSECOLOR);

 			cc.hwndOwner = hwnd;

-			cc.hInstance = (HWND)hInst;

+			cc.hInstance = (HWND)g_hInst;

 			cc.rgbResult = GetWindowLongPtr(hwnd, 0);

 			cc.lpCustColors = custColours;

 			cc.Flags = CC_ANYCOLOR|CC_FULLOPEN|CC_RGBINIT;

@@ -96,7 +96,7 @@ int InitColourPicker(void)
 	wcl.lpfnWndProc = ColourPickerWndProc;

 	wcl.cbClsExtra = 0;

 	wcl.cbWndExtra = sizeof(COLORREF)*2;

-	wcl.hInstance = hInst;

+	wcl.hInstance = g_hInst;

 	wcl.hCursor = NULL;

 	wcl.lpszClassName = _T(WNDCLASS_COLOURPICKER);

 	wcl.hbrBackground = (HBRUSH)(COLOR_BTNFACE+1);

diff --git a/src/modules/clist/contact.cpp b/src/mir_app/src/contact.cpp
index 661d3040cf..f4f9296c63 100644
--- a/src/modules/clist/contact.cpp
+++ b/src/mir_app/src/contact.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"
 #include "clc.h"
 
 extern HANDLE hContactIconChangedEvent;
diff --git a/src/modules/clist/contacts.cpp b/src/mir_app/src/contacts.cpp
index 9995bf219b..2d1729ad73 100644
--- a/src/modules/clist/contacts.cpp
+++ b/src/mir_app/src/contacts.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 #define NAMEORDERCOUNT 9

 static TCHAR* nameOrderDescr[ NAMEORDERCOUNT ] =

@@ -380,7 +380,7 @@ class CContactOptsDlg : public CDlgBase
 

 public:

 	CContactOptsDlg() :

-		CDlgBase(hInst, IDD_OPT_CONTACT),

+		CDlgBase(g_hInst, IDD_OPT_CONTACT),

 		m_nameOrder(this, IDC_NAMEORDER)

 	{

 		m_nameOrder.SetFlags(MTREE_DND);

diff --git a/src/modules/database/database.cpp b/src/mir_app/src/database.cpp
index 0fdb7f7174..802840cb5e 100644
--- a/src/modules/database/database.cpp
+++ b/src/mir_app/src/database.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "profilemanager.h"

 

 // contains the location of mirandaboot.ini

@@ -70,7 +70,7 @@ bool IsInsideRootDir(TCHAR* profiledir, bool exact)
 }

 

 // returns 1 if the profile path was returned, without trailing slash

-int getProfilePath(TCHAR *buf, size_t cch)

+int getProfilePath(TCHAR *buf, size_t)

 {

 	TCHAR profiledir[MAX_PATH];

 	GetPrivateProfileString(_T("Database"), _T("ProfileDir"), _T(""), profiledir, SIZEOF(profiledir), mirandabootini);

diff --git a/src/modules/database/database.h b/src/mir_app/src/database.h
index c0acab5c48..c0acab5c48 100644
--- a/src/modules/database/database.h
+++ b/src/mir_app/src/database.h
diff --git a/src/modules/database/dbini.cpp b/src/mir_app/src/dbini.cpp
index d972d8cfd2..50f10dfee6 100644
--- a/src/modules/database/dbini.cpp
+++ b/src/mir_app/src/dbini.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "profilemanager.h"

 

 static bool bModuleInitialized = false;

@@ -81,7 +81,7 @@ static bool IsInSpaceSeparatedList(const char *szWord, const char *szList)
 		if (szEnd == NULL)

 			return !mir_strcmp(szItem, szWord);

 

-		if (szEnd - szItem == wordLen)

+		if (size_t(szEnd - szItem) == wordLen)

 			if (!strncmp(szItem, szWord, wordLen))

 				return true;

 

@@ -191,7 +191,7 @@ struct SettingsList
 	SettingsList *next;

 } *setting_items = NULL;

 

-int SettingsEnumProc(const char *szSetting, LPARAM lParam)

+int SettingsEnumProc(const char *szSetting, LPARAM)

 {

 	SettingsList *newItem = (SettingsList *)mir_alloc(sizeof(SettingsList));

 	newItem->name = mir_strdup(szSetting);

@@ -305,7 +305,7 @@ LBL_NewLine:
 			warnInfo.szValue = szValue;

 			warnInfo.warnNoMore = 0;

 			warnInfo.cancel = 0;

-			if (warnThisSection && IDNO == DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_WARNINICHANGE), NULL, WarnIniChangeDlgProc, (LPARAM)&warnInfo))

+			if (warnThisSection && IDNO == DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_WARNINICHANGE), NULL, WarnIniChangeDlgProc, (LPARAM)&warnInfo))

 				continue;

 			if (warnInfo.cancel)

 				break;

@@ -408,7 +408,6 @@ static void DoAutoExec(void)
 {

 	TCHAR szUse[7], szIniPath[MAX_PATH], szFindPath[MAX_PATH];

 	TCHAR buf[2048], szSecurity[11], szOverrideSecurityFilename[MAX_PATH], szOnCreateFilename[MAX_PATH];

-	int secur;

 

 	GetPrivateProfileString(_T("AutoExec"), _T("Use"), _T("prompt"), szUse, SIZEOF(szUse), mirandabootini);

 	if (!mir_tstrcmpi(szUse, _T("no"))) return;

@@ -417,6 +416,8 @@ static void DoAutoExec(void)
 	GetPrivateProfileString(_T("AutoExec"), _T("Unsafe"), _T("AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte XFire"), buf, SIZEOF(buf), mirandabootini);

 	ptrA szUnsafeSections(mir_t2a(buf));

 	GetPrivateProfileString(_T("AutoExec"), _T("Warn"), _T("notsafe"), szSecurity, SIZEOF(szSecurity), mirandabootini);

+

+	int secur = 0;

 	if (!mir_tstrcmpi(szSecurity, _T("none"))) secur = 0;

 	else if (!mir_tstrcmpi(szSecurity, _T("notsafe"))) secur = 1;

 	else if (!mir_tstrcmpi(szSecurity, _T("onlyunsafe"))) secur = 2;

@@ -448,7 +449,7 @@ static void DoAutoExec(void)
 

 		mir_sntprintf(szIniPath, SIZEOF(szIniPath), _T("%s%s"), szFindPath, fd.cFileName);

 		if (!mir_tstrcmpi(szUse, _T("prompt")) && !secFN) {

-			int result = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_INSTALLINI), NULL, InstallIniDlgProc, (LPARAM)szIniPath);

+			int result = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_INSTALLINI), NULL, InstallIniDlgProc, (LPARAM)szIniPath);

 			if (result == IDC_NOTOALL) break;

 			if (result == IDCANCEL) continue;

 		}

@@ -479,7 +480,7 @@ static void DoAutoExec(void)
 				MoveFile(szIniPath, szNewPath);

 			}

 			else if (!mir_tstrcmpi(szOnCompletion, _T("ask")))

-				DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_INIIMPORTDONE), NULL, IniImportDoneDlgProc, (LPARAM)szIniPath);

+				DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_INIIMPORTDONE), NULL, IniImportDoneDlgProc, (LPARAM)szIniPath);

 		}

 	}

 		while (FindNextFile(hFind, &fd));

diff --git a/src/modules/database/dbintf.cpp b/src/mir_app/src/dbintf.cpp
index fed80cd528..1beb0df2a5 100644
--- a/src/modules/database/dbintf.cpp
+++ b/src/mir_app/src/dbintf.cpp
@@ -21,7 +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.

 */

 

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

+#include "stdafx.h"

 #include "database.h"

 

 MIDatabase *currDb = NULL;

@@ -55,7 +55,7 @@ static INT_PTR srvDeleteContact(WPARAM wParam, LPARAM)
 	return (currDb) ? currDb->DeleteContact(wParam) : 0;

 }

 

-static INT_PTR srvAddContact(WPARAM wParam, LPARAM)

+static INT_PTR srvAddContact(WPARAM, LPARAM)

 {

 	MCONTACT hNew = (currDb) ? currDb->AddContact() : 0;

 	Netlib_Logf(NULL, "New contact created: %d", hNew);

@@ -93,7 +93,7 @@ static INT_PTR srvEnumResidentSettings(WPARAM wParam, LPARAM lParam)
 

 LIST<DATABASELINK> arDbPlugins(5);

 

-static INT_PTR srvRegisterPlugin(WPARAM wParam, LPARAM lParam)

+static INT_PTR srvRegisterPlugin(WPARAM, LPARAM lParam)

 {

 	DATABASELINK* pPlug = (DATABASELINK*)lParam;

 	if (pPlug == NULL)

@@ -103,7 +103,7 @@ static INT_PTR srvRegisterPlugin(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR srvFindPlugin(WPARAM wParam, LPARAM lParam)

+static INT_PTR srvFindPlugin(WPARAM, LPARAM lParam)

 {

 	for (int i = arDbPlugins.getCount() - 1; i >= 0; i--) {

 		int error = arDbPlugins[i]->grokHeader((TCHAR*)lParam);

@@ -114,12 +114,12 @@ static INT_PTR srvFindPlugin(WPARAM wParam, LPARAM lParam)
 	return NULL;

 }

 

-static INT_PTR srvGetCurrentDb(WPARAM wParam, LPARAM lParam)

+static INT_PTR srvGetCurrentDb(WPARAM, LPARAM)

 {

 	return (INT_PTR)currDb;

 }

 

-static INT_PTR srvInitInstance(WPARAM wParam, LPARAM lParam)

+static INT_PTR srvInitInstance(WPARAM, LPARAM lParam)

 {

 	MIDatabase* pDb = (MIDatabase*)lParam;

 	if (pDb != NULL)

@@ -127,7 +127,7 @@ static INT_PTR srvInitInstance(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR srvDestroyInstance(WPARAM wParam, LPARAM lParam)

+static INT_PTR srvDestroyInstance(WPARAM, LPARAM lParam)

 {

 	MIDatabase* pDb = (MIDatabase*)lParam;

 	if (pDb != NULL) {

diff --git a/src/modules/database/dbutils.cpp b/src/mir_app/src/dbutils.cpp
index 880e8a59d8..3de2bfb8a2 100644
--- a/src/modules/database/dbutils.cpp
+++ b/src/mir_app/src/dbutils.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "profilemanager.h"

 

 static int CompareEventTypes(const DBEVENTTYPEDESCR *p1, const DBEVENTTYPEDESCR *p2)

@@ -321,7 +321,7 @@ static INT_PTR GetProfileNameW(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR SetDefaultProfile(WPARAM wParam, LPARAM lParam)

+static INT_PTR SetDefaultProfile(WPARAM wParam, LPARAM)

 {

 	extern TCHAR* g_defaultProfile;

 	replaceStrT(g_defaultProfile, (TCHAR*)wParam);

diff --git a/src/modules/options/descbutton.cpp b/src/mir_app/src/descbutton.cpp
index f6b66eb041..57110d779d 100644
--- a/src/modules/options/descbutton.cpp
+++ b/src/mir_app/src/descbutton.cpp
@@ -23,7 +23,7 @@ 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 "stdafx.h"

 #include "m_descbutton.h"

 

 extern HINSTANCE hInst;

@@ -142,7 +142,7 @@ static void MDescButton_DrawGradient(HDC hdc, int x, int y, int width, int heigh
 	SetBkColor(hdc, oldColor);

 }

 

-static LRESULT MDescButton_OnPaint(HWND hwndDlg, MDescButtonCtrl *dat, UINT  msg, WPARAM wParam, LPARAM lParam)

+static LRESULT MDescButton_OnPaint(HWND hwndDlg, MDescButtonCtrl *dat)

 {

 	PAINTSTRUCT ps;

 	HDC hdc = BeginPaint(hwndDlg, &ps);

@@ -273,7 +273,7 @@ static LRESULT CALLBACK MDescButtonWndProc(HWND hwndDlg, UINT  msg, WPARAM wPara
 		break;

 

 	case WM_PAINT:

-		MDescButton_OnPaint(hwndDlg, dat, msg, wParam, lParam);

+		MDescButton_OnPaint(hwndDlg, dat);

 		break;

 

 	case DBCM_SETTITLE:

diff --git a/src/modules/plugins/dll_sniffer.cpp b/src/mir_app/src/dll_sniffer.cpp
index 31a566346c..b19451eb55 100644
--- a/src/modules/plugins/dll_sniffer.cpp
+++ b/src/mir_app/src/dll_sniffer.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "plugins.h"

 

 static IMAGE_SECTION_HEADER *getSectionByRVA(IMAGE_SECTION_HEADER *pISH, int nSections, IMAGE_DATA_DIRECTORY *pIDD)

@@ -111,7 +111,7 @@ MUUID* GetPluginInterfaces(const TCHAR* ptszFileName, bool& bIsPlugin)
 			WORD  *ptrOrdRVA = (WORD*)&pSecStart[pED->AddressOfNameOrdinals];

 			DWORD *ptrFuncList = (DWORD*)&pSecStart[pED->AddressOfFunctions];

 

-			MUUID* pIds;

+			MUUID* pIds = NULL;

 			bool bHasLoad = false, bHasUnload = false, bHasInfo = false, bHasMuuids = false;

 			for (size_t i=0; i < pED->NumberOfNames; i++, ptrRVA++, ptrOrdRVA++) {

 				char *szName = (char*)&pSecStart[*ptrRVA];

diff --git a/src/modules/crypt/encrypt.cpp b/src/mir_app/src/encrypt.cpp
index 4bdc393358..91cfaf2614 100644
--- a/src/modules/crypt/encrypt.cpp
+++ b/src/mir_app/src/encrypt.cpp
@@ -21,7 +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.

 */

 

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

+#include "stdafx.h"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 

@@ -57,7 +57,7 @@ static INT_PTR srvEnumProviders(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR srvGetProvider(WPARAM wParam, LPARAM lParam)

+static INT_PTR srvGetProvider(WPARAM, LPARAM lParam)

 {

 	if (lParam == 0)

 		return 0;

diff --git a/src/modules/utils/enterstring.cpp b/src/mir_app/src/enterstring.cpp
index c7fd4b4001..4e76e94a6e 100644
--- a/src/modules/utils/enterstring.cpp
+++ b/src/mir_app/src/enterstring.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 struct EnterStringFormParam : public ENTER_STRING

 {

@@ -176,7 +176,7 @@ static INT_PTR CALLBACK sttEnterStringDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa
 		{

 			UTILRESIZEDIALOG urd = { 0 };

 			urd.cbSize = sizeof(urd);

-			urd.hInstance = hInst;

+			urd.hInstance = g_hInst;

 			urd.hwndDlg = hwndDlg;

 			urd.lpTemplate = MAKEINTRESOURCEA(IDD_ENTER_STRING);

 			urd.pfnResizer = sttEnterStringResizer;

@@ -266,7 +266,7 @@ INT_PTR __cdecl svcEnterString(WPARAM, LPARAM lParam)
 

 	EnterStringFormParam param;

 	memcpy(&param, pForm, sizeof(ENTER_STRING));

-	if (!DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_ENTER_STRING), GetForegroundWindow(), sttEnterStringDlgProc, LPARAM(&param)))

+	if (!DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_ENTER_STRING), GetForegroundWindow(), sttEnterStringDlgProc, LPARAM(&param)))

 		return FALSE;

 

 	pForm->ptszResult = param.ptszResult;

diff --git a/src/modules/icolib/extracticon.cpp b/src/mir_app/src/extracticon.cpp
index d3bafc6bde..cfd2ed22db 100644
--- a/src/modules/icolib/extracticon.cpp
+++ b/src/mir_app/src/extracticon.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 #ifdef _ASSERT

 #undef _ASSERT

diff --git a/src/modules/extraicons/extraicons.cpp b/src/mir_app/src/extraicons.cpp
index be02a26b87..fc4d267043 100644
--- a/src/modules/extraicons/extraicons.cpp
+++ b/src/mir_app/src/extraicons.cpp
@@ -19,13 +19,13 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.

 */

 

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

+#include "stdafx.h"

 

 #include "m_cluiframes.h"

 

 #include "extraicons.h"

 #include "usedIcons.h"

-#include "..\clist\clc.h"

+#include "clc.h"

 

 // Prototypes ///////////////////////////////////////////////////////////////////////////

 

@@ -54,7 +54,7 @@ int clistSlotCount = 0;
 int InitOptionsCallback(WPARAM wParam, LPARAM lParam);

 

 // Called when all the modules are loaded

-int ModulesLoaded(WPARAM wParam, LPARAM lParam)

+int ModulesLoaded(WPARAM, LPARAM)

 {

 	// add our modules to the KnownModules list

 	CallService("DBEditorpp/RegisterSingleModule", (WPARAM) MODULE_NAME, 0);

diff --git a/src/modules/extraicons/extraicons.h b/src/mir_app/src/extraicons.h
index 9214dec2cf..795556cbd8 100644
--- a/src/modules/extraicons/extraicons.h
+++ b/src/mir_app/src/extraicons.h
@@ -25,7 +25,6 @@ Boston, MA 02111-1307, USA.
 #define MODULE_NAME "ExtraIcons"

 

 // Global Variables

-extern HINSTANCE hInst;

 

 #define FREE(_m_)		if (_m_ != NULL) { free(_m_); _m_ = NULL; }

 

diff --git a/src/modules/options/filter.cpp b/src/mir_app/src/filter.cpp
index 982fe77399..83f91c407c 100644
--- a/src/modules/options/filter.cpp
+++ b/src/mir_app/src/filter.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "filter.h"

 

 CPageList filterStrings(1);

diff --git a/src/modules/options/filter.h b/src/mir_app/src/filter.h
index 9317547726..9317547726 100644
--- a/src/modules/options/filter.h
+++ b/src/mir_app/src/filter.h
diff --git a/src/modules/findadd/findadd.cpp b/src/mir_app/src/findadd.cpp
index f19f3760bf..e1fa64a9b5 100644
--- a/src/modules/findadd/findadd.cpp
+++ b/src/mir_app/src/findadd.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"
 #include "findadd.h"
 
 #define TIMERID_THROBBER 111
@@ -439,7 +439,7 @@ static INT_PTR CALLBACK DlgProcFindAdd(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 			UTILRESIZEDIALOG urd = { 0 };
 			urd.cbSize = sizeof(urd);
 			urd.hwndDlg = hwndDlg;
-			urd.hInstance = hInst;
+			urd.hInstance = g_hInst;
 			urd.lpTemplate = MAKEINTRESOURCEA(IDD_FINDADD);
 			urd.lParam = (LPARAM)dat;
 			urd.pfnResizer = FindAddDlgResizer;
@@ -1015,7 +1015,7 @@ static INT_PTR FindAddCommand(WPARAM, LPARAM)
 				netProtoCount++;
 		}
 		if (netProtoCount > 0)
-			hwndFindAdd = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FINDADD), NULL, DlgProcFindAdd);
+			hwndFindAdd = CreateDialog(g_hInst, MAKEINTRESOURCE(IDD_FINDADD), NULL, DlgProcFindAdd);
 	}
 	return 0;
 }
diff --git a/src/modules/findadd/findadd.h b/src/mir_app/src/findadd.h
index 4d7ecd27c2..4d7ecd27c2 100644
--- a/src/modules/findadd/findadd.h
+++ b/src/mir_app/src/findadd.h
diff --git a/src/modules/clist/genmenu.cpp b/src/mir_app/src/genmenu.cpp
index c8ea4e0c33..eac64d523e 100644
--- a/src/modules/clist/genmenu.cpp
+++ b/src/mir_app/src/genmenu.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "genmenu.h"

 

 static bool bIsGenMenuInited;

@@ -238,7 +238,7 @@ INT_PTR MO_ProcessHotKeys(HANDLE menuHandle, INT_PTR vKey)
 	return FALSE;

 }

 

-INT_PTR MO_GetProtoRootMenu(WPARAM wParam, LPARAM lParam)

+INT_PTR MO_GetProtoRootMenu(WPARAM wParam, LPARAM)

 {

 	char *szProto = (char*)wParam;

 	if (szProto == NULL)

diff --git a/src/modules/clist/genmenu.h b/src/mir_app/src/genmenu.h
index 198d5417bc..198d5417bc 100644
--- a/src/modules/clist/genmenu.h
+++ b/src/mir_app/src/genmenu.h
diff --git a/src/modules/clist/genmenuopt.cpp b/src/mir_app/src/genmenuopt.cpp
index 3299a17818..8a1cbf497c 100644
--- a/src/modules/clist/genmenuopt.cpp
+++ b/src/mir_app/src/genmenuopt.cpp
@@ -22,14 +22,14 @@ 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 "stdafx.h"
 #include "genmenu.h"
 
 #define STR_SEPARATOR _T("-----------------------------------")
 
 extern bool bIconsDisabled;
 extern int DefaultImageListColorDepth;
-void RebuildProtoMenus(int);
+void RebuildProtoMenus();
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
@@ -262,7 +262,7 @@ class CGenMenuOptionsPage : public CDlgBase
 
 public:
 	CGenMenuOptionsPage() :
-		CDlgBase(hInst, IDD_OPT_GENMENU),
+		CDlgBase(g_hInst, IDD_OPT_GENMENU),
 		m_menuItems(this, IDC_MENUITEMS),
 		m_menuObjects(this, IDC_MENUOBJECTS),
 		m_radio1(this, IDC_RADIO1),
@@ -329,7 +329,7 @@ public:
 		if (iNewMenuValue != iInitMenuValue) {
 			db_set_b(NULL, "CList", "MoveProtoMenus", iNewMenuValue);
 
-			RebuildProtoMenus(iNewMenuValue);
+			RebuildProtoMenus();
 			iInitMenuValue = iNewMenuValue;
 		}
 		RebuildCurrent();
diff --git a/src/modules/clist/groups.cpp b/src/mir_app/src/groups.cpp
index 53dfd6a659..8ad218df03 100644
--- a/src/modules/clist/groups.cpp
+++ b/src/mir_app/src/groups.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 HANDLE hGroupChangeEvent;

diff --git a/src/modules/options/headerbar.cpp b/src/mir_app/src/headerbar.cpp
index fe0c0bd2da..b321a7853b 100644
--- a/src/modules/options/headerbar.cpp
+++ b/src/mir_app/src/headerbar.cpp
@@ -23,7 +23,7 @@ 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 "stdafx.h"

 #include "m_iconheader.h"

 

 extern HINSTANCE hInst;

@@ -126,7 +126,7 @@ static void MHeaderbar_DrawGradient(HDC hdc, int x, int y, int width, int height
 	SetBkColor(hdc, oldColor);

 }

 

-static LRESULT MHeaderbar_OnPaint(HWND hwndDlg, MHeaderbarCtrl *mit, UINT  msg, WPARAM wParam, LPARAM lParam)

+static LRESULT MHeaderbar_OnPaint(HWND hwndDlg, MHeaderbarCtrl *mit)

 {

 	int iTopSpace = IsAeroMode() ? 0 : 3;

 	PAINTSTRUCT ps;

@@ -338,7 +338,7 @@ static LRESULT CALLBACK MHeaderbarWndProc(HWND hwndDlg, UINT  msg, WPARAM wParam
 		break;

 

 	case WM_PAINT:

-		MHeaderbar_OnPaint(hwndDlg, itc, msg, wParam, lParam);

+		MHeaderbar_OnPaint(hwndDlg, itc);

 		break;

 

 	case WM_DESTROY:

diff --git a/src/modules/skin/hotkey_opts.cpp b/src/mir_app/src/hotkey_opts.cpp
index c385293210..8224fd7ee0 100644
--- a/src/modules/skin/hotkey_opts.cpp
+++ b/src/mir_app/src/hotkey_opts.cpp
@@ -21,7 +21,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 "stdafx.h"
 
 #include <m_hotkeys.h>
 #include "skin.h"
@@ -1036,7 +1036,7 @@ static INT_PTR CALLBACK sttOptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam,
 int HotkeyOptionsInit(WPARAM wParam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.hInstance = hInst;
+	odp.hInstance = g_hInst;
 	odp.flags = ODPF_BOLDGROUPS;
 	odp.position = -180000000;
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_HOTKEYS);
diff --git a/src/modules/skin/hotkeys.cpp b/src/mir_app/src/hotkeys.cpp
index f74f91f4b9..edc92b10dd 100644
--- a/src/modules/skin/hotkeys.cpp
+++ b/src/mir_app/src/hotkeys.cpp
@@ -21,7 +21,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 "stdafx.h"

 

 #include <m_hotkeys.h>

 #include "skin.h"

@@ -351,7 +351,7 @@ int LoadSkinHotkeys(void)
 	wcl.style = 0;

 	wcl.cbClsExtra = 0;

 	wcl.cbWndExtra = 0;

-	wcl.hInstance = hInst;

+	wcl.hInstance = g_hInst;

 	wcl.hIcon = NULL;

 	wcl.hCursor = LoadCursor(NULL, IDC_ARROW);

 	wcl.hbrBackground = (HBRUSH)GetStockObject(LTGRAY_BRUSH);

@@ -362,7 +362,7 @@ int LoadSkinHotkeys(void)
 

 	g_pid = GetCurrentProcessId();

 

-	g_hwndHotkeyHost = CreateWindow(_T("MirandaHotkeyHostWnd"), NULL, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP, NULL, hInst, NULL);

+	g_hwndHotkeyHost = CreateWindow(_T("MirandaHotkeyHostWnd"), NULL, 0, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, HWND_DESKTOP, NULL, g_hInst, NULL);

 	SetWindowPos(g_hwndHotkeyHost, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE | SWP_DEFERERASE | SWP_NOSENDCHANGING | SWP_HIDEWINDOW);

 

 	hhkKeyboard = SetWindowsHookEx(WH_KEYBOARD, sttKeyboardProc, NULL, hMainThreadId);

diff --git a/src/modules/utils/hyperlink.cpp b/src/mir_app/src/hyperlink.cpp
index 12e2b2790e..bb62808f44 100644
--- a/src/modules/utils/hyperlink.cpp
+++ b/src/mir_app/src/hyperlink.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 struct HyperlinkWndData {

 	HFONT hEnableFont, hDisableFont;

@@ -260,7 +260,7 @@ int InitHyperlink(void)
 	wcl.lpfnWndProc = HyperlinkWndProc;

 	wcl.cbClsExtra = 0;

 	wcl.cbWndExtra = sizeof(struct HyperlinkWndData*);

-	wcl.hInstance = hInst;

+	wcl.hInstance = g_hInst;

 	wcl.hCursor = NULL;

 	wcl.lpszClassName = WNDCLASS_HYPERLINK;

 	wcl.hbrBackground = NULL;

diff --git a/src/modules/icolib/skin2icons.cpp b/src/mir_app/src/icolib.cpp
index 5b41b14e36..06d8b132b5 100644
--- a/src/modules/icolib/skin2icons.cpp
+++ b/src/mir_app/src/icolib.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 #include "IcoLib.h"

 

@@ -499,7 +499,7 @@ static void IcoLib_FreeIcon(IcolibItem* icon)
 /////////////////////////////////////////////////////////////////////////////////////////

 // IcoLib_AddNewIcon

 

-HANDLE IcoLib_AddNewIcon(int hLangpack, SKINICONDESC *sid)

+MIR_APP_DLL(HANDLE) IcoLib_AddNewIcon(int hLangpack, SKINICONDESC *sid)

 {

 	bool utf = (sid->flags & SIDF_UNICODE) != 0;

 	bool utf_path = (sid->flags & SIDF_PATH_UNICODE) != 0;

@@ -705,7 +705,7 @@ HICON IconItem_GetIcon(IcolibItem* item, bool big)
 //     cx/cyDesired = GetSystemMetrics(SM_CX/CYSMICON)

 //     fuLoad = 0

 

-HICON IcoLib_GetIcon(const char* pszIconName, bool big)

+MIR_APP_DLL(HICON) IcoLib_GetIcon(const char* pszIconName, bool big)

 {

 	if (!pszIconName)

 		return hIconBlank;

@@ -719,7 +719,7 @@ HICON IcoLib_GetIcon(const char* pszIconName, bool big)
 // IcoLib_GetIconHandle

 // lParam: pszIconName

 

-HANDLE IcoLib_GetIconHandle(const char* pszIconName)

+MIR_APP_DLL(HANDLE) IcoLib_GetIconHandle(const char* pszIconName)

 {

 	if (!pszIconName)

 		return NULL;

@@ -733,7 +733,7 @@ HANDLE IcoLib_GetIconHandle(const char* pszIconName)
 // lParam: icolib item handle

 // wParam: 0

 

-HICON IcoLib_GetIconByHandle(HANDLE hItem, bool big)

+MIR_APP_DLL(HICON) IcoLib_GetIconByHandle(HANDLE hItem, bool big)

 {

 	if (hItem == NULL)

 		return NULL;

@@ -751,7 +751,7 @@ HICON IcoLib_GetIconByHandle(HANDLE hItem, bool big)
 // lParam: NULL

 // wParam: HICON

 

-HANDLE IcoLib_IsManaged(HICON hIcon)

+MIR_APP_DLL(HANDLE) IcoLib_IsManaged(HICON hIcon)

 {

 	mir_cslock lck(csIconList);

 

@@ -831,7 +831,7 @@ int LoadIcoLibModule(void)
 {

 	bModuleInitialized = TRUE;

 

-	hIconBlank = LoadIconEx(NULL, MAKEINTRESOURCE(IDI_BLANK), 0);

+	hIconBlank = LoadIconEx(g_hInst, MAKEINTRESOURCE(IDI_BLANK), 0);

 

 	hIcoLib_AddNewIcon    = CreateServiceFunction("Skin2/Icons/AddIcon",    sttIcoLib_AddNewIcon);

 	hIcoLib_RemoveIcon    = CreateServiceFunction(MS_SKIN2_REMOVEICON,      IcoLib_RemoveIcon);

diff --git a/src/modules/options/iconheader.cpp b/src/mir_app/src/iconheader.cpp
index 42ec5d2fbb..103948ef32 100644
--- a/src/modules/options/iconheader.cpp
+++ b/src/mir_app/src/iconheader.cpp
@@ -23,7 +23,7 @@ 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 "stdafx.h"

 #include "m_iconheader.h"

 

 extern HINSTANCE hInst;

@@ -255,7 +255,7 @@ static void MIcoTab_DrawItem(HWND hwnd, HDC hdc, MIcoTabCtrl *dat, MIcoTab *tab,
 		DeleteObject(SelectObject(hdc, hFntSave));

 }

 

-static LRESULT MIcoTab_OnPaint(HWND hwndDlg, MIcoTabCtrl *mit, UINT  msg, WPARAM wParam, LPARAM lParam)

+static LRESULT MIcoTab_OnPaint(HWND hwndDlg, MIcoTabCtrl *mit)

 {

 	PAINTSTRUCT ps;

 

@@ -458,7 +458,7 @@ static LRESULT CALLBACK MIcoTabWndProc(HWND hwndDlg, UINT  msg, WPARAM wParam, L
 		break;

 

 	case WM_PAINT:

-		MIcoTab_OnPaint(hwndDlg, itc, msg, wParam, lParam);

+		MIcoTab_OnPaint(hwndDlg, itc);

 		break;

 

 	case ITCM_SETBACKGROUND:

diff --git a/src/modules/ignore/ignore.cpp b/src/mir_app/src/ignore.cpp
index 9d984a5a5c..fc5fa575b5 100644
--- a/src/modules/ignore/ignore.cpp
+++ b/src/mir_app/src/ignore.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 #define IGNOREEVENT_MAX  7

 

@@ -318,7 +318,7 @@ static int IgnoreOptInitialise(WPARAM wParam, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 900000000;

-	odp.hInstance = hInst;

+	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_IGNORE);

 	odp.pszTitle = LPGEN("Ignore");

 	odp.pszGroup = LPGEN("Contacts");

@@ -407,7 +407,7 @@ static int iBoldControls[] = { IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3, M
 static int IgnoreModernOptInit(WPARAM wParam, LPARAM)

 {

 	MODERNOPTOBJECT obj = { sizeof(obj) };

-	obj.hInstance = hInst;

+	obj.hInstance = g_hInst;

 	obj.dwFlags = MODEROPT_FLG_TCHAR;

 	obj.iSection = MODERNOPT_PAGE_IGNORE;

 	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;

diff --git a/src/modules/utils/imgconv.cpp b/src/mir_app/src/imgconv.cpp
index 8bbbb308cb..75974fc541 100644
--- a/src/modules/utils/imgconv.cpp
+++ b/src/mir_app/src/imgconv.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 typedef DWORD ARGB;

 

diff --git a/src/modules/clist/keyboard.cpp b/src/mir_app/src/keyboard.cpp
index 343d7906ef..508cc8ba6a 100644
--- a/src/modules/clist/keyboard.cpp
+++ b/src/mir_app/src/keyboard.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 #include <m_hotkeys.h>

 

diff --git a/src/modules/langpack/langpack.cpp b/src/mir_app/src/langpack.cpp
index 4904e26fcc..9e5e547c50 100644
--- a/src/modules/langpack/langpack.cpp
+++ b/src/mir_app/src/langpack.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "langpack.h"

 

 MIR_CORE_DLL(int) LoadLangPackDescr(const TCHAR *szLangPack, LANGPACK_INFO *lpInfo);

@@ -75,7 +75,7 @@ BOOL EnumLangpacks(ENUM_PACKS_CALLBACK callback, WPARAM wParam, LPARAM lParam)
 		DWORD v = CallService(MS_SYSTEM_GETVERSION, 0, 0);

 		pack.szLastModifiedUsing.Format("%d.%d.%d", ((v >> 24) & 0xFF), ((v >> 16) & 0xFF), ((v >> 8) & 0xFF));

 		/* file date */

-		if (GetModuleFileName(NULL, pack.tszFullPath, SIZEOF(pack.tszFullPath))) {

+		if (GetModuleFileName(g_hInst, pack.tszFullPath, SIZEOF(pack.tszFullPath))) {

 			mir_tstrcpy(pack.tszFileName, _T("default"));

 			HANDLE hFile = CreateFile(pack.tszFileName, 0, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);

 			if (hFile != INVALID_HANDLE_VALUE) {

diff --git a/src/modules/langpack/langpack.h b/src/mir_app/src/langpack.h
index 900f853f69..900f853f69 100644
--- a/src/modules/langpack/langpack.h
+++ b/src/mir_app/src/langpack.h
diff --git a/src/modules/langpack/lpopts.cpp b/src/mir_app/src/lpopts.cpp
index 4adb56ec11..fac4b383e2 100644
--- a/src/modules/langpack/lpopts.cpp
+++ b/src/mir_app/src/lpopts.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "langpack.h"

 

 static void SetDlgItemText_CP(HWND hwndDlg, int ctrlID, LPCSTR str)

@@ -70,7 +70,7 @@ static void DisplayPackInfo(HWND hwndDlg, const LANGPACK_INFO *pack)
 	SetDlgItemText(hwndDlg, IDC_LANGINFOFRAME, TranslateTS(pack->tszLanguage));

 }

 

-static BOOL InsertPackItemEnumProc(LANGPACK_INFO *pack, WPARAM wParam, LPARAM lParam)

+static BOOL InsertPackItemEnumProc(LANGPACK_INFO *pack, WPARAM wParam, LPARAM)

 {

 	LANGPACK_INFO *pack2 = new LANGPACK_INFO();

 	*pack2 = *pack;

@@ -200,7 +200,7 @@ INT_PTR CALLBACK DlgLangpackOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 int LangpackOptionsInit(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

-	odp.hInstance = hInst;

+	odp.hInstance = g_hInst;

 	odp.pfnDlgProc = DlgLangpackOpt;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LANGUAGES);

 	odp.position = -1300000000;

diff --git a/src/modules/langpack/lpservices.cpp b/src/mir_app/src/lpservices.cpp
index 5bb898b709..ce01393140 100644
--- a/src/modules/langpack/lpservices.cpp
+++ b/src/mir_app/src/lpservices.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 /////////////////////////////////////////////////////////////////////////////////////////

 

@@ -82,7 +82,7 @@ static INT_PTR srvPcharToTchar(WPARAM wParam, LPARAM lParam)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-static INT_PTR srvReloadLangpack(WPARAM wParam, LPARAM lParam)

+static INT_PTR srvReloadLangpack(WPARAM, LPARAM lParam)

 {

 	ReloadLangpack((TCHAR*)lParam);

 	return 0;

@@ -90,7 +90,7 @@ static INT_PTR srvReloadLangpack(WPARAM wParam, LPARAM lParam)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-static INT_PTR srvGetPluginLangpack(WPARAM wParam, LPARAM lParam)

+static INT_PTR srvGetPluginLangpack(WPARAM, LPARAM lParam)

 {

 	return GetPluginLangByInstance((HINSTANCE)lParam);

 }

diff --git a/src/modules/database/mdatabasecache.cpp b/src/mir_app/src/mdatabasecache.cpp
index ffc9631d77..82c5a54ef8 100644
--- a/src/modules/database/mdatabasecache.cpp
+++ b/src/mir_app/src/mdatabasecache.cpp
@@ -21,7 +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.

 */

 

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

+#include "stdafx.h"

 #include "database.h"

 

 static int stringCompare(const char *p1, const char *p2)

diff --git a/src/modules/metacontacts/meta_addto.cpp b/src/mir_app/src/meta_addto.cpp
index 575ecbcb55..d66c173d7f 100644
--- a/src/modules/metacontacts/meta_addto.cpp
+++ b/src/mir_app/src/meta_addto.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"

 

 #include "metacontacts.h"

 

@@ -219,6 +219,6 @@ static INT_PTR CALLBACK Meta_SelectDialogProc(HWND hwndDlg, UINT msg, WPARAM wPa
 INT_PTR Meta_AddTo(WPARAM hContact, LPARAM)

 {

 	HWND clui = (HWND)CallService(MS_CLUI_GETHWND, 0, 0);

-	DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_METASELECT), clui, &Meta_SelectDialogProc, hContact);

+	DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_METASELECT), clui, &Meta_SelectDialogProc, hContact);

 	return 0;

 }

diff --git a/src/modules/metacontacts/meta_api.cpp b/src/mir_app/src/meta_api.cpp
index f1b0926ad1..f5642bdf9f 100644
--- a/src/modules/metacontacts/meta_api.cpp
+++ b/src/mir_app/src/meta_api.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"

 

 #include "metacontacts.h"

 

diff --git a/src/modules/metacontacts/meta_edit.cpp b/src/mir_app/src/meta_edit.cpp
index 7aaa351545..85e8154aaa 100644
--- a/src/modules/metacontacts/meta_edit.cpp
+++ b/src/mir_app/src/meta_edit.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"

 

 #include "metacontacts.h"

 

@@ -444,9 +444,9 @@ static INT_PTR CALLBACK Meta_EditDialogProc(HWND hwndDlg, UINT msg, WPARAM wPara
 * @param lParam :	Allways set to 0.

 */

 

-INT_PTR Meta_Edit(WPARAM wParam, LPARAM lParam)

+INT_PTR Meta_Edit(WPARAM wParam, LPARAM)

 {

 	HWND clui = (HWND)CallService(MS_CLUI_GETHWND, 0, 0);

-	DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_METAEDIT), clui, Meta_EditDialogProc, (LPARAM)wParam);

+	DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_METAEDIT), clui, Meta_EditDialogProc, (LPARAM)wParam);

 	return 0;

 }

diff --git a/src/modules/metacontacts/meta_main.cpp b/src/mir_app/src/meta_main.cpp
index 8e2cd9c929..b13c607e64 100644
--- a/src/modules/metacontacts/meta_main.cpp
+++ b/src/mir_app/src/meta_main.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"

 

 #include "metacontacts.h"

 

@@ -56,7 +56,7 @@ void UnloadMetacontacts(void)
 // Called when the plugin is loaded into Miranda

 int LoadMetacontacts(void)

 {

-	Icon_Register(hInst, LPGEN("MetaContacts"), iconList, SIZEOF(iconList), "mc");

+	Icon_Register(g_hInst, LPGEN("MetaContacts"), iconList, SIZEOF(iconList), "mc");

 

 	db_set_resident(META_PROTO, "Status");

 	db_set_resident(META_PROTO, "IdleTS");

diff --git a/src/modules/metacontacts/meta_menu.cpp b/src/mir_app/src/meta_menu.cpp
index e2a78aff38..b2c168b169 100644
--- a/src/modules/metacontacts/meta_menu.cpp
+++ b/src/mir_app/src/meta_menu.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"

 

 #include <m_nudge.h>

 #include "metacontacts.h"

@@ -276,7 +276,6 @@ int Meta_ModifyMenu(WPARAM hMeta, LPARAM)
 			}

 

 			MCONTACT hContact = Meta_GetContactHandle(cc, i);

-			char *szProto = GetContactProto(hContact);

 

 			if (options.menu_contact_label == DNT_UID) {

 				Meta_GetSubNick(hMeta, i, tszNick);

diff --git a/src/modules/metacontacts/meta_options.cpp b/src/mir_app/src/meta_options.cpp
index 0ff0b9b48c..2588c7d8c9 100644
--- a/src/modules/metacontacts/meta_options.cpp
+++ b/src/mir_app/src/meta_options.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"

 

 #include "metacontacts.h"

 

@@ -57,7 +57,7 @@ class CMetaOptionsDlg : public CDlgBase
 

 public:

 	CMetaOptionsDlg() :

-		CDlgBase(hInst, IDD_METAOPTIONS),

+		CDlgBase(g_hInst, IDD_METAOPTIONS),

 		m_btnUid(this, IDC_RAD_UID),

 		m_btnDid(this, IDC_RAD_DID),

 		m_btnMsg(this, IDC_RAD_MSG),

diff --git a/src/modules/metacontacts/meta_services.cpp b/src/mir_app/src/meta_services.cpp
index 72f60c5f71..e4e40b2891 100644
--- a/src/modules/metacontacts/meta_services.cpp
+++ b/src/mir_app/src/meta_services.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"

 

 #include <m_nudge.h>

 

@@ -50,7 +50,7 @@ OBJLIST<MetaSrmmData> arMetaWindows(1, NumericKeySortT);
 *

 * @return			Depending on the \c WPARAM.

 */

-INT_PTR Meta_GetCaps(WPARAM wParam, LPARAM lParam)

+INT_PTR Meta_GetCaps(WPARAM wParam, LPARAM)

 {

 	switch (wParam) {

 	case PFLAGNUM_1:

@@ -96,7 +96,7 @@ INT_PTR Meta_GetName(WPARAM wParam, LPARAM lParam)
 * @return			an \c HICON in which the icon has been loaded.

 */

 

-INT_PTR Meta_LoadIcon(WPARAM wParam, LPARAM lParam)

+INT_PTR Meta_LoadIcon(WPARAM wParam, LPARAM)

 {

 	UINT id;

 	switch (wParam & 0xFFFF) {

@@ -113,7 +113,7 @@ INT_PTR Meta_LoadIcon(WPARAM wParam, LPARAM lParam)
 		return 0;

 	}

 

-	return (INT_PTR)LoadImage(hInst, MAKEINTRESOURCE(id), IMAGE_ICON,

+	return (INT_PTR)LoadImage(g_hInst, MAKEINTRESOURCE(id), IMAGE_ICON,

 		GetSystemMetrics(wParam & PLIF_SMALL ? SM_CXSMICON : SM_CXICON),

 		GetSystemMetrics(wParam & PLIF_SMALL ? SM_CYSMICON : SM_CYICON), 0);

 }

@@ -140,7 +140,7 @@ static INT_PTR MetaFilter_RecvMessage(WPARAM wParam, LPARAM lParam)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-void CALLBACK SetStatusThread(HWND hWnd, UINT msg, UINT_PTR id, DWORD dw)

+void CALLBACK SetStatusThread(HWND, UINT, UINT_PTR, DWORD)

 {

 	previousMode = mcStatus;

 

@@ -155,7 +155,7 @@ void CALLBACK SetStatusThread(HWND hWnd, UINT msg, UINT_PTR id, DWORD dw)
 * @param lParam :	Allways set to 0.

 */

 

-INT_PTR Meta_SetStatus(WPARAM wParam, LPARAM lParam)

+INT_PTR Meta_SetStatus(WPARAM wParam, LPARAM)

 {

 	// firstSetOnline starts out true - used to delay metacontact's 'onlineness' to prevent double status notifications on startup

 	if (mcStatus == ID_STATUS_OFFLINE && firstSetOnline) {

@@ -173,7 +173,7 @@ INT_PTR Meta_SetStatus(WPARAM wParam, LPARAM lParam)
 

 /** Returns the current status

 */

-INT_PTR Meta_GetStatus(WPARAM wParam, LPARAM lParam)

+INT_PTR Meta_GetStatus(WPARAM, LPARAM)

 {

 	return mcStatus;

 }

@@ -455,7 +455,7 @@ int Meta_SettingChanged(WPARAM hContact, LPARAM lParam)
 /////////////////////////////////////////////////////////////////////////////////////////

 // Contact's deletion hook

 

-int Meta_ContactDeleted(WPARAM hContact, LPARAM lParam)

+int Meta_ContactDeleted(WPARAM hContact, LPARAM)

 {

 	DBCachedContact *cc = currDb->m_cache->GetCachedContact(hContact);

 	if (cc == NULL)

@@ -525,7 +525,7 @@ static INT_PTR Meta_UserIsTyping(WPARAM hMeta, LPARAM lParam)
 // Returns 1 to stop event processing and opens page for metacontact default 

 // contact (returning 1 to stop it doesn't work!)

 

-static int Meta_UserInfo(WPARAM wParam, LPARAM hMeta)

+static int Meta_UserInfo(WPARAM, LPARAM hMeta)

 {

 	DBCachedContact *cc = CheckMeta(hMeta);

 	if (cc == NULL || cc->nDefault == -1)

@@ -538,7 +538,7 @@ static int Meta_UserInfo(WPARAM wParam, LPARAM hMeta)
 /////////////////////////////////////////////////////////////////////////////////////////

 // record window open/close status for subs & metas

 

-static int Meta_MessageWindowEvent(WPARAM wParam, LPARAM lParam)

+static int Meta_MessageWindowEvent(WPARAM, LPARAM lParam)

 {

 	MessageWindowEventData *mwed = (MessageWindowEventData*)lParam;

 	if (mwed->uType == MSG_WINDOW_EVT_OPEN) {

@@ -568,7 +568,7 @@ static int Meta_MessageWindowEvent(WPARAM wParam, LPARAM lParam)
 /////////////////////////////////////////////////////////////////////////////////////////

 // returns manually chosen sub in the meta window

 

-static INT_PTR Meta_SrmmCurrentSub(WPARAM hMeta, LPARAM lParam)

+static INT_PTR Meta_SrmmCurrentSub(WPARAM hMeta, LPARAM)

 {

 	MetaSrmmData tmp = { hMeta };

 	if (MetaSrmmData *p = arMetaWindows.find(&tmp))

@@ -635,7 +635,7 @@ static int Meta_SrmmIconClicked(WPARAM hMeta, LPARAM lParam)
 //

 // Initializes the 4 menus present in the context-menu

 

-int Meta_ModulesLoaded(WPARAM wParam, LPARAM lParam)

+int Meta_ModulesLoaded(WPARAM, LPARAM)

 {

 	HookEvent(ME_CLIST_PREBUILDCONTACTMENU, Meta_ModifyMenu);

 

@@ -707,7 +707,7 @@ INT_PTR Meta_ContactMenuFunc(WPARAM hMeta, LPARAM lParam)
 /////////////////////////////////////////////////////////////////////////////////////////

 // file transfer support - mostly not required, since subcontacts do the receiving

 

-INT_PTR Meta_FileSend(WPARAM wParam, LPARAM lParam)

+INT_PTR Meta_FileSend(WPARAM, LPARAM lParam)

 {

 	CCSDATA *ccs = (CCSDATA*)lParam;

 	DBCachedContact *cc = CheckMeta(ccs->hContact);

@@ -725,7 +725,7 @@ INT_PTR Meta_FileSend(WPARAM wParam, LPARAM lParam)
 	return 0; // fail

 }

 

-INT_PTR Meta_GetAwayMsg(WPARAM wParam, LPARAM lParam)

+INT_PTR Meta_GetAwayMsg(WPARAM, LPARAM lParam)

 {

 	CCSDATA *ccs = (CCSDATA*)lParam;

 	DBCachedContact *cc = CheckMeta(ccs->hContact);

@@ -771,7 +771,7 @@ INT_PTR Meta_GetAvatarInfo(WPARAM wParam, LPARAM lParam)
 	return GAIR_NOAVATAR; // fail

 }

 

-INT_PTR Meta_GetInfo(WPARAM wParam, LPARAM lParam)

+INT_PTR Meta_GetInfo(WPARAM, LPARAM lParam)

 {

 	CCSDATA *ccs = (CCSDATA*)lParam;

 

@@ -809,7 +809,7 @@ INT_PTR Meta_GetInfo(WPARAM wParam, LPARAM lParam)
 	return CallContactService(ccs->hContact, PSS_GETINFO, ccs->wParam, ccs->lParam);

 }

 

-int Meta_CallMostOnline(WPARAM hContact, LPARAM lParam)

+int Meta_CallMostOnline(WPARAM hContact, LPARAM)

 {

 	DBCachedContact *cc = CheckMeta(hContact);

 	if (cc == NULL)

@@ -820,7 +820,7 @@ int Meta_CallMostOnline(WPARAM hContact, LPARAM lParam)
 	return 0;

 }

 

-int Meta_PreShutdown(WPARAM wParam, LPARAM lParam)

+int Meta_PreShutdown(WPARAM, LPARAM)

 {

 	Meta_SetStatus(ID_STATUS_OFFLINE, 0);

 	Meta_SuppressStatus(FALSE);

@@ -829,7 +829,7 @@ int Meta_PreShutdown(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-INT_PTR MenuFunc(WPARAM wParam, LPARAM lParam, LPARAM param)

+INT_PTR MenuFunc(WPARAM wParam, LPARAM, LPARAM param)

 {

 	return Meta_ContactMenuFunc(wParam, param);

 }

diff --git a/src/modules/metacontacts/meta_utils.cpp b/src/mir_app/src/meta_utils.cpp
index e58f509fcf..fc32d1a929 100644
--- a/src/modules/metacontacts/meta_utils.cpp
+++ b/src/mir_app/src/meta_utils.cpp
@@ -20,7 +20,7 @@ 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 "stdafx.h"

 

 #include "metacontacts.h"

 

@@ -567,7 +567,7 @@ void Meta_FixStatus(DBCachedContact *ccMeta)
 	Meta_UpdateSrmmIcon(ccMeta, status);

 }

 

-void Meta_UpdateSrmmIcon(DBCachedContact *ccMeta, int iStatus)

+void Meta_UpdateSrmmIcon(DBCachedContact *ccMeta, int)

 {

 	StatusIconData sid = { sizeof(sid) };

 	sid.szModule = META_PROTO;

diff --git a/src/modules/metacontacts/metacontacts.h b/src/mir_app/src/metacontacts.h
index 2c4ff0715c..2c4ff0715c 100644
--- a/src/modules/metacontacts/metacontacts.h
+++ b/src/mir_app/src/metacontacts.h
diff --git a/src/miranda32.def b/src/mir_app/src/mir_app.def
index 207032d84a..c713745838 100644
--- a/src/miranda32.def
+++ b/src/mir_app/src/mir_app.def
@@ -11,9 +11,11 @@ GetSkinIconHandle           @8
 IcoLib_AddNewIcon           @9

 IcoLib_GetIcon             @10

 IcoLib_GetIconByHandle     @11

-IcoLib_IsManaged           @12

-IcoLib_ReleaseIcon         @13

-Window_FreeIcon_IcoLib     @14

-Window_SetIcon_IcoLib      @15

-Window_SetProtoIcon_IcoLib @16

-ProtoServiceExists         @17

+IcoLib_GetIconHandle       @12

+IcoLib_IsManaged           @13

+IcoLib_ReleaseIcon         @14

+Window_FreeIcon_IcoLib     @15

+Window_SetIcon_IcoLib      @16

+Window_SetProtoIcon_IcoLib @17

+ProtoServiceExists         @18

+mir_main                   @19

diff --git a/src/core/miranda.cpp b/src/mir_app/src/miranda.cpp
index b5b65f8d40..15acd9e720 100644
--- a/src/core/miranda.cpp
+++ b/src/mir_app/src/miranda.cpp
@@ -23,10 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 */

 

-#include "commonheaders.h"

+#include "stdafx.h"

 

-#define MMI_SIZE_V1 (4*sizeof(void*))

-#define MMI_SIZE_V2 (7*sizeof(void*))

+#pragma comment(lib, "version.lib")

 

 int LoadDefaultModules(void);

 void UnloadNewPluginsModule(void);

@@ -51,11 +50,17 @@ static HANDLE hWaitObjects[MAXIMUM_WAIT_OBJECTS-1];
 static char *pszWaitServices[MAXIMUM_WAIT_OBJECTS-1];

 static int waitObjectCount = 0;

 HANDLE hMirandaShutdown;

-HINSTANCE hInst;

+HINSTANCE g_hInst;

 DWORD hMainThreadId;

 int hLangpack = 0;

 bool bModulesLoadedFired = false;

 

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

+{

+	g_hInst = hinstDLL;

+	return TRUE;

+}

+

 /////////////////////////////////////////////////////////////////////////////////////////

 // exception handling

 

@@ -169,7 +174,7 @@ INT_PTR CheckRestart()
 	if (tszPID) {

 		HANDLE hProcess = OpenProcess(SYNCHRONIZE, FALSE, _ttol(tszPID));

 		if (hProcess) {

-			INT_PTR result = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_WAITRESTART), NULL, WaitForProcessDlgProc, (LPARAM)hProcess);

+			INT_PTR result = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_WAITRESTART), NULL, WaitForProcessDlgProc, (LPARAM)hProcess);

 			CloseHandle(hProcess);

 			return result;

 		}

@@ -180,10 +185,8 @@ INT_PTR CheckRestart()
 static void crtErrorHandler(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t)

 {}

 

-

-int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int)

+int WINAPI mir_main(LPTSTR cmdLine)

 {

-	hInst = hInstance;

 	hMainThreadId = GetCurrentThreadId();

 

 	_set_invalid_parameter_handler(&crtErrorHandler);

@@ -315,7 +318,7 @@ static INT_PTR OkToExit(WPARAM, LPARAM)
 static INT_PTR GetMirandaVersion(WPARAM, LPARAM)

 {

 	TCHAR filename[MAX_PATH];

-	GetModuleFileName(NULL, filename, SIZEOF(filename));

+	GetModuleFileName(g_hInst, filename, SIZEOF(filename));

 

 	DWORD unused, verInfoSize = GetFileVersionInfoSize(filename, &unused);

 	PVOID pVerInfo = _alloca(verInfoSize);

@@ -334,7 +337,7 @@ static INT_PTR GetMirandaVersion(WPARAM, LPARAM)
 static INT_PTR GetMirandaFileVersion(WPARAM, LPARAM lParam)

 {

 	TCHAR filename[MAX_PATH];

-	GetModuleFileName(NULL, filename, SIZEOF(filename));

+	GetModuleFileName(g_hInst, filename, SIZEOF(filename));

 

 	DWORD unused, verInfoSize = GetFileVersionInfoSize(filename, &unused);

 	PVOID pVerInfo = _alloca(verInfoSize);

@@ -355,7 +358,7 @@ static INT_PTR GetMirandaFileVersion(WPARAM, LPARAM lParam)
 static INT_PTR GetMirandaVersionText(WPARAM wParam, LPARAM lParam)

 {

 	TCHAR filename[MAX_PATH], *productVersion;

-	GetModuleFileName(NULL, filename, SIZEOF(filename));

+	GetModuleFileName(g_hInst, filename, SIZEOF(filename));

 

 	DWORD unused, verInfoSize = GetFileVersionInfoSize(filename, &unused);

 	PVOID pVerInfo = _alloca(verInfoSize);

diff --git a/src/core/miranda.h b/src/mir_app/src/miranda.h
index ba8516baf1..8ceb3d308d 100644
--- a/src/core/miranda.h
+++ b/src/mir_app/src/miranda.h
@@ -69,7 +69,7 @@ void KillModuleSounds(int hLangpack);
 

 /**** miranda.cpp **********************************************************************/

 

-extern HINSTANCE hInst;

+extern HINSTANCE g_hInst;

 extern DWORD hMainThreadId;

 extern HANDLE hOkToExitEvent, hModulesLoadedEvent, hevLoadModule, hevUnloadModule;

 extern TCHAR mirandabootini[MAX_PATH];

@@ -183,8 +183,4 @@ extern "C"
 	MIR_CORE_DLL(void) db_setCurrent(MIDatabase* _db);

 

 	MIR_CORE_DLL(PROTOCOLDESCRIPTOR*) Proto_RegisterModule(PROTOCOLDESCRIPTOR *pd);

-

-	int     ProtoServiceExists(LPCSTR szModule, const char *szService);

-	INT_PTR CallContactService(MCONTACT, const char *, WPARAM, LPARAM);

-	INT_PTR CallProtoService(LPCSTR szModule, const char *szService, WPARAM wParam, LPARAM lParam);

 };

diff --git a/src/core/modules.cpp b/src/mir_app/src/modules.cpp
index 21824566ed..0c7e748552 100644
--- a/src/core/modules.cpp
+++ b/src/mir_app/src/modules.cpp
@@ -21,11 +21,11 @@ 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 "commonheaders.h"

+#include "stdafx.h"

 

-#include "../modules/plugins/plugins.h"

-#include "../modules/langpack/langpack.h"

-#include "../modules/chat/chat.h"

+#include "plugins.h"

+#include "langpack.h"

+#include "chat.h"

 

 INT_PTR CheckRestart();		// core: IDD_WAITRESTART

 

diff --git a/src/modules/clist/movetogroup.cpp b/src/mir_app/src/movetogroup.cpp
index c01474d7bd..cfc7bee71e 100644
--- a/src/modules/clist/movetogroup.cpp
+++ b/src/mir_app/src/movetogroup.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 HGENMENU hMoveToGroupItem = 0, hPriorityItem = 0, hFloatingItem = 0;

 

diff --git a/src/modules/netlib/netlib.cpp b/src/mir_app/src/netlib.cpp
index a900c77f93..7453fe5c0a 100644
--- a/src/modules/netlib/netlib.cpp
+++ b/src/mir_app/src/netlib.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "netlib.h"

 

 static BOOL bModuleInitialized = FALSE;

diff --git a/src/modules/netlib/netlib.h b/src/mir_app/src/netlib.h
index 949d1755b2..949d1755b2 100644
--- a/src/modules/netlib/netlib.h
+++ b/src/mir_app/src/netlib.h
diff --git a/src/modules/netlib/netlibautoproxy.cpp b/src/mir_app/src/netlibautoproxy.cpp
index 6410c49e74..92982a9999 100644
--- a/src/modules/netlib/netlibautoproxy.cpp
+++ b/src/mir_app/src/netlibautoproxy.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "netlib.h"

 

 #include <wininet.h>

diff --git a/src/modules/netlib/netlibbind.cpp b/src/mir_app/src/netlibbind.cpp
index 699799dd17..77fb25fd97 100644
--- a/src/modules/netlib/netlibbind.cpp
+++ b/src/mir_app/src/netlibbind.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "netlib.h"

 

 bool BindSocketToPort(const char *szPorts, SOCKET s, SOCKET s6, int* portn)

@@ -156,6 +156,7 @@ static void NetlibBindAcceptThread(void* param)
 				break;

 			}

 		}

+		else s = NULL;

 

 		NetlibLogf(nlbp->nlu, "New incoming connection on port %u from %s (%p)", nlbp->wPort, ptrA(NetlibAddressToString(&sin)), s);

 		

diff --git a/src/modules/netlib/netlibhttp.cpp b/src/mir_app/src/netlibhttp.cpp
index 3fe48d5dc1..9a2e67dc54 100644
--- a/src/modules/netlib/netlibhttp.cpp
+++ b/src/mir_app/src/netlibhttp.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "../plugins/zlib/src/zlib.h"

 #include "netlib.h"

 

@@ -407,7 +407,7 @@ INT_PTR NetlibHttpSendRequest(WPARAM wParam, LPARAM lParam)
 	char *szHost = NULL, *szNewUrl = NULL;

 	char *pszProxyAuthHdr = NULL, *pszAuthHdr = NULL;

 	int i, doneHostHeader, doneContentLengthHeader, doneProxyAuthHeader, doneAuthHeader;

-	int bytesSent;

+	int bytesSent = 0;

 	bool lastFirstLineFail = false;

 

 	if (nlhr == NULL || nlhr->cbSize != sizeof(NETLIBHTTPREQUEST) || nlhr->szUrl == NULL || nlhr->szUrl[0] == '\0') {

diff --git a/src/modules/netlib/netlibhttpproxy.cpp b/src/mir_app/src/netlibhttpproxy.cpp
index 892554542d..62e7784c64 100644
--- a/src/modules/netlib/netlibhttpproxy.cpp
+++ b/src/mir_app/src/netlibhttpproxy.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "netlib.h"

 

 typedef enum

diff --git a/src/modules/netlib/netliblog.cpp b/src/mir_app/src/netliblog.cpp
index 2d3db45941..3ac72264d8 100644
--- a/src/modules/netlib/netliblog.cpp
+++ b/src/mir_app/src/netliblog.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "netlib.h"

 

 #define MS_NETLIB_LOGWIN "Netlib/Log/Win"

@@ -268,7 +268,7 @@ static INT_PTR CALLBACK LogOptionsDlgProc(HWND hwndDlg, UINT message, WPARAM wPa
 void NetlibLogShowOptions(void)

 {

 	if (logOptions.hwndOpts == NULL)

-		logOptions.hwndOpts = CreateDialog(hInst, MAKEINTRESOURCE(IDD_NETLIBLOGOPTS), NULL, LogOptionsDlgProc);

+		logOptions.hwndOpts = CreateDialog(g_hInst, MAKEINTRESOURCE(IDD_NETLIBLOGOPTS), NULL, LogOptionsDlgProc);

 	SetForegroundWindow(logOptions.hwndOpts);

 }

 

diff --git a/src/modules/netlib/netlibopenconn.cpp b/src/mir_app/src/netlibopenconn.cpp
index 1eb1ba633c..83e34eb428 100644
--- a/src/modules/netlib/netlibopenconn.cpp
+++ b/src/mir_app/src/netlibopenconn.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"
 #include "netlib.h"
 
 extern mir_cs csNetlibUser;
diff --git a/src/modules/netlib/netlibopts.cpp b/src/mir_app/src/netlibopts.cpp
index fff81944d3..85d17fcee8 100644
--- a/src/modules/netlib/netlibopts.cpp
+++ b/src/mir_app/src/netlibopts.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "netlib.h"

 

 struct NetlibTempSettings

@@ -520,7 +520,7 @@ int NetlibOptInitialise(WPARAM wParam, LPARAM)
 

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 900000000;

-	odp.hInstance = hInst;

+	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NETLIB);

 	odp.pszTitle = LPGEN("Network");

 	odp.pfnDlgProc = DlgProcNetlibOpts;

diff --git a/src/modules/netlib/netlibpktrecver.cpp b/src/mir_app/src/netlibpktrecver.cpp
index 5783cda6b3..ca23de0327 100644
--- a/src/modules/netlib/netlibpktrecver.cpp
+++ b/src/mir_app/src/netlibpktrecver.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "netlib.h"

 

 INT_PTR NetlibPacketRecverCreate(WPARAM wParam, LPARAM lParam)

diff --git a/src/modules/netlib/netlibsecurity.cpp b/src/mir_app/src/netlibsecurity.cpp
index 4c3cb4301c..1471d611b9 100644
--- a/src/modules/netlib/netlibsecurity.cpp
+++ b/src/mir_app/src/netlibsecurity.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "netlib.h"

 

 #define SECURITY_WIN32

@@ -159,8 +159,8 @@ char* CompleteGssapi(HANDLE hSecurity, unsigned char *szChallenge, unsigned chls
 		return NULL;

 	}

 

-	unsigned char LayerMask = inDataBuffer[0];

-	unsigned int MaxMessageSize = htonl(*(unsigned*)&inDataBuffer[1]);

+	// unsigned char LayerMask = inDataBuffer[0];

+	// unsigned int MaxMessageSize = htonl(*(unsigned*)&inDataBuffer[1]);

 

 	SecPkgContext_Sizes sizes;

 	sc = QueryContextAttributes(&hNtlm->hClientContext, SECPKG_ATTR_SIZES, &sizes);

diff --git a/src/modules/netlib/netlibsock.cpp b/src/mir_app/src/netlibsock.cpp
index e53e73bd89..ee1cfde144 100644
--- a/src/modules/netlib/netlibsock.cpp
+++ b/src/mir_app/src/netlibsock.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "netlib.h"

 

 extern HANDLE hConnectionHeaderMutex, hSendEvent, hRecvEvent;

diff --git a/src/modules/netlib/netlibupnp.cpp b/src/mir_app/src/netlibupnp.cpp
index d3f30498d6..55fe46152a 100644
--- a/src/modules/netlib/netlibupnp.cpp
+++ b/src/mir_app/src/netlibupnp.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "netlib.h"

 

 static const char search_request_msg[] =

@@ -208,7 +208,6 @@ static void validateSocket(void)
 	static const TIMEVAL tv = { 0, 0 };

 	fd_set rfd;

 	char buf[4];

-	bool opened;

 

 	if (sock == INVALID_SOCKET)

 		return;

@@ -216,11 +215,8 @@ static void validateSocket(void)
 	FD_ZERO(&rfd);

 	FD_SET(sock, &rfd);

 

+	bool opened = false;

 	switch (select(1, &rfd, NULL, NULL, &tv)) {

-	case SOCKET_ERROR:

-		opened = false;

-		break;

-

 	case 0:

 		opened = true;

 		break;

diff --git a/src/modules/plugins/newplugins.cpp b/src/mir_app/src/newplugins.cpp
index 6eccaa8059..dafeb4d964 100644
--- a/src/modules/plugins/newplugins.cpp
+++ b/src/mir_app/src/newplugins.cpp
@@ -22,11 +22,11 @@ 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 "stdafx.h"

 

 #include "plugins.h"

-#include "..\database\profilemanager.h"

-#include "..\langpack\langpack.h"

+#include "profilemanager.h"

+#include "langpack.h"

 

 void LoadExtraIconsModule();

 

@@ -175,7 +175,7 @@ char* GetPluginNameByInstance(HINSTANCE hInstance)
 	return NULL;

 }

 

-int GetPluginLangByInstance(HINSTANCE hInstance)

+MIR_APP_DLL(int) GetPluginLangByInstance(HINSTANCE hInstance)

 {

 	if (pluginList.getCount() == 0)

 		return NULL;

diff --git a/src/modules/utils/openurl.cpp b/src/mir_app/src/openurl.cpp
index afbfa4681b..1ad7b508ad 100644
--- a/src/modules/utils/openurl.cpp
+++ b/src/mir_app/src/openurl.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include <ctype.h>

 

 struct TOpenUrlInfo

diff --git a/src/modules/options/options.cpp b/src/mir_app/src/options.cpp
index 61e3f3775f..4bdec9d37f 100644
--- a/src/modules/options/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -23,7 +23,7 @@ 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 "stdafx.h"

 #include "filter.h"

 

 #define FILTER_TIMEOUT_TIMER 10012

@@ -351,7 +351,7 @@ static LRESULT CALLBACK OptionsFilterSubclassProc(HWND hWnd, UINT message, WPARA
 	return 0;

 }

 

-static bool CheckPageShow(HWND hdlg, OptionsDlgData *dat, int i)

+static bool CheckPageShow(HWND, OptionsDlgData *dat, int i)

 {

 	OptionsPageData *opd = dat->arOpd[i];

 	if (dat->szFilterString[0] && !MatchesFilter(opd, dat->szFilterString))

@@ -453,7 +453,7 @@ static void CALLBACK FilterSearchTimerFunc(HWND hwnd, UINT, UINT_PTR, DWORD)
 		return;

 

 	if (hFilterSearchWnd == NULL)

-		hFilterSearchWnd = CreateWindowA("STATIC", "Test", WS_OVERLAPPED | WS_DISABLED, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandle(NULL), 0); // Fake window to keep option page focused

+		hFilterSearchWnd = CreateWindowA("STATIC", "Test", WS_OVERLAPPED | WS_DISABLED, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL, GetModuleHandleA("mir_app.dll"), 0); // Fake window to keep option page focused

 

 	if (FilterPage < dat->arOpd.getCount())

 		FindFilterStrings(TRUE, dat->currentPage == FilterPage, hFilterSearchWnd, dat->arOpd[FilterPage]);

@@ -487,14 +487,14 @@ static void FillFilterCombo(HWND hDlg, OptionsDlgData* dat)
 	int index = SendDlgItemMessage(hDlg, IDC_KEYWORD_FILTER, (UINT)CB_ADDSTRING, 0, (LPARAM)TranslateT(ALL_MODULES_FILTER));

 	SendDlgItemMessage(hDlg, IDC_KEYWORD_FILTER, (UINT)CB_SETITEMDATA, (WPARAM)index, 0);

 	index = SendDlgItemMessage(hDlg, IDC_KEYWORD_FILTER, (UINT)CB_ADDSTRING, 0, (LPARAM)TranslateT(CORE_MODULES_FILTER));

-	SendDlgItemMessage(hDlg, IDC_KEYWORD_FILTER, (UINT)CB_SETITEMDATA, (WPARAM)index, (LPARAM)hInst);

+	SendDlgItemMessage(hDlg, IDC_KEYWORD_FILTER, (UINT)CB_SETITEMDATA, (WPARAM)index, (LPARAM)g_hInst);

 	

 	for (int i = 0; i < dat->arOpd.getCount(); i++) {

 		OptionsPageData *opd = dat->arOpd[i];

 		FindFilterStrings(FALSE, FALSE, hDlg, opd); // only modules name (fast enougth)

 

 		HINSTANCE inst = opd->getInst();

-		if (inst == hInst)

+		if (inst == g_hInst)

 			continue;

 

 		int j;

@@ -1164,7 +1164,7 @@ void OpenAccountOptions(PROTOACCOUNT *pa)
 	psh.pStartPage = (LPCTSTR)&ood;

 	psh.pszCaption = tszTitle;

 	psh.ppsp = (PROPSHEETPAGE*)opi.odp;

-	hwndOptions = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_OPTIONSPAGE), NULL, OptionsDlgProc, (LPARAM)&psh);

+	hwndOptions = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_OPTIONSPAGE), NULL, OptionsDlgProc, (LPARAM)&psh);

 	mir_free((void*)ood.pszPage);

 	FreeOptionsData(&opi);

 }

@@ -1209,7 +1209,7 @@ static void OpenOptionsNow(int hLangpack, const char *pszGroup, const char *pszP
 		psh.pszCaption = TranslateT("Miranda NG options");

 		psh.ppsp = (PROPSHEETPAGE*)opi.odp; // blatent misuse of the structure, but what the hell

 

-		hwndOptions = CreateDialogParam(hInst,

+		hwndOptions = CreateDialogParam(g_hInst,

 			MAKEINTRESOURCE(bSinglePage ? IDD_OPTIONSPAGE : IDD_OPTIONS),

 			NULL, OptionsDlgProc, (LPARAM)&psh);

 

diff --git a/src/modules/extraicons/options_ei.cpp b/src/mir_app/src/options_ei.cpp
index 28d0bf553d..dbac3f75c2 100644
--- a/src/modules/extraicons/options_ei.cpp
+++ b/src/mir_app/src/options_ei.cpp
@@ -19,7 +19,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.

 */

 

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

+#include "stdafx.h"

 

 #include "extraicons.h"

 

@@ -42,7 +42,7 @@ struct intlist
 	int *data;

 };

 

-static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort)

+static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM)

 {

 	intlist *a = (intlist*)lParam1;

 	intlist *b = (intlist*)lParam2;

@@ -219,7 +219,7 @@ class CExtraIconOptsDlg : public CDlgBase
 			hItem = m_tree.GetNextSibling(hItem);

 		}

 

-		HMENU menu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_OPT_POPUP));

+		HMENU menu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_OPT_POPUP));

 		HMENU submenu = GetSubMenu(menu, popup);

 		TranslateMenu(submenu);

 

@@ -243,7 +243,7 @@ class CExtraIconOptsDlg : public CDlgBase
 

 public:

 	CExtraIconOptsDlg() :

-		CDlgBase(hInst, IDD_EI_OPTIONS),

+		CDlgBase(g_hInst, IDD_EI_OPTIONS),

 		m_tree(this, IDC_EXTRAORDER)

 	{

 		m_tree.SetFlags(MTREE_DND | MTREE_MULTISELECT);

@@ -261,7 +261,7 @@ public:
 		int cx = GetSystemMetrics(SM_CXSMICON);

 		HIMAGELIST hImageList = ImageList_Create(cx, cx, ILC_COLOR32 | ILC_MASK, 2, 2);

 

-		HICON hBlankIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_BLANK), IMAGE_ICON, cx, cx, 0);

+		HICON hBlankIcon = (HICON)LoadImage(g_hInst, MAKEINTRESOURCE(IDI_BLANK), IMAGE_ICON, cx, cx, 0);

 		ImageList_AddIcon(hImageList, hBlankIcon);

 

 		for (int i = 0; i < registeredExtraIcons.getCount(); i++) {

@@ -456,7 +456,7 @@ public:
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-int InitOptionsCallback(WPARAM wParam, LPARAM lParam)

+int InitOptionsCallback(WPARAM wParam, LPARAM)

 {

 	if (GetNumberOfSlots() < 1)

 		return 0;

diff --git a/src/modules/utils/path.cpp b/src/mir_app/src/path.cpp
index a7ac429900..e0b795574c 100644
--- a/src/modules/utils/path.cpp
+++ b/src/mir_app/src/path.cpp
@@ -22,8 +22,8 @@ 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 "../database/profilemanager.h"

+#include "stdafx.h"

+#include "profilemanager.h"

 

 #include "..\..\..\plugins\ExternalAPI\m_folders.h"

 

@@ -110,7 +110,7 @@ static __forceinline int _xcsncmp(const char *s1, const char *s2, size_t n) { re
 static __forceinline size_t _xcslen(const char *s1) { return strlen(s1); }

 static __forceinline char *_xcscpy(char *s1, const char *s2) { return strcpy(s1, s2); }

 static __forceinline char *_xcsncpy(char *s1, const char *s2, size_t n) { return strncpy(s1, s2, n); }

-static __forceinline char *_xstrselect(char *, char *s1, TCHAR *s2) { return s1; }

+static __forceinline char *_xstrselect(char *, char *s1, TCHAR*) { return s1; }

 static __forceinline char *_itox(char *, int a) { return itoa(a, (char *)mir_alloc(sizeof(char)*20), 10); }

 static __forceinline char *mir_a2x(char *, char *s) { return mir_strdup(s); }

 

@@ -140,7 +140,7 @@ static __forceinline char *GetProfileDirX(char*)
 	return mir_t2a(g_profileDir);

 }

 

-static __forceinline char *SHGetSpecialFolderPathX(int iCSIDL, char* var)

+static __forceinline char *SHGetSpecialFolderPathX(int iCSIDL, char*)

 {

 	char result[512];

 	if (SHGetSpecialFolderPathA(NULL, result, iCSIDL, FALSE))

@@ -197,7 +197,7 @@ static __forceinline int _xcsncmp(const TCHAR *s1, const TCHAR *s2, size_t n) {
 static __forceinline size_t _xcslen(const TCHAR *s1) { return _tcslen(s1); }

 static __forceinline TCHAR *_xcscpy(TCHAR *s1, const TCHAR *s2) { return _tcscpy(s1, s2); }

 static __forceinline TCHAR *_xcsncpy(TCHAR *s1, const TCHAR *s2, size_t n) { return _tcsncpy(s1, s2, n); }

-static __forceinline TCHAR *_xstrselect(TCHAR *, char *s1, TCHAR *s2) { return s2; }

+static __forceinline TCHAR *_xstrselect(TCHAR*, char*, TCHAR *s2) { return s2; }

 static __forceinline TCHAR *_itox(TCHAR *, int a) { return _itot(a, (TCHAR *)mir_alloc(sizeof(TCHAR)*20), 10); }

 static __forceinline TCHAR *mir_a2x(TCHAR *, char *s) { return mir_a2t(s); }

 

@@ -219,7 +219,7 @@ static __forceinline TCHAR *GetEnvironmentVariableX(TCHAR *variable)
 	return NULL;

 }

 

-static __forceinline TCHAR *SHGetSpecialFolderPathX(int iCSIDL, TCHAR* var)

+static __forceinline TCHAR *SHGetSpecialFolderPathX(int iCSIDL, TCHAR*)

 {

 	TCHAR result[512];

 	if (SHGetSpecialFolderPath(NULL, result, iCSIDL, FALSE))

diff --git a/src/modules/plugins/pluginopts.cpp b/src/mir_app/src/pluginopts.cpp
index 9200d04bd1..9f62b32c6e 100644
--- a/src/modules/plugins/pluginopts.cpp
+++ b/src/mir_app/src/pluginopts.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 #include <m_version.h>

 

@@ -550,7 +550,7 @@ INT_PTR CALLBACK DlgPluginOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 int PluginOptionsInit(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

-	odp.hInstance = hInst;

+	odp.hInstance = g_hInst;

 	odp.pfnDlgProc = DlgPluginOpt;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_PLUGINS);

 	odp.position = 1300000000;

diff --git a/src/modules/plugins/plugins.h b/src/mir_app/src/plugins.h
index 35ae742b60..35ae742b60 100644
--- a/src/modules/plugins/plugins.h
+++ b/src/mir_app/src/plugins.h
diff --git a/src/modules/database/profilemanager.cpp b/src/mir_app/src/profilemanager.cpp
index 0dc3c75304..7f7138be2f 100644
--- a/src/modules/database/profilemanager.cpp
+++ b/src/mir_app/src/profilemanager.cpp
@@ -22,12 +22,14 @@ 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 "..\plugins\plugins.h"
-#include "..\langpack\langpack.h"
+#include "stdafx.h"
+#include "plugins.h"
+#include "langpack.h"
 #include "profilemanager.h"
 #include <sys/stat.h>
 
+#pragma warning(disable : 4512)
+
 void EnsureCheckerLoaded(bool);
 
 #define WM_INPUTCHANGED (WM_USER + 0x3000)
@@ -131,7 +133,7 @@ class CCreateProfileDlg : public CDlgBase
 
 public:
 	CCreateProfileDlg(CCtrlButton &_btn, PROFILEMANAGERDATA *_pd) :
-		CDlgBase(hInst, IDD_PROFILE_NEW),
+		CDlgBase(g_hInst, IDD_PROFILE_NEW),
 		m_btnOk(_btn),
 		m_pd(_pd),
 		m_driverList(this, IDC_PROFILEDRIVERS),
@@ -178,9 +180,9 @@ public:
 		PostMessage(m_hwnd, WM_FOCUSTEXTBOX, 0, 0);
 	}
 
-	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)

-	{

-		switch (msg) {

+	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
+	{
+		switch (msg) {
 		case WM_FOCUSTEXTBOX:
 			SetFocus(m_profileName.GetHwnd());
 			break;
@@ -233,6 +235,11 @@ class CChooseProfileDlg : public CDlgBase
 
 	struct ProfileEnumData
 	{
+		ProfileEnumData(CCtrlListView &_list, TCHAR *_profile) :
+			list(_list),
+			szProfile(_profile)
+		{}
+
 		CCtrlListView &list;
 		TCHAR* szProfile;
 	};
@@ -441,7 +448,7 @@ class CChooseProfileDlg : public CDlgBase
 
 public:
 	CChooseProfileDlg(CCtrlButton &_btn, PROFILEMANAGERDATA *_pd) :
-		CDlgBase(hInst, IDD_PROFILE_SELECTION),
+		CDlgBase(g_hInst, IDD_PROFILE_SELECTION),
 		m_btnOk(_btn),
 		m_pd(_pd),
 		m_profileList(this, IDC_PROFILELIST)
@@ -481,7 +488,7 @@ public:
 		m_profileList.SetExtendedListViewStyle(m_profileList.GetExtendedListViewStyle() | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_LABELTIP | LVS_EX_FULLROWSELECT);
 
 		// find all the profiles
-		ProfileEnumData ped = { m_profileList, m_pd->ptszProfile };
+		ProfileEnumData ped(m_profileList, m_pd->ptszProfile);
 		findProfiles(m_pd->ptszProfileDir, EnumProfilesForList, (LPARAM)&ped);
 		PostMessage(m_hwnd, WM_FOCUSTEXTBOX, 0, 0);
 
@@ -519,19 +526,19 @@ public:
 		}
 	}
 
-	void list_OnDblClick(CCtrlListView::TEventInfo *evt)
+	void list_OnDblClick(CCtrlListView::TEventInfo*)
 	{
 		CheckRun();
 		EndDialog(GetParent(m_hwndParent), 1);
 	}
 
-	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)

-	{

-		switch (msg) {

+	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
+	{
+		switch (msg) {
 		case WM_TIMER:
 			if (WaitForSingleObject(m_hFileNotify, 0) == WAIT_OBJECT_0) {
 				m_profileList.DeleteAllItems();
-				ProfileEnumData ped = { m_profileList, m_pd->ptszProfile };
+				ProfileEnumData ped(m_profileList, m_pd->ptszProfile);
 				findProfiles(m_pd->ptszProfileDir, EnumProfilesForList, (LPARAM)&ped);
 				FindNextChangeNotification(m_hFileNotify);
 			}
@@ -571,7 +578,7 @@ class CProfileManager : public CDlgBase
 
 public:
 	CProfileManager(PROFILEMANAGERDATA *_pd) :
-		CDlgBase(hInst, IDD_PROFILEMANAGER),
+		CDlgBase(g_hInst, IDD_PROFILEMANAGER),
 		m_btnOk(this, IDOK),
 		m_pd(_pd),
 		m_tab(this, IDC_TABS),
@@ -586,8 +593,8 @@ public:
 	
 	virtual void OnInitDialog()
 	{
-		SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadImage(hInst, MAKEINTRESOURCE(IDI_DETAILSLOGO), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));
-		SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadImage(hInst, MAKEINTRESOURCE(IDI_DETAILSLOGO), IMAGE_ICON, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), 0));
+		SendMessage(m_hwnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadImage(g_hInst, MAKEINTRESOURCE(IDI_DETAILSLOGO), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0));
+		SendMessage(m_hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadImage(g_hInst, MAKEINTRESOURCE(IDI_DETAILSLOGO), IMAGE_ICON, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), 0));
 
 		if (m_pd->noProfiles || shouldAutoCreate(m_pd->ptszProfile))
 			m_tab.ActivatePage(1);
@@ -608,9 +615,9 @@ public:
 		}
 	}
 
-	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)

-	{

-		switch (msg) {

+	virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
+	{
+		switch (msg) {
 		case WM_CTLCOLORSTATIC:
 			switch (GetDlgCtrlID((HWND)lParam)) {
 			case IDC_WHITERECT:
diff --git a/src/modules/database/profilemanager.h b/src/mir_app/src/profilemanager.h
index 21650375a2..21650375a2 100644
--- a/src/modules/database/profilemanager.h
+++ b/src/mir_app/src/profilemanager.h
diff --git a/src/modules/protocols/protoaccs.cpp b/src/mir_app/src/protoaccs.cpp
index 1e92cb637c..6aa601dfbf 100644
--- a/src/modules/protocols/protoaccs.cpp
+++ b/src/mir_app/src/protoaccs.cpp
@@ -22,9 +22,9 @@ 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 "stdafx.h"

 

-#include "../clist/clc.h"

+#include "clc.h"

 

 bool CheckProtocolOrder(void);

 void BuildProtoMenus();

@@ -43,7 +43,7 @@ LIST<PROTOACCOUNT> accounts(10, CompareAccounts);
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-static int EnumDbModules(const char *szModuleName, DWORD ofsModuleName, LPARAM lParam)

+static int EnumDbModules(const char *szModuleName, DWORD, LPARAM)

 {

 	DBVARIANT dbv;

 	if (!db_get_s(NULL, szModuleName, "AM_BaseProto", &dbv)) {

@@ -446,7 +446,7 @@ void BuildProtoMenus()
 	}

 }

 

-void RebuildProtoMenus(int iNewValue)

+void RebuildProtoMenus()

 {

 	RebuildMenuOrder();

 	BuildProtoMenus();

diff --git a/src/modules/protocols/protochains.cpp b/src/mir_app/src/protochains.cpp
index be760d9877..e7f4348fe0 100644
--- a/src/modules/protocols/protochains.cpp
+++ b/src/mir_app/src/protochains.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include <m_protomod.h>

 

 extern LIST<PROTOCOLDESCRIPTOR> filters;

@@ -56,7 +56,7 @@ static int GetProtocolP(MCONTACT hContact, char *szBuf, int cbLen)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-INT_PTR CallContactService(MCONTACT hContact, const char *szProtoService, WPARAM wParam, LPARAM lParam)

+MIR_APP_DLL(INT_PTR) CallContactService(MCONTACT hContact, const char *szProtoService, WPARAM wParam, LPARAM lParam)

 {

 	INT_PTR ret;

 	CCSDATA ccs = { hContact, szProtoService, wParam, lParam };

diff --git a/src/modules/clist/protocolorder.cpp b/src/mir_app/src/protocolorder.cpp
index 274ae0dce6..3f6af51b04 100644
--- a/src/modules/clist/protocolorder.cpp
+++ b/src/mir_app/src/protocolorder.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "clc.h"

 

 struct ProtocolData

@@ -141,7 +141,7 @@ class CProtocolOrderOpts : public CDlgBase
 

 public:

 	CProtocolOrderOpts() :

-		CDlgBase(hInst, IDD_OPT_PROTOCOLORDER),

+		CDlgBase(g_hInst, IDD_OPT_PROTOCOLORDER),

 		m_order(this, IDC_PROTOCOLORDER),

 		m_btnReset(this, IDC_RESETPROTOCOLDATA),

 		m_bDragging(false),

@@ -219,13 +219,13 @@ public:
 

 int ProtocolOrderOptInit(WPARAM wParam, LPARAM)

 {

-	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.position = -10000000;
-	odp.groupPosition = 1000000;
-	odp.pszTitle = LPGEN("Accounts");
-	odp.pszGroup = LPGEN("Contact list");
-	odp.pDialog = new CProtocolOrderOpts();
-	odp.flags = ODPF_BOLDGROUPS;
-	Options_AddPage(wParam, &odp);
+	OPTIONSDIALOGPAGE odp = { 0 };

+	odp.position = -10000000;

+	odp.groupPosition = 1000000;

+	odp.pszTitle = LPGEN("Accounts");

+	odp.pszGroup = LPGEN("Contact list");

+	odp.pDialog = new CProtocolOrderOpts();

+	odp.flags = ODPF_BOLDGROUPS;

+	Options_AddPage(wParam, &odp);

 	return 0;

 }

diff --git a/src/modules/protocols/protocols.cpp b/src/mir_app/src/protocols.cpp
index 273fb85dd9..2d18d58757 100644
--- a/src/modules/protocols/protocols.cpp
+++ b/src/mir_app/src/protocols.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 int LoadProtoChains(void);

 int LoadProtoOptions(void);

@@ -366,7 +366,7 @@ static INT_PTR Proto_BroadcastAck(WPARAM, LPARAM lParam)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-int ProtoServiceExists(const char *szModule, const char *szService)

+MIR_APP_DLL(int) ProtoServiceExists(const char *szModule, const char *szService)

 {

 	if (szModule == NULL || szService == NULL)

 		return false;

@@ -383,7 +383,7 @@ int ProtoServiceExists(const char *szModule, const char *szService)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-INT_PTR CallProtoService(const char* szModule, const char* szService, WPARAM wParam, LPARAM lParam)

+MIR_APP_DLL(INT_PTR) CallProtoService(const char* szModule, const char* szService, WPARAM wParam, LPARAM lParam)

 {

 	return CallProtoServiceInt(NULL, szModule, szService, wParam, lParam);

 }

diff --git a/src/modules/protocols/protodir.cpp b/src/mir_app/src/protodir.cpp
index 672fb7f007..dbeac1afee 100644
--- a/src/modules/protocols/protodir.cpp
+++ b/src/mir_app/src/protodir.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 #if 0

 

diff --git a/src/modules/protocols/protoint.cpp b/src/mir_app/src/protoint.cpp
index 2fadfa4e89..c440c5c22d 100644
--- a/src/modules/protocols/protoint.cpp
+++ b/src/mir_app/src/protoint.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 char** __fastcall Proto_FilesMatrixA(TCHAR **files);

 

diff --git a/src/modules/protocols/protoopts.cpp b/src/mir_app/src/protoopts.cpp
index 35b59d11bb..8e072db725 100644
--- a/src/modules/protocols/protoopts.cpp
+++ b/src/mir_app/src/protoopts.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 #define LBN_MY_CHECK	0x1000

 #define LBN_MY_RENAME	0x1001

@@ -351,7 +351,7 @@ static LRESULT CALLBACK AccListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 			rc.bottom = rc.top + max(GetSystemMetrics(SM_CXSMICON), parentDat->titleHeight) + 4 - 1;

 			++rc.top; --rc.right;

 

-			dat->hwndEdit = CreateWindow(_T("EDIT"), pa->tszAccountName, WS_CHILD | WS_BORDER | ES_AUTOHSCROLL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, hwnd, NULL, hInst, NULL);

+			dat->hwndEdit = CreateWindow(_T("EDIT"), pa->tszAccountName, WS_CHILD | WS_BORDER | ES_AUTOHSCROLL, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, hwnd, NULL, g_hInst, NULL);

 			mir_subclassWindow(dat->hwndEdit, sttEditSubclassProc);

 			SendMessage(dat->hwndEdit, WM_SETFONT, (WPARAM)parentDat->hfntTitle, 0);

 			SendMessage(dat->hwndEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN | EC_USEFONTINFO, 0);

@@ -829,7 +829,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM
 		case IDC_ADD:

 			{

 				AccFormDlgParam param = { PRAC_ADDED, NULL };

-				if (IDOK == DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_ACCFORM), hwndDlg, AccFormDlgProc, (LPARAM)&param))

+				if (IDOK == DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_ACCFORM), hwndDlg, AccFormDlgProc, (LPARAM)&param))

 					SendMessage(hwndDlg, WM_MY_REFRESH, 0, 0);

 			}

 			break;

@@ -895,7 +895,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM
 			idx = ListBox_GetCurSel(hwndList);

 			if (idx != -1) {

 				AccFormDlgParam param = { PRAC_UPGRADED, (PROTOACCOUNT*)ListBox_GetItemData(hwndList, idx) };

-				DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_ACCFORM), hwndDlg, AccFormDlgProc, (LPARAM)&param);

+				DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_ACCFORM), hwndDlg, AccFormDlgProc, (LPARAM)&param);

 			}

 			break;

 

@@ -1008,7 +1008,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM
 static INT_PTR OptProtosShow(WPARAM, LPARAM)

 {

 	if (!hAccMgr)

-		hAccMgr = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_ACCMGR), NULL, AccMgrDlgProc, 0);

+		hAccMgr = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_ACCMGR), NULL, AccMgrDlgProc, 0);

 

 	ShowWindow(hAccMgr, SW_RESTORE);

 	SetForegroundWindow(hAccMgr);

diff --git a/src/modules/utils/resizer.cpp b/src/mir_app/src/resizer.cpp
index 17f9e5bd34..ce27ee8079 100644
--- a/src/modules/utils/resizer.cpp
+++ b/src/mir_app/src/resizer.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 #pragma pack(2)

 

diff --git a/src/resource.h b/src/mir_app/src/resource.h
index 7fd2a39ca5..7fd2a39ca5 100644
--- a/src/resource.h
+++ b/src/mir_app/src/resource.h
diff --git a/src/modules/findadd/searchresults.cpp b/src/mir_app/src/searchresults.cpp
index 9b8db18ff0..af1bf873b6 100644
--- a/src/modules/findadd/searchresults.cpp
+++ b/src/mir_app/src/searchresults.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "findadd.h"

 

 enum {

@@ -333,8 +333,6 @@ void CreateResultsColumns(HWND hwndResults, struct FindAddDlgData *dat, char *sz
 

 void ShowMoreOptionsMenu(HWND hwndDlg, int x, int y)

 {

-	struct FindAddDlgData *dat = (struct FindAddDlgData*)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

-

 	LVITEM lvi;

 	if (ListView_GetSelectedCount(GetDlgItem(hwndDlg, IDC_RESULTS)) != 1) return;

 	lvi.mask = LVIF_PARAM;

@@ -342,7 +340,7 @@ void ShowMoreOptionsMenu(HWND hwndDlg, int x, int y)
 	ListView_GetItem(GetDlgItem(hwndDlg, IDC_RESULTS), &lvi);

 	struct ListSearchResult *lsr = (struct ListSearchResult*)lvi.lParam;

 

-	HMENU hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_CONTEXT));

+	HMENU hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_CONTEXT));

 	HMENU hPopupMenu = GetSubMenu(hMenu, 4);

 	TranslateMenu(hPopupMenu);

 	int commandId = TrackPopupMenu(hPopupMenu, TPM_RIGHTBUTTON | TPM_RETURNCMD, x, y, 0, hwndDlg, NULL);

diff --git a/src/modules/fonts/services.cpp b/src/mir_app/src/services.cpp
index 77f29e8218..85f6837853 100644
--- a/src/modules/fonts/services.cpp
+++ b/src/mir_app/src/services.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "FontService.h"

 

 #define FontID_OLDSIZE (offsetof(FontID, backgroundGroup))

diff --git a/src/modules/skin/skin.h b/src/mir_app/src/skin.h
index d0e6eae726..d0e6eae726 100644
--- a/src/modules/skin/skin.h
+++ b/src/mir_app/src/skin.h
diff --git a/src/modules/icolib/skin2opts.cpp b/src/mir_app/src/skin2opts.cpp
index c856cd8b30..c5645c5008 100644
--- a/src/modules/icolib/skin2opts.cpp
+++ b/src/mir_app/src/skin2opts.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 #include "IcoLib.h"

 

@@ -70,7 +70,7 @@ static HICON ExtractIconFromPath(const TCHAR *path, int cxIcon, int cyIcon)
 // lParam: pszIconName or NULL

 // wParam: HICON or NULL

 

-int IcoLib_ReleaseIcon(HICON hIcon, char* szIconName, bool big)

+MIR_APP_DLL(int) IcoLib_ReleaseIcon(HICON hIcon, char* szIconName, bool big)

 {

 	mir_cslock lck(csIconList);

 

@@ -243,7 +243,7 @@ static int OpenPopupMenu(HWND hwndDlg)
 	int cmd;

 

 	GetCursorPos(&pt);

-	hMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDR_ICOLIB_CONTEXT));

+	hMenu = LoadMenu(g_hInst, MAKEINTRESOURCE(IDR_ICOLIB_CONTEXT));

 	hPopup = GetSubMenu(hMenu, 0);

 	TranslateMenu(hPopup);

 	cmd = TrackPopupMenu(hPopup, TPM_RIGHTBUTTON | TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL);

@@ -452,12 +452,13 @@ INT_PTR CALLBACK DlgProcIconImport(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				mir_sntprintf(caption, SIZEOF(caption), _T("%d"), i + 1);

 				lvi.pszText = caption;

 

-				HICON hIcon;

-				_ExtractIconEx(filename, i, 16, 16, &hIcon, LR_DEFAULTCOLOR);

-				lvi.iImage = ImageList_AddIcon(hIml, hIcon);

-				DestroyIcon(hIcon);

-				lvi.lParam = i;

-				ListView_InsertItem(hPreview, &lvi);

+				HICON hIcon = NULL;

+				if (_ExtractIconEx(filename, i, 16, 16, &hIcon, LR_DEFAULTCOLOR) == 1) {

+					lvi.iImage = ImageList_AddIcon(hIml, hIcon);

+					DestroyIcon(hIcon);

+					lvi.lParam = i;

+					ListView_InsertItem(hPreview, &lvi);

+				}

 			}

 			MySetCursor(IDC_ARROW);

 		}

@@ -586,7 +587,7 @@ INT_PTR CALLBACK DlgProcIconImport(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 		if (!IsIconic(hwndDlg)) {

 			UTILRESIZEDIALOG urd = { 0 };

 			urd.cbSize = sizeof(urd);

-			urd.hInstance = hInst;

+			urd.hInstance = g_hInst;

 			urd.hwndDlg = hwndDlg;

 			urd.lParam = 0; // user-defined

 			urd.lpTemplate = MAKEINTRESOURCEA(IDD_ICOLIB_IMPORT);

@@ -858,7 +859,7 @@ INT_PTR CALLBACK DlgProcIcoLibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_IMPORT) {

-			dat->hwndIndex = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_ICOLIB_IMPORT), GetParent(hwndDlg), DlgProcIconImport, (LPARAM)hwndDlg);

+			dat->hwndIndex = CreateDialogParam(g_hInst, MAKEINTRESOURCE(IDD_ICOLIB_IMPORT), GetParent(hwndDlg), DlgProcIconImport, (LPARAM)hwndDlg);

 			EnableWindow((HWND)lParam, FALSE);

 		}

 		else if (LOWORD(wParam) == IDC_GETMORE) {

@@ -1036,7 +1037,7 @@ INT_PTR CALLBACK DlgProcIcoLibOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 int SkinOptionsInit(WPARAM wParam, LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { 0 };

-	odp.hInstance = hInst;

+	odp.hInstance = g_hInst;

 	odp.flags = ODPF_BOLDGROUPS;

 	odp.position = -180000000;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICOLIB);

diff --git a/src/modules/skin/skinicons.cpp b/src/mir_app/src/skinicons.cpp
index 1b8b9de3be..93173a8f5b 100644
--- a/src/modules/skin/skinicons.cpp
+++ b/src/mir_app/src/skinicons.cpp
@@ -21,7 +21,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 "stdafx.h"

 #include <io.h>

 

 struct StandardIconDescription

@@ -142,16 +142,15 @@ HICON LoadIconEx(HINSTANCE hInstance, LPCTSTR lpIconName, BOOL bShared)
 {

 	HICON hResIcon = bShared ? LoadSmallIcon(hInstance, lpIconName) : LoadSmallIconShared(hInstance, lpIconName);

 	if (!hResIcon) { //Icon not found in hInstance lets try to load it from core

-		HINSTANCE hCoreInstance = hInst;

-		if (hCoreInstance != hInstance)

-			hResIcon = bShared ? LoadSmallIcon(hCoreInstance, lpIconName) : LoadSmallIconShared(hCoreInstance, lpIconName);

+		if (g_hInst != hInstance)

+			hResIcon = bShared ? LoadSmallIcon(g_hInst, lpIconName) : LoadSmallIconShared(g_hInst, lpIconName);

 	}

 	return hResIcon;

 }

 

 int ImageList_AddIcon_NotShared(HIMAGELIST hIml, LPCTSTR szResource)

 {

-	HICON hTempIcon = LoadIconEx(hInst, szResource, 0);

+	HICON hTempIcon = LoadIconEx(g_hInst, szResource, 0);

 	int res = ImageList_AddIcon(hIml, hTempIcon);

 	Safe_DestroyIcon(hTempIcon);

 	return res;

@@ -188,25 +187,25 @@ int ImageList_ReplaceIcon_IconLibLoaded(HIMAGELIST hIml, int nIndex, HICON hIcon
 	return res;

 }

 

-void Window_SetIcon_IcoLib(HWND hWnd, int iconId)

+MIR_APP_DLL(void) Window_SetIcon_IcoLib(HWND hWnd, int iconId)

 {

 	SendMessage(hWnd, WM_SETICON, ICON_BIG,   (LPARAM)LoadSkinIcon(iconId, true));

 	SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadSkinIcon(iconId));

 }

 

-void Window_SetProtoIcon_IcoLib(HWND hWnd, const char *szProto, int iconId)

+MIR_APP_DLL(void) Window_SetProtoIcon_IcoLib(HWND hWnd, const char *szProto, int iconId)

 {

 	SendMessage(hWnd, WM_SETICON, ICON_BIG,   (LPARAM)LoadSkinProtoIcon(szProto, iconId, true));

 	SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadSkinProtoIcon(szProto, iconId));

 }

 

-void Window_FreeIcon_IcoLib(HWND hWnd)

+MIR_APP_DLL(void) Window_FreeIcon_IcoLib(HWND hWnd)

 {

 	IcoLib_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_BIG, 0), NULL);

 	IcoLib_ReleaseIcon((HICON)SendMessage(hWnd, WM_SETICON, ICON_SMALL, 0), NULL);

 }

 

-void Button_SetIcon_IcoLib(HWND hwndDlg, int itemId, int iconId, const char* tooltip)

+MIR_APP_DLL(void) Button_SetIcon_IcoLib(HWND hwndDlg, int itemId, int iconId, const char* tooltip)

 {

 	HWND hWnd = GetDlgItem(hwndDlg, itemId);

 	SendMessage(hWnd, BM_SETIMAGE, IMAGE_ICON, (LPARAM)LoadSkinIcon(iconId));

@@ -214,7 +213,7 @@ void Button_SetIcon_IcoLib(HWND hwndDlg, int itemId, int iconId, const char* too
 	SendMessage(hWnd, BUTTONADDTOOLTIP, (WPARAM)tooltip, 0);

 }

 

-void Button_FreeIcon_IcoLib(HWND hwndDlg, int itemId)

+MIR_APP_DLL(void) Button_FreeIcon_IcoLib(HWND hwndDlg, int itemId)

 {

 	HICON hIcon = (HICON)SendDlgItemMessage(hwndDlg, itemId, BM_SETIMAGE, IMAGE_ICON, 0);

 	IcoLib_ReleaseIcon(hIcon, 0);

@@ -224,7 +223,7 @@ void Button_FreeIcon_IcoLib(HWND hwndDlg, int itemId)
 //  wParam = szProto

 //  lParam = status

 //

-HICON LoadSkinProtoIcon(const char *szProto, int status, bool big)

+MIR_APP_DLL(HICON) LoadSkinProtoIcon(const char *szProto, int status, bool big)

 {

 	char iconName[MAX_PATH];

 	INT_PTR caps2;

@@ -272,7 +271,7 @@ HICON LoadSkinProtoIcon(const char *szProto, int status, bool big)
 		PROTOACCOUNT *pa = Proto_GetAccount(szProto);

 		if (pa) {

 			TCHAR szPath[MAX_PATH], szFullPath[MAX_PATH], *str;

-			GetModuleFileName(hInst, szPath, MAX_PATH);

+			GetModuleFileName(NULL, szPath, SIZEOF(szPath));

 

 			//

 			//  Queried protocol isn't in list, adding

@@ -340,7 +339,7 @@ HICON LoadSkinProtoIcon(const char *szProto, int status, bool big)
 	return hIcon;

 }

 

-HANDLE GetSkinIconHandle(int idx)

+MIR_APP_DLL(HANDLE) GetSkinIconHandle(int idx)

 {

 	for (int i=0; i < SIZEOF(mainIcons); i++)

 		if (idx == mainIcons[i].id)

@@ -353,7 +352,7 @@ char* GetSkinIconName(int idx)
 {

 	static char szIconName[100];

 

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

+	for (int i = 0; i < SIZEOF(mainIcons); i++) {

 		if (idx != mainIcons[i].id)

 			continue;

 

@@ -363,7 +362,7 @@ char* GetSkinIconName(int idx)
 	return NULL;

 }

 

-HICON LoadSkinIcon(int idx, bool big)

+MIR_APP_DLL(HICON) LoadSkinIcon(int idx, bool big)

 {

 	//

 	//  Query for global status icons

@@ -372,7 +371,7 @@ HICON LoadSkinIcon(int idx, bool big)
 		if (idx >= SIZEOF(statusIcons))

 			return NULL;

 

-		return LoadSkinProtoIcon(NULL, statusIcons[ idx ].id, big);

+		return LoadSkinProtoIcon(NULL, statusIcons[idx].id, big);

 	}

 

 	return IcoLib_GetIconByHandle(GetSkinIconHandle(idx), big);

@@ -386,7 +385,7 @@ static void convertOneProtocol(char *moduleName, char *iconName)
 	char *pm = moduleName + mir_strlen(moduleName);

 	char *pi = iconName + mir_strlen(iconName);

 

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

+	for (int i = 0; i < SIZEOF(statusIcons); i++) {

 		_itoa(statusIcons[i].id, pm, 10);

 

 		DBVARIANT dbv;

@@ -397,7 +396,9 @@ static void convertOneProtocol(char *moduleName, char *iconName)
 			db_free(&dbv);

 

 			db_unset(NULL, "Icons", moduleName);

-}	}	}

+		}

+	}

+}

 

 static INT_PTR sttLoadSkinIcon(WPARAM wParam, LPARAM lParam)

 {

@@ -430,7 +431,7 @@ int LoadSkinIcons(void)
 	//

 	//  Perform "1st-time running import"

 

-	for (i=0; i < SIZEOF(mainIcons); i++) {

+	for (i = 0; i < SIZEOF(mainIcons); i++) {

 		_itoa(mainIcons[i].id, moduleName, 10);

 		if (db_get_ts(NULL, "Icons", moduleName, &dbv))

 			break;

@@ -447,7 +448,7 @@ int LoadSkinIcons(void)
 		// get the next protocol name

 		moduleName[0] = 'p';

 		moduleName[1] = 0;

-		_itoa(j++, moduleName+1, 100);

+		_itoa(j++, moduleName + 1, 100);

 		if (db_get_ts(NULL, "Icons", moduleName, &dbv))

 			break;

 

@@ -470,7 +471,7 @@ int LoadSkinIcons(void)
 	CreateServiceFunction(MS_SKIN_LOADPROTOICONBIG, sttLoadSkinProtoIconBig);

 

 	TCHAR modulePath[MAX_PATH];

-	GetModuleFileName(NULL, modulePath, SIZEOF(modulePath));

+	GetModuleFileName(g_hInst, modulePath, SIZEOF(modulePath));

 

 	SKINICONDESC sid = { 0 };

 	sid.defaultFile.t = modulePath;

@@ -480,7 +481,7 @@ int LoadSkinIcons(void)
 	//

 	//  Add main icons to list

 	//

-	for (i=0; i < SIZEOF(mainIcons); i++) {

+	for (i = 0; i < SIZEOF(mainIcons); i++) {

 		mir_snprintf(iconName, SIZEOF(iconName), "%s%d", mainIconsFmt, i);

 		sid.section.a = mainIcons[i].section == NULL ? LPGEN("Main icons") : (char*)mainIcons[i].section;

 		sid.description.a = (char*)mainIcons[i].description;

@@ -494,7 +495,7 @@ int LoadSkinIcons(void)
 	//

 	// Asterisk is used, to avoid conflict with proto-plugins

 	// 'coz users can't rename it to name with '*'

-	for (i=0; i < SIZEOF(statusIcons); i++) {

+	for (i = 0; i < SIZEOF(statusIcons); i++) {

 		mir_snprintf(iconName, SIZEOF(iconName), "%s%s%d", statusIconsFmt, GLOBAL_PROTO_NAME, i);

 		sid.pszName = iconName;

 		sid.description.a = (char*)statusIcons[i].description;

diff --git a/src/modules/skin/sounds.cpp b/src/mir_app/src/sounds.cpp
index 1b95f807ed..712a39441f 100644
--- a/src/modules/skin/sounds.cpp
+++ b/src/mir_app/src/sounds.cpp
@@ -21,7 +21,10 @@ 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 "stdafx.h"

+

+#pragma comment(lib, "winmm.lib")

 

 struct SoundItem

 {

@@ -435,7 +438,7 @@ static int SkinOptionsInit(WPARAM wParam, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = -200000000;

-	odp.hInstance = hInst;

+	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SOUND);

 	odp.pszTitle = LPGEN("Sounds");

 	odp.pfnDlgProc = DlgProcSoundOpts;

diff --git a/src/modules/srmm/statusicon.cpp b/src/mir_app/src/srmm_statusicon.cpp
index 01e604ff12..87916cebb0 100644
--- a/src/modules/srmm/statusicon.cpp
+++ b/src/mir_app/src/srmm_statusicon.cpp
@@ -21,7 +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.

 */

 

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

+#include "stdafx.h"

 

 struct StatusIconChild : public MZeroedObject

 {

@@ -142,7 +142,7 @@ static INT_PTR AddStatusIcon(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR RemoveStatusIcon(WPARAM wParam, LPARAM lParam)

+static INT_PTR RemoveStatusIcon(WPARAM, LPARAM lParam)

 {

 	StatusIconData *sid = (StatusIconData *)lParam;

 	if (sid == NULL || sid->cbSize != sizeof(StatusIconData))

diff --git a/src/core/stdafx.cpp b/src/mir_app/src/stdafx.cxx
index 288f19664b..5d3cae4e8e 100644
--- a/src/core/stdafx.cpp
+++ b/src/mir_app/src/stdafx.cxx
@@ -16,4 +16,4 @@ You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.

 */

 

-#include "commonheaders.h"
\ No newline at end of file
+#include "stdafx.h"
\ No newline at end of file
diff --git a/src/core/commonheaders.h b/src/mir_app/src/stdafx.h
index 3c60da9b96..f4ffff15c9 100644
--- a/src/core/commonheaders.h
+++ b/src/mir_app/src/stdafx.h
@@ -60,7 +60,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_system.h>

 #include <m_system_cpp.h>

 #include <m_string.h>

-#include <m_core.h>

 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_db_int.h>

@@ -95,7 +94,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_gui.h>

 

 #include "miranda.h"

-#include "stdplug.h"

 

 #include <m_ssl.h>

 #include <m_netlib.h>

@@ -104,4 +102,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 typedef struct GlobalLogSettingsBase GlobalLogSettings;

 #include <m_chat_int.h>

 

-#include "../resource.h"
\ No newline at end of file
+#include "resource.h"
\ No newline at end of file
diff --git a/src/modules/utils/timeutils.cpp b/src/mir_app/src/timeutils.cpp
index a2f926f74d..57afeff219 100644
--- a/src/modules/utils/timeutils.cpp
+++ b/src/mir_app/src/timeutils.cpp
@@ -25,7 +25,7 @@ implements services to handle location - based timezones, instead of
 simple UTC offsets.

 */

 

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

+#include "stdafx.h"

 

 // KB167296

 void UnixTimeToFileTime(mir_time ts, LPFILETIME pft)

@@ -49,8 +49,8 @@ void FormatTime(const SYSTEMTIME *st, const TCHAR *szFormat, TCHAR *szDest, int
 	CMString tszTemp;

 

 	for (const TCHAR* pFormat = szFormat; *pFormat; ++pFormat) {

-		DWORD fmt;

-		bool date, iso = false;

+		DWORD fmt = 0;

+		bool date = false, iso = false;

 		switch (*pFormat) {

 		case 't':

 			fmt = TIME_NOSECONDS;

diff --git a/src/modules/utils/timezones.cpp b/src/mir_app/src/timezones.cpp
index 6cf2a9c0f6..d95fef6169 100644
--- a/src/modules/utils/timezones.cpp
+++ b/src/mir_app/src/timezones.cpp
@@ -25,7 +25,7 @@ implements services to handle location - based timezones, instead of
 simple UTC offsets.

 */

 

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

+#include "stdafx.h"

 

 TIME_API tmi;

 

diff --git a/src/modules/extraicons/usedIcons.cpp b/src/mir_app/src/usedIcons.cpp
index db967687dd..5592e01f82 100644
--- a/src/modules/extraicons/usedIcons.cpp
+++ b/src/mir_app/src/usedIcons.cpp
@@ -19,7 +19,7 @@ not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.

 */

 

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

+#include "stdafx.h"

 

 #include "extraicons.h"

 

diff --git a/src/modules/extraicons/usedIcons.h b/src/mir_app/src/usedIcons.h
index b15da88108..b15da88108 100644
--- a/src/modules/extraicons/usedIcons.h
+++ b/src/mir_app/src/usedIcons.h
diff --git a/src/modules/utils/utils.cpp b/src/mir_app/src/utils.cpp
index abcca9426f..9ac79dd185 100644
--- a/src/modules/utils/utils.cpp
+++ b/src/mir_app/src/utils.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 #define MS_SYSTEM_GET_MD5I	"Miranda/System/GetMD5I"

 

@@ -345,7 +345,7 @@ static INT_PTR SaveWindowPosition(WPARAM, LPARAM lParam)
 	return 0;

 }

 

-static INT_PTR svcAssertInsideScreen(WPARAM wParam, LPARAM lParam)

+static INT_PTR svcAssertInsideScreen(WPARAM wParam, LPARAM)

 {

 	LPRECT rc = (LPRECT)wParam;

 	if (rc == NULL)

diff --git a/src/modules/visibility/visibility.cpp b/src/mir_app/src/visibility.cpp
index 6f694ef660..5c5f85f84e 100644
--- a/src/modules/visibility/visibility.cpp
+++ b/src/mir_app/src/visibility.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 static void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *groupChildCount)

 {

@@ -272,7 +272,7 @@ static int VisibilityOptInitialise(WPARAM wParam, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.position = 850000000;

-	odp.hInstance = hInst;

+	odp.hInstance = g_hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_VISIBILITY);

 	odp.pszTitle = LPGEN("Visibility");

 	odp.pszGroup = LPGEN("Contacts");

diff --git a/src/modules/utils/windowlist.cpp b/src/mir_app/src/windowlist.cpp
index 19445a3851..cea13f4e6e 100644
--- a/src/modules/utils/windowlist.cpp
+++ b/src/mir_app/src/windowlist.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 

 struct TWindowListItem

 {

diff --git a/src/modules/xml/xmlApi.cpp b/src/mir_app/src/xmlApi.cpp
index 37aadfa12b..cd0c347987 100644
--- a/src/modules/xml/xmlApi.cpp
+++ b/src/mir_app/src/xmlApi.cpp
@@ -22,7 +22,7 @@ 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 "stdafx.h"

 #include "xmlParser.h"

 

 static HXML xmlapiCreateNode(LPCTSTR name, LPCTSTR text, char isDeclaration)

diff --git a/src/modules/xml/xmlParser.cpp b/src/mir_app/src/xmlParser.cpp
index eae664e888..be360ea40f 100644
--- a/src/modules/xml/xmlParser.cpp
+++ b/src/mir_app/src/xmlParser.cpp
@@ -50,7 +50,7 @@
 ****************************************************************************
 */
 
-#include "..\..\core\commonheaders.h"
+#include "stdafx.h"
 #include "xmlParser.h"
 
 #include <memory.h>
@@ -582,7 +582,7 @@ typedef enum XMLStatus
 	eOutsideTag
 } XMLStatus;
 
-XMLError XMLNode::writeToFile(XMLCSTR filename, const char *encoding, char nFormat) const
+XMLError XMLNode::writeToFile(XMLCSTR filename, const char* /*encoding*/, char nFormat) const
 {
 	if (!d) return eXMLErrorNone;
 	FILE *f = xfopen(filename, _CXML("wb"));
@@ -2817,7 +2817,7 @@ char XMLNode::setGlobalOptions(XMLCharEncoding _characterEncoding, char _guessWi
 	return 0;
 }
 
-XMLNode::XMLCharEncoding XMLNode::guessCharEncoding(void *buf, int l, char useXMLEncodingAttribute)
+XMLNode::XMLCharEncoding XMLNode::guessCharEncoding(void* /*buf*/, int /*l*/, char /*useXMLEncodingAttribute*/)
 {
 #ifdef _XMLWIDECHAR
 	return (XMLCharEncoding)0;
diff --git a/src/modules/xml/xmlParser.h b/src/mir_app/src/xmlParser.h
index aa9bf91a88..aa9bf91a88 100644
--- a/src/modules/xml/xmlParser.h
+++ b/src/mir_app/src/xmlParser.h
diff --git a/src/mir_core/mir_core_10.vcxproj b/src/mir_core/mir_core_10.vcxproj
index 8770eb8e40..2f3cd36668 100644
--- a/src/mir_core/mir_core_10.vcxproj
+++ b/src/mir_core/mir_core_10.vcxproj
@@ -171,7 +171,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <SubSystem>Windows</SubSystem>

-      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

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

       <DelayLoadDLLs>miranda32.exe</DelayLoadDLLs>

@@ -212,7 +212,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

       <SubSystem>Windows</SubSystem>

-      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>

       <DelayLoadDLLs>miranda64.exe</DelayLoadDLLs>

@@ -246,7 +246,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <SubSystem>Windows</SubSystem>

-      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

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

       <DelayLoadDLLs>miranda32.exe</DelayLoadDLLs>

@@ -290,7 +290,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

       <SubSystem>Windows</SubSystem>

-      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin10\lib</AdditionalLibraryDirectories>

       <AdditionalOptions>/PDBALTPATH:%_PDB% /ignore:4197</AdditionalOptions>

       <DelayLoadDLLs>miranda64.exe</DelayLoadDLLs>

diff --git a/src/mir_core/mir_core_12.vcxproj b/src/mir_core/mir_core_12.vcxproj
index 626835ac80..bcec8cec62 100644
--- a/src/mir_core/mir_core_12.vcxproj
+++ b/src/mir_core/mir_core_12.vcxproj
@@ -179,7 +179,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <SubSystem>Windows</SubSystem>

-      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

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

       <DelayLoadDLLs>miranda32.exe</DelayLoadDLLs>

@@ -221,7 +221,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

       <SubSystem>Windows</SubSystem>

-      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

       <AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>

       <DelayLoadDLLs>miranda64.exe</DelayLoadDLLs>

@@ -255,7 +255,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <RandomizedBaseAddress>false</RandomizedBaseAddress>

       <SubSystem>Windows</SubSystem>

-      <AdditionalDependencies>miranda32.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

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

       <DelayLoadDLLs>miranda32.exe</DelayLoadDLLs>

@@ -299,7 +299,7 @@
       <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

       <SubSystem>Windows</SubSystem>

-      <AdditionalDependencies>miranda64.lib;ws2_32.lib;comctl32.lib;winmm.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>

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

       <AdditionalLibraryDirectories>$(ProfileDir)..\..\bin12\lib</AdditionalLibraryDirectories>

       <DelayLoadDLLs>miranda64.exe</DelayLoadDLLs>

       <AdditionalOptions>/ignore:4197 %(AdditionalOptions)</AdditionalOptions>

diff --git a/src/mir_core/src/icons.cpp b/src/mir_core/src/icons.cpp
index 47d6e1c904..fe3bb37319 100644
--- a/src/mir_core/src/icons.cpp
+++ b/src/mir_core/src/icons.cpp
@@ -24,7 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "commonheaders.h"

 

 #include <m_icolib.h>

-#include "..\src\core\stdplug.h"

 

 MIR_CORE_DLL(void) Icon_Register(HINSTANCE hInst, const char *szSection, IconItem *pIcons, size_t iCount, char *prefix, int hLangpack)

 {

diff --git a/src/mir_core/src/langpack.cpp b/src/mir_core/src/langpack.cpp
index 0cbe25e91c..062233e256 100644
--- a/src/mir_core/src/langpack.cpp
+++ b/src/mir_core/src/langpack.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 

 #include "commonheaders.h"

-#include "../../modules/langpack/langpack.h"

+#include "../../mir_app/src/langpack.h"

 

 #define LANGPACK_BUF_SIZE 4000

 

diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def
index 5c5896f34f..f2decbe158 100644
--- a/src/mir_core/src/mir_core.def
+++ b/src/mir_core/src/mir_core.def
@@ -1,8 +1,6 @@
 LIBRARY mir_core

 

 EXPORTS

-CallContactService              @1

-CallProtoService                @2

 Langpack_LookupUuid             @3

 Langpack_MarkPluginLoaded       @4

 CallFunctionAsync               @5

@@ -161,7 +159,6 @@ wildcmpi                      @158
 wildcmpiw                     @159

 mir_base64_encode             @160

 mir_base64_decode             @161

-ProtoServiceExists            @162

 ProtoBroadcastAck             @163

 db_set_resident               @165

 db_set                        @166

diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def
index 4045e1d217..3a15379fcd 100644
--- a/src/mir_core/src/mir_core64.def
+++ b/src/mir_core/src/mir_core64.def
@@ -1,8 +1,6 @@
 LIBRARY mir_core

 

 EXPORTS

-CallContactService              @1

-CallProtoService                @2

 Langpack_LookupUuid             @3

 Langpack_MarkPluginLoaded       @4

 CallFunctionAsync               @5

@@ -161,7 +159,6 @@ wildcmpi                      @158
 wildcmpiw                     @159

 mir_base64_encode             @160

 mir_base64_decode             @161

-ProtoServiceExists            @162

 ProtoBroadcastAck             @163

 db_set_resident               @165

 db_set                        @166

diff --git a/src/miranda32/miranda32.vcxproj b/src/miranda32/miranda32.vcxproj
new file mode 100644
index 0000000000..e6037379a5
--- /dev/null
+++ b/src/miranda32/miranda32.vcxproj
@@ -0,0 +1,30 @@
+<?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>Miranda</ProjectName>

+    <TargetName Condition="'$(Platform)'=='Win32'">Miranda32</TargetName>

+    <TargetName Condition="'$(Platform)'=='x64'">Miranda64</TargetName>

+    <ProjectGuid>{F9916510-9055-4C9F-997A-3755DEC1511B}</ProjectGuid>

+  </PropertyGroup>

+  <ImportGroup Label="PropertySheets">

+    <Import Project="$(ProjectDir)..\..\build\vc.common\app.props" />

+  </ImportGroup>

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

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

+  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

+</Project>
\ No newline at end of file
diff --git a/src/miranda32.exe.manifest b/src/miranda32/res/miranda32.exe.manifest
index b0c140a148..b0c140a148 100644
--- a/src/miranda32.exe.manifest
+++ b/src/miranda32/res/miranda32.exe.manifest
diff --git a/src/miranda32/res/resource.rc b/src/miranda32/res/resource.rc
new file mode 100644
index 0000000000..ae457d069e
--- /dev/null
+++ b/src/miranda32/res/resource.rc
@@ -0,0 +1,21 @@
+// Microsoft Visual C++ generated resource script.

+//

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

+

+#include <windows.h>

+#include <winres.h>

+

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

+// English (United States) resources

+

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+

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

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_MIRANDA   ICON  "../../mir_app/res/miranda_logo.ico"

diff --git a/src/miranda32/res/version.rc b/src/miranda32/res/version.rc
new file mode 100644
index 0000000000..8f42a6229f
--- /dev/null
+++ b/src/miranda32/res/version.rc
@@ -0,0 +1,53 @@
+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include <windows.h>

+#include <winres.h>

+

+#include "../../include/m_version.h"

+

+#ifndef _MAC

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

+//

+// Version

+//

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION MIRANDA_VERSION_FILEVERSION

+ PRODUCTVERSION MIRANDA_VERSION_FILEVERSION

+ FILEFLAGSMASK 0x3fL

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x40004L

+ FILETYPE 0x1L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "Comments", "Licensed under the terms of the GNU General Public License\0"

+            VALUE "CompanyName", "Miranda NG Team\0"

+            VALUE "FileDescription", "Miranda NG\0"

+            VALUE "FileVersion", MIRANDA_VERSION_DISPLAY

+            VALUE "InternalName", "miranda32\0"

+            VALUE "LegalCopyright", "Copyright © 2000-11 Miranda IM, 2012-15 Miranda NG project. This software is released under the terms of the GNU General Public License.\0"

+            VALUE "LegalTrademarks", "\0"

+            VALUE "OriginalFilename", "miranda32.exe\0"

+            VALUE "PrivateBuild", "\0"

+            VALUE "ProductName", "Miranda NG\0"

+            VALUE "ProductVersion", MIRANDA_VERSION_DISPLAY

+            VALUE "SpecialBuild", "\0"

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END

+

+#endif    // !_MAC

diff --git a/src/miranda32/src/miranda.cpp b/src/miranda32/src/miranda.cpp
new file mode 100644
index 0000000000..029c56562f
--- /dev/null
+++ b/src/miranda32/src/miranda.cpp
@@ -0,0 +1,62 @@
+/*

+

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

+

+Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org),

+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.

+

+*/

+

+#include "stdafx.h"

+

+int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int)

+{

+	TCHAR tszPath[MAX_PATH];

+	GetModuleFileName(hInstance, tszPath, _countof(tszPath));

+

+	TCHAR *p = _tcsrchr(tszPath, '\\');

+	if (p)

+		p[1] = 0;

+

+	_tcsncat(tszPath, _T("libs"), _TRUNCATE);

+	DWORD cbPath = (DWORD)_tcslen(tszPath);

+	

+	DWORD cbSize = GetEnvironmentVariable(_T("PATH"), NULL, 0);

+	TCHAR *ptszVal = new TCHAR[cbSize + MAX_PATH + 2];

+	_tcscpy(ptszVal, tszPath);

+	_tcscat(ptszVal, _T(";"));

+	GetEnvironmentVariable(_T("PATH"), ptszVal + cbPath + 1, cbSize);

+	SetEnvironmentVariable(_T("PATH"), ptszVal);

+

+	HINSTANCE hMirApp = LoadLibraryA("mir_app.dll");

+	if (hMirApp == NULL) {

+		MessageBox(NULL, _T("mir_app.dll cannot be loaded"), _T("Fatal error"), MB_ICONERROR | MB_OK);

+		return 1;

+	}

+

+	typedef int (WINAPI *pfnMain)(LPTSTR);

+	pfnMain fnMain = (pfnMain)GetProcAddress(hMirApp, "mir_main");

+	if (fnMain == NULL) {

+		MessageBox(NULL, _T("invalid mir_app.dll present, program exiting"), _T("Fatal error"), MB_ICONERROR | MB_OK);

+		return 2;

+	}

+

+	int retVal = fnMain(cmdLine);

+	FreeLibrary(hMirApp);

+	return retVal;

+}

diff --git a/src/miranda32/src/stdafx.cxx b/src/miranda32/src/stdafx.cxx
new file mode 100644
index 0000000000..5d3cae4e8e
--- /dev/null
+++ b/src/miranda32/src/stdafx.cxx
@@ -0,0 +1,19 @@
+/*

+

+Copyright (C) 2012-15 Miranda NG team (http://miranda-ng.org)

+

+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 version 2

+of the License.

+

+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, see <http://www.gnu.org/licenses/>.

+*/

+

+#include "stdafx.h"
\ No newline at end of file
diff --git a/src/miranda32/src/stdafx.h b/src/miranda32/src/stdafx.h
new file mode 100644
index 0000000000..4d29d7be51
--- /dev/null
+++ b/src/miranda32/src/stdafx.h
@@ -0,0 +1,28 @@
+/*

+

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

+

+Copyright (ñ) 2012-15 Miranda NG project (http://miranda-ng.org),

+Copyright (c) 2000-12 Miranda 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.

+*/

+

+#include <windows.h>

+

+#include <tchar.h>

+

diff --git a/src/miranda32_10.vcxproj b/src/miranda32_10.vcxproj
deleted file mode 100644
index 0b94c03baa..0000000000
--- a/src/miranda32_10.vcxproj
+++ /dev/null
@@ -1,723 +0,0 @@
-<?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>Miranda</ProjectName>

-    <ProjectGuid>{F9916510-9055-4C9F-997A-3755DEC1511B}</ProjectGuid>

-  </PropertyGroup>

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

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

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

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

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-  </PropertyGroup>

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

-    <CharacterSet>Unicode</CharacterSet>

-  </PropertyGroup>

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

-    <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.30128.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

-    <IgnoreImportLibrary>true</IgnoreImportLibrary>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)32</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)32</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)64</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)64</TargetName>

-  </PropertyGroup>

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

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>false</ExceptionHandling>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;4530;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FloatingPointModel>Fast</FloatingPointModel>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\include\msapi</AdditionalIncludeDirectories>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;UxTheme.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalManifestDependencies>type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;type=%27win32%27 name=%27Microsoft.Windows.Gdiplus%27 version=%271.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\bin10\lib</AdditionalLibraryDirectories>

-      <ModuleDefinitionFile>miranda32.def</ModuleDefinitionFile>

-      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

-    </Link>

-    <Manifest>

-      <AdditionalManifestFiles>miranda32.exe.manifest</AdditionalManifestFiles>

-    </Manifest>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>false</ExceptionHandling>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;4530;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FloatingPointModel>Fast</FloatingPointModel>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\include\msapi</AdditionalIncludeDirectories>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;UxTheme.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalManifestDependencies>type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;type=%27win32%27 name=%27Microsoft.Windows.Gdiplus%27 version=%271.0.0.0%27 processorArchitecture=%27amd64%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\bin10\lib</AdditionalLibraryDirectories>

-      <AdditionalOptions>/PDBALTPATH:%_PDB%</AdditionalOptions>

-      <BaseAddress>0x400000</BaseAddress>

-      <ModuleDefinitionFile>miranda32.def</ModuleDefinitionFile>

-    </Link>

-    <Manifest>

-      <AdditionalManifestFiles>miranda32.exe.manifest</AdditionalManifestFiles>

-    </Manifest>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

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

-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>false</StringPooling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;4530;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\include\msapi</AdditionalIncludeDirectories>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;UxTheme.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalManifestDependencies>type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;type=%27win32%27 name=%27Microsoft.Windows.Gdiplus%27 version=%271.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\bin10\lib</AdditionalLibraryDirectories>

-      <ModuleDefinitionFile>miranda32.def</ModuleDefinitionFile>

-    </Link>

-    <Manifest>

-      <AdditionalManifestFiles>miranda32.exe.manifest</AdditionalManifestFiles>

-    </Manifest>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

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

-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>false</StringPooling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;4530;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\include\msapi</AdditionalIncludeDirectories>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;UxTheme.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalManifestDependencies>type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;type=%27win32%27 name=%27Microsoft.Windows.Gdiplus%27 version=%271.0.0.0%27 processorArchitecture=%27amd64%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\bin10\lib</AdditionalLibraryDirectories>

-      <BaseAddress>0x400000</BaseAddress>

-      <ModuleDefinitionFile>miranda32.def</ModuleDefinitionFile>

-    </Link>

-    <Manifest>

-      <AdditionalManifestFiles>miranda32.exe.manifest</AdditionalManifestFiles>

-    </Manifest>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClInclude Include="..\include\m_addcontact.h" />

-    <ClInclude Include="..\include\m_awaymsg.h" />

-    <ClInclude Include="..\include\m_button.h" />

-    <ClInclude Include="..\include\m_button_int.h" />

-    <ClInclude Include="..\include\m_clc.h" />

-    <ClInclude Include="..\include\m_clist.h" />

-    <ClInclude Include="..\include\m_clistint.h" />

-    <ClInclude Include="..\include\m_clui.h" />

-    <ClInclude Include="..\include\m_contacts.h" />

-    <ClInclude Include="..\include\m_database.h" />

-    <ClInclude Include="..\include\m_db_int.h" />

-    <ClInclude Include="..\include\m_email.h" />

-    <ClInclude Include="..\include\m_extraicons.h" />

-    <ClInclude Include="..\include\m_file.h" />

-    <ClInclude Include="..\include\m_findadd.h" />

-    <ClInclude Include="..\include\m_history.h" />

-    <ClInclude Include="..\include\m_hotkeys.h" />

-    <ClInclude Include="..\include\m_icq.h" />

-    <ClInclude Include="..\include\m_idle.h" />

-    <ClInclude Include="..\include\m_ignore.h" />

-    <ClInclude Include="..\include\m_json.h" />

-    <ClInclude Include="..\include\m_langpack.h" />

-    <ClInclude Include="..\include\m_message.h" />

-    <ClInclude Include="..\include\m_metacontacts.h" />

-    <ClInclude Include="..\include\m_netlib.h" />

-    <ClInclude Include="..\include\m_options.h" />

-    <ClInclude Include="..\include\m_popup.h" />

-    <ClInclude Include="..\include\m_protocols.h" />

-    <ClInclude Include="..\include\m_protomod.h" />

-    <ClInclude Include="..\include\m_protosvc.h" />

-    <ClInclude Include="..\include\m_skin.h" />

-    <ClInclude Include="..\include\m_system.h" />

-    <ClInclude Include="..\include\m_system_cpp.h" />

-    <ClInclude Include="..\include\m_timezones.h" />

-    <ClInclude Include="..\include\m_url.h" />

-    <ClInclude Include="..\include\m_userinfo.h" />

-    <ClInclude Include="..\include\m_utils.h" />

-    <ClInclude Include="..\include\newpluginapi.h" />

-    <ClInclude Include="..\include\statusmodes.h" />

-    <ClInclude Include="..\include\win2k.h" />

-    <ClInclude Include="core\commonheaders.h" />

-    <ClInclude Include="core\miranda.h" />

-    <ClInclude Include="core\stdplug.h" />

-    <ClInclude Include="modules\chat\chat.h" />

-    <ClInclude Include="modules\database\database.h" />

-    <ClInclude Include="modules\database\profilemanager.h" />

-    <ClInclude Include="modules\extraicons\ExtraIcon.h" />

-    <ClInclude Include="modules\extraicons\extraicons.h" />

-    <ClInclude Include="modules\extraicons\usedIcons.h" />

-    <ClInclude Include="modules\findadd\findadd.h" />

-    <ClInclude Include="modules\langpack\langpack.h" />

-    <ClInclude Include="modules\metacontacts\metacontacts.h" />

-    <ClInclude Include="modules\netlib\netlib.h" />

-    <ClInclude Include="modules\options\filter.h" />

-    <ClInclude Include="..\include\m_protoint.h" />

-    <ClInclude Include="modules\plugins\plugins.h" />

-    <ClInclude Include="modules\skin\skin.h" />

-    <ClInclude Include="modules\clist\clc.h" />

-    <ClInclude Include="modules\clist\genmenu.h" />

-    <ClInclude Include="modules\fonts\FontService.h" />

-    <ClInclude Include="modules\icolib\IcoLib.h" />

-    <ClInclude Include="..\include\m_xml.h" />

-    <ClInclude Include="modules\xml\xmlParser.h" />

-    <ClInclude Include="resource.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="core\stdafx.cpp">

-      <PrecompiledHeader>Create</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="core\miranda.cpp" />

-    <ClCompile Include="core\modules.cpp" />

-    <ClCompile Include="modules\addcontact\addcontact.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\button\button.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_opts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_rtf.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_svc.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\clist.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\colorchooser.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\log.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\manager.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\tools.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\contacts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\crypt\encrypt.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\database.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbini.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbintf.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbutils.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\mdatabasecache.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\profilemanager.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\BaseExtraIcon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\CallbackExtraIcon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\DefaultExtraIcons.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\ExtraIcon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\ExtraIconGroup.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\extraicons.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\IcolibExtraIcon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\options_ei.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\usedIcons.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\findadd\findadd.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\findadd\searchresults.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\skin2opts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\ignore\ignore.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\langpack.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\lpopts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\lpservices.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_addto.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_edit.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_api.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_main.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_menu.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_options.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_services.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_utils.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlib.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibautoproxy.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibbind.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibhttp.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibhttpproxy.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netliblog.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibopenconn.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibopts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibpktrecver.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibsecurity.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibsock.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibupnp.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\options\descbutton.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\options\filter.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\options\headerbar.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\options\iconheader.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\options\options.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\dll_sniffer.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\newplugins.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\pluginopts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoaccs.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protochains.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protocols.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoint.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoopts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\skin\hotkeys.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\skin\hotkey_opts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\skin\skinicons.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\skin\sounds.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\srmm\statusicon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\colourpicker.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\enterstring.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\hyperlink.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\imgconv.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\openurl.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\path.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\resizer.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\timeutils.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\timezones.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\utils.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\windowlist.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\visibility\visibility.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clc.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcfiledrop.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcidents.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcitems.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcmsgs.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcutils.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistcore.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistevents.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistmenus.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistmod.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistsettings.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clisttray.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clui.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\cluiservices.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\contact.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\Docking.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\genmenu.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\genmenuopt.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\groups.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\keyboard.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\movetogroup.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\protocolorder.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\FontOptions.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\FontService.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\services.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\extracticon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\skin2icons.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\xml\xmlApi.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\xml\xmlParser.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

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

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

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\plugins\zlib\zlib_10.vcxproj">

-      <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>

-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="res\always_visible.ico" />

-    <None Include="res\auth_add.ico" />

-    <None Include="res\auth_grant.ico" />

-    <None Include="res\auth_request.ico" />

-    <None Include="res\auth_revoke.ico" />

-    <None Include="res\chat_channel.ico" />

-    <None Include="res\chat_join.ico" />

-    <None Include="res\chat_leave.ico" />

-    <None Include="res\check_off.ico" />

-    <None Include="res\check_on.ico" />

-    <None Include="res\contact_add.ico" />

-    <None Include="res\contact_delete.ico" />

-    <None Include="res\contact_groups.ico" />

-    <None Include="res\contact_rename.ico" />

-    <None Include="res\contact_view_details.ico" />

-    <None Include="res\cursor_drag_copy.cur" />

-    <None Include="res\cursor_drop_user.cur" />

-    <None Include="res\cursor_hyperlink.cur" />

-    <None Include="res\female.ico" />

-    <None Include="res\group_closed.ico" />

-    <None Include="res\group_opened.ico" />

-    <None Include="res\icon_accmgr.ico" />

-    <None Include="res\icon_all.ico" />

-    <None Include="res\icon_ansi.ico" />

-    <None Include="res\icon_auth_request.ico" />

-    <None Include="res\icon_connecting.ico" />

-    <None Include="res\icon_down_arrow.ico" />

-    <None Include="res\Icon_exit.ico" />

-    <None Include="res\icon_file.ico" />

-    <None Include="res\icon_find_user.ico" />

-    <None Include="res\icon_frame.ico" />

-    <None Include="res\icon_help.ico" />

-    <None Include="res\icon_history.ico" />

-    <None Include="res\icon_loaded.ico" />

-    <None Include="res\icon_loaded_gray.ico" />

-    <None Include="res\icon_mail.ico" />

-    <None Include="res\icon_mainmenu.ico" />

-    <None Include="res\icon_message.ico" />

-    <None Include="res\icon_notloaded.ico" />

-    <None Include="res\icon_notloaded_gray.ico" />

-    <None Include="res\icon_options.ico" />

-    <None Include="res\icon_search_all.ico" />

-    <None Include="res\Icon_show_hide.ico" />

-    <None Include="res\icon_small_dot.ico" />

-    <None Include="res\icon_sms.ico" />

-    <None Include="res\icon_typing.ico" />

-    <None Include="res\icon_undo.ico" />

-    <None Include="res\icon_unicode.ico" />

-    <None Include="res\icon_url.ico" />

-    <None Include="res\icon_window.ico" />

-    <None Include="res\icon_windows.ico" />

-    <None Include="res\male.ico" />

-    <None Include="res\meta_add.ico" />

-    <None Include="res\meta_convert.ico" />

-    <None Include="res\meta_edit.ico" />

-    <None Include="res\meta_menu.ico" />

-    <None Include="res\meta_menuof.ico" />

-    <None Include="res\meta_remove2.ico" />

-    <None Include="res\meta_set_as_default.ico" />

-    <None Include="res\miranda_home.ico" />

-    <None Include="res\miranda_logo.ico" />

-    <None Include="res\miranda_manager.ico" />

-    <None Include="res\never_visible.ico" />

-    <None Include="res\Off.ico" />

-    <None Include="res\On.ico" />

-    <None Include="res\status_away.ico" />

-    <None Include="res\status_DND.ico" />

-    <None Include="res\status_free4chat.ico" />

-    <None Include="res\status_invisible.ico" />

-    <None Include="res\status_locked.ico" />

-    <None Include="res\status_NA.ico" />

-    <None Include="res\status_occupied.ico" />

-    <None Include="res\status_offline.ico" />

-    <None Include="res\status_online.ico" />

-    <None Include="res\status_on_the_phone.ico" />

-    <None Include="res\status_out2lunch.ico" />

-    <None Include="res\status_user_online.ico" />

-    <None Include="res\_blank.ico" />

-  </ItemGroup>

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

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

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

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

-  <ItemGroup>

-    <Filter Include="SDK">

-      <UniqueIdentifier>{9263229c-5f0c-40b1-90c1-9f09be9d7dcc}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Core">

-      <UniqueIdentifier>{9a75b1ab-85d2-4231-b3a8-633eb85d8506}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules">

-      <UniqueIdentifier>{ad89ee42-29f6-4b6b-9316-11f7cad2f75b}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\addcontact">

-      <UniqueIdentifier>{edb05be9-a16a-4f37-8035-711e5286311f}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\button">

-      <UniqueIdentifier>{880105c7-0ef2-41ee-9541-fe2c9e5a7679}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\database">

-      <UniqueIdentifier>{a4463881-5b8c-497a-b5f4-5832dbc5fbfa}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\findadd">

-      <UniqueIdentifier>{ada379e5-5553-4316-b4f0-62f2f60e8540}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\ignore">

-      <UniqueIdentifier>{4f9373ec-57ce-4c35-9217-9ffc5aefa841}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\langpack">

-      <UniqueIdentifier>{384c1011-28ee-43b0-8bd7-33e316792bc3}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\netlib">

-      <UniqueIdentifier>{3bd450f7-3173-4cb6-8eea-23acebcb8671}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\options">

-      <UniqueIdentifier>{ec6cab41-4990-429f-b01f-db0f3a8d1ba6}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\plugins">

-      <UniqueIdentifier>{6f3414dd-ebb2-43d1-b17a-56117abfac62}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\protocols">

-      <UniqueIdentifier>{9bea12c5-dd45-4fd2-906c-a0f1cc89fe29}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\skin">

-      <UniqueIdentifier>{474a2558-48fd-45d5-b8e8-3a07d780f02a}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\utils">

-      <UniqueIdentifier>{4549cb1a-17d4-49a2-82e9-3acd7e17f5bc}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\visibility">

-      <UniqueIdentifier>{a0e1084a-b62f-4bc2-a973-8fcc2df5deae}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\clist">

-      <UniqueIdentifier>{c0446d71-a213-4c3a-ac52-98af890c5dcf}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\fonts">

-      <UniqueIdentifier>{4c1e9a4f-27f1-4c36-9efe-ca1b4f586f06}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\icolib">

-      <UniqueIdentifier>{021bd45a-8d83-4aca-83df-ac43192b922a}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\xmlparser">

-      <UniqueIdentifier>{c3bf6128-d3fd-44f6-a207-df2977019960}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Resources">

-      <UniqueIdentifier>{dcc9b0d7-b335-458b-ac09-6cc6cf55e397}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\crypt">

-      <UniqueIdentifier>{15d84b6a-4aa3-4cd5-93b3-2559709224ea}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\extraicons">

-      <UniqueIdentifier>{e125e36b-fc7d-4a78-8f13-67d3c9333621}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\srmm">

-      <UniqueIdentifier>{b3f78380-76da-4a82-a0e2-1a14b173dac1}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\chat">

-      <UniqueIdentifier>{4c3f7adf-3969-4bff-b71f-e03d96adca37}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\metacontacts">

-      <UniqueIdentifier>{79f0ee25-4708-4fd6-aeef-fb5f2628008b}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Resources\Icons">

-      <UniqueIdentifier>{7fbe104f-6dd8-45f8-8c9e-29b2e254d2ee}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\include\m_addcontact.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_awaymsg.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_clc.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_clist.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_clistint.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_clui.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_contacts.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_email.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_file.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_findadd.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_history.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_hotkeys.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_icq.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_idle.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_ignore.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_langpack.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_netlib.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_options.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_popup.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_protocols.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_protomod.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_protosvc.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_skin.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_system.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_system_cpp.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_url.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_userinfo.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\newpluginapi.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\statusmodes.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\win2k.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="core\commonheaders.h">

-      <Filter>Core</Filter>

-    </ClInclude>

-    <ClInclude Include="core\miranda.h">

-      <Filter>Core</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\database\profilemanager.h">

-      <Filter>Modules\database</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\findadd\findadd.h">

-      <Filter>Modules\findadd</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\netlib\netlib.h">

-      <Filter>Modules\netlib</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\options\filter.h">

-      <Filter>Modules\options</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_protoint.h">

-      <Filter>Modules\protocols</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\clist\clc.h">

-      <Filter>Modules\clist</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\clist\genmenu.h">

-      <Filter>Modules\clist</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\fonts\FontService.h">

-      <Filter>Modules\fonts</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\icolib\IcoLib.h">

-      <Filter>Modules\icolib</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_xml.h">

-      <Filter>Modules\xmlparser</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\xml\xmlParser.h">

-      <Filter>Modules\xmlparser</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_timezones.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\plugins\plugins.h">

-      <Filter>Modules\plugins</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\skin\skin.h">

-      <Filter>Modules\skin</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_json.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="core\stdplug.h">

-      <Filter>Core</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_button_int.h">

-      <Filter>Modules\button</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_button.h">

-      <Filter>Modules\button</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_database.h">

-      <Filter>Modules\database</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_db_int.h">

-      <Filter>Modules\database</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\database\database.h">

-      <Filter>Modules\database</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\extraicons\ExtraIcon.h">

-      <Filter>Modules\extraicons</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\extraicons\usedIcons.h">

-      <Filter>Modules\extraicons</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\extraicons\extraicons.h">

-      <Filter>Modules\extraicons</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_message.h">

-      <Filter>Modules\srmm</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_extraicons.h">

-      <Filter>Modules\extraicons</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_utils.h">

-      <Filter>Modules\utils</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\chat\chat.h">

-      <Filter>Modules\chat</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\metacontacts\metacontacts.h">

-      <Filter>Modules\metacontacts</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_metacontacts.h">

-      <Filter>Modules\metacontacts</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\langpack\langpack.h">

-      <Filter>Modules\langpack</Filter>

-    </ClInclude>

-    <ClInclude Include="resource.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="core\miranda.cpp">

-      <Filter>Core</Filter>

-    </ClCompile>

-    <ClCompile Include="core\modules.cpp">

-      <Filter>Core</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\addcontact\addcontact.cpp">

-      <Filter>Modules\addcontact</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\button\button.cpp">

-      <Filter>Modules\button</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\database.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbini.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbutils.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\profilemanager.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\findadd\findadd.cpp">

-      <Filter>Modules\findadd</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\findadd\searchresults.cpp">

-      <Filter>Modules\findadd</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\ignore\ignore.cpp">

-      <Filter>Modules\ignore</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\lpservices.cpp">

-      <Filter>Modules\langpack</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlib.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibautoproxy.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibbind.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibhttp.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibhttpproxy.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netliblog.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibopenconn.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibopts.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibpktrecver.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibsecurity.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibsock.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibupnp.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\options\descbutton.cpp">

-      <Filter>Modules\options</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\options\filter.cpp">

-      <Filter>Modules\options</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\options\headerbar.cpp">

-      <Filter>Modules\options</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\options\iconheader.cpp">

-      <Filter>Modules\options</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\options\options.cpp">

-      <Filter>Modules\options</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\newplugins.cpp">

-      <Filter>Modules\plugins</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoaccs.cpp">

-      <Filter>Modules\protocols</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protochains.cpp">

-      <Filter>Modules\protocols</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protocols.cpp">

-      <Filter>Modules\protocols</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoint.cpp">

-      <Filter>Modules\protocols</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoopts.cpp">

-      <Filter>Modules\protocols</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\skin\hotkeys.cpp">

-      <Filter>Modules\skin</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\skin\skinicons.cpp">

-      <Filter>Modules\skin</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\skin\sounds.cpp">

-      <Filter>Modules\skin</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\colourpicker.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\hyperlink.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\openurl.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\path.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\resizer.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\windowlist.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\visibility\visibility.cpp">

-      <Filter>Modules\visibility</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clc.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcfiledrop.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcidents.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcitems.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcmsgs.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcutils.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistcore.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistevents.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistmenus.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistmod.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistsettings.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clisttray.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clui.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\cluiservices.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\contact.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\Docking.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\genmenu.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\genmenuopt.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\groups.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\keyboard.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\movetogroup.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\protocolorder.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\FontOptions.cpp">

-      <Filter>Modules\fonts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\FontService.cpp">

-      <Filter>Modules\fonts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\services.cpp">

-      <Filter>Modules\fonts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\extracticon.cpp">

-      <Filter>Modules\icolib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\skin2icons.cpp">

-      <Filter>Modules\icolib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\xml\xmlApi.cpp">

-      <Filter>Modules\xmlparser</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\xml\xmlParser.cpp">

-      <Filter>Modules\xmlparser</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\imgconv.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\timezones.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\timeutils.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\pluginopts.cpp">

-      <Filter>Modules\plugins</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\skin\hotkey_opts.cpp">

-      <Filter>Modules\skin</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\skin2opts.cpp">

-      <Filter>Modules\icolib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\utils.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\dll_sniffer.cpp">

-      <Filter>Modules\plugins</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbintf.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\crypt\encrypt.cpp">

-      <Filter>Modules\crypt</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\contacts.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\mdatabasecache.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\BaseExtraIcon.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\CallbackExtraIcon.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\DefaultExtraIcons.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\ExtraIcon.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\ExtraIconGroup.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\extraicons.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\IcolibExtraIcon.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\usedIcons.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\options_ei.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="core\stdafx.cpp">

-      <Filter>Core</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\srmm\statusicon.cpp">

-      <Filter>Modules\srmm</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\enterstring.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\log.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\manager.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_svc.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\clist.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_opts.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\tools.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_api.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_main.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_menu.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_options.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_services.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_utils.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_addto.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_edit.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\langpack.cpp">

-      <Filter>Modules\langpack</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\lpopts.cpp">

-      <Filter>Modules\langpack</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\colorchooser.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_rtf.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc">

-      <Filter>Resources</Filter>

-    </ResourceCompile>

-    <ResourceCompile Include="version.rc">

-      <Filter>Resources</Filter>

-    </ResourceCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="res\_blank.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\contact_view_details.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\always_visible.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\auth_add.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\auth_grant.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\auth_request.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\auth_revoke.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\chat_channel.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\chat_join.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\chat_leave.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\check_off.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\check_on.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\contact_add.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\contact_delete.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\contact_groups.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\contact_rename.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\On.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\cursor_drag_copy.cur">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\cursor_drop_user.cur">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\cursor_hyperlink.cur">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\female.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\group_closed.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\group_opened.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_accmgr.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_all.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_ansi.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_auth_request.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_connecting.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_down_arrow.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\Icon_exit.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_file.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_find_user.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_frame.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_help.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_history.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_loaded.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_loaded_gray.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_mail.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_mainmenu.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_message.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_notloaded.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_notloaded_gray.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_options.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_search_all.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\Icon_show_hide.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_small_dot.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_sms.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_typing.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_undo.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_unicode.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_url.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_window.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\icon_windows.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\male.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\meta_add.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\meta_convert.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\meta_edit.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\meta_menu.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\meta_menuof.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\meta_remove2.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\meta_set_as_default.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\miranda_home.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\miranda_logo.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\miranda_manager.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\never_visible.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\Off.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_user_online.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_away.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_DND.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_free4chat.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_invisible.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_locked.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_NA.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_occupied.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_offline.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_on_the_phone.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_online.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\status_out2lunch.ico">

-      <Filter>Resources\Icons</Filter>

-    </None>

-  </ItemGroup>

-</Project>
\ No newline at end of file
diff --git a/src/miranda32_12.vcxproj b/src/miranda32_12.vcxproj
deleted file mode 100644
index 2bbabfb35d..0000000000
--- a/src/miranda32_12.vcxproj
+++ /dev/null
@@ -1,738 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="12.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>Miranda</ProjectName>

-    <ProjectGuid>{F9916510-9055-4C9F-997A-3755DEC1511B}</ProjectGuid>

-  </PropertyGroup>

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

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

-    <CharacterSet>Unicode</CharacterSet>

-    <PlatformToolset>v120_xp</PlatformToolset>

-  </PropertyGroup>

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

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v120_xp</PlatformToolset>

-  </PropertyGroup>

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

-    <CharacterSet>Unicode</CharacterSet>

-    <PlatformToolset>v120_xp</PlatformToolset>

-  </PropertyGroup>

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

-    <CharacterSet>Unicode</CharacterSet>

-    <WholeProgramOptimization>true</WholeProgramOptimization>

-    <PlatformToolset>v120_xp</PlatformToolset>

-  </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.30128.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

-    <IgnoreImportLibrary>true</IgnoreImportLibrary>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectName)32</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectName)32</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectName)64</TargetName>

-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectName)64</TargetName>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />

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

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

-      <PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>false</ExceptionHandling>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;4530;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FloatingPointModel>Fast</FloatingPointModel>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\include\msapi</AdditionalIncludeDirectories>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;UxTheme.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalManifestDependencies>type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;type=%27win32%27 name=%27Microsoft.Windows.Gdiplus%27 version=%271.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\bin12\lib</AdditionalLibraryDirectories>

-      <ModuleDefinitionFile>miranda32.def</ModuleDefinitionFile>

-    </Link>

-    <Manifest>

-      <AdditionalManifestFiles>miranda32.exe.manifest</AdditionalManifestFiles>

-    </Manifest>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Full</Optimization>

-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

-      <PreprocessorDefinitions>NDEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>true</StringPooling>

-      <ExceptionHandling>false</ExceptionHandling>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;4530;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <BufferSecurityCheck>false</BufferSecurityCheck>

-      <FloatingPointModel>Fast</FloatingPointModel>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\include\msapi</AdditionalIncludeDirectories>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;UxTheme.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalManifestDependencies>type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;type=%27win32%27 name=%27Microsoft.Windows.Gdiplus%27 version=%271.0.0.0%27 processorArchitecture=%27amd64%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <OptimizeReferences>true</OptimizeReferences>

-      <EnableCOMDATFolding>true</EnableCOMDATFolding>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\bin12\lib</AdditionalLibraryDirectories>

-      <BaseAddress>0x400000</BaseAddress>

-      <ModuleDefinitionFile>miranda32.def</ModuleDefinitionFile>

-    </Link>

-    <Manifest>

-      <AdditionalManifestFiles>miranda32.exe.manifest</AdditionalManifestFiles>

-    </Manifest>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

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

-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>false</StringPooling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;4530;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\include\msapi</AdditionalIncludeDirectories>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;UxTheme.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalManifestDependencies>type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;type=%27win32%27 name=%27Microsoft.Windows.Gdiplus%27 version=%271.0.0.0%27 processorArchitecture=%27X86%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\bin12\lib</AdditionalLibraryDirectories>

-      <ModuleDefinitionFile>miranda32.def</ModuleDefinitionFile>

-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>

-    </Link>

-    <Manifest>

-      <AdditionalManifestFiles>miranda32.exe.manifest</AdditionalManifestFiles>

-    </Manifest>

-  </ItemDefinitionGroup>

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

-    <ClCompile>

-      <Optimization>Disabled</Optimization>

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

-      <PreprocessorDefinitions>_DEBUG;_WINDOWS;_NOSDK;_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>

-      <StringPooling>false</StringPooling>

-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

-      <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>

-      <WarningLevel>Level3</WarningLevel>

-      <DisableSpecificWarnings>4996;4530;%(DisableSpecificWarnings)</DisableSpecificWarnings>

-      <ExceptionHandling>false</ExceptionHandling>

-    </ClCompile>

-    <ResourceCompile>

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

-      <AdditionalIncludeDirectories>..\include\msapi</AdditionalIncludeDirectories>

-    </ResourceCompile>

-    <Link>

-      <AdditionalDependencies>ws2_32.lib;comctl32.lib;winmm.lib;version.lib;UxTheme.lib;Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

-      <AdditionalManifestDependencies>type=%27win32%27 name=%27Microsoft.Windows.Common-Controls%27 version=%276.0.0.0%27 processorArchitecture=%27*%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;type=%27win32%27 name=%27Microsoft.Windows.Gdiplus%27 version=%271.0.0.0%27 processorArchitecture=%27amd64%27 publicKeyToken=%276595b64144ccf1df%27 language=%27*%27;%(AdditionalManifestDependencies)</AdditionalManifestDependencies>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Windows</SubSystem>

-      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

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

-      <AdditionalLibraryDirectories>$(ProfileDir)..\bin12\lib</AdditionalLibraryDirectories>

-      <BaseAddress>0x400000</BaseAddress>

-      <ModuleDefinitionFile>miranda32.def</ModuleDefinitionFile>

-    </Link>

-    <Manifest>

-      <AdditionalManifestFiles>miranda32.exe.manifest</AdditionalManifestFiles>

-    </Manifest>

-  </ItemDefinitionGroup>

-  <ItemGroup>

-    <ClInclude Include="..\include\m_addcontact.h" />

-    <ClInclude Include="..\include\m_awaymsg.h" />

-    <ClInclude Include="..\include\m_button.h" />

-    <ClInclude Include="..\include\m_button_int.h" />

-    <ClInclude Include="..\include\m_chat.h" />

-    <ClInclude Include="..\include\m_chat_int.h" />

-    <ClInclude Include="..\include\m_clc.h" />

-    <ClInclude Include="..\include\m_clist.h" />

-    <ClInclude Include="..\include\m_clistint.h" />

-    <ClInclude Include="..\include\m_clui.h" />

-    <ClInclude Include="..\include\m_contacts.h" />

-    <ClInclude Include="..\include\m_database.h" />

-    <ClInclude Include="..\include\m_db_int.h" />

-    <ClInclude Include="..\include\m_email.h" />

-    <ClInclude Include="..\include\m_extraicons.h" />

-    <ClInclude Include="..\include\m_file.h" />

-    <ClInclude Include="..\include\m_findadd.h" />

-    <ClInclude Include="..\include\m_history.h" />

-    <ClInclude Include="..\include\m_hotkeys.h" />

-    <ClInclude Include="..\include\m_icq.h" />

-    <ClInclude Include="..\include\m_idle.h" />

-    <ClInclude Include="..\include\m_ignore.h" />

-    <ClInclude Include="..\include\m_json.h" />

-    <ClInclude Include="..\include\m_langpack.h" />

-    <ClInclude Include="..\include\m_message.h" />

-    <ClInclude Include="..\include\m_metacontacts.h" />

-    <ClInclude Include="..\include\m_netlib.h" />

-    <ClInclude Include="..\include\m_options.h" />

-    <ClInclude Include="..\include\m_popup.h" />

-    <ClInclude Include="..\include\m_protocols.h" />

-    <ClInclude Include="..\include\m_protomod.h" />

-    <ClInclude Include="..\include\m_protosvc.h" />

-    <ClInclude Include="..\include\m_skin.h" />

-    <ClInclude Include="..\include\m_string.h" />

-    <ClInclude Include="..\include\m_system.h" />

-    <ClInclude Include="..\include\m_system_cpp.h" />

-    <ClInclude Include="..\include\m_timezones.h" />

-    <ClInclude Include="..\include\m_url.h" />

-    <ClInclude Include="..\include\m_userinfo.h" />

-    <ClInclude Include="..\include\m_utils.h" />

-    <ClInclude Include="..\include\newpluginapi.h" />

-    <ClInclude Include="..\include\statusmodes.h" />

-    <ClInclude Include="..\include\win2k.h" />

-    <ClInclude Include="core\commonheaders.h" />

-    <ClInclude Include="core\miranda.h" />

-    <ClInclude Include="core\stdplug.h" />

-    <ClInclude Include="modules\chat\chat.h" />

-    <ClInclude Include="modules\database\database.h" />

-    <ClInclude Include="modules\database\profilemanager.h" />

-    <ClInclude Include="modules\extraicons\ExtraIcon.h" />

-    <ClInclude Include="modules\extraicons\extraicons.h" />

-    <ClInclude Include="modules\extraicons\usedIcons.h" />

-    <ClInclude Include="modules\findadd\findadd.h" />

-    <ClInclude Include="modules\langpack\langpack.h" />

-    <ClInclude Include="modules\metacontacts\metacontacts.h" />

-    <ClInclude Include="modules\netlib\netlib.h" />

-    <ClInclude Include="modules\options\filter.h" />

-    <ClInclude Include="..\include\m_protoint.h" />

-    <ClInclude Include="modules\plugins\plugins.h" />

-    <ClInclude Include="modules\skin\skin.h" />

-    <ClInclude Include="modules\clist\clc.h" />

-    <ClInclude Include="modules\clist\genmenu.h" />

-    <ClInclude Include="modules\fonts\FontService.h" />

-    <ClInclude Include="modules\icolib\IcoLib.h" />

-    <ClInclude Include="..\include\m_xml.h" />

-    <ClInclude Include="modules\xml\xmlParser.h" />

-    <ClInclude Include="resource.h" />

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="core\stdafx.cpp">

-      <PrecompiledHeader>Create</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="core\miranda.cpp" />

-    <ClCompile Include="core\modules.cpp" />

-    <ClCompile Include="modules\addcontact\addcontact.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\button\button.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_opts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_rtf.cpp">

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\core\commonheaders.h</PrecompiledHeaderFile>

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\core\commonheaders.h</PrecompiledHeaderFile>

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\core\commonheaders.h</PrecompiledHeaderFile>

-      <PrecompiledHeaderFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\clist.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\colorchooser.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\log.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\manager.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_svc.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\chat\tools.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\contacts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\crypt\encrypt.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\database.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbini.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbintf.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbutils.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\mdatabasecache.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\database\profilemanager.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\BaseExtraIcon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\CallbackExtraIcon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\DefaultExtraIcons.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\ExtraIcon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\ExtraIconGroup.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\extraicons.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\IcolibExtraIcon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\options_ei.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\usedIcons.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\findadd\findadd.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\findadd\searchresults.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\skin2opts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\ignore\ignore.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\langpack.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\lpopts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\lpservices.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_addto.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_edit.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_api.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_main.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_menu.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_options.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_services.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_utils.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlib.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibautoproxy.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibbind.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibhttp.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibhttpproxy.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netliblog.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibopenconn.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibopts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibpktrecver.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibsecurity.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibsock.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibupnp.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\options\descbutton.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\options\filter.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\options\headerbar.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\options\iconheader.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\options\options.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\dll_sniffer.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\newplugins.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\pluginopts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoaccs.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protochains.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protocols.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoint.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoopts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\skin\hotkeys.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\skin\hotkey_opts.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\skin\skinicons.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\skin\sounds.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\srmm\statusicon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\colourpicker.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\enterstring.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\hyperlink.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\imgconv.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\openurl.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\path.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\resizer.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\timeutils.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\timezones.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\utils.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\utils\windowlist.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\visibility\visibility.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clc.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcfiledrop.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcidents.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcitems.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcmsgs.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcutils.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistcore.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistevents.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistmenus.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistmod.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistsettings.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clisttray.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clui.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\cluiservices.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\contact.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\Docking.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\genmenu.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\genmenuopt.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\groups.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\keyboard.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\movetogroup.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\clist\protocolorder.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\FontOptions.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\FontService.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\services.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\extracticon.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\skin2icons.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\xml\xmlApi.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="modules\xml\xmlParser.cpp">

-      <PrecompiledHeaderFile>..\..\core\commonheaders.h</PrecompiledHeaderFile>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

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

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

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\plugins\Zlib\zlib_12.vcxproj">

-      <Project>{e2a369cd-eda3-414f-8ad0-e732cd7ee68c}</Project>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <Image Include="res\always_visible.ico" />

-    <Image Include="res\auth_add.ico" />

-    <Image Include="res\auth_grant.ico" />

-    <Image Include="res\auth_request.ico" />

-    <Image Include="res\auth_revoke.ico" />

-    <Image Include="res\chat_channel.ico" />

-    <Image Include="res\chat_join.ico" />

-    <Image Include="res\chat_leave.ico" />

-    <Image Include="res\check_off.ico" />

-    <Image Include="res\check_on.ico" />

-    <Image Include="res\contact_add.ico" />

-    <Image Include="res\contact_delete.ico" />

-    <Image Include="res\contact_groups.ico" />

-    <Image Include="res\contact_rename.ico" />

-    <Image Include="res\contact_view_details.ico" />

-    <Image Include="res\female.ico" />

-    <Image Include="res\group_closed.ico" />

-    <Image Include="res\group_opened.ico" />

-    <Image Include="res\icon_accmgr.ico" />

-    <Image Include="res\icon_all.ico" />

-    <Image Include="res\icon_ansi.ico" />

-    <Image Include="res\icon_auth_request.ico" />

-    <Image Include="res\icon_connecting.ico" />

-    <Image Include="res\icon_down_arrow.ico" />

-    <Image Include="res\icon_error.ico" />

-    <Image Include="res\Icon_exit.ico" />

-    <Image Include="res\icon_fatal.ico" />

-    <Image Include="res\icon_file.ico" />

-    <Image Include="res\icon_find_user.ico" />

-    <Image Include="res\icon_frame.ico" />

-    <Image Include="res\icon_help.ico" />

-    <Image Include="res\icon_history.ico" />

-    <Image Include="res\icon_loaded.ico" />

-    <Image Include="res\icon_loaded_gray.ico" />

-    <Image Include="res\icon_mail.ico" />

-    <Image Include="res\icon_mainmenu.ico" />

-    <Image Include="res\icon_message.ico" />

-    <Image Include="res\icon_notify.ico" />

-    <Image Include="res\icon_notloaded.ico" />

-    <Image Include="res\icon_notloaded_gray.ico" />

-    <Image Include="res\icon_options.ico" />

-    <Image Include="res\icon_search_all.ico" />

-    <Image Include="res\Icon_show_hide.ico" />

-    <Image Include="res\icon_small_dot.ico" />

-    <Image Include="res\icon_sms.ico" />

-    <Image Include="res\icon_typing.ico" />

-    <Image Include="res\icon_undo.ico" />

-    <Image Include="res\icon_unicode.ico" />

-    <Image Include="res\icon_url.ico" />

-    <Image Include="res\icon_warning.ico" />

-    <Image Include="res\icon_window.ico" />

-    <Image Include="res\icon_windows.ico" />

-    <Image Include="res\male.ico" />

-    <Image Include="res\meta_add.ico" />

-    <Image Include="res\meta_convert.ico" />

-    <Image Include="res\meta_edit.ico" />

-    <Image Include="res\meta_menu.ico" />

-    <Image Include="res\meta_menuof.ico" />

-    <Image Include="res\meta_remove2.ico" />

-    <Image Include="res\meta_set_as_default.ico" />

-    <Image Include="res\miranda_home.ico" />

-    <Image Include="res\miranda_logo.ico" />

-    <Image Include="res\miranda_manager.ico" />

-    <Image Include="res\never_visible.ico" />

-    <Image Include="res\Off.ico" />

-    <Image Include="res\On.ico" />

-    <Image Include="res\status_away.ico" />

-    <Image Include="res\status_DND.ico" />

-    <Image Include="res\status_free4chat.ico" />

-    <Image Include="res\status_invisible.ico" />

-    <Image Include="res\status_locked.ico" />

-    <Image Include="res\status_NA.ico" />

-    <Image Include="res\status_occupied.ico" />

-    <Image Include="res\status_offline.ico" />

-    <Image Include="res\status_online.ico" />

-    <Image Include="res\status_on_the_phone.ico" />

-    <Image Include="res\status_out2lunch.ico" />

-    <Image Include="res\status_user_online.ico" />

-    <Image Include="res\_blank.ico" />

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="res\cursor_drag_copy.cur" />

-    <None Include="res\cursor_drop_user.cur" />

-    <None Include="res\cursor_hyperlink.cur" />

-  </ItemGroup>

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

-  <ImportGroup Label="ExtensionTargets">

-  </ImportGroup>

-</Project>
\ No newline at end of file
diff --git a/src/miranda32_12.vcxproj.filters b/src/miranda32_12.vcxproj.filters
deleted file mode 100644
index 9eaad6e492..0000000000
--- a/src/miranda32_12.vcxproj.filters
+++ /dev/null
@@ -1,895 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

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

-  <ItemGroup>

-    <Filter Include="SDK">

-      <UniqueIdentifier>{9263229c-5f0c-40b1-90c1-9f09be9d7dcc}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Core">

-      <UniqueIdentifier>{9a75b1ab-85d2-4231-b3a8-633eb85d8506}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules">

-      <UniqueIdentifier>{ad89ee42-29f6-4b6b-9316-11f7cad2f75b}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\addcontact">

-      <UniqueIdentifier>{edb05be9-a16a-4f37-8035-711e5286311f}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\button">

-      <UniqueIdentifier>{880105c7-0ef2-41ee-9541-fe2c9e5a7679}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\database">

-      <UniqueIdentifier>{a4463881-5b8c-497a-b5f4-5832dbc5fbfa}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\findadd">

-      <UniqueIdentifier>{ada379e5-5553-4316-b4f0-62f2f60e8540}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\ignore">

-      <UniqueIdentifier>{4f9373ec-57ce-4c35-9217-9ffc5aefa841}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\langpack">

-      <UniqueIdentifier>{384c1011-28ee-43b0-8bd7-33e316792bc3}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\netlib">

-      <UniqueIdentifier>{3bd450f7-3173-4cb6-8eea-23acebcb8671}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\options">

-      <UniqueIdentifier>{ec6cab41-4990-429f-b01f-db0f3a8d1ba6}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\plugins">

-      <UniqueIdentifier>{6f3414dd-ebb2-43d1-b17a-56117abfac62}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\protocols">

-      <UniqueIdentifier>{9bea12c5-dd45-4fd2-906c-a0f1cc89fe29}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\skin">

-      <UniqueIdentifier>{474a2558-48fd-45d5-b8e8-3a07d780f02a}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\utils">

-      <UniqueIdentifier>{4549cb1a-17d4-49a2-82e9-3acd7e17f5bc}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\visibility">

-      <UniqueIdentifier>{a0e1084a-b62f-4bc2-a973-8fcc2df5deae}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\clist">

-      <UniqueIdentifier>{c0446d71-a213-4c3a-ac52-98af890c5dcf}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\fonts">

-      <UniqueIdentifier>{4c1e9a4f-27f1-4c36-9efe-ca1b4f586f06}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\icolib">

-      <UniqueIdentifier>{021bd45a-8d83-4aca-83df-ac43192b922a}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\xmlparser">

-      <UniqueIdentifier>{c3bf6128-d3fd-44f6-a207-df2977019960}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Resources">

-      <UniqueIdentifier>{dcc9b0d7-b335-458b-ac09-6cc6cf55e397}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\crypt">

-      <UniqueIdentifier>{15d84b6a-4aa3-4cd5-93b3-2559709224ea}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\extraicons">

-      <UniqueIdentifier>{e125e36b-fc7d-4a78-8f13-67d3c9333621}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\srmm">

-      <UniqueIdentifier>{b3f78380-76da-4a82-a0e2-1a14b173dac1}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\chat">

-      <UniqueIdentifier>{4c3f7adf-3969-4bff-b71f-e03d96adca37}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Modules\metacontacts">

-      <UniqueIdentifier>{79f0ee25-4708-4fd6-aeef-fb5f2628008b}</UniqueIdentifier>

-    </Filter>

-    <Filter Include="Resources\Icons">

-      <UniqueIdentifier>{453959e1-554a-4053-b2c4-fdc3c903154f}</UniqueIdentifier>

-    </Filter>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="..\include\m_addcontact.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_awaymsg.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_clc.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_clist.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_clistint.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_clui.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_contacts.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_email.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_file.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_findadd.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_history.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_hotkeys.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_icq.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_idle.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_ignore.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_langpack.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_netlib.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_options.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_popup.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_protocols.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_protomod.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_protosvc.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_skin.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_system.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_system_cpp.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_url.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_userinfo.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\newpluginapi.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\statusmodes.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\win2k.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="core\commonheaders.h">

-      <Filter>Core</Filter>

-    </ClInclude>

-    <ClInclude Include="core\miranda.h">

-      <Filter>Core</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\database\profilemanager.h">

-      <Filter>Modules\database</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\findadd\findadd.h">

-      <Filter>Modules\findadd</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\netlib\netlib.h">

-      <Filter>Modules\netlib</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\options\filter.h">

-      <Filter>Modules\options</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_protoint.h">

-      <Filter>Modules\protocols</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\clist\clc.h">

-      <Filter>Modules\clist</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\clist\genmenu.h">

-      <Filter>Modules\clist</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\fonts\FontService.h">

-      <Filter>Modules\fonts</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\icolib\IcoLib.h">

-      <Filter>Modules\icolib</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_xml.h">

-      <Filter>Modules\xmlparser</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\xml\xmlParser.h">

-      <Filter>Modules\xmlparser</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_timezones.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\plugins\plugins.h">

-      <Filter>Modules\plugins</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\skin\skin.h">

-      <Filter>Modules\skin</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_json.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="core\stdplug.h">

-      <Filter>Core</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_button_int.h">

-      <Filter>Modules\button</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_button.h">

-      <Filter>Modules\button</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_database.h">

-      <Filter>Modules\database</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_db_int.h">

-      <Filter>Modules\database</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\database\database.h">

-      <Filter>Modules\database</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\extraicons\ExtraIcon.h">

-      <Filter>Modules\extraicons</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\extraicons\usedIcons.h">

-      <Filter>Modules\extraicons</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\extraicons\extraicons.h">

-      <Filter>Modules\extraicons</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_message.h">

-      <Filter>Modules\srmm</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_extraicons.h">

-      <Filter>Modules\extraicons</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_utils.h">

-      <Filter>Modules\utils</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_chat_int.h">

-      <Filter>Modules\chat</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_chat.h">

-      <Filter>Modules\chat</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\chat\chat.h">

-      <Filter>Modules\chat</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_string.h">

-      <Filter>SDK</Filter>

-    </ClInclude>

-    <ClInclude Include="modules\metacontacts\metacontacts.h">

-      <Filter>Modules\metacontacts</Filter>

-    </ClInclude>

-    <ClInclude Include="..\include\m_metacontacts.h">

-      <Filter>Modules\metacontacts</Filter>

-    </ClInclude>

-    <ClInclude Include="resource.h" />

-    <ClInclude Include="modules\langpack\langpack.h">

-      <Filter>Modules\langpack</Filter>

-    </ClInclude>

-  </ItemGroup>

-  <ItemGroup>

-    <ClCompile Include="core\miranda.cpp">

-      <Filter>Core</Filter>

-    </ClCompile>

-    <ClCompile Include="core\modules.cpp">

-      <Filter>Core</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\addcontact\addcontact.cpp">

-      <Filter>Modules\addcontact</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\button\button.cpp">

-      <Filter>Modules\button</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\database.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbini.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbutils.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\profilemanager.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\findadd\findadd.cpp">

-      <Filter>Modules\findadd</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\findadd\searchresults.cpp">

-      <Filter>Modules\findadd</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\ignore\ignore.cpp">

-      <Filter>Modules\ignore</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlib.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibautoproxy.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibbind.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibhttp.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibhttpproxy.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netliblog.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibopenconn.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibopts.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibpktrecver.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibsecurity.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibsock.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\netlib\netlibupnp.cpp">

-      <Filter>Modules\netlib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\options\descbutton.cpp">

-      <Filter>Modules\options</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\options\filter.cpp">

-      <Filter>Modules\options</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\options\headerbar.cpp">

-      <Filter>Modules\options</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\options\iconheader.cpp">

-      <Filter>Modules\options</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\options\options.cpp">

-      <Filter>Modules\options</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\newplugins.cpp">

-      <Filter>Modules\plugins</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoaccs.cpp">

-      <Filter>Modules\protocols</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protochains.cpp">

-      <Filter>Modules\protocols</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protocols.cpp">

-      <Filter>Modules\protocols</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoint.cpp">

-      <Filter>Modules\protocols</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\protocols\protoopts.cpp">

-      <Filter>Modules\protocols</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\skin\hotkeys.cpp">

-      <Filter>Modules\skin</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\skin\skinicons.cpp">

-      <Filter>Modules\skin</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\skin\sounds.cpp">

-      <Filter>Modules\skin</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\colourpicker.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\hyperlink.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\openurl.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\path.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\resizer.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\windowlist.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\visibility\visibility.cpp">

-      <Filter>Modules\visibility</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clc.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcfiledrop.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcidents.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcitems.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcmsgs.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clcutils.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistcore.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistevents.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistmenus.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistmod.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clistsettings.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clisttray.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\clui.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\cluiservices.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\contact.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\Docking.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\genmenu.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\genmenuopt.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\groups.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\keyboard.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\movetogroup.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\protocolorder.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\FontOptions.cpp">

-      <Filter>Modules\fonts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\FontService.cpp">

-      <Filter>Modules\fonts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\fonts\services.cpp">

-      <Filter>Modules\fonts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\extracticon.cpp">

-      <Filter>Modules\icolib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\skin2icons.cpp">

-      <Filter>Modules\icolib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\xml\xmlApi.cpp">

-      <Filter>Modules\xmlparser</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\xml\xmlParser.cpp">

-      <Filter>Modules\xmlparser</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\imgconv.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\timezones.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\timeutils.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\pluginopts.cpp">

-      <Filter>Modules\plugins</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\skin\hotkey_opts.cpp">

-      <Filter>Modules\skin</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\icolib\skin2opts.cpp">

-      <Filter>Modules\icolib</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\utils.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\plugins\dll_sniffer.cpp">

-      <Filter>Modules\plugins</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\dbintf.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\crypt\encrypt.cpp">

-      <Filter>Modules\crypt</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\clist\contacts.cpp">

-      <Filter>Modules\clist</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\database\mdatabasecache.cpp">

-      <Filter>Modules\database</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\BaseExtraIcon.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\CallbackExtraIcon.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\DefaultExtraIcons.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\ExtraIcon.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\ExtraIconGroup.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\extraicons.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\IcolibExtraIcon.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\usedIcons.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\extraicons\options_ei.cpp">

-      <Filter>Modules\extraicons</Filter>

-    </ClCompile>

-    <ClCompile Include="core\stdafx.cpp">

-      <Filter>Core</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\srmm\statusicon.cpp">

-      <Filter>Modules\srmm</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\utils\enterstring.cpp">

-      <Filter>Modules\utils</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\log.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\manager.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_svc.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\clist.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_opts.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\tools.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_api.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_main.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_menu.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_options.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_services.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_utils.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_addto.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\metacontacts\meta_edit.cpp">

-      <Filter>Modules\metacontacts</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\lpservices.cpp">

-      <Filter>Modules\langpack</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\lpopts.cpp">

-      <Filter>Modules\langpack</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\langpack\langpack.cpp">

-      <Filter>Modules\langpack</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\colorchooser.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-    <ClCompile Include="modules\chat\chat_rtf.cpp">

-      <Filter>Modules\chat</Filter>

-    </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ResourceCompile Include="resource.rc">

-      <Filter>Resources</Filter>

-    </ResourceCompile>

-    <ResourceCompile Include="version.rc">

-      <Filter>Resources</Filter>

-    </ResourceCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <Image Include="res\_blank.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\always_visible.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\auth_add.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\auth_grant.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\auth_request.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\auth_revoke.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\chat_channel.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\chat_join.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\chat_leave.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\check_off.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\check_on.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\contact_add.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\contact_delete.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\contact_groups.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\contact_rename.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\contact_view_details.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\female.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\group_closed.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\group_opened.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_accmgr.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_all.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_ansi.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_auth_request.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_connecting.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_down_arrow.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_error.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\Icon_exit.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_fatal.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_file.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_find_user.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_frame.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_help.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_history.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_loaded.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_loaded_gray.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_mail.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_mainmenu.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_message.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_notify.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_notloaded.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_notloaded_gray.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_options.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_search_all.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\Icon_show_hide.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_small_dot.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_sms.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_typing.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_undo.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_unicode.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_url.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_warning.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_window.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\icon_windows.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\male.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\meta_add.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\meta_convert.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\meta_edit.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\meta_menu.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\meta_menuof.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\meta_remove2.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\meta_set_as_default.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\miranda_home.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\miranda_logo.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\miranda_manager.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\never_visible.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\Off.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\On.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_away.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_DND.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_free4chat.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_invisible.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_locked.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_NA.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_occupied.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_offline.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_on_the_phone.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_online.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_out2lunch.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-    <Image Include="res\status_user_online.ico">

-      <Filter>Resources\Icons</Filter>

-    </Image>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="res\cursor_hyperlink.cur">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\cursor_drop_user.cur">

-      <Filter>Resources\Icons</Filter>

-    </None>

-    <None Include="res\cursor_drag_copy.cur">

-      <Filter>Resources\Icons</Filter>

-    </None>

-  </ItemGroup>

-</Project>
\ No newline at end of file