compilation fix

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

13 files changed, 56 insertions, 58 deletions

diff --git a/plugins/NewAwaySysMod/AwayOpt.cpp b/plugins/NewAwaySysMod/AwayOpt.cpp
index 82e6c06a4d..054c212144 100644
--- a/plugins/NewAwaySysMod/AwayOpt.cpp
+++ b/plugins/NewAwaySysMod/AwayOpt.cpp
@@ -23,9 +23,9 @@
 #include "Path.h"

 #include "m_button.h"

 #include "m_clc.h"

-#include "..\CommonLibs\Themes.h"

-#include "..\CommonLibs\GroupCheckbox.h"

-#include "..\CommonLibs\ThemedImageCheckbox.h"

+#include ".\CommonLibs\Themes.h"

+#include ".\CommonLibs\GroupCheckbox.h"

+#include ".\CommonLibs\ThemedImageCheckbox.h"

 

 //NightFox

 #include <m_modernopt.h>

@@ -167,7 +167,7 @@ int CALLBACK PopupOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			for (I = 0; I < lengthof(StatusButtons); I++)

 			{

 				HWND hButton = GetDlgItem(hwndDlg, StatusButtons[I].DlgItem);

-				SendMessage(hButton, BUTTONADDTOOLTIP, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, StatusButtons[I].Status, GCMDF_TCHAR), BATF_TCHAR);

+				SendMessage(hButton, BUTTONADDTOOLTIP, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, StatusButtons[I].Status, GSMDF_TCHAR), BATF_TCHAR);

 				SendMessage(hButton, BUTTONSETASPUSHBTN, 0, 0);

 				SendMessage(hButton, BUTTONSETASFLATBTN, 0, 0);

 			}

@@ -371,7 +371,7 @@ int CALLBACK MessagesOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam
 			for (I = 0; I < lengthof(DefMsgDlgItems); I++)

 			{

 				HWND hButton = GetDlgItem(hwndDlg, DefMsgDlgItems[I].DlgItem);

-				SendMessage(hButton, BUTTONADDTOOLTIP, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, DefMsgDlgItems[I].Status, GCMDF_TCHAR), BATF_TCHAR);

+				SendMessage(hButton, BUTTONADDTOOLTIP, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, DefMsgDlgItems[I].Status, GSMDF_TCHAR), BATF_TCHAR);

 				SendMessage(hButton, BUTTONSETASPUSHBTN, 0, 0);

 				SendMessage(hButton, BUTTONSETASFLATBTN, 0, 0);

 				g_OrigDefStatusButtonMsgProc = (WNDPROC)SetWindowLongPtr(hButton, GWLP_WNDPROC, (LONG_PTR)DefStatusButtonSubclassProc);

@@ -654,7 +654,7 @@ int CALLBACK MoreOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 			for (I = 0; I < lengthof(StatusButtons); I++)

 			{

 				HWND hButton = GetDlgItem(hwndDlg, StatusButtons[I].DlgItem);

-				SendMessage(hButton, BUTTONADDTOOLTIP, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, StatusButtons[I].Status, GCMDF_TCHAR), BATF_TCHAR);

+				SendMessage(hButton, BUTTONADDTOOLTIP, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, StatusButtons[I].Status, GSMDF_TCHAR), BATF_TCHAR);

 				SendMessage(hButton, BUTTONSETASPUSHBTN, 0, 0);

 				SendMessage(hButton, BUTTONSETASFLATBTN, 0, 0);

 			}

@@ -834,7 +834,7 @@ int CALLBACK AutoreplyOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 			for (I = 0; I < lengthof(StatusButtons); I++)

 			{

 				HWND hButton = GetDlgItem(hwndDlg, StatusButtons[I].DlgItem);

-				SendMessage(hButton, BUTTONADDTOOLTIP, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, StatusButtons[I].Status, GCMDF_TCHAR), BATF_TCHAR);

+				SendMessage(hButton, BUTTONADDTOOLTIP, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, StatusButtons[I].Status, GSMDF_TCHAR), BATF_TCHAR);

 				SendMessage(hButton, BUTTONSETASPUSHBTN, 0, 0);

 				SendMessage(hButton, BUTTONSETASFLATBTN, 0, 0);

 			}

@@ -1027,7 +1027,7 @@ int CALLBACK MessagesModernOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			for (I = 0; I < lengthof(DefMsgDlgItems); I++)

 			{

 				HWND hButton = GetDlgItem(hwndDlg, DefMsgDlgItems[I].DlgItem);

-				SendMessage(hButton, BUTTONADDTOOLTIP, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, DefMsgDlgItems[I].Status, GCMDF_TCHAR), BATF_TCHAR);

+				SendMessage(hButton, BUTTONADDTOOLTIP, CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, DefMsgDlgItems[I].Status, GSMDF_TCHAR), BATF_TCHAR);

 				SendMessage(hButton, BUTTONSETASPUSHBTN, 0, 0);

 				SendMessage(hButton, BUTTONSETASFLATBTN, 0, 0);

 				g_OrigDefStatusButtonMsgProc = (WNDPROC)SetWindowLongPtr(hButton, GWLP_WNDPROC, (LONG_PTR)DefStatusButtonSubclassProc);

diff --git a/plugins/NewAwaySysMod/AwaySys.cpp b/plugins/NewAwaySysMod/AwaySys.cpp
index c335ee1dac..497fecc00f 100644
--- a/plugins/NewAwaySysMod/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/AwaySys.cpp
@@ -30,14 +30,13 @@
 */

 

 #define _DECL_DLLMAIN

-#include <process.h> // needed for MSVC 7 msvcr7*.dll patch

 #include "Common.h"

 #include "m_genmenu.h"

 #include "m_idle.h"

 #include "m_statusplugins.h"

 #include "m_updater.h"

-#include "..\CommonLibs\m_NewAwaySys.h"

-#include "..\CommonLibs\m_ContactSettings.h"

+#include "m_NewAwaySys.h"

+#include "m_ContactSettings.h"

 #include "MsgTree.h"

 #include "ContactList.h"

 #include "Properties.h"

@@ -47,9 +46,12 @@
 

 //NightFox

 #include <m_modernopt.h>

+#include <process.h> // needed for MSVC 7 msvcr7*.dll patch

 

 HINSTANCE g_hInstance;

 PLUGINLINK *pluginLink;

+MM_INTERFACE mmi;

+int hLangpack = 0;

 TMyArray<HANDLE> hHooks, hServices;

 HANDLE g_hContactMenuItem = NULL, g_hReadStatMenuItem = NULL, /*g_hTopToolbarbutton = NULL, */g_hToggleSOEMenuItem = NULL, g_hToggleSOEContactMenuItem = NULL, g_hAutoreplyOnContactMenuItem = NULL, g_hAutoreplyOffContactMenuItem = NULL, g_hAutoreplyUseDefaultContactMenuItem = NULL;

 bool g_fNoProcessing = false; // tells the status change proc not to do anything

@@ -478,13 +480,13 @@ int PreBuildContactMenu(WPARAM wParam, LPARAM lParam)
 		}

 		if ((Flag1 & PF1_MODEMSGSEND && CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(iMode)) || ((Flag1 & PF1_IM) == PF1_IM && (I < 0 || !g_AutoreplyOptPage.GetDBValueCopy(StatusModeList[I].DisableReplyCtlID))))

 		{ // the protocol supports status message sending for current status, or autoreplying

-			_stprintf(szSetStr, TranslateT("Set %s message for the contact"), CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, iMode, GCMDF_TCHAR), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR));

+			_stprintf(szSetStr, TranslateT("Set %s message for the contact"), CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, iMode, GSMDF_TCHAR), CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR));

 			miSetMsg.ptszName = szSetStr;

 			miSetMsg.flags = CMIM_FLAGS | CMIF_TCHAR | CMIM_NAME;

 		}

 		if (Flag1 & PF1_MODEMSGRECV && CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_3, 0) & Proto_Status2Flag(iContactMode))

 		{ // the protocol supports status message reading for contact's status

-			_stprintf(szReadStr, TranslateT("Re&ad %s Message"), CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, iContactMode, GCMDF_TCHAR));

+			_stprintf(szReadStr, TranslateT("Re&ad %s Message"), CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, iContactMode, GSMDF_TCHAR));

 			miReadMsg.ptszName = szReadStr;

 			miReadMsg.flags = CMIM_FLAGS | CMIF_TCHAR | CMIM_NAME | CMIM_ICON;

 			miReadMsg.hIcon = LoadSkinnedProtoIcon(szProto, iContactMode);

@@ -691,7 +693,7 @@ static int ContactSettingsInit(WPARAM wParam, LPARAM lParam)
 

 			if (g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_PERSTATUSPERSONALSETTINGS))

 			{

-				_stprintf(Title, TranslateT("Enable autoreply when you are %s"), (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, StatusMode, GCMDF_TCHAR));

+				_stprintf(Title, TranslateT("Enable autoreply when you are %s"), (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, StatusMode, GSMDF_TCHAR));

 				csc.ptszTitle = Title;

 				csc.ptszTooltip = TranslateT("\"Store contact autoreply/ignore settings for each status separately\" is enabled, so this setting is per-contact AND per-status.");

 			} else

@@ -705,7 +707,7 @@ static int ContactSettingsInit(WPARAM wParam, LPARAM lParam)
 

 			if (g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_PERSTATUSPERSONALSETTINGS))

 			{

-				_stprintf(Title, TranslateT("Don't send status message when you are %s"), (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, StatusMode, GCMDF_TCHAR));

+				_stprintf(Title, TranslateT("Don't send status message when you are %s"), (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, StatusMode, GSMDF_TCHAR));

 				csc.ptszTitle = Title;

 				csc.ptszTooltip = TranslateT("Ignore status message requests from this contact and don't send an autoreply.\r\n\"Store contact autoreply/ignore settings for each status separately\" is enabled, so this setting is per-contact AND per-status.");

 			} else

@@ -737,7 +739,7 @@ int srvVariablesHandler(WPARAM wParam, LPARAM lParam)
 		Result.ReleaseBuffer();

 	} else if (!lstrcmp(ai->targv[0], _T(VAR_STATDESC)))

 	{

-		Result = (VarParseData.Flags & VPF_XSTATUS) ? STR_XSTATUSDESC : (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, g_ProtoStates[VarParseData.szProto].Status, GCMDF_TCHAR);

+		Result = (VarParseData.Flags & VPF_XSTATUS) ? STR_XSTATUSDESC : (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, g_ProtoStates[VarParseData.szProto].Status, GSMDF_TCHAR);

 	} else if (!lstrcmp(ai->targv[0], _T(VAR_MYNICK)))

 	{

 		if (g_MoreOptPage.GetDBValueCopy(IDC_MOREOPTDLG_MYNICKPERPROTO) && VarParseData.szProto)

@@ -843,7 +845,7 @@ static int MyCallService(const char *name, WPARAM wParam, LPARAM lParam)
 {

 	if (name && wParam <= ID_STATUS_OUTTOLUNCH && wParam >= ID_STATUS_OFFLINE) // wParam conditions here are distinctive "features" of PS_SETSTATUS and PS_SETAWAYMSG services, so if wParam does not suit them, we'll pass the control to the old CallService function as soon as possible

 	{

-		char *pProtoNameEnd = strrchr(name, '/');

+		const char *pProtoNameEnd = strrchr(name, '/');

 		if (pProtoNameEnd)

 		{

 			if (!lstrcmpA(pProtoNameEnd, PS_SETSTATUS))

@@ -1053,17 +1055,12 @@ int MirandaLoaded(WPARAM wParam, LPARAM lParam)
 extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)

 {

 	pluginLink = link;

-	if (CallService(MS_SYSTEM_GETVERSION, 0, 0) < 0x060000)

-	{

-		MessageBox(NULL, TranslateT("New Away System plugin requires Miranda version 0.6.0.0 or above."), TranslateT("New Away System"), MB_OK);

-		return 1;

-	}

+	mir_getMMI( &mmi );

+	mir_getLP( &pluginInfo );

+

 	hHooks.AddElem(HookEvent(ME_SYSTEM_MODULESLOADED, MirandaLoaded));

-//	hHooks.AddElem(HookEvent(ME_CS_CSMODULELOADED, CSModuleLoaded)); // compatibility with StartupStatus and AdvancedAutoAway

 	if (DBGetContactSettingString(NULL, "KnownModules", "New Away System", (char*)NULL) == NULL)

-	{

 		DBWriteContactSettingString(NULL, "KnownModules", "New Away System", MOD_NAME);

-	}

 

 	InitCommonControls();

 	InitOptions(); // must be called before we hook CallService

diff --git a/plugins/NewAwaySysMod/Client.cpp b/plugins/NewAwaySysMod/Client.cpp
index e37d3eeb62..5edd3537a6 100644
--- a/plugins/NewAwaySysMod/Client.cpp
+++ b/plugins/NewAwaySysMod/Client.cpp
@@ -160,7 +160,7 @@ int GetRecentGroupID(int iMode)
 	{

 		for (Order = 0; Order < TreeCtrl->Value.GetSize(); Order++) // find a group named accordingly to the current status

 		{

-			if (TreeCtrl->Value[Order].ParentID == g_Messages_RecentRootID && TreeCtrl->Value[Order].Flags & TIF_GROUP && !_tcsicmp(TreeCtrl->Value[Order].Title, iMode ? (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, iMode, GCMDF_TCHAR) : MSGTREE_RECENT_OTHERGROUP))

+			if (TreeCtrl->Value[Order].ParentID == g_Messages_RecentRootID && TreeCtrl->Value[Order].Flags & TIF_GROUP && !_tcsicmp(TreeCtrl->Value[Order].Title, iMode ? (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, iMode, GSMDF_TCHAR) : MSGTREE_RECENT_OTHERGROUP))

 			{

 				return TreeCtrl->Value[Order].ID;

 			}

diff --git a/plugins/NewAwaySysMod/Common.h b/plugins/NewAwaySysMod/Common.h
index 0cec979cd0..52df7ac67d 100644
--- a/plugins/NewAwaySysMod/Common.h
+++ b/plugins/NewAwaySysMod/Common.h
@@ -21,8 +21,9 @@
 

 #pragma once

 

+#define _CRT_SECURE_NO_WARNINGS

 #define WIN32_LEAN_AND_MEAN

-#define _WIN32_WINNT 0x0400

+#define _WIN32_WINNT 0x0500

 

 #define MIRANDA_VER 0x0600

 

@@ -63,9 +64,9 @@
 #include "m_popup.h"

 //#include "m_popupw.h"

 #include "m_metacontacts.h"

-#include "..\CommonLibs\m_LogService.h"

-#include "..\CommonLibs\CString.h"

-#include "..\CommonLibs\Options.h"

+#include "m_LogService.h"

+#include ".\CommonLibs\CString.h"

+#include ".\CommonLibs\Options.h"

 

 

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

diff --git a/plugins/NewAwaySysMod/CommonLibs/CString.cpp b/plugins/NewAwaySysMod/CommonLibs/CString.cpp
index de3b1a3297..a021132b14 100644
--- a/plugins/NewAwaySysMod/CommonLibs/CString.cpp
+++ b/plugins/NewAwaySysMod/CommonLibs/CString.cpp
@@ -17,7 +17,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

 

-//#include <stdio.h>

+#define _CRT_SECURE_NO_WARNINGS

 #include "CString.h"

 

 #define STR_GROWBY 64

@@ -158,7 +158,7 @@ TString<T>& TString<T>::Replace(const T *szFind, const T *szReplaceBy)
 	TString<T> Result;

 	Result.GetBuffer(1)[0] = '\0';

 	Result.ReleaseBuffer(0); // set the string to ""; we can't do it in a usual way (using a constructor or an assignment) because we don't know whether "" needs to be unicode or ansi

-	while (p = My_strstr(pCurPos, szFind))

+	while (p = ( T* )My_strstr(pCurPos, szFind))

 	{

 		Result.DiffCat(pCurPos, p);

 		Result += szReplaceBy;

@@ -339,8 +339,8 @@ TCString DBGetContactSettingString(HANDLE hContact, const char *szModule, const
 

 int DBGetContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv)

 {

-	//return DBGetContactSettingString_Helper(hContact, szModule, szSetting, dbv, __FILE__, __LINE__, DBVT_ASCIIZ);

-	return DBGetContactSettingString_Helper(hContact, szModule, szSetting, dbv, DBVT_ASCIIZ);

+	return DBGetContactSettingString_Helper(hContact, szModule, szSetting, dbv, __FILE__, __LINE__, DBVT_ASCIIZ);

+	//return DBGetContactSettingString_Helper(hContact, szModule, szSetting, dbv, DBVT_ASCIIZ);

 	

 }

 

diff --git a/plugins/NewAwaySysMod/CommonLibs/CString.h b/plugins/NewAwaySysMod/CommonLibs/CString.h
index 8ba1a8da07..ed2540c511 100644
--- a/plugins/NewAwaySysMod/CommonLibs/CString.h
+++ b/plugins/NewAwaySysMod/CommonLibs/CString.h
@@ -33,7 +33,7 @@ __inline int My_lstrlen(LPCSTR lpString) {return lstrlenA(lpString);}
 __inline int My_lstrlen(LPCWSTR lpString) {return lstrlenW(lpString);}

 __inline int My_lstrcmp(LPCSTR lpString1, LPCSTR lpString2) {return lstrcmpA(lpString1, lpString2);}

 __inline int My_lstrcmp(LPCWSTR lpString1, LPCWSTR lpString2) {return lstrcmpW(lpString1, lpString2);}

-__inline LPSTR My_strstr(LPCSTR lpString1, LPCSTR lpString2) {return strstr(lpString1, lpString2);}

+__inline LPCSTR My_strstr(LPCSTR lpString1, LPCSTR lpString2) {return strstr(lpString1, lpString2);}

 __inline LPWSTR My_strstr(LPCWSTR lpString1, LPCWSTR lpString2) {return (LPWSTR)wcsstr(lpString1, lpString2);}

 __inline LPSTR My_lstrcpy(LPSTR lpString1, LPCSTR lpString2) {return lstrcpyA(lpString1, lpString2);}

 __inline LPWSTR My_lstrcpy(LPWSTR lpString1, LPCWSTR lpString2) {return lstrcpyW(lpString1, lpString2);}

diff --git a/plugins/NewAwaySysMod/NewAwaySys.vcxproj b/plugins/NewAwaySysMod/NewAwaySys.vcxproj
index 9077f56283..cbcb347f0c 100644
--- a/plugins/NewAwaySysMod/NewAwaySys.vcxproj
+++ b/plugins/NewAwaySysMod/NewAwaySys.vcxproj
@@ -288,30 +288,30 @@
     <ClCompile Include="AwaySys.cpp" />

     <ClCompile Include="Client.cpp" />

     <ClCompile Include="ContactList.cpp" />

-    <ClCompile Include="..\CommonLibs\CString.cpp" />

-    <ClCompile Include="..\CommonLibs\GroupCheckbox.cpp" />

+    <ClCompile Include=".\CommonLibs\CString.cpp" />

+    <ClCompile Include=".\CommonLibs\GroupCheckbox.cpp" />

     <ClCompile Include="MsgEventAdded.cpp">

       <Optimization Condition="'$(Configuration)|$(Platform)'=='ReleaseW|Win32'">MinSpace</Optimization>

     </ClCompile>

     <ClCompile Include="MsgTree.cpp" />

     <ClCompile Include="Notification.cpp" />

-    <ClCompile Include="..\CommonLibs\Options.cpp" />

+    <ClCompile Include=".\CommonLibs\Options.cpp" />

     <ClCompile Include="Properties.cpp" />

     <ClCompile Include="ReadAwayMsg.cpp" />

     <ClCompile Include="Services.cpp" />

     <ClCompile Include="SetAwayMsg.cpp" />

-    <ClCompile Include="..\CommonLibs\ThemedImageCheckbox.cpp" />

-    <ClCompile Include="..\CommonLibs\Themes.cpp" />

+    <ClCompile Include=".\CommonLibs\ThemedImageCheckbox.cpp" />

+    <ClCompile Include=".\CommonLibs\Themes.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="AggressiveOptimize.h" />

     <ClInclude Include="Common.h" />

     <ClInclude Include="ContactList.h" />

-    <ClInclude Include="..\CommonLibs\CString.h" />

-    <ClInclude Include="..\CommonLibs\GroupCheckbox.h" />

-    <ClInclude Include="..\CommonLibs\m_ContactSettings.h" />

-    <ClInclude Include="..\CommonLibs\m_LogService.h" />

-    <ClInclude Include="..\CommonLibs\m_NewAwaySys.h" />

+    <ClInclude Include=".\CommonLibs\CString.h" />

+    <ClInclude Include=".\CommonLibs\GroupCheckbox.h" />

+    <ClInclude Include=".\CommonLibs\m_ContactSettings.h" />

+    <ClInclude Include=".\CommonLibs\m_LogService.h" />

+    <ClInclude Include=".\CommonLibs\m_NewAwaySys.h" />

     <ClInclude Include="m_popup.h" />

     <ClInclude Include="m_popupw.h" />

     <ClInclude Include="m_statusplugins.h" />

@@ -319,14 +319,14 @@
     <ClInclude Include="m_updater.h" />

     <ClInclude Include="m_variables.h" />

     <ClInclude Include="MsgTree.h" />

-    <ClInclude Include="..\CommonLibs\Options.h" />

+    <ClInclude Include=".\CommonLibs\Options.h" />

     <ClInclude Include="Path.h" />

     <ClInclude Include="Properties.h" />

     <ClInclude Include="resource.h" />

     <ClInclude Include="Services.h" />

-    <ClInclude Include="..\CommonLibs\ThemedImageCheckbox.h" />

-    <ClInclude Include="..\CommonLibs\Themes.h" />

-    <ClInclude Include="..\CommonLibs\TMyArray.h" />

+    <ClInclude Include=".\CommonLibs\ThemedImageCheckbox.h" />

+    <ClInclude Include=".\CommonLibs\Themes.h" />

+    <ClInclude Include=".\CommonLibs\TMyArray.h" />

     <ClInclude Include="VersionNo.h" />

   </ItemGroup>

   <ItemGroup>

diff --git a/plugins/NewAwaySysMod/Notification.cpp b/plugins/NewAwaySysMod/Notification.cpp
index b1434d0155..56f94b2ca6 100644
--- a/plugins/NewAwaySysMod/Notification.cpp
+++ b/plugins/NewAwaySysMod/Notification.cpp
@@ -30,8 +30,8 @@ void ShowMsg(TCHAR *FirstLine, TCHAR *SecondLine, bool IsErrorMsg, int Timeout)
 		ppd.lchIcon = LoadIcon(NULL, IsErrorMsg ? IDI_EXCLAMATION : IDI_INFORMATION);

 //		lstrcpy(ppd.lpzContactName, FirstLine);

 //		lstrcpy(ppd.lpzText, SecondLine);

-		lstrcpy(ppd.lpwzContactName, FirstLine);

-		lstrcpy(ppd.lpwzText, SecondLine);

+		lstrcpy(ppd.lptzContactName, FirstLine);

+		lstrcpy(ppd.lptzText, SecondLine);

 		ppd.colorBack = IsErrorMsg ? 0x0202E3 : 0xE8F1FD;

 		ppd.colorText = IsErrorMsg ? 0xE8F1FD : 0x000000;

 		ppd.iSeconds = Timeout;

@@ -223,7 +223,7 @@ int ShowPopupNotification(COptPage &PopupNotifyData, HANDLE hContact, int iStatu
 		TCString szUIN;

 		_ultot(VarParseData.UIN, szUIN.GetBuffer(16), 10);

 		szUIN.ReleaseBuffer();

-		TCHAR *szStatDesc = iStatusMode ? (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, iStatusMode, GCMDF_TCHAR) : STR_XSTATUSDESC;

+		TCHAR *szStatDesc = iStatusMode ? (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, iStatusMode, GSMDF_TCHAR) : STR_XSTATUSDESC;

 		_ASSERT(szStatDesc);

 		PopupMsg = TCString((TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)) + _T(" (") + szUIN + TranslateT(") is reading your ") + szStatDesc + TranslateT(" message:\r\n") + ExtraText;

 	}

diff --git a/plugins/NewAwaySysMod/Path.h b/plugins/NewAwaySysMod/Path.h
index e64b7ceb3c..5577d14063 100644
--- a/plugins/NewAwaySysMod/Path.h
+++ b/plugins/NewAwaySysMod/Path.h
@@ -20,7 +20,7 @@
 #pragma once

 

 #include "m_utils.h"

-#include "..\CommonLibs\CString.h"

+#include ".\CommonLibs\CString.h"

 

 

 __inline TCString Path_ToRelative(TCString &Path)

diff --git a/plugins/NewAwaySysMod/Properties.cpp b/plugins/NewAwaySysMod/Properties.cpp
index 97ecf7d665..eb14d79950 100644
--- a/plugins/NewAwaySysMod/Properties.cpp
+++ b/plugins/NewAwaySysMod/Properties.cpp
@@ -260,7 +260,7 @@ void CProtoSettings::SetMsgFormat(int Flags, TCString Message)
 		int RecentGroupID = GetRecentGroupID(Status);

 		if (RecentGroupID == -1)

 		{ // we didn't find the group, it also means that we're using per status messages; so we need to create it

-			TreeCtrl->Value.AddElem(CTreeItem(Status ? (const TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, Status, GCMDF_TCHAR) : MSGTREE_RECENT_OTHERGROUP, g_Messages_RecentRootID, RecentGroupID = TreeCtrl->GenerateID(), TIF_GROUP));

+			TreeCtrl->Value.AddElem(CTreeItem(Status ? (const TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, Status, GSMDF_TCHAR) : MSGTREE_RECENT_OTHERGROUP, g_Messages_RecentRootID, RecentGroupID = TreeCtrl->GenerateID(), TIF_GROUP));

 			TreeCtrl->SetModified(true);

 		}

 		int I;

diff --git a/plugins/NewAwaySysMod/ReadAwayMsg.cpp b/plugins/NewAwaySysMod/ReadAwayMsg.cpp
index c5524911c1..925271326d 100644
--- a/plugins/NewAwaySysMod/ReadAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/ReadAwayMsg.cpp
@@ -69,7 +69,7 @@ static INT_PTR CALLBACK ReadAwayMsgDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam
 			TCHAR *status, *contactName;

 			contactName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)awayData->hContact, GCDNF_TCHAR);

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

-			status = (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, DBGetContactSettingWord(awayData->hContact, szProto, "Status", ID_STATUS_OFFLINE), GCMDF_TCHAR);

+			status = (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, DBGetContactSettingWord(awayData->hContact, szProto, "Status", ID_STATUS_OFFLINE), GSMDF_TCHAR);

 			GetWindowText(hwndDlg, format, lengthof(format));

 			_sntprintf(str, lengthof(str), format, status, contactName);

 			SetWindowText(hwndDlg, str);

diff --git a/plugins/NewAwaySysMod/Services.cpp b/plugins/NewAwaySysMod/Services.cpp
index 74cb52be8e..41d7e8e42a 100644
--- a/plugins/NewAwaySysMod/Services.cpp
+++ b/plugins/NewAwaySysMod/Services.cpp
@@ -20,7 +20,7 @@
 

 #include "Common.h"

 #include "Properties.h"

-#include "..\CommonLibs\m_NewAwaySys.h"

+#include "m_NewAwaySys.h"

 

 

 typedef struct {

diff --git a/plugins/NewAwaySysMod/SetAwayMsg.cpp b/plugins/NewAwaySysMod/SetAwayMsg.cpp
index 2a6d17a86f..50f876ff88 100644
--- a/plugins/NewAwaySysMod/SetAwayMsg.cpp
+++ b/plugins/NewAwaySysMod/SetAwayMsg.cpp
@@ -26,7 +26,7 @@
 #include "ContactList.h"

 #include "MsgTree.h"

 #include "Properties.h"

-#include "..\CommonLibs\m_NewAwaySys.h"

+#include "m_NewAwaySys.h"

 

 #define EXTRAIMGLIST_DOT 0

 #define EXTRAIMGLIST_IGNORE 1

@@ -968,7 +968,7 @@ int CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 							//TCString WindowTitle(TranslateT("Set "));

 							TCString WindowTitle(TranslateT("Set message for"));

 							WindowTitle += _T(" \"");

-							WindowTitle += Status ? (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, Status, GCMDF_TCHAR) : TranslateT("Statuses");

+							WindowTitle += Status ? (TCHAR*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, Status, GSMDF_TCHAR) : TranslateT("Statuses");

 							//WindowTitle += TranslateT(" message");

 							if (nNewContacts == 1)

 							{