solution adjustment

StatusPlugins include directory deleted
tabsrmm vc2010 project added
small project fixes

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

16 files changed, 172 insertions, 2224 deletions

diff --git a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj b/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj
index 992e2b3fd2..7c794946a7 100644
--- a/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj
+++ b/plugins/StatusPlugins/AdvancedAutoAway/AdvancedAutoAway_10.vcxproj
@@ -85,7 +85,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -124,7 +124,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

@@ -187,7 +187,7 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <BufferSecurityCheck>false</BufferSecurityCheck>

       <FloatingPointModel>Fast</FloatingPointModel>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>../commonstatus.h</PrecompiledHeaderFile>

     </ClCompile>

@@ -205,7 +205,7 @@
   </ItemDefinitionGroup>

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

     <ClCompile>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>../commonstatus.h</PrecompiledHeaderFile>

     </ClCompile>

diff --git a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj b/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj
index 2b0d2ae62a..4b2302f25f 100644
--- a/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj
+++ b/plugins/StatusPlugins/KeepStatus/KeepStatus_10.vcxproj
@@ -81,7 +81,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -123,7 +123,7 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -170,7 +170,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

       <WholeProgramOptimization>true</WholeProgramOptimization>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <StringPooling>true</StringPooling>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>commonstatus.h</PrecompiledHeaderFile>

@@ -188,7 +188,7 @@
   </ItemDefinitionGroup>

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

     <ClCompile>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>commonstatus.h</PrecompiledHeaderFile>

     </ClCompile>

diff --git a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj b/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj
index 063140a1da..cdde5b2572 100644
--- a/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj
+++ b/plugins/StatusPlugins/StartupStatus/StartupStatus_10.vcxproj
@@ -83,7 +83,7 @@
     </Midl>

     <ClCompile>

       <Optimization>Disabled</Optimization>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

@@ -122,7 +122,7 @@
       <Optimization>Full</Optimization>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

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

       <StringPooling>true</StringPooling>

       <ExceptionHandling>false</ExceptionHandling>

@@ -188,7 +188,7 @@
       <RuntimeTypeInfo>false</RuntimeTypeInfo>

       <PrecompiledHeader>Use</PrecompiledHeader>

       <PrecompiledHeaderFile>../commonstatus.h</PrecompiledHeaderFile>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

     </ClCompile>

     <Link />

     <Link>

@@ -207,7 +207,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

       <PrecompiledHeaderFile>../commonstatus.h</PrecompiledHeaderFile>

-      <AdditionalIncludeDirectories>../../../include;../../ExternalAPI;../includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

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

     </ClCompile>

     <Link>

       <AdditionalDependencies>wininet.lib;Delayimp.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/plugins/StatusPlugins/StatusPlugins_10.sln b/plugins/StatusPlugins/StatusPlugins_10.sln
index f6d559576f..6d63bffd91 100644
--- a/plugins/StatusPlugins/StatusPlugins_10.sln
+++ b/plugins/StatusPlugins/StatusPlugins_10.sln
@@ -8,36 +8,36 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartupStatus", "StartupSta
 EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

-		Debug Unicode|Win32 = Debug Unicode|Win32

-		Debug Unicode|x64 = Debug Unicode|x64

-		Release Unicode|Win32 = Release Unicode|Win32

-		Release Unicode|x64 = Release Unicode|x64

+		Debug|Win32 = Debug|Win32

+		Debug|x64 = Debug|x64

+		Release|Win32 = Release|Win32

+		Release|x64 = Release|x64

 	EndGlobalSection

 	GlobalSection(ProjectConfigurationPlatforms) = postSolution

-		{D548A54E-310B-4A86-A545-64BDD5748745}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

-		{D548A54E-310B-4A86-A545-64BDD5748745}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

-		{D548A54E-310B-4A86-A545-64BDD5748745}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64

-		{D548A54E-310B-4A86-A545-64BDD5748745}.Debug Unicode|x64.Build.0 = Debug Unicode|x64

-		{D548A54E-310B-4A86-A545-64BDD5748745}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

-		{D548A54E-310B-4A86-A545-64BDD5748745}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

-		{D548A54E-310B-4A86-A545-64BDD5748745}.Release Unicode|x64.ActiveCfg = Release Unicode|x64

-		{D548A54E-310B-4A86-A545-64BDD5748745}.Release Unicode|x64.Build.0 = Release Unicode|x64

-		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

-		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

-		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64

-		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug Unicode|x64.Build.0 = Debug Unicode|x64

-		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

-		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

-		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release Unicode|x64.ActiveCfg = Release Unicode|x64

-		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release Unicode|x64.Build.0 = Release Unicode|x64

-		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug Unicode|Win32.ActiveCfg = Debug Unicode|Win32

-		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug Unicode|Win32.Build.0 = Debug Unicode|Win32

-		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug Unicode|x64.ActiveCfg = Debug Unicode|x64

-		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug Unicode|x64.Build.0 = Debug Unicode|x64

-		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release Unicode|Win32.ActiveCfg = Release Unicode|Win32

-		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release Unicode|Win32.Build.0 = Release Unicode|Win32

-		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release Unicode|x64.ActiveCfg = Release Unicode|x64

-		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release Unicode|x64.Build.0 = Release Unicode|x64

+		{D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.ActiveCfg = Debug|Win32

+		{D548A54E-310B-4A86-A545-64BDD5748745}.Debug|Win32.Build.0 = Debug|Win32

+		{D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.ActiveCfg = Debug|x64

+		{D548A54E-310B-4A86-A545-64BDD5748745}.Debug|x64.Build.0 = Debug|x64

+		{D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.ActiveCfg = Release|Win32

+		{D548A54E-310B-4A86-A545-64BDD5748745}.Release|Win32.Build.0 = Release|Win32

+		{D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.ActiveCfg = Release|x64

+		{D548A54E-310B-4A86-A545-64BDD5748745}.Release|x64.Build.0 = Release|x64

+		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.ActiveCfg = Debug|Win32

+		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|Win32.Build.0 = Debug|Win32

+		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.ActiveCfg = Debug|x64

+		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Debug|x64.Build.0 = Debug|x64

+		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.ActiveCfg = Release|Win32

+		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|Win32.Build.0 = Release|Win32

+		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.ActiveCfg = Release|x64

+		{66503A70-B1E8-4545-B4FF-2108DFB40C72}.Release|x64.Build.0 = Release|x64

+		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.ActiveCfg = Debug|Win32

+		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|Win32.Build.0 = Debug|Win32

+		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.ActiveCfg = Debug|x64

+		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Debug|x64.Build.0 = Debug|x64

+		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.ActiveCfg = Release|Win32

+		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|Win32.Build.0 = Release|Win32

+		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.ActiveCfg = Release|x64

+		{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/plugins/StatusPlugins/includes/m_NewAwaySys.h b/plugins/StatusPlugins/includes/m_NewAwaySys.h
deleted file mode 100644
index 4038fadaa7..0000000000
--- a/plugins/StatusPlugins/includes/m_NewAwaySys.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*

-	New Away System plugin for Miranda IM

-	Copyright (c) 2005-2006 Chervov Dmitry

-

-    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

-*/

-

-#ifndef __M_NEWAWAYSYS_H

-#define __M_NEWAWAYSYS_H

-

-// NAS_PROTOINFO::Flags constants

-#define PIF_NO_CLIST_SETSTATUSMODE 1 // NAS won't call MS_CLIST_SETSTATUSMODE service on a global status change, if this flag is set. it's useful if you want to change the global message and status in NAS without changing current "real" protocol statuses. NAS ignores this flag if szProto != NULL

-#define PIF_NOTTEMPORARY 2

-// usually you should NOT set this flag

-// for MS_NAS_SETSTATE: NAS will overwrite current user-defined message for szProto if this flag is specified; otherwise (if the flag isn't specified), your szMsg will be stored only until the next szProto status change, and won't overwrite any messages specified by user

-// for MS_NAS_GETSTATE: NAS ignores any temporary messages and returns only non-temporary ones. this flag affects something only when status == 0

-

-typedef struct {

-	int cbSize;

-	char *szProto; // pointer to protocol modulename (NULL means global)

-	union

-	{

-		char *szMsg;

-		WCHAR *wszMsg;

-		TCHAR *tszMsg;

-	}; // pointer to the status message _format_ (i.e. it's an unparsed message containing variables, in any case. NAS takes care of parsing) (may be NULL - means that there's no specific message for this protocol - then the global status message will be used)

-/*

-	Be aware that MS_NAS_GETSTATE allocates memory for szMsg through Miranda's

-	memory management interface (MS_SYSTEM_GET_MMI). And MS_NAS_SETSTATE

-	expects szMsg to be allocated through the same service. MS_NAS_SETSTATE deallocates szMsg.

-*/

-	WORD status; // status mode. 0 means current (NAS will overwrite 0 with the current status mode)

-// for MS_NAS_GETSTATE if the specified status is not 0, MS_NAS_GETSTATE will return the default/last status message (depends on settings) - i.e. the same message that will be shown by default when user changes status to the specified one. please note that, for example, if current status mode is ID_STATUS_AWAY, then status messages returned by MS_NAS_GETSTATE for status=0 and status=ID_STATUS_AWAY may be different! for status=ID_STATUS_AWAY it always returns the default/last status message, and for status=0 it returns _current_ status message.

-	int Flags;

-} NAS_PROTOINFO;

-

-// MS_NAS_GETSTATE

-// Fills specified array of NAS_PROTOINFO items with protocol data.

-// You must construct the array and specify cbSize and szProto fields of

-// all items in the array before calling this service.

-// Remember to free szMsg fields through Miranda's MMI if you don't pass them back to NAS through MS_NAS_SETSTATE later.

-// wParam = (WPARAM)(NAS_PROTOINFO*)pi - pointer to an array of NAS_PROTOINFO items to be filled.

-// lParam = (LPARAM)(int)protoCount - number of items in pi.

-// returns 0 on success

-#define MS_NAS_GETSTATEA "NewAwaySystem/GetStateA"

-#define MS_NAS_GETSTATEW "NewAwaySystem/GetStateW"

-#ifdef _UNICODE

-	#define MS_NAS_GETSTATE MS_NAS_GETSTATEW

-#else

-	#define MS_NAS_GETSTATE MS_NAS_GETSTATEA

-#endif

-

-// MS_NAS_SETSTATE

-// Changes status mode and message of specified protocols.

-// (Note that this service deallocates szMsg field of the specified items through

-// Miranda's MMI, so the array is not valid anymore after MS_NAS_SETSTATE returns!)

-// wParam = (WPARAM)(NAS_PROTOINFO*)pi - pointer to an array of NAS_PROTOINFO items.

-// lParam = (LPARAM)(int)protoCount - number of items in pi.

-// returns 0 on success

-#define MS_NAS_SETSTATEA "NewAwaySystem/SetStateA"

-#define MS_NAS_SETSTATEW "NewAwaySystem/SetStateW"

-#ifdef _UNICODE

-	#define MS_NAS_SETSTATE MS_NAS_SETSTATEW

-#else

-	#define MS_NAS_SETSTATE MS_NAS_SETSTATEA

-#endif

-

-// NAS_ISWINFO::Flags constants

-#define ISWF_NOCOUNTDOWN 1 // don't start the countdown to close the window

-#define ISWF_UNICODE 2 // specifies that NAS_ISWINFO::szMsg is a WCHAR*

-#ifdef _UNICODE

-	#define ISWF_TCHAR ISWF_UNICODE // will use WCHAR* instead of char*

-#else

-	#define ISWF_TCHAR 0 // will use char*, as usual

-#endif

-

-typedef struct {

-	int cbSize;

-	char *szProto; // pointer to initial protocol modulename (NULL means global); ignored when hContact is not NULL.

-	HANDLE hContact; // NAS will select this contact in the window initially, if it's not NULL.

-	union

-	{

-		char *szMsg;

-		WCHAR *wszMsg;

-		TCHAR *tszMsg;

-	}; // pointer to an initial status message (may be NULL, NAS will use the default message then)

-	WORD status; // status mode. 0 means current.

-	int Flags; // a combination of ISWF_ constants

-} NAS_ISWINFO;

-

-// MS_NAS_INVOKESTATUSWINDOW

-// Invokes the status message change window.

-// Though if the window is open already, this service just activates an existing window and changes protocol status (i.e. it ignores szMsg and hContact). This behavior may change in future.

-// wParam = (WPARAM)(NAS_ISWINFO*)iswi - pointer to a NAS_ISWINFO structure.

-// lParam = 0

-// returns HWND of the window on success, or NULL on failure.

-#define MS_NAS_INVOKESTATUSWINDOW "NewAwaySystem/InvokeStatusWindow"

-

-/* An example:

-	NAS_ISWINFO iswi = {0}; // for C you may use ZeroMemory() instead

-	iswi.cbSize = sizeof(iswi);

-	iswi.tszMsg = _T("New global status message.");

-	iswi.Flags = ISWF_TCHAR;

-	CallService(MS_NAS_INVOKESTATUSWINDOW, (WPARAM)&iswi, 0);

-*/

-

-#endif // __M_NEWAWAYSYS_H
\ No newline at end of file
diff --git a/plugins/StatusPlugins/includes/m_toolbar.h b/plugins/StatusPlugins/includes/m_toolbar.h
deleted file mode 100644
index fc417cf873..0000000000
--- a/plugins/StatusPlugins/includes/m_toolbar.h
+++ /dev/null
@@ -1,88 +0,0 @@
-#ifndef M_TOOLBAR_H

-#define M_TOOLBAR_H

-

-#define TOOLBARBUTTON_ICONIDPREFIX "MTB_"

-#define TOOLBARBUTTON_ICONIDPRIMARYSUFFIX "_Primary"

-#define TOOLBARBUTTON_ICONIDSECONDARYSUFFIX "_Secondary"

-#define TOOLBARBUTTON_ICONNAMEPRESSEDSUFFIX "Pressed"

-

-//button flags

-#define TBBF_DISABLED			(1<<0)

-#define TBBF_VISIBLE			(1<<1) 

-#define TBBF_PUSHED				(1<<2)

-#define TBBF_SHOWTOOLTIP		(1<<3)

-#define TBBF_ISSEPARATOR		(1<<5)

-#define TBBF_ISLBUTTON			(1<<6)

-#define TBBF_FLEXSIZESEPARATOR  (TBBF_ISSEPARATOR|TBBF_PUSHED) 

-typedef struct _tagTBButton

-{

-	int cbSize;				 // size of structure

-	char * pszButtonID;		 // char id of button used to store button info in DB and know about icon 

-	char * pszButtonName;    // name of button (not translated)

-	char * pszServiceName;	 // service name to be executed

-	LPARAM lParam;			 // param of service to be called

-	char * pszTooltipUp, *pszTooltipDn;	

-	DWORD defPos;			 // default order pos of button (less values are nearer to edge).. please use values greater that 100. the default buttons has pos: 10,20..90

-	DWORD tbbFlags;			 // combine of TBBF_ flags above

-	void (*ParamDestructor)(void *); //will be called on parameters deletion

-	HANDLE hPrimaryIconHandle;

-	HANDLE hSecondaryIconHandle;

-}TBButton;

-

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

-// Events

-// Only after this event module subscribers should register their buttons

-// wparam=lparam=0

-// don't forget to return 0 to continue processing

-#define ME_TB_MODULELOADED	 "ToolBar/ModuleLoaded"

-

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

-// Services

-//

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

-// Adding a button

-// WPARAM  = 0

-// LPARAM  = (TBButton *) &description

-// LRESULT = (HANDLE) hButton

-// in order to correctly process default icons via iconlib it should be

-// registered icolib icon with id named:

-// 'TBButton_'+pszButtonID+ 'Up' or +'Down' for Push (2-state) buttons

-#define MS_TB_ADDBUTTON "ToolBar/AddButton"

-

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

-// Remove button

-// WPARAM = (HANDLE) hButton;

-// LPARAM = 0;

-#define MS_TB_REMOVEBUTTON "ToolBar/RemoveButton"

-

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

-// SetState

-// WPARAM = (HANDLE) hButton;

-// LPARAM = one of below TBST_ states 

-// LRESULT= old state

-#define TBST_PUSHED			1

-#define TBST_RELEASED		0

-#define MS_TB_SETBUTTONSTATE "ToolBar/SetButtonState"

-

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

-// SetStatebyId

-// WPARAM = (char *) szButtonID;

-// LPARAM = one of below TBST_ states 

-// LRESULT= old state

-#define MS_TB_SETBUTTONSTATEBYID "ToolBar/SetButtonStateId"

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

-// GetState

-// WPARAM = (HANLDE) hButton;

-// LPARAM = 0

-// LRESULT= current state

-#define MS_TB_GETBUTTONSTATE "ToolBar/GetButtonState"

-

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

-// GetState

-// WPARAM = (char *) szButtonID;;

-// LPARAM = 0

-// LRESULT= current state

-#define MS_TB_GETBUTTONSTATEBYID "ToolBar/GetButtonStateId"

-

-

-#endif
\ No newline at end of file
diff --git a/plugins/StatusPlugins/includes/m_toptoolbar.h b/plugins/StatusPlugins/includes/m_toptoolbar.h
deleted file mode 100644
index 5628f68de8..0000000000
--- a/plugins/StatusPlugins/includes/m_toptoolbar.h
+++ /dev/null
@@ -1,125 +0,0 @@
-

-#ifndef M_TOPTOOLBAR_H

-#define M_TOPTOOLBAR_H

-

-//button flags

-#define TTBBF_DISABLED			1

-#define TTBBF_VISIBLE			2 

-#define TTBBF_PUSHED			4

-#define TTBBF_SHOWTOOLTIP		8

-#define TTBBF_DRAWBORDER		16//draw border for bitmap,bitmap must be WxH 16x12

-#define TTBBF_ISSEPARATOR		32

-

-//for internal launch buttons

-#define TTBBF_ISLBUTTON			64

-

-typedef struct {

-	int cbSize;

-	HBITMAP hbBitmapUp;

-	HBITMAP hbBitmapDown;

-	char *pszServiceUp;

-	char *pszServiceDown;

-	DWORD dwFlags;

-	LPARAM lParamUp;

-	WPARAM wParamUp;

-	LPARAM lParamDown;

-	WPARAM wParamDown;

-	char *name;

-

-} TTBButton, * lpTTBButton;

-

-typedef struct {

-	int cbSize;

-	HBITMAP hbBitmapUp;

-	HBITMAP hbBitmapDown;

-	char *pszServiceUp;

-	char *pszServiceDown;

-	DWORD dwFlags;

-	LPARAM lParamUp;

-	WPARAM wParamUp;

-	LPARAM lParamDown;

-	WPARAM wParamDown;

-	char *name;

-	HICON hIconUp,hIconDn;

-	char *tooltipUp;

-	char *tooltipDn;

-

-} TTBButtonV2, * lpTTBButtonV2;

-

-//=== EVENTS ===

-/*

-toptoolbar/moduleloaded event

-wParam = lParam = 0

-Called when the toolbar services are available

-

-!!!Warning you may work with TTB services only in this event or later.

-

-*/

-#define ME_TTB_MODULELOADED				"TopToolBar/ModuleLoaded"

-

-

-

-//=== SERVICES ===

-/*

-toptoolbar/addbutton service

-wparam = (TTBButton*)lpTTBButton

-lparam = 0

-returns: hTTBButton - handle of added button on success, -1 on failure.

-*/

-#define MS_TTB_ADDBUTTON						"TopToolBar/AddButton"

-

-/*

-toptoolbar/removebutton service

-wparam = (HANDLE)hTTButton

-lparam = 0

-returns: 0 on success, -1 on failure.

-*/

-#define MS_TTB_REMOVEBUTTON					"TopToolBar/RemoveButton"

-

-/*

-toptoolbar/setstate service

-wparam = (HANDLE)hTTButton

-lparam = (LPARAM) state

-returns: 0 on success, -1 on failure.

-*/

-#define TTBST_PUSHED			1

-#define TTBST_RELEASED			2

-

-#define MS_TTB_SETBUTTONSTATE					"TopToolBar/SetState"

-

-/*

-toptoolbar/getstate service

-wparam = (HANDLE)hTTButton

-lparam = 0

-returns: state on success, -1 on failure.

-*/

-#define MS_TTB_GETBUTTONSTATE					"TopToolBar/GetState"

-

-/*

-toptoolbar/getoptions service

-(HIWORD)wparam = (HANDLE)hTTButton

-(LOWORD)wparam = TTBO_FLAG

-lparam = 0,or lparam=lpTTBButton if flag=TTBO_ALLDATA

-returns: value on success, -1 on failure.

-*/

-#define TTBO_FLAGS				0     //get/set all flags

-#define TTBO_POS				1     //position

-#define TTBO_WIDTH				2     //not impemented

-#define TTBO_HEIGHT				3     //not impemented

-#define TTBO_TIPNAME			4     //tool tip name

-#define TTBO_ALLDATA			5     //change all data via lparam=lpTTBButton

-

-

-#define MS_TTB_GETBUTTONOPTIONS					"TopToolBar/GetOptions"

-

-/*

-toptoolbar/setoptions service

-(HIWORD)wparam = (HANDLE)hTTButton

-(LOWORD)wparam = TTBO_FLAG

-lparam = value

-returns: 1 on success, -1 on failure.

-*/

-#define MS_TTB_SETBUTTONOPTIONS					"TopToolBar/SetOptions"

-

-

-#endif
\ No newline at end of file
diff --git a/plugins/StatusPlugins/includes/m_trigger.h b/plugins/StatusPlugins/includes/m_trigger.h
deleted file mode 100644
index e51294b83e..0000000000
--- a/plugins/StatusPlugins/includes/m_trigger.h
+++ /dev/null
@@ -1,1024 +0,0 @@
-#ifndef __M_TRIGGER_H__

-#define __M_TRIGGER_H__

-

-#if !defined(_TCHAR_DEFINED)

-#include <tchar.h>

-#endif

-#include <m_utils.h>

-

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

-// Triggers

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

-

-// This section explains how to create your own trigger. A trigger can be seen

-// as an event which can result in a set of actions that will be performed.

-// Implementing a trigger consists of two parts. First, you register a trigger

-// with MS_TRIGGER_REGISTERTRIGGER to allow a user to configure it in the

-// options dialog. Second, when the event occurs belonging to your registered

-// trigger, you inform the trigger plugin with MS_TRIGGER_REPORTEVENT. You can

-// send a 'payload' together with this notification. This payload, called

-// 'TriggerData', can consist of a certain contact, protocol, status and/or a

-// piece of text.

-

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

-// Triggers: Register a trigger

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

-

-#define MS_TRIGGER_REGISTERTRIGGER  "/TriggerPlugin/RegisterTrigger"

-

-// Parameters:

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

-// wParam = (WPARAM)0

-// lParam = (LPARAM)(TRIGGERREGISTER *)&tr

-//   Pointer to a structure describing the trigger to add (see below).

-

-// Return Value:

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

-// Returns 0 on success, nozero otherwise. Registering an already existing

-// trigger will replace this previously registered trigger.

-

-typedef struct {

-  int cbSize;  // Set to sizeof(TRIGGERREGISTER).

-  char *pszName;  // Used as identifier and shown in the options dialog, must 

-                  // be unique.

-  HINSTANCE hInstance;  // Only needed when options screen is available.

-  DLGPROC pfnDlgProc; // Optional, the callback procedure for the options page.

-  char *pszTemplate;  // Optional, template for the options page; must be 

-                      // WS_CHILD.

-  int flags;  // Flags, see below.

-  int dFlags;  // Specify the default DF_* flags which your trigger can send

-               // (see below).

-} TRIGGERREGISTER;

-

-// Flags

-#define TRF_NOEXPORT  0x01  // This trigger cannot be exported. Set this flag

-                            // in case you stored settings not using the helper

-                            // functions at the end of this header. On export,

-                            // TriggerPlugin will search for these settings

-                            // and export them automatically. Contact-specific

-                            // settings are never exported.

-

-// Please specify the dFlags to indicate what kind of data your trigger is

-// able to send as TriggerData. Please specify the maximum set, if your trigger

-// does not always send a certain data, please specify it anyway.

-

-#define DF_CONTACT  0x01  // The trigger might send a contact handle with the

-                          // TriggerData.

-#define DF_PROTO    0x02  // The trigger might send a protocol ID with the

-                          // TriggerData.

-#define DF_STATUS   0x04  // The trigger might send a status code with the

-                          // TriggerData.

-#define DF_TEXT	    0x08  // The trigger might send a string with the

-                          // TriggerData.

-#define DF_LPARAM   0x10  // The trigger might send a custom parameter with the

-                          // TriggerData.

-#define DF_UNICODE  0x20  // The trigger processes WCHAR strings.

-

-#if defined(UNICODE) || defined(_UNICODE)

-#define DF_TCHAR   DF_UNICODE  // Strings in structure are TCHAR*.

-#else

-#define DF_TCHAR   0

-#endif

-

-// Dialog Messages

-// The following message should be processed by your options dialog procedure,

-// if available. You can create an options dialog to give the user the

-// possibility to report your event only under certain circumstances. Each

-// trigger is assigned a certain ID. This ID can be used to store the settings

-// for your trigger. 

-

-// WM_INITDIALOG

-

-// Parameters:

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

-// lParam = (LPARAM)(DWORD)triggerID

-//   The trigger ID for which the options are to be set. This can be a new ID

-//   or an ID of a trigger which is being edited. Initialize your options

-//   dialog accordingly. There are helper function at the end of this header

-//   file to read your settings for a certain trigger ID.

-

-#define TM_ADDTRIGGER  WM_APP+10

-

-// TM_ADDTRIGGER

-// 'OK' is pressed and a new trigger will be added. Save your settings using 

-// the given trigger ID.

-

-// Parameters:

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

-// wParam = (WPARAM)(DWORD)triggerID

-//   The trigger ID for which the settings are to be stored. There are helper

-//   function at the end of this header file to store your settings with a 

-//   certain trigger ID.

-// lParam = 0

-

-#define TM_DELTRIGGER  WM_APP+11

-

-// TM_DELTRIGGER

-// The trigger addociated with the given trigger ID will be removed.

-

-// Parameters:

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

-// wParam = (WPARAM)(DWORD)triggerID

-//   The trigger ID for which the settings are to be removed. There is a

-//   helper service at the end of this header file to easily cleanup settings

-//   for a certain trigger ID.

-// lParam = 0

-

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

-// Triggers: Report the Event

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

-

-// When the event occurs, you report it with MS_TRIGGER_REPORTEVENT. If your

-// trigger is configurable, so it has an options screen, you might want to

-// report your trigger for certain trigger ID's only. Please use the

-// MS_TRIGGER_FINDNEXTTRIGGERID to enumerate over the trigger ID's associated

-// with your trigger in the correct order as specified by the user. It's up

-// to you to found out whether or not the trigger is to be reported for a

-// certain ID.

-

-#define MS_TRIGGER_FINDNEXTTRIGGERID  "/TriggerPlugin/FindNextTriggerID"

-

-// Enumerate over the associated trigger ID's for your trigger in the correct

-// order. 

-

-// Parameters:

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

-// wParam = (WPARAM)(DWORD)triggerID

-//   0 to retrieve the first trigger ID for your trigger or the previous ID

-//   returned by this service to get the next one.

-// lParam = 0

-

-// Return Value:

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

-// Returns the next trigger ID given the parameter or 0 if no more trigger IDs

-// are available.

-

-#define MS_TRIGGER_REPORTEVENT  "/TriggerPlugin/ReportEvent"

-

-// Report your event for further processing. This can be a general event for

-// which no individual settings exist, or a specific event for a given

-// trigger ID.

-

-// Parameters:

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

-// wParam = 0

-// lParam = (LPARAM)(REPORTINFO *)&ri

-//   See below.

-

-// Return Value:

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

-// Returns CRV_TRUE if all conditions specific to this trigger hold and the

-// chain was executed. Returns CRV_FALSE if these conditions did not hold and

-// the chain were not processed.

-

-// The structure below can be used to send TriggerData with your trigger. This

-// can be used by the associated conditions and actions.

-

-typedef struct {

-  int cbSize;  // Set to sizeof(TRIGGERDATA)

-  int dFlags;  // Indicate which members are valid using the DF_* flags (see

-               // above).

-  HANDLE hContact;  // Associate a contact handle to this event.

-  char *szProto;  // Associate a protocol ID to this event.

-  int status;  // Associcate a status code to this event.

-  union {

-    char *szText;  // Associate a string to this event.

-    TCHAR *tszText;

-    WCHAR *wszText;

-  };

-  LPARAM lParam;  // Associate custom data to this trigger.

-} TRIGGERDATA;

-

-typedef struct {

-  int cbSize;  // Set to sizeof(REPORTINFO).

-  DWORD triggerID;  // The trigger ID of the event to trigger or 0 if this does

-                    // not apply.

-  char *pszName;  // The name of the trigger (this may be NULL if triggerID is

-                  // not 0).

-  int flags;  // On of the TRG_* flags, see below.

-  TRIGGERDATA *td;  // Optional, the associated TriggerData, see above.

-} REPORTINFO;

-

-#define TRG_PERFORM  0x01  // Indicates the event for this trigger actually 

-                           // occured and needs to be processed accordingly.

-#define TRG_CLEANUP  0x02  // Indicates the trigger instructs to remove the

-                           // itself and all associated information. This can

-                           // be used for "one time triggers". Remove your own

-                           // settings by yourself.

-

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

-// Actions

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

-

-// An actions might be performed as a reaction to a reported event by a

-// trigger. You first register your action so it can be associated to a

-// trigger in the options screen. Next, your provided service or function

-// will be called when necessary.

-

-#define MS_TRIGGER_REGISTERACTION  "/TriggerPlugin/RegisterAction"

-

-// Parameters:

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

-// wParam = (WPARAM)0

-// lParam = (LPARAM)(ACTIONREGISTER *)&ar

-//   Pointer to a structure describing the action to add (see below).

-

-// Return Value:

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

-// Returns 0 on success, nozero otherwise. Registering an already existing

-// action will replace this previously registered action.

-

-typedef int (* ACTIONFUNCTION)(DWORD actionID, REPORTINFO* ri);

-

-typedef struct {

-  int cbSize;  // Set to sizeof(ACTIONREGISTER).

-  char *pszName;  // The name of this action, it must be a unique string.

-  union {

-    char *pszService;  // A service (called with wParam = 

-                       // (WPARAM)(DWORD)actionID, lParam = 

-                       // (LPARAM)(REPORTINFO *)&ri) or function to be called

-                       // when the action has to be performed.

-	ACTIONFUNCTION actionFunction;

-  };

-  HINSTANCE hInstance;	// Only needed when an options screen is available.

-  DLGPROC pfnDlgProc;  // Optional, the callback procedure for the options

-                       // dialog.

-  char *pszTemplate;  // Optional, template for the options dialog, must be

-                      // WS_CHILD.

-  int flags;  // One of the ARF_* flags, see below.

-} ACTIONREGISTER;

-

-#define ARF_UNICODE  0x01  // This action processes unicode strings.

-#define ARF_FUNCTION  0x02  // The actionFunction will be called instead of

-                           // the service.

-#define ARF_NOEXPORT  0x04  // This action cannot be exported. Set this flag in

-                            // case you stored settings not using the helper

-                            // functions at the end of this header. On export,

-                            // TriggerPlugin will search for these settings

-                            // and export them automatically. Contact-specific

-                            // settings are never exported.

-

-#if defined(UNICODE) || defined(_UNICODE)

-#define ARF_TCHAR   ARF_UNICODE

-#else

-#define ARF_TCHAR   0

-#endif

-

-// The service or actionFunction will be called with a pointer to a REPORTINFO

-// struct, containing information about the trigger event. If you can use

-// TriggerData from this struct, always check the ri->td->dFlags before using

-// it. It's up to you to deal with an action in case the expected TriggerData

-// is not available. It's recommened though, to cancel your action. The

-// ri->flags is a combination of the ACT_* flags, indicating how to process the

-// call, see below.

-

-#define ACT_PERFORM  0x01  // Your action is to be performed.

-#define ACT_CLEANUP  0x02  // The settings associated to this action should be

-                           // removed.

-

-// Dialog Messages

-// The following messages are to be processed by the options dialog, if there

-// is one.

-

-// WM_INITDIALOG

-

-// Parameters:

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

-// lParam = (LPARAM)(DWORD)actionID

-//   The action ID for which the options are to be set. This can be a new ID

-//   or an ID of an action which is being edited. Initialize your options

-//   dialog accordingly. There are helper function at the end of this header

-//   file to read your settings for a certain action ID.

-

-#define	TM_ADDACTION  WM_APP+12

-

-// TM_ADDACTION

-// 'OK' is pressed and a new action will be added. Save your settings using

-// the given action ID. Helper functions can be found at the end of this

-// header file.

-

-// Parameters:

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

-// wParam = (WPARAM)(DWORD)actionID

-//   The action ID for which the settings are to be saved. There are helper

-//   functions at the end of this header file to store settings with a certain

-//   action ID.

-// lParam = 0

-

-// Dialog Messages

-// You can send the following messages to the parent window of your dialog.

-// When initalizing your dialog, you might be interested in the TriggerData 

-// the associated trigger is able to provide, you can do so by sending the

-// folowing message to the parent of your dialog.

-

-#define TM_GETTRIGGERINFO  WM_APP+13

-

-// Parameters:

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

-// wParam = 0

-// lParam = (LPARAM)(TRIGGERINFO *)&ti

-

-// Return Value:

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

-// Returns 0 on success, the struct given will be filled with the requested

-// information. Returns any other value on error.

-

-typedef struct {

-  int cbSize;  // (in) Set to sizeof(TRIGGERINFO).

-  int dFlags;  // (out) The default DF_* flags used by the trigger (as indicated

-               // by its TRIGGERREGISTER).

-} TRIGGERINFO;

-

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

-// Conditions

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

-

-// Depending on the configuration of the user, a condition may need to hold

-// for an action to be performed. A condition function is called and its

-// return value specifies whether or not the condition holds. A condition

-// needs to be registered. After its registered, the condition function might

-// be called to check whether or not the condition holds.

-

-#define MS_TRIGGER_REGISTERCONDITION  "/TriggerPlugin/RegisterCondition"

-

-// Parameters:

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

-// wParam = (WPARAM)0

-// lParam = (LPARAM)(CONDITIONREGISTER *)&cr

-//   Pointer to a structure describing the condition to add (see below).

-

-// Return Value:

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

-// Returns 0 on success, nozero otherwise. Registering an already existing

-// condition will replace this previously registered condition.

-

-typedef int (* CONDITIONFUNCTION)(DWORD conditionID, REPORTINFO *ri);

-

-typedef struct {

-  int cbSize;  // Set to sizeof(CONDITIONREGISTER).

-  char *pszName;  // The name identifying this condition, must be unique.

-  union {

-    char *pszService;  // The service (wParam = (WPARAM)(DWORD)conditionID,

-                       // lParam = (LPARAM)(REPORTINFO *)&ri) or function which

-                       // is called to see whether the condition holds. Must

-                       // return CRV_TRUE if the condition holds, CRV_FALSE

-                       // otherwise.

-    CONDITIONFUNCTION conditionFunction;

-  };

-  HINSTANCE hInstance;  // Only needed when an options dialog is available.

-  DLGPROC pfnDlgProc;  // Optional, the dialog procedure for the options

-                       // dialog.

-  char *pszTemplate;  // Optional, template for the options dialog,  must be

-                      // WS_CHILD.

-  int flags;  // CRF_* flags, see below.

-} CONDITIONREGISTER;

-

-// The flags that can be used to register the condition.

-

-#define CRF_UNICODE  0x01  // The condition function or service processes

-                           // unicode strings.

-#define CRF_FUNCTION  0x02  // The conditionFunction will be called instead of

-                            // the service.

-#define CRF_NOEXPORT  0x04  // This condition cannot be exported. Set this flag

-                            // in case you stored settings not using the helper

-                            // functions at the end of this header. On export,

-                            // TriggerPlugin will search for these settings

-                            // and export them automatically. Contact-specific

-                            // settings are never exported.

-

-#if defined(UNICODE) || defined(_UNICODE)

-#define CRF_TCHAR   CRF_UNICODE

-#else

-#define CRF_TCHAR   0

-#endif

-

-// The service or conditionFunction will be called with a pointer to a

-// REPORTINFO struct, containing information about the trigger event. If you

-// can use TriggerData from this struct, always check the ri->td->dFlags before

-// using it. It's up to you to deal with an condition in case the expected

-// TriggerData is not available. It's recommened though, to return CRV_FALSE in

-// those cases. The ri->flags is a combination of the CND_* flags, indicating

-// how to process the call, see below.

-

-// Return values for the condition function or service. The condition service

-// or function is expected to return one of the following.

-

-#define CRV_FALSE  0  // The condition does not hold.

-#define CRV_TRUE  1  // The condition does hold.

-

-// REPORTINFO flags, received by the condition function or service. These

-// indicate how to process the call.

-

-#define CND_PERFORM  0x01  // Perform your condition and return either

-                           // CRV_TRUE or CRV_FALSE to indicate whether or not

-                           // your condition holds at this moment.

-#define CND_CLEANUP  0x02  // The condition is deleted. Remove your settings

-                           // from the DB. There is a helper service below to

-                           // easily remove settings given a condition ID.

-

-// Dialog Messages

-// The following messages are to be processed by the options dialog, if there

-// is one.

-

-// WM_INITDIALOG

-

-// Parameters:

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

-// lParam = (LPARAM)(DWORD)conditionID

-//   The condition ID for which the options are to be set. This can be a new ID

-//   or an ID of a condition which is being edited. Initialize your options

-//   dialog accordingly. There are helper function at the end of this header

-//   file to read your settings for a certain condition ID.

-

-#define	TM_ADDCONDITION  WM_APP+14

-

-// TM_ADDCONDITION

-// 'OK' is pressed and a new condition will be added. Save your settings using

-// the given condition ID. Helper functions can be found at the end of this

-// header file.

-

-// Parameters:

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

-// wParam = (WPARAM)(DWORD)conditionID

-//   The condition ID for which the settings are to be saved. There are helper

-//   functions at the end of this header file to store settings with a certain

-//   condition ID.

-// lParam = 0

-

-// When initalizing your dialog, you might be interested in the TriggerData the

-// associated trigger is able to provide, you can find out by sending a

-// TM_GETTRIGGERINFO message to the parent of your dialog. See the section on

-// dialog messages for actions for more information (above).

-

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

-// Misc. Services

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

-

-#define MS_TRIGGER_ENABLETRIGGER  "/TriggerPlugin/EnableTrigger"

-

-// Parameters:

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

-// wParam = (WPARAM)(DWORD)triggerID

-//   The triggerID to set or get the state from or 0 for the global state.

-// lParam = (LPARAM)(int)type

-//   One of ETT_* (see below).

-

-// Return Value:

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

-// Returns the state (0=disabled) if ETT_GETSTATE is given as lParam.

-// Otherwise, it returns 0 if setting the state was succesful or any other on

-// failure. The global state must be enabled if a single state is to be

-// changed.

-

-#define ETT_DISABLE  0  // Disable the trigger(s).

-#define ETT_ENABLE  1  // Enable the trigger(s).

-#define ETT_TOGGLE  2  // Toggle the state of the trigger(s).

-#define ETT_GETSTATE  3  // Retrieve the state of the trigger (0=disabled).

-

-#define ME_TRIGGER_TRIGGERENABLED	"/TriggerPlugin/TriggerEnabled"

-

-// Parameters:

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

-// wParam = (WPARAM)(DWORD)triggerID

-//   The triggerID to set or get the state from or 0 for the global state.

-// lParam = (LPARAM)(int)type

-//   Either ETT_DISABLE or ETT_ENABLE describing the new state.

-

-// This event is fired when one or all of the triggers enabled state is 

-// changed. This can be used to (de)initialize internal variables. For 

-// example if your trigger reads the triggers from the DB in memory during 

-// an initialization fase. It is recommended to do this when this event is 

-// fired with wParam = 0 and lParam = ETT_ENABLE (remember triggers can be 

-// imported, without calling your options screen callback). This event is 

-// fired upon startup and shutdown in case the module is enabled.

-

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

-// Database Helper Services

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

-

-// The rest of this header file defines helper services and functions to easily

-// store and retrieve settings for a certain trigger, action or condition.

-

-#define MS_TRIGGER_REMOVESETTINGS  "/TriggerPlugin/RemoveSettings"

-

-// Parameters:

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

-// wParam = (WPARAM)0

-// lParam = (LPARAM)(REMOVETRIGGERSETTINGS *)&rts

-//   Pointer to a structure describing the settings to remove (see below).

-

-// Return Value:

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

-// Returns the number of settings removed from the database.

-

-// This service helps you remove all settings you have written with the DB

-// helper functions, defined at the end of this header file.

-

-typedef struct {

-  int cbSize;  // Set to sizeof(REMOVETRIGGERSETTINGS).

-  char *prefix;  // A string indicating what kind of setting are to be removed,

-                 // see below.

-  DWORD id;  // The ID of the set of settings to be removed.

-  char *szModule;  // The module where the settings are stored.

-  HANDLE hContact;  // The contact for which the setting are to be removed. Can

-                    // be INVALID_HANDLE_VALUE to remove the settings for all

-                    // contacts and NULL.

-} REMOVETRIGGERSETTINGS;

-

-// The following prefixes indicate what kind of settings are to be removed from

-// the database.

-

-#define PREFIX_ACTIONID  "aid"  // The prefix for a DB setting associated to

-                                // an action.

-#define PREFIX_TRIGGERID  "tid"  // The prefix for a DB setting associated to

-                                 // a trigger.

-#define PREFIX_CONDITIONID  "cid"  // The prefix for a DB setting associated

-                                   // to a condition.

-

-#ifndef TRIGGER_NOHELPER

-

-// Helper #1: RemoveAllTriggerSettings

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

-// Remove all settings from the DB given the triggerID and module.

-

-static __inline int RemoveAllTriggerSettings(DWORD triggerID, char *szModule) {

-

-  REMOVETRIGGERSETTINGS rts;

-

-  rts.cbSize = sizeof(REMOVETRIGGERSETTINGS);

-  rts.prefix = PREFIX_TRIGGERID;

-  rts.id = triggerID;

-  rts.szModule = szModule;

-  rts.hContact = INVALID_HANDLE_VALUE;

-

-  return CallService(MS_TRIGGER_REMOVESETTINGS, 0, (LPARAM)&rts);

-}

-

-// Helper #2: RemoveAllActionSettings

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

-// Remove all settings from the DB given the actionID and module.

-

-static __inline int RemoveAllActionSettings(DWORD actionID, char *szModule) {

-

-  REMOVETRIGGERSETTINGS rts;

-

-  rts.cbSize = sizeof(REMOVETRIGGERSETTINGS);

-  rts.prefix = PREFIX_ACTIONID;

-  rts.id = actionID;

-  rts.szModule = szModule;

-  rts.hContact = INVALID_HANDLE_VALUE;

-

-  return CallService(MS_TRIGGER_REMOVESETTINGS, 0, (LPARAM)&rts);

-}

-

-// Helper #1: RemoveAllConditionSettings

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

-// Remove all settings from the DB given the conditionID and module.

-

-static __inline int RemoveAllConditionSettings(DWORD conditionID, char *szModule) {

-

-  REMOVETRIGGERSETTINGS rts;

-

-  rts.cbSize = sizeof(REMOVETRIGGERSETTINGS);

-  rts.prefix = PREFIX_CONDITIONID;

-  rts.id = conditionID;

-  rts.szModule = szModule;

-  rts.hContact = INVALID_HANDLE_VALUE;

-

-  return CallService(MS_TRIGGER_REMOVESETTINGS, 0, (LPARAM)&rts);

-}

-

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

-// Database Helper Functions

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

-

-// Basically, these function work the same as Miranda's helper functions for

-// getting/setting DB settings. There is one extra parameter, the ID for the

-// trigger/action/condition. The settings are named as follows:

-

-// DBWriteTriggerSetting*(DWORD triggerID, ...) to write a setting given a

-// trigger ID.

-// DBGetTriggerSetting*(DWORD triggerID, ...) to read a setting given a

-// trigger ID.

-// DBWriteActionSetting*(DWORD actionID, ...) to write a setting given an

-// action ID.

-// DBGetActionSetting*(DWORD actionID, ...) to read a setting given an

-// action ID.

-// DBWriteConditionSetting*(DWORD conditionID, ...) to write a setting given a

-// condition ID.

-// DBGetConditionSetting*(DWORD conditionID, ...) to read a setting given a

-// condition ID.

-

-#define MAX_SETTING_LEN  255  // Max. length of a DB setting including the

-                              // prefix and ID.

-

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

-// Database Helper Functions: Triggers

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

-

-static int __inline DBWriteTriggerSettingByte(DWORD triggerID, HANDLE hContact,const char *szModule,const char *szSetting,BYTE val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBWriteContactSettingByte(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteTriggerSettingWord(DWORD triggerID, HANDLE hContact,const char *szModule,const char *szSetting,WORD val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBWriteContactSettingWord(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteTriggerSettingDword(DWORD triggerID, HANDLE hContact,const char *szModule,const char *szSetting,DWORD val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBWriteContactSettingDword(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteTriggerSettingString(DWORD triggerID, HANDLE hContact,const char *szModule,const char *szSetting,const char *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBWriteContactSettingString(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteTriggerSettingTString(DWORD triggerID, HANDLE hContact,const char *szModule,const char *szSetting,const TCHAR *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBWriteContactSettingTString(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteTriggerSettingWString(DWORD triggerID, HANDLE hContact,const char *szModule,const char *szSetting,const WCHAR *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBWriteContactSettingWString(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteTriggerSettingStringUtf(DWORD triggerID, HANDLE hContact,const char *szModule,const char *szSetting,const char *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBWriteContactSettingStringUtf(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBGetTriggerSettingByte(DWORD triggerID, HANDLE hContact, const char *szModule, const char *szSetting, int errorValue) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBGetContactSettingByte(hContact, szModule, dbSetting, errorValue);

-}

-

-static WORD __inline DBGetTriggerSettingWord(DWORD triggerID, HANDLE hContact, const char *szModule, const char *szSetting, int errorValue) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBGetContactSettingWord(hContact, szModule, dbSetting, errorValue);

-}

-

-static DWORD __inline DBGetTriggerSettingDword(DWORD triggerID, HANDLE hContact, const char *szModule, const char *szSetting, int errorValue) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBGetContactSettingDword(hContact, szModule, dbSetting, errorValue);

-}

-

-static int __inline DBGetTriggerSetting(DWORD triggerID, HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBGetContactSetting(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetTriggerSettingW(DWORD triggerID, HANDLE hContact,const char *szModule, const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBGetContactSettingW(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetTriggerSettingTString(DWORD triggerID, HANDLE hContact,const char *szModule, const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBGetContactSettingTString(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetTriggerSettingWString(DWORD triggerID, HANDLE hContact,const char *szModule,	const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBGetContactSettingWString(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetTriggerSettingStringUtf(DWORD triggerID, HANDLE hContact,const char *szModule, const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBGetContactSettingStringUtf(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBDeleteTriggerSetting(DWORD triggerID, HANDLE hContact,const char *szModule,const char *szSetting) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_TRIGGERID, triggerID, szSetting);

-	return DBDeleteContactSetting(hContact, szModule, dbSetting);

-}

-

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

-// Database Helper Functions: Actions

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

-

-static int __inline DBWriteActionSettingByte(DWORD actionID, HANDLE hContact,const char *szModule,const char *szSetting,BYTE val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBWriteContactSettingByte(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteActionSettingWord(DWORD actionID, HANDLE hContact,const char *szModule,const char *szSetting,WORD val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBWriteContactSettingWord(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteActionSettingDword(DWORD actionID, HANDLE hContact,const char *szModule,const char *szSetting,DWORD val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBWriteContactSettingDword(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteActionSettingString(DWORD actionID, HANDLE hContact,const char *szModule,const char *szSetting,const char *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBWriteContactSettingString(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteActionSettingTString(DWORD actionID, HANDLE hContact,const char *szModule,const char *szSetting,const TCHAR *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBWriteContactSettingTString(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteActionSettingWString(DWORD actionID, HANDLE hContact,const char *szModule,const char *szSetting,const WCHAR *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBWriteContactSettingWString(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteActionSettingStringUtf(DWORD actionID, HANDLE hContact,const char *szModule,const char *szSetting,const char *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBWriteContactSettingStringUtf(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBGetActionSettingByte(DWORD actionID, HANDLE hContact, const char *szModule, const char *szSetting, int errorValue) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBGetContactSettingByte(hContact, szModule, dbSetting, errorValue);

-}

-

-static WORD __inline DBGetActionSettingWord(DWORD actionID, HANDLE hContact, const char *szModule, const char *szSetting, int errorValue) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBGetContactSettingWord(hContact, szModule, dbSetting, errorValue);

-}

-

-static DWORD __inline DBGetActionSettingDword(DWORD actionID, HANDLE hContact, const char *szModule, const char *szSetting, int errorValue) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBGetContactSettingDword(hContact, szModule, dbSetting, errorValue);

-}

-

-static int __inline DBGetActionSetting(DWORD actionID, HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBGetContactSetting(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetActionSettingW(DWORD actionID, HANDLE hContact,const char *szModule, const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBGetContactSettingW(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetActionSettingTString(DWORD actionID, HANDLE hContact,const char *szModule, const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBGetContactSettingTString(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetActionSettingWString(DWORD actionID, HANDLE hContact,const char *szModule, const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBGetContactSettingWString(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetActionSettingStringUtf(DWORD actionID, HANDLE hContact,const char *szModule, const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBGetContactSettingStringUtf(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBDeleteActionSetting(DWORD actionID, HANDLE hContact,const char *szModule,const char *szSetting) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_ACTIONID, actionID, szSetting);

-	return DBDeleteContactSetting(hContact, szModule, dbSetting);

-}

-

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

-// Database Helper Functions: Conditions

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

-

-static int __inline DBWriteConditionSettingByte(DWORD conditionID, HANDLE hContact,const char *szModule,const char *szSetting,BYTE val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBWriteContactSettingByte(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteConditionSettingWord(DWORD conditionID, HANDLE hContact,const char *szModule,const char *szSetting,WORD val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBWriteContactSettingWord(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteConditionSettingDword(DWORD conditionID, HANDLE hContact,const char *szModule,const char *szSetting,DWORD val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBWriteContactSettingDword(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteConditionSettingString(DWORD conditionID, HANDLE hContact,const char *szModule,const char *szSetting,const char *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBWriteContactSettingString(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteConditionSettingTString(DWORD conditionID, HANDLE hContact,const char *szModule,const char *szSetting,const TCHAR *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBWriteContactSettingTString(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteConditionSettingWString(DWORD conditionID, HANDLE hContact,const char *szModule,const char *szSetting,const WCHAR *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBWriteContactSettingWString(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBWriteConditionSettingStringUtf(DWORD conditionID, HANDLE hContact,const char *szModule,const char *szSetting,const char *val) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBWriteContactSettingStringUtf(hContact, szModule, dbSetting, val);

-}

-

-static int __inline DBGetConditionSettingByte(DWORD conditionID, HANDLE hContact, const char *szModule, const char *szSetting, int errorValue) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBGetContactSettingByte(hContact, szModule, dbSetting, errorValue);

-}

-

-static WORD __inline DBGetConditionSettingWord(DWORD conditionID, HANDLE hContact, const char *szModule, const char *szSetting, int errorValue) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBGetContactSettingWord(hContact, szModule, dbSetting, errorValue);

-}

-

-static DWORD __inline DBGetConditionSettingDword(DWORD conditionID, HANDLE hContact, const char *szModule, const char *szSetting, int errorValue) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBGetContactSettingDword(hContact, szModule, dbSetting, errorValue);

-}

-

-static int __inline DBGetConditionSetting(DWORD conditionID, HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) {

-

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBGetContactSetting(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetConditionSettingW(DWORD conditionID, HANDLE hContact,const char *szModule, const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBGetContactSettingW(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetConditionSettingTString(DWORD conditionID, HANDLE hContact,const char *szModule, const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBGetContactSettingTString(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetConditionSettingWString(DWORD conditionID, HANDLE hContact,const char *szModule, const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBGetContactSettingWString(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBGetConditionSettingStringUtf(DWORD conditionID, HANDLE hContact,const char *szModule, const char *szSetting,DBVARIANT *dbv) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBGetContactSettingStringUtf(hContact, szModule, dbSetting, dbv);

-}

-

-static int __inline DBDeleteConditionSetting(DWORD conditionID, HANDLE hContact,const char *szModule,const char *szSetting) {

-

-	char dbSetting[MAX_SETTING_LEN];

-

-	mir_snprintf(dbSetting, sizeof(dbSetting), "%s%u_%s", PREFIX_CONDITIONID, conditionID, szSetting);

-	return DBDeleteContactSetting(hContact, szModule, dbSetting);

-}

-

-#endif // nohelper

-#endif // m_trigger

diff --git a/plugins/StatusPlugins/includes/m_updater.h b/plugins/StatusPlugins/includes/m_updater.h
deleted file mode 100644
index 371b7437a0..0000000000
--- a/plugins/StatusPlugins/includes/m_updater.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef _M_UPDATER_H

-#define _M_UPDATER_H

-

-// NOTES:

-// - For langpack updates, include a string of the following format in the langpack text file:

-//    ";FLID: <file listing name> <version>"

-//    version must be four numbers seperated by '.', in the range 0-255 inclusive

-// - Updater will disable plugins that are downloaded but were not active prior to the update (this is so that, if an archive contains e.g. ansi and 

-//    unicode versions, the correct plugin will be the only one active after the new version is installed)...so if you add a support plugin, you may need 

-//    to install an ini file to make the plugin activate when miranda restarts after the update

-// - Updater will replace all dlls that have the same internal shortName as a downloaded update dll (this is so that msn1.dll and msn2.dll, for example,

-//    will both be updated) - so if you have a unicode and a non-unicode version of a plugin in your archive, you should make the internal names different (which will break automatic 

-//    updates from the file listing if there is only one file listing entry for both versions, unless you use the 'MS_UPDATE_REGISTER' service below)

-// - Updater will install all files in the root of the archive into the plugins folder, except for langpack files that contain the FLID string which go into the root folder (same

-//    folder as miranda32.exe)...all folders in the archive will also be copied to miranda's root folder, and their contents transferred into the new folders. The only exception is a 

-//    special folder called 'root_files' - if there is a folder by that name in the archive, it's contents will also be copied into miranda's root folder - this is intended to be used 

-//    to install additional dlls etc that a plugin may require)

-

-// if you set Update.szUpdateURL to the following value when registering, as well as setting your beta site and version data,

-// Updater will ignore szVersionURL and pbVersionPrefix, and attempt to find the file listing URL's from the backend XML data.

-// for this to work, the plugin name in pluginInfo.shortName must match the file listing exactly (except for case)

-#define UPDATER_AUTOREGISTER		"UpdaterAUTOREGISTER"

-// Updater will also use the backend xml data if you provide URL's that reference the miranda file listing for updates (so you can use that method 

-// if e.g. your plugin shortName does not match the file listing) - it will grab the file listing id from the end of these URLs

-

-typedef struct Update_tag {

-  int cbSize;     

-  char *szComponentName;		// component name as it will appear in the UI (will be translated before displaying)

-

-  char *szVersionURL;			// URL where the current version can be found (NULL to disable)

-  BYTE *pbVersionPrefix;		// bytes occuring in VersionURL before the version, used to locate the version information within the URL data

-								// (note that this URL could point at a binary file - dunno why, but it could :)

-  int cpbVersionPrefix;			// number of bytes pointed to by pbVersionPrefix

-  char *szUpdateURL;			// URL where dll/zip is located

-								// set to UPDATER_AUTOREGISTER if you want Updater to find the file listing URLs (ensure plugin shortName matches file listing!)

-

-  char *szBetaVersionURL;		// URL where the beta version can be found (NULL to disable betas)

-  BYTE *pbBetaVersionPrefix;	// bytes occuring in VersionURL before the version, used to locate the version information within the URL data

-  int cpbBetaVersionPrefix;		// number of bytes pointed to by pbVersionPrefix

-  char *szBetaUpdateURL;		// URL where dll/zip is located

-

-  BYTE *pbVersion;				// bytes of current version, used for comparison with those in VersionURL

-  int cpbVersion;				// number of bytes pointed to by pbVersion

-

-  char *szBetaChangelogURL;		// url for displaying changelog for beta versions

-} Update;

-

-// register a comonent with Updater

-//

-// wparam = 0

-// lparam = (LPARAM)&Update

-#define MS_UPDATE_REGISTER      "Update/Register"

-

-// utility functions to create a version string from a DWORD or from pluginInfo

-// point buf at a buffer at least 16 chars wide - but note the version string returned may be shorter

-//

-__inline static char *CreateVersionString(DWORD version, char *buf) {

-	mir_snprintf(buf, 16, "%d.%d.%d.%d", (version >> 24) & 0xFF, (version >> 16) & 0xFF, (version >> 8) & 0xFF, version & 0xFF);

-	return buf;

-}

-

-__inline static char *CreateVersionStringPlugin(PLUGININFO *pluginInfo, char *buf) {

-	return CreateVersionString(pluginInfo->version, buf);

-}

-

-

-// register the 'easy' way - use this method if you have no beta URL and the plugin is on the miranda file listing

-// NOTE: the plugin version string on the file listing must be the string version of the version in pluginInfo (i.e. 0.0.0.1,

-// four numbers between 0 and 255 inclusivem, so no letters, brackets, etc.)

-//

-// wParam = (int)fileID				- this is the file ID from the file listing (i.e. the number at the end of the download link)

-// lParam = (PLUGININFO*)&pluginInfo

-#define MS_UPDATE_REGISTERFL	"Update/RegisterFL"

-

-// this function can be used to 'unregister' components - useful for plugins that register non-plugin/langpack components and

-// may need to change those components on the fly

-// lParam = (char *)szComponentName

-#define MS_UPDATE_UNREGISTER	"Update/Unregister"

-

-// this event is fired when the startup process is complete, but NOT if a restart is imminent

-// it is designed for status managment plugins to use as a trigger for beggining their own startup process

-// wParam = lParam = 0 (unused)

-// (added in version 0.1.6.0)

-#define ME_UPDATE_STARTUPDONE	"Update/StartupDone"

-

-// this service can be used to enable/disable Updater's global status control

-// it can be called from the StartupDone event handler

-// wParam = (BOOL)enable

-// lParam = 0

-// (added in version 0.1.6.0)

-#define MS_UPDATE_ENABLESTATUSCONTROL	"Update/EnableStatusControl"

-

-// An description of usage of the above service and event:

-// Say you are a status control plugin that normally sets protocol or global statuses in your ModulesLoaded event handler.

-// In order to make yourself 'Updater compatible', you would move the status control code from ModulesLoaded to another function, 

-// say DoStartup. Then, in ModulesLoaded you would check for the existence of the MS_UPDATE_ENABLESTATUSCONTROL service.

-// If it does not exist, call DoStartup. If it does exist, hook the ME_UPDATE_STARTUPDONE event and call DoStartup from there. You may

-// also wish to call MS_UPDATE_ENABLESTATUSCONTROL with wParam == FALSE at this time, to disable Updater's own status control feature.

-

-// this service can be used to determine whether updates are possible for a component with the given name

-// wParam = 0

-// lParam = (char *)szComponentName

-// returns TRUE if updates are supported, FALSE otherwise

-#define MS_UPDATE_ISUPDATESUPPORTED		"Update/IsUpdateSupported"

-

-#endif

-

-

-/////////////// Usage Example ///////////////

-

-#ifdef EXAMPLE_CODE

-

-// you need to #include "m_updater.h" and HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded) in your Load function...

-

-int OnModulesLoaded(WPARAM wParam, LPARAM lParam) {

-

-	Update update = {0}; // for c you'd use memset or ZeroMemory...

-	char szVersion[16];

-

-	update.cbSize = sizeof(Update);

-

-	update.szComponentName = pluginInfo.shortName;

-	update.pbVersion = (BYTE *)CreateVersionString(&pluginInfo, szVersion);

-	update.cpbVersion = strlen((char *)update.pbVersion);

-

-	// these are the three lines that matter - the archive, the page containing the version string, and the text (or data) 

-	// before the version that we use to locate it on the page

-	// (note that if the update URL and the version URL point to standard file listing entries, the backend xml

-	// data will be used to check for updates rather than the actual web page - this is not true for beta urls)

-	update.szUpdateURL = "http://scottellis.com.au:81/test/updater.zip";

-	update.szVersionURL = "http://scottellis.com.au:81/test/updater_test.html";

-	update.pbVersionPrefix = (BYTE *)"Updater version ";

-	

-	update.cpbVersionPrefix = strlen((char *)update.pbVersionPrefix);

-

-	// do the same for the beta versions of the above struct members if you wish to allow beta updates from another URL

-

-	CallService(MS_UPDATE_REGISTER, 0, (WPARAM)&update);

-

-	// Alternatively, to register a plugin with e.g. file ID 2254 on the file listing...

-	// CallService(MS_UPDATE_REGISTERFL, (WPARAM)2254, (LPARAM)&pluginInfo);

-

-	return 0;

-}

-

-#endif

diff --git a/plugins/StatusPlugins/includes/m_variables.h b/plugins/StatusPlugins/includes/m_variables.h
deleted file mode 100644
index 152994dbbc..0000000000
--- a/plugins/StatusPlugins/includes/m_variables.h
+++ /dev/null
@@ -1,668 +0,0 @@
-/*

-    Variables Plugin for Miranda-IM (www.miranda-im.org)

-    Copyright 2003-2006 P. Boon

-

-    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

-*/

-

-#ifndef __M_VARS

-#define __M_VARS

-

-#if !defined(_TCHAR_DEFINED)

-#include <tchar.h>

-#endif

-

-#ifndef VARIABLES_NOHELPER

-#include <m_button.h>

-#endif

-

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

-// Memory management

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

-

-// Release memory that was allocated by the Variables plugin, e.g. returned 

-// strings.

-

-#define MS_VARS_FREEMEMORY  "Vars/FreeMemory"

-

-// Parameters:

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

-// wParam = (WPARAM)(void *)pntr 

-//   Pointer to memory that was allocated by the Variables plugin (e.g. a 

-//   returned string) (can be NULL).

-// lParam = 0

-

-// Return Value:

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

-// Does return 0 on success, nozero otherwise.

-

-// Note: Do only use this service to free memory that was *explicitliy* 

-// stated that it should be free with this service.

-

-

-

-#define MS_VARS_GET_MMI "Vars/GetMMI"

-

-// Get Variable's RTL/CRT function poiners to malloc(), free() and

-// realloc().

-

-// Parameters:

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

-// wParam = 0

-// lParam = (LPARAM) &MM_INTERFACE  

-//   Pointer to a memory manager interface struct (see m_system.h).

-

-// Return Value:

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

-// Returns 0 on success, nozero otherwise

-

-// Note: Works exactly the same as the MS_SYSTEM_GET_MMI service 

-// service of m_system.h.

-

-// Helper function for easy using:

-#ifndef VARIABLES_NOHELPER

-__inline static void variables_free(void *pntr) {

-

-  CallService(MS_VARS_FREEMEMORY, (WPARAM)pntr, 0);

-}

-#endif

-

-

-

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

-// String formatting

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

-

-#define MS_VARS_FORMATSTRING    "Vars/FormatString"

-

-// This service can be used to parse tokens in a text. The tokens will be  

-// replaced by their resolved values. A token can either be a field or a 

-// function. A field takes no arguments and is represented between 

-// %-characters, e.g. "%winampsong%". A function can take any number of 

-// arguments and is represented by a ? or !-character followed by the name 

-// of the function and a list of arguments, e.g. "?add(1,2)".

-

-// Parameters:

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

-// wParam = (WPARAM)(FORMATINFO *)&fi

-//   See below.

-// lParam = 0

-

-// Return Value:

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

-// Returns a pointer to the resolved string or NULL in case of an error.

-

-// Note: The returned pointer needs to be freed using MS_VARS_FREEMEMORY.

-

-typedef struct {

-  int cbSize;  // Set this to sizeof(FORMATINFO).

-  int flags;  // Flags to use (see FIF_* below).

-  union {

-    char *szFormat;  // Text in which the tokens will be replaced (can't be 

-                     // NULL).

-    WCHAR *wszFormat;

-    TCHAR *tszFormat;

-  };

-  union {

-    char *szExtraText;  // Extra, context-specific string (can be NULL) -> 

-                        // The field "extratext" will be replaced by this 

-                        // string. (Previously szSource).

-    WCHAR *wszExtraText;

-    TCHAR *tszExtraText;

-  };

-  HANDLE hContact;  // Handle to contact (can be NULL) -> The field "subject"

-                    // represents this contact.

-  int pCount;  // (output) Number of succesful parsed tokens, needs to be set

-               // to 0 before the call

-  int eCount;  // (output) Number of failed tokens, needs to be set to 0 

-               // before the call

-} FORMATINFO;

-

-// Possible flags:

-#define FIF_UNICODE 0x01  // Expects and returns unicode text (WCHAR*).

-

-#if defined(UNICODE) || defined(_UNICODE)

-#define FIF_TCHAR   FIF_UNICODE // Strings in structure are TCHAR*.

-#else

-#define FIF_TCHAR   0

-#endif

-

-// Helper functions for easy using:

-

-// Helper #1: variables_parse

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

-// The returned string needs to be freed using MS_VARS_FREEMEMORY.

-

-#ifndef VARIABLES_NOHELPER

-__inline static TCHAR *variables_parse(TCHAR *tszFormat, TCHAR *tszExtraText, HANDLE hContact) {

-

-  FORMATINFO fi;

-

-  ZeroMemory(&fi, sizeof(fi));

-  fi.cbSize = sizeof(fi);

-  fi.tszFormat = tszFormat;

-  fi.tszExtraText = tszExtraText;

-  fi.hContact = hContact;

-  fi.flags = FIF_TCHAR;

-

-  return (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

-}

-#endif

-

-// Helper #2: variables_parsedup

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

-// Returns a _strdup()'ed copy of the unparsed string when Variables is not 

-// installed, returns a strdup()'ed copy of the parsed result otherwise.

-

-// Note: The returned pointer needs to be released using your own free().

-

-#ifndef VARIABLES_NOHELPER

-__inline static TCHAR *variables_parsedup(TCHAR *tszFormat, TCHAR *tszExtraText, HANDLE hContact) {

-

-  if (ServiceExists(MS_VARS_FORMATSTRING)) {

-    FORMATINFO fi;

-    TCHAR *tszParsed, *tszResult;

-    

-    ZeroMemory(&fi, sizeof(fi));

-    fi.cbSize = sizeof(fi);

-    fi.tszFormat = tszFormat;

-    fi.tszExtraText = tszExtraText;

-    fi.hContact = hContact;

-    fi.flags |= FIF_TCHAR;

-    tszParsed = (TCHAR *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0);

-    if (tszParsed) {

-      tszResult = _tcsdup(tszParsed);

-      CallService(MS_VARS_FREEMEMORY, (WPARAM)tszParsed, 0);

-      return tszResult;

-    }

-  }

-  return tszFormat?_tcsdup(tszFormat):tszFormat;

-}

-#endif

-

-

-

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

-// Register tokens

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

-

-// Plugins can define tokens which will be parsed by the Variables plugin.

-

-#define MS_VARS_REGISTERTOKEN "Vars/RegisterToken"

-

-// With this service you can define your own token. The newly added tokens 

-// using this service are taken into account on every call to 

-// MS_VARS_FORMATSTRING.

-

-// Parameters:

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

-// wParam = 0

-// lParam = (LPARAM)(TOKENREGISTER*)&tr

-//   See below.

-

-// Return Value:

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

-// Returns 0 on success, nonzero otherwise. Existing tokens will be 

-// 'overwritten' if registered twice.

-

-// Needed for szService and parseFunction:

-typedef struct {

-  int cbSize;  // You need to check if this is >=sizeof(ARGUMENTSINFO) 

-               // (already filled in).

-  FORMATINFO *fi;  // Arguments passed to MS_VARS_FORMATSTRING.

-  unsigned int argc;  // Number of elements in the argv array.

-  union {

-    char **argv; // Argv[0] will be the token name, the following elements 

-                 // are the additional arguments.

-    WCHAR **wargv;  // If the registered token was registered as a unicode 

-                    // token, wargv should be accessed.

-    TCHAR **targv;

-  };

-  int flags;  // (output) You can set flags here (initially 0), use the 

-              // AIF_* flags (see below).

-} ARGUMENTSINFO;

-

-// Available flags for ARGUMENTSINFO:

-// Set the flags of the ARGUMENTSINFO struct to any of these to influence 

-// further parsing.

-#define AIF_DONTPARSE   0x01    // Don't parse the result of this function, 

-                                // usually the result of a token is parsed 

-                                // again, if the `?` is used as a function 

-                                // character.

-#define AIF_FALSE       0x02    // The function returned logical false.

-

-// Definition of parse/cleanup functions:

-typedef char* (*VARPARSEFUNCA)(ARGUMENTSINFO *ai);

-typedef WCHAR* (*VARPARSEFUNCW)(ARGUMENTSINFO *ai);

-typedef void (*VARCLEANUPFUNCA)(char *szReturn);

-typedef void (*VARCLEANUPFUNCW)(WCHAR *wszReturn);

-

-#if defined(UNICODE) || defined(_UNICODE)

-#define VARPARSEFUNC    VARPARSEFUNCW

-#define VARCLEANUPFUNC  VARCLEANUPFUNCW

-#else

-#define VARPARSEFUNC    VARPARSEFUNCA

-#define VARCLEANUPFUNC  VARCLEANUPFUNCA

-#endif

-

-typedef struct {

-  int cbSize;  // Set this to sizeof(TOKENREGISTER).

-  union {

-    char *szTokenString;  // Name of the new token to be created, without %, 

-                          // ?, ! etc. signs (can't be NULL).

-    WCHAR *wszTokenString;  

-    TCHAR *tszTokenString;

-  };

-  union {

-    char *szService;  // Name of a service that is used to request the 

-                      // token's value, if no service is used, a function 

-                      // and TRF_PARSEFUNC must be used.

-    VARPARSEFUNCA parseFunction;  // See above, use with TRF_PARSEFUNC.

-    VARPARSEFUNCW parseFunctionW;

-    VARPARSEFUNC parseFunctionT;

-  };

-  union {

-    char *szCleanupService;  // Name of a service to be called when the 

-                             // memory allocated in szService can be freed

-                             // (only used when flag VRF_CLEANUP is set, 

-                             // else set this to NULL).

-    VARCLEANUPFUNCA cleanupFunction;  // See above, use with TRF_CLEANUPFUNC.

-    VARCLEANUPFUNCW cleanupFunctionW;

-    VARCLEANUPFUNC cleanupFunctionT;

-  };

-  char *szHelpText;  // Help info shown in help dialog (can be NULL). Has to 

-                     // be in the following format: 

-                     // "subject\targuments\tdescription" 

-                     // (Example: "math\t(x, y ,...)\tx + y + ..."), or:  

-                     // "subject\tdescription" 

-                     // (Example: "miranda\tPath to the Miranda-IM 

-                     // executable").

-                     // Note: subject and description are translated by 

-                     // Variables.

-  int memType;  // Describes which method Varibale's plugin needs to use to 

-                // free the returned buffer, use one of the VR_MEM_* values 

-                // (see below). Only valid if the flag VRF_FREEMEM is set, 

-                // use TR_MEM_OWNER otherwise).

-  int flags; // Flags to use (see below), one of TRF_* (see below).

-} TOKENREGISTER;

-

-// Available Memory Storage Types:

-// These values describe which method Variables Plugin will use to free the 

-// buffer returned by the parse function or service

-#define TR_MEM_VARIABLES    1  // Memory is allocated using the functions 

-                               // retrieved by MS_VARS_GET_MMI.

-#define TR_MEM_MIRANDA      2  // Memory is allocated using Miranda's Memory

-                               // Manager Interface (using the functions 

-                               // returned by MS_SYSTEM_GET_MMI), if 

-                               // VRF_FREEMEM is set, the memory will be 

-                               // freed by Variables.

-#define TR_MEM_OWNER        3  // Memory is owned by the calling plugin 

-                               // (can't be freed by Variables Plugin 

-                               // automatically). This should be used if 

-                               // VRF_FREEMEM is not specified in the flags.

-

-// Available Flags for TOKENREGISTER:

-#define TRF_FREEMEM     0x01  // Variables Plugin will automatically free the

-                              // pointer returned by the parse function or 

-                              // service (which method it will us is 

-                              // specified in memType -> see above).

-#define TRF_CLEANUP     0x02  // Call cleanup service or function, notifying 

-                              // that the returned buffer can be freed. 

-                              // Normally you should use either TRF_FREEMEM 

-                              // or TRF_CLEANUP.

-#define TRF_PARSEFUNC   0x40  // parseFunction will be used instead of a 

-                              // service.

-#define TRF_CLEANUPFUNC 0x80  // cleanupFunction will be used instead of a 

-                              // service.

-#define TRF_USEFUNCS    TRF_PARSEFUNC|TRF_CLEANUPFUNC

-#define TRF_UNPARSEDARGS    0x04  // Provide the arguments for the parse 

-                                  // function in their raw (unparsed) form. 

-                                  // By default, arguments are parsed before 

-                                  // presenting them to the parse function.

-#define TRF_FIELD       0x08  // The token can be used as a %field%.

-#define TRF_FUNCTION    0x10  // The token can be used as a ?function(). 

-                              // Normally you should use either TRF_FIELD or 

-                              // TRF_FUNCTION.

-#define TRF_UNICODE     0x20  // Strings in structure are unicode (WCHAR*). 

-                              // In this case, the strings pointing to the 

-                              // arguments in the ARGUMENTS struct are 

-                              // unicode also. The returned buffer is 

-                              // expected to be unicode also, and the 

-                              // unicode parse and cleanup functions are 

-                              // called.

-

-#if defined(UNICODE) || defined(_UNICODE)

-#define TRF_TCHAR   TRF_UNICODE // Strings in structure are TCHAR*.

-#else

-#define TRF_TCHAR   0

-#endif

-

-// Deprecated:

-#define TRF_CALLSVC     TRF_CLEANUP

-

-// Callback Service (szService) / parseFunction:

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

-// Service that is called automatically by the Variable's Plugin to resolve a

-// registered variable.

-

-// Parameters:

-// wParam = 0

-// lParam = (LPARAM)(ARGUMENTSINFO *)&ai

-//   see above

-

-// Return Value:

-// Needs to return the pointer to a dynamically allocacated string or NULL. 

-// A return value of NULL is regarded as an error (eCount will be increaded).

-// Flags in the ARGUMENTSINFO struct can be set (see above).

-

-// Callback Service (szCallbackService) / cleanupFunction:

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

-// This service is called when the memory that was allocated by the parse 

-// function or service can be freed. Note: It will only be called when the 

-// flag VRF_CLEANUP of TOKENREGISTER is set.

-

-// Parameters:

-// wParam = 0

-// lParam = (LPARAM)(char *)&res

-//   Result from parse function or service (pointer to a string).

-

-// Return Value:

-// Should return 0 on success.

-

-

-

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

-// Show the help dialog

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

-

-// Plugins can invoke Variables' help dialog which can be used for easy input

-// by users.

-

-#define MS_VARS_SHOWHELPEX    "Vars/ShowHelpEx"

-

-// This service can be used to open the help dialog of Variables. This dialog

-// provides easy input for the user and/or information about the available 

-// tokens.

-

-// Parameters:

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

-// wParam = (WPARAM)(HWND)hwndParent

-// lParam = (LPARAM)(VARHELPINFO)&vhi

-//   See below.

-

-// Return Value:

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

-// Returns 0 on succes, any other value on error.

-

-typedef struct {

-  int cbSize;  // Set to sizeof(VARHELPINFO).

-  FORMATINFO *fi;  // Used for both input and output. If this pointer is not 

-                   // NULL, the information is used as the initial values for 

-                   // the dialog.

-  HWND hwndCtrl;  // Used for both input and output. The window text of this 

-                  // window will be read and used as the initial input of the 

-                  // input dialog. If the user presses the OK button the window

-                  // text of this window will be set to the text of the input 

-                  // field and a EN_CHANGE message via WM_COMMAND is send to 

-                  // this window. (Can be NULL).

-  char *szSubjectDesc;  // The description of the %subject% token will be set 

-                        // to this text, if not NULL. This is translated

-                        // automatically.

-  char *szExtraTextDesc;  // The description of the %extratext% token will be 

-                          // set to this text, if not NULL. This is translated 

-                          // automatically.

-  int flags;  // Flags, see below.

-} VARHELPINFO;

-

-

-// Flags for VARHELPINFO

-#define VHF_TOKENS              0x00000001  // Create a dialog with the list of

-                                            // tokens

-#define VHF_INPUT               0x00000002  // Create a dialog with an input 

-                                            // field (this contains the list of

-                                            // tokens as well).

-#define VHF_SUBJECT             0x00000004  // Create a dialog to select a 

-                                            // contact for the %subject% token.

-#define VHF_EXTRATEXT           0x00000008  // Create a dialog to enter a text 

-                                            // for the %extratext% token.

-#define VHF_HELP                0x00000010  // Create a dialog with help info.

-#define VHF_HIDESUBJECTTOKEN    0x00000020  // Hide the %subject% token in the 

-                                            // list of tokens.

-#define VHF_HIDEEXTRATEXTTOKEN  0x00000040  // Hide the %extratext% token in 

-                                            // the list of tokens.

-#define VHF_DONTFILLSTRUCT      0x00000080  // Don't fill the struct with the 

-                                            // new information if OK is pressed

-#define VHF_FULLFILLSTRUCT      0x00000100  // Fill all members of the struct 

-                                            // when OK is pressed. By default 

-                                            // only szFormat is set. With this

-                                            // flag on, hContact and 

-                                            // szExtraText are also set.

-#define VHF_SETLASTSUBJECT      0x00000200  // Set the last contact that was 

-                                            // used in the %subject% dialog in

-                                            // case fi.hContact is NULL.

-

-// Predefined flags

-#define VHF_FULLDLG             VHF_INPUT|VHF_SUBJECT|VHF_EXTRATEXT|VHF_HELP

-#define VHF_SIMPLEDLG           VHF_INPUT|VHF_HELP

-#define VHF_NOINPUTDLG          VHF_TOKENS|VHF_HELP

-

-// If the service fills information in the struct for szFormat or szExtraText, 

-// these members must be free'd using the free function of Variables.

-// If wParam==NULL, the dialog is created modeless. Only one dialog can be 

-// shown at the time. 

-// If both hwndCtrl and fi are NULL, the user input will not be retrievable. 

-// In this case, the dialog is created with only a "Close" button, instead of 

-// the "OK" and "Cancel" buttons.

-// In case of modeless dialog and fi != NULL, please make sure this pointer 

-// stays valid while the dialog is open.

-

-// Helper function for easy use in standard case:

-#ifndef VARIABLES_NOHELPER

-__inline static int variables_showhelp(HWND hwndDlg, UINT uIDEdit, int flags, char *szSubjectDesc, char *szExtraDesc) {

-	

-  VARHELPINFO vhi;

-

-  ZeroMemory(&vhi, sizeof(VARHELPINFO));

-  vhi.cbSize = sizeof(VARHELPINFO);

-  if (flags == 0) {

-    flags = VHF_SIMPLEDLG;

-  }

-  vhi.flags = flags;

-  vhi.hwndCtrl = GetDlgItem(hwndDlg, uIDEdit);

-  vhi.szSubjectDesc = szSubjectDesc;

-  vhi.szExtraTextDesc = szExtraDesc;

-

-  return CallService(MS_VARS_SHOWHELPEX, (WPARAM)hwndDlg, (LPARAM)&vhi);

-}

-#endif

-

-

-#define MS_VARS_GETSKINITEM	  "Vars/GetSkinItem"

-

-// This service can be used to get the icon you can use for example on the

-// Variables help button in your options screen. You can also get the tooltip

-// text to use with such a button. If icon library is available the icon will

-// be retrieved from icon library manager, otherwise the default is returned.

-

-// Parameters:

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

-// wParam = (WPARAM)0

-// lParam = (LPARAM)VSI_* (see below)

-

-// Return Value:

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

-// Depends on the information to retrieve (see below).

-

-// VSI_ constants

-#define VSI_HELPICON    1  // Can be used on the button accessing the

-                           // Variables help dialog. Returns (HICON)hIcon on

-                           // success or NULL on failure;

-#define VSI_HELPTIPTEXT 2  // Returns the tooltip text you can use for the

-                           // help button. Returns (char *)szTipText, a 

-                           // static, translated buffer containing the help

-                           // text or NULL on error.

-

-// Helper to set the icon on a button accessing the help dialog. 

-// Preferably a 16x14 MButtonClass control, but it works on a standard 

-// button control as well. If no icon is availble (because of old version of

-// Variables) the string "V" is shown on the button. If Variables is not

-// available, the button will be hidden.

-#ifndef VARIABLES_NOHELPER

-__inline static int variables_skin_helpbutton(HWND hwndDlg, UINT uIDButton) {

-

-	int res;

-	HICON hIcon;

-	TCHAR tszClass[32];

-

-	hIcon = NULL;

-	res = 0;

-	if (ServiceExists(MS_VARS_GETSKINITEM)) {

-		hIcon = (HICON)CallService(MS_VARS_GETSKINITEM, 0, (LPARAM)VSI_HELPICON);

-	}

-	GetClassName(GetDlgItem(hwndDlg, uIDButton), tszClass, sizeof(tszClass));

-	if (!_tcscmp(tszClass, _T("Button"))) {

-		if (hIcon != NULL) {

-			SetWindowLong(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE, GetWindowLong(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE)|BS_ICON);

-			SendMessage(GetDlgItem(hwndDlg, uIDButton), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon);

-		}

-		else {

-			SetWindowLong(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE, GetWindowLong(GetDlgItem(hwndDlg, uIDButton), GWL_STYLE)&~BS_ICON);

-			SetDlgItemText(hwndDlg, uIDButton, _T("V"));

-		}

-	}

-	else if (!_tcscmp(tszClass, MIRANDABUTTONCLASS)) {

-		if (hIcon != NULL) {

-			char *szTipInfo;

-

-			SendMessage(GetDlgItem(hwndDlg, uIDButton), BM_SETIMAGE, (WPARAM)IMAGE_ICON, (LPARAM)hIcon);

-			if (ServiceExists(MS_VARS_GETSKINITEM)) {

-				szTipInfo = (char *)CallService(MS_VARS_GETSKINITEM, 0, (LPARAM)VSI_HELPTIPTEXT);

-			}

-			if (szTipInfo == NULL) {

-				szTipInfo = Translate("Open String Formatting Help");

-			}

-			SendMessage(GetDlgItem(hwndDlg, uIDButton), BUTTONADDTOOLTIP, (WPARAM)szTipInfo, 0);

-			SendDlgItemMessage(hwndDlg, uIDButton, BUTTONSETASFLATBTN, 0, 0);

-		}

-		else {

-			SetDlgItemText(hwndDlg, uIDButton, _T("V"));

-		}

-	}

-	else {

-		res = -1;

-	}

-	ShowWindow(GetDlgItem(hwndDlg, uIDButton), ServiceExists(MS_VARS_FORMATSTRING));

-	

-	return res;

-}

-#endif

-

-

-#define MS_VARS_SHOWHELP    "Vars/ShowHelp"

-

-// WARNING: This service is obsolete, please use MS_VARS_SHOWHELPEX

-

-// Shows a help dialog where all possible tokens are displayed. The tokens

-// are explained on the dialog, too. The user can edit the initial string and 

-// insert as many tokens as he likes.

-

-// Parameters:

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

-// wParam = (HWND)hwndEdit

-//   Handle to an edit control in which the modified string 

-//   should be inserted (When the user clicks OK in the dialog the edited 

-//   string will be set to hwndEdit) (can be NULL).

-// lParam = (char *)pszInitialString

-//   String that the user is provided with initially when 

-//   the dialog gets opened (If this is NULL then the current text in the 

-//   hwndEdit edit control will be used) (can be NULL).

-

-// Return Value:

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

-// Returns the handle to the help dialog (HWND).

-

-// Note: Only one help dialog can be opened at a time. When the dialog gets 

-// closed an EN_CHANGE of the edit controll will be triggered because the 

-// contents were updated. (Only when user selected OK).

-

-// Example: 

-// CallService(MS_VARS_SHOWHELP, (WPARAM)hwndEdit, (LPARAM)"some initial text");

-

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

-// Retrieve a contact's HANDLE given a string

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

-

-#define MS_VARS_GETCONTACTFROMSTRING    "Vars/GetContactFromString"

-

-// Searching for contacts in the database. You can find contacts in db by 

-// searching for their name, e.g first name.

-

-// Parameters:

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

-// wParam = (WPARAM)(CONTACTSINFO *)&ci

-//   See below.

-// lParam = 0

-

-// Return Value:

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

-// Returns number of contacts found matching the given string representation.

-// The hContacts array of CONTACTSINFO struct contains these hContacts after 

-// the call.

-

-// Note: The hContacts array needs to be freed after use using 

-// MS_VARS_FREEMEMORY.

-

-typedef struct {

-  int cbSize;  // Set this to sizeof(CONTACTSINFO).

-  union {

-    char *szContact;  // String to search for, e.g. last name (can't be NULL).

-    WCHAR * wszContact;

-    TCHAR *tszContact;

-  };

-  HANDLE *hContacts;  // (output) Array of contacts found.

-  DWORD flags;  // Contact details that will be matched with the search 

-                // string (flags can be combined).

-} CONTACTSINFO;

-

-// Possible flags:

-#define CI_PROTOID      0x00000001  // The contact in the string is encoded 

-                                    // in the format <PROTOID:UNIQUEID>, e.g.

-                                    // <ICQ:12345678>.

-#define CI_NICK         0x00000002  // Search nick names.

-#define CI_LISTNAME     0x00000004  // Search custom names shown in contact 

-                                    // list.

-#define CI_FIRSTNAME    0x00000008  // Search contact's first names (contact 

-                                    // details).

-#define CI_LASTNAME     0x00000010  // Search contact's last names (contact 

-                                    // details).

-#define CI_EMAIL        0x00000020  // Search contact's email adresses 

-                                    // (contact details).

-#define CI_UNIQUEID     0x00000040  // Search unique ids of the contac, e.g. 

-                                    // UIN.

-#define CI_CNFINFO	    0x40000000  // Searches one of the CNF_* flags (set 

-                                    // flags to CI_CNFINFO|CNF_X), only one 

-                                    // CNF_ type possible

-#define CI_UNICODE      0x80000000  // tszContact is a unicode string 

-                                    // (WCHAR*).

-

-#if defined(UNICODE) || defined(_UNICODE)

-#define CI_TCHAR    CI_UNICODE  // Strings in structure are TCHAR*.

-#else

-#define CI_TCHAR    0

-#endif

-

-

-

-#endif //__M_VARS

diff --git a/plugins/StatusPlugins/includes/m_vsramm.h b/plugins/StatusPlugins/includes/m_vsramm.h
deleted file mode 100644
index cff14d8a2e..0000000000
--- a/plugins/StatusPlugins/includes/m_vsramm.h
+++ /dev/null
@@ -1,11 +0,0 @@
-typedef struct {

-	char *szProto;

-	char *msg;

-	char *uMsg;

-	int statusMode;

-} PROTOMSGINFO;

-

-// wParam = 0

-// lParam = PROTOMSGINFO *

-// returns 0 on success

-#define MS_VSRAMM_SETAWAYMSG		"VSRAMM/SetAwayMsg"
\ No newline at end of file
diff --git a/plugins/clist_nicer/clist_nicer_10.vcxproj b/plugins/clist_nicer/clist_nicer_10.vcxproj
index ffb9bceb67..d71b48b32c 100644
--- a/plugins/clist_nicer/clist_nicer_10.vcxproj
+++ b/plugins/clist_nicer/clist_nicer_10.vcxproj
@@ -208,6 +208,7 @@
       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <GenerateDebugInformation>true</GenerateDebugInformation>

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

     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

diff --git a/plugins/modernb/icons_pack/ICONS_10.vcxproj b/plugins/modernb/icons_pack/ICONS_10.vcxproj
index becc238ea9..617894f82e 100644
--- a/plugins/modernb/icons_pack/ICONS_10.vcxproj
+++ b/plugins/modernb/icons_pack/ICONS_10.vcxproj
@@ -136,7 +136,6 @@
     <Link>

       <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

       <NoEntryPoint>true</NoEntryPoint>

     </Link>

   </ItemDefinitionGroup>

@@ -197,7 +196,6 @@
     <Link>

       <AdditionalOptions>/ALIGN:4096 /ignore:4108 %(AdditionalOptions)</AdditionalOptions>

       <SuppressStartupBanner>true</SuppressStartupBanner>

-      <GenerateDebugInformation>true</GenerateDebugInformation>

       <NoEntryPoint>true</NoEntryPoint>

     </Link>

   </ItemDefinitionGroup>

diff --git a/plugins/tabsrmm/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj b/plugins/tabsrmm/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
new file mode 100644
index 0000000000..e5e63b26b2
--- /dev/null
+++ b/plugins/tabsrmm/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj
@@ -0,0 +1,108 @@
+<?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>tabsrmm_icons</ProjectName>

+    <ProjectGuid>{F553F140-B7D3-4984-90B1-00D4831B8A6E}</ProjectGuid>

+    <RootNamespace>ICONS_NOVA</RootNamespace>

+    <Keyword>Win32Proj</Keyword>

+  </PropertyGroup>

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

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+  </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+  </PropertyGroup>

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

+  <ImportGroup Label="ExtensionSettings">

+  </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)'=='Release|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)'=='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)'=='Debug|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.30319.1</_ProjectFileVersion>

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

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)64\Icons\</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)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Icons\</OutDir>

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

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

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

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

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

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

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>

+    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>

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

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

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

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

+  </PropertyGroup>

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

+    <Link>

+      <NoEntryPoint>true</NoEntryPoint>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Link>

+      <NoEntryPoint>true</NoEntryPoint>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Link>

+      <NoEntryPoint>true</NoEntryPoint>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <Link>

+      <NoEntryPoint>true</NoEntryPoint>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClInclude Include="..\ICONSXP\resource.h" />

+  </ItemGroup>

+  <ItemGroup>

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

+  </ItemGroup>

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

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/tabsrmm/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj.filters b/plugins/tabsrmm/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj.filters
new file mode 100644
index 0000000000..3eb80668f3
--- /dev/null
+++ b/plugins/tabsrmm/icons/ICONS_NOVA/ICONS_NOVA_10.vcxproj.filters
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

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

+  <ItemGroup>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

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

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>

+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\ICONSXP\resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ICONS_NOVA.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/plugins/tabsrmm/tabsrmm_10.vcxproj b/plugins/tabsrmm/tabsrmm_10.vcxproj
index 3a11c63482..df6b2ca512 100644
--- a/plugins/tabsrmm/tabsrmm_10.vcxproj
+++ b/plugins/tabsrmm/tabsrmm_10.vcxproj
@@ -205,7 +205,6 @@
       <DelayLoadDLLs>%(DelayLoadDLLs)</DelayLoadDLLs>

       <GenerateDebugInformation>true</GenerateDebugInformation>

       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>

-      <GenerateMapFile>true</GenerateMapFile>

       <MapFileName>

       </MapFileName>

       <OptimizeReferences>true</OptimizeReferences>