adopted Notes&Reminders, added x64 version

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

27 files changed, 200 insertions, 125 deletions

diff --git a/plugins/!NotAdopted/NotesAndReminders/NotesReminders.vcxproj b/plugins/NotesAndReminders/NotesReminders.vcxproj
index d77a0f481c..c19719ddaa 100644
--- a/plugins/!NotAdopted/NotesAndReminders/NotesReminders.vcxproj
+++ b/plugins/NotesAndReminders/NotesReminders.vcxproj
@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|x64">

+      <Configuration>Debug</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

     <ProjectConfiguration Include="Release|Win32">

       <Configuration>Release</Configuration>

       <Platform>Win32</Platform>

     </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|x64">

+      <Configuration>Release</Configuration>

+      <Platform>x64</Platform>

+    </ProjectConfiguration>

   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{EEB57129-946C-4B98-8856-FDA501AE2A5E}</ProjectGuid>

@@ -20,26 +28,45 @@
     <CharacterSet>MultiByte</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+  </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

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

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <CharacterSet>MultiByte</CharacterSet>

+  </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.40219.1</_ProjectFileVersion>

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

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

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

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

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

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

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

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

     <IgnoreImportLibrary>true</IgnoreImportLibrary>

   </PropertyGroup>

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

@@ -68,6 +95,32 @@
       <AdditionalLibraryDirectories>$(SolutionDir)\lib</AdditionalLibraryDirectories>

     </Link>

   </ItemDefinitionGroup>

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

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

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

+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>

+      <WarningLevel>Level3</WarningLevel>

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

+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>globals.h</PrecompiledHeaderFile>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+    </ClCompile>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>comctl32.lib;Gdi32.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <BaseAddress>0x14310000</BaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+      <SubSystem>Windows</SubSystem>

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

+    </Link>

+  </ItemDefinitionGroup>

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

     <ClCompile>

       <Optimization>Full</Optimization>

@@ -79,7 +132,36 @@
       <WarningLevel>Level3</WarningLevel>

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

       <PrecompiledHeader>Use</PrecompiledHeader>

-      <PrecompiledHeaderFile>global.h</PrecompiledHeaderFile>

+      <PrecompiledHeaderFile>globals.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ResourceCompile>

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

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

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>Gdi32.lib;comctl32.lib;winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OptimizeReferences>true</OptimizeReferences>

+      <BaseAddress>0x14310000</BaseAddress>

+      <RandomizedBaseAddress>false</RandomizedBaseAddress>

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

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <SubSystem>Windows</SubSystem>

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

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+    </Link>

+  </ItemDefinitionGroup>

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

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

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

+      <StringPooling>true</StringPooling>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <WarningLevel>Level3</WarningLevel>

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

+      <PrecompiledHeader>Use</PrecompiledHeader>

+      <PrecompiledHeaderFile>globals.h</PrecompiledHeaderFile>

     </ClCompile>

     <ResourceCompile>

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

diff --git a/plugins/!NotAdopted/NotesAndReminders/NotesReminders.vcxproj.filters b/plugins/NotesAndReminders/NotesReminders.vcxproj.filters
index 5eccb5444e..5eccb5444e 100644
--- a/plugins/!NotAdopted/NotesAndReminders/NotesReminders.vcxproj.filters
+++ b/plugins/NotesAndReminders/NotesReminders.vcxproj.filters
diff --git a/plugins/!NotAdopted/NotesAndReminders/docs/N&R - readme.txt b/plugins/NotesAndReminders/docs/N&R - readme.txt
index 30ced4b8f1..30ced4b8f1 100644
--- a/plugins/!NotAdopted/NotesAndReminders/docs/N&R - readme.txt
+++ b/plugins/NotesAndReminders/docs/N&R - readme.txt
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/addremin.ico b/plugins/NotesAndReminders/res/addremin.ico
index 0264fd1716..0264fd1716 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/addremin.ico
+++ b/plugins/NotesAndReminders/res/addremin.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/bringfront.ico b/plugins/NotesAndReminders/res/bringfront.ico
index 11984568a8..11984568a8 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/bringfront.ico
+++ b/plugins/NotesAndReminders/res/bringfront.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/captioni.ico b/plugins/NotesAndReminders/res/captioni.ico
index c7543c075f..c7543c075f 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/captioni.ico
+++ b/plugins/NotesAndReminders/res/captioni.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/captionn.ico b/plugins/NotesAndReminders/res/captionn.ico
index fd925f0660..fd925f0660 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/captionn.ico
+++ b/plugins/NotesAndReminders/res/captionn.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/deleteic.ico b/plugins/NotesAndReminders/res/deleteic.ico
index 5aa90434c1..5aa90434c1 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/deleteic.ico
+++ b/plugins/NotesAndReminders/res/deleteic.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/deletere.ico b/plugins/NotesAndReminders/res/deletere.ico
index 8560fc8f5e..8560fc8f5e 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/deletere.ico
+++ b/plugins/NotesAndReminders/res/deletere.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/hidenote.ico b/plugins/NotesAndReminders/res/hidenote.ico
index bada524874..bada524874 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/hidenote.ico
+++ b/plugins/NotesAndReminders/res/hidenote.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/noteicon.ico b/plugins/NotesAndReminders/res/noteicon.ico
index 5479ed29e7..5479ed29e7 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/noteicon.ico
+++ b/plugins/NotesAndReminders/res/noteicon.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/playsound.ico b/plugins/NotesAndReminders/res/playsound.ico
index 0e3711dbc5..0e3711dbc5 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/playsound.ico
+++ b/plugins/NotesAndReminders/res/playsound.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/reminder.ico b/plugins/NotesAndReminders/res/reminder.ico
index d3bed91d4d..d3bed91d4d 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/reminder.ico
+++ b/plugins/NotesAndReminders/res/reminder.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/removeno.ico b/plugins/NotesAndReminders/res/removeno.ico
index d2aae887a6..d2aae887a6 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/removeno.ico
+++ b/plugins/NotesAndReminders/res/removeno.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/resource.rc b/plugins/NotesAndReminders/res/resource.rc
index d66898ed60..d66898ed60 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/resource.rc
+++ b/plugins/NotesAndReminders/res/resource.rc
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/showhide.ico b/plugins/NotesAndReminders/res/showhide.ico
index 99b241d4fb..99b241d4fb 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/showhide.ico
+++ b/plugins/NotesAndReminders/res/showhide.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/viewnotes.ico b/plugins/NotesAndReminders/res/viewnotes.ico
index 18057a372a..18057a372a 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/viewnotes.ico
+++ b/plugins/NotesAndReminders/res/viewnotes.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/res/viewremi.ico b/plugins/NotesAndReminders/res/viewremi.ico
index b9e8bce9d5..b9e8bce9d5 100644
--- a/plugins/!NotAdopted/NotesAndReminders/res/viewremi.ico
+++ b/plugins/NotesAndReminders/res/viewremi.ico
diff --git a/plugins/!NotAdopted/NotesAndReminders/src/globals.h b/plugins/NotesAndReminders/src/globals.h
index f8cc794e4a..ecdae3cf1c 100644
--- a/plugins/!NotAdopted/NotesAndReminders/src/globals.h
+++ b/plugins/NotesAndReminders/src/globals.h
@@ -97,7 +97,7 @@ extern BOOL CheckRemindersAndStart(void);
 

 extern void InitSettings(void);

 extern void TermSettings(void);

-extern int CALLBACK DlgProcOptions(HWND hdlg,UINT message,

+extern INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,

 								   WPARAM wParam,LPARAM lParam);

 extern void LoadNRFont(int i, LOGFONT *lf, COLORREF *colour);

 

@@ -109,7 +109,6 @@ extern LPCSTR GetTimeFormatStr();
 

 extern HINSTANCE hinstance;

 extern HINSTANCE hmiranda;

-extern PLUGINLINK *pluginLink;

 

 extern BOOL g_CloseAfterAddReminder, g_UseDefaultPlaySound;

 extern HICON g_hReminderIcon;

diff --git a/plugins/!NotAdopted/NotesAndReminders/src/hotkeys.cpp b/plugins/NotesAndReminders/src/hotkeys.cpp
index a8bd8d3c53..d324d5fdd7 100644
--- a/plugins/!NotAdopted/NotesAndReminders/src/hotkeys.cpp
+++ b/plugins/NotesAndReminders/src/hotkeys.cpp
@@ -1,6 +1,6 @@
 #include "globals.h"

 

-#define MSG_WND_CLASS "MIM_SNMsgWindow"

+#define MSG_WND_CLASS _T("MIM_SNMsgWindow")

 

 

 HWND HKHwnd;

@@ -15,31 +15,32 @@ void RegisterKeyBindings()
 

 	ZeroMemory(&desc, sizeof(desc));

 	desc.cbSize = sizeof(desc);

-	desc.pszSection = SECTIONNAME;

+	desc.ptszSection = _T(SECTIONNAME);

+	desc.dwFlags = HKD_TCHAR;

 

 	desc.pszName = MODULENAME"/NewNote";

-	desc.pszDescription = "New Note";

+	desc.ptszDescription = LPGENT("New Note");

 	desc.lParam = KB_NEW_NOTE;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, VK_INSERT);

 	desc.pszService = MODULENAME"/MenuCommandAddNew";

 	Hotkey_Register(&desc);

 

 	desc.pszName = MODULENAME"/ToggleNotesVis";

-	desc.pszDescription = "Toggle Notes Visibility";

+	desc.ptszDescription = LPGENT("Toggle Notes Visibility");

 	desc.lParam = KB_TOGGLE_NOTES;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, VK_ADD);

 	desc.pszService = MODULENAME"/MenuCommandShowHide";

 	Hotkey_Register(&desc);

 

 	desc.pszName = MODULENAME"/BringNotesFront";

-	desc.pszDescription = "Bring All Notes to Front";

+	desc.ptszDescription = LPGENT("Bring All Notes to Front");

 	desc.lParam = KB_TOGGLE_NOTES;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, VK_HOME);

 	desc.pszService = MODULENAME"/MenuCommandBringAllFront";

 	Hotkey_Register(&desc);

 

 	desc.pszName = MODULENAME"/NewReminder";

-	desc.pszDescription = "New Reminder";

+	desc.ptszDescription = LPGENT("New Reminder");

 	desc.lParam = KB_NEW_REMINDER;

 	desc.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL|HOTKEYF_SHIFT, VK_SUBTRACT);

 	desc.pszService = MODULENAME"/MenuCommandNewReminder";

@@ -80,7 +81,7 @@ void RegisterKeyBindings()
 }*/

 

 

-int CALLBACK NotifyHotKeyWndProc(HWND AHwnd,UINT Message,WPARAM wParam,LPARAM lParam)

+LRESULT CALLBACK NotifyHotKeyWndProc(HWND AHwnd,UINT Message,WPARAM wParam,LPARAM lParam)

 {

 	BOOL b;

 

@@ -116,7 +117,7 @@ void CreateMsgWindow(void)
 		TWC.lpszMenuName = NULL;

 		TWC.lpszClassName = MSG_WND_CLASS;

 		TWC.cbSize = sizeof(TWC);

-		TWC.lpfnWndProc = (WNDPROC)NotifyHotKeyWndProc;

+		TWC.lpfnWndProc = NotifyHotKeyWndProc;

 		RegisterClassEx(&TWC);

 	}

 

diff --git a/plugins/!NotAdopted/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp
index 2165a8e49b..505aa21fbb 100644
--- a/plugins/!NotAdopted/NotesAndReminders/src/main.cpp
+++ b/plugins/NotesAndReminders/src/main.cpp
@@ -33,12 +33,12 @@ static PLUGININFOEX pluginInfo =
 

 void RegisterFontServiceFonts();

 void RegisterKeyBindings();

-int OpenTriggeredReminder(WPARAM w, LPARAM l);

+INT_PTR OpenTriggeredReminder(WPARAM w, LPARAM l);

 void BringAllNotesToFront(STICKYNOTE *pActive);

 void CloseNotesList();

 void CloseReminderList();

 

-int PluginMenuCommandAddNew(WPARAM w,LPARAM l)

+INT_PTR PluginMenuCommandAddNew(WPARAM w,LPARAM l)

 {

 	STICKYNOTE* PSN;

 	PSN = NewNote(0,0,0,0,NULL,NULL,TRUE,TRUE,0);

@@ -46,74 +46,74 @@ int PluginMenuCommandAddNew(WPARAM w,LPARAM l)
 	return 0;

 }

 

-int PluginMenuCommandDeleteAll(WPARAM w,LPARAM l)

+INT_PTR PluginMenuCommandDeleteAll(WPARAM w,LPARAM l)

 {

-	if (g_Stickies && MessageBox(NULL, Translate("Are you sure you want to delete all notes?"), SECTIONNAME, MB_OKCANCEL) == IDOK)

+	if (g_Stickies && MessageBox(NULL, TranslateT("Are you sure you want to delete all notes?"), _T(SECTIONNAME), MB_OKCANCEL) == IDOK)

 		DeleteNotes();

 	return 0;

 }

 

-int PluginMenuCommandShowHide(WPARAM w,LPARAM l)

+INT_PTR PluginMenuCommandShowHide(WPARAM w,LPARAM l)

 {

 	ShowHideNotes();

 	return 0;

 }

 

-int PluginMenuCommandViewNotes(WPARAM w,LPARAM l)

+INT_PTR PluginMenuCommandViewNotes(WPARAM w,LPARAM l)

 {

 	ListNotes();

 	return 0;

 }

 

-int PluginMenuCommandAllBringFront(WPARAM w,LPARAM l)

+INT_PTR PluginMenuCommandAllBringFront(WPARAM w,LPARAM l)

 {

 	BringAllNotesToFront(NULL);

 	return 0;

 }

 

-int PluginMenuCommandNewReminder(WPARAM w,LPARAM l)

+INT_PTR PluginMenuCommandNewReminder(WPARAM w,LPARAM l)

 {

 	NewReminder();

 	return 0;

 }

 

-int PluginMenuCommandViewReminders(WPARAM w,LPARAM l)

+INT_PTR PluginMenuCommandViewReminders(WPARAM w,LPARAM l)

 {

 	ListReminders();

 	return 0;

 }

 

-int PluginMenuCommandDeleteReminders(WPARAM w,LPARAM l)

+INT_PTR PluginMenuCommandDeleteReminders(WPARAM w,LPARAM l)

 {

-	if (RemindersList && MessageBox(NULL, Translate("Are you sure you want to delete all reminders?"), SECTIONNAME, MB_OKCANCEL) == IDOK)

+	if (RemindersList && MessageBox(NULL, TranslateT("Are you sure you want to delete all reminders?"), _T(SECTIONNAME), MB_OKCANCEL) == IDOK)

 		DeleteReminders();

 	return 0;

 }

 

 struct

 {

-	char* szDescr;

+	TCHAR* szDescr;

 	char* szName;

 	int   defIconID;

 }

 static const iconList[] =

 {

-	{"New Reminder", "AddReminder", IDI_ADDREMINDER},

-	{"Delete All Notes", "DeleteIcon", IDI_DELETEICON},

-	{"New Note", "NoteIcon", IDI_NOTEICON},

-	{"Show/Hide Notes", "ShowHide", IDI_SHOWHIDE},

-	{"On Top Caption Icon", "CaptionIcon", IDI_CAPTIONICON},

-	{"Delete All Reminders", "DeleteReminder", IDI_DELETEREMINDER},

-	{"View Reminders", "ViewReminders", IDI_VIEWREMINDERS},

-	{"Not on Top Caption Icon", "CaptionIconNotTop", IDI_CAPTIONICONNOTTOP},

-	{"Hide Note Icon", "HideNote", IDI_HIDENOTE},

-	{"Remove Note Icon", "RemoveNote", IDI_REMOVENOTE},

-	{"Reminder Icon", "Reminder", IDI_REMINDER},

-	{"Bring All to Front", "BringFront", IDI_BRINGFRONT},

-	{"Play Sound Icon", "PlaySound", IDI_PLAYSOUND},

-	{"View Notes", "ViewNotes", IDI_VIEWNOTES},

-	{"New Note", "NewNote", IDI_NOTEICON},

-	{"New Reminder", "NewReminder", IDI_ADDREMINDER}

+	{LPGENT("New Reminder"), "AddReminder", IDI_ADDREMINDER},

+	{LPGENT("Delete All Notes"), "DeleteIcon", IDI_DELETEICON},

+	{LPGENT("New Note"), "NoteIcon", IDI_NOTEICON},

+	{LPGENT("Show/Hide Notes"), "ShowHide", IDI_SHOWHIDE},

+	{LPGENT("On Top Caption Icon"), "CaptionIcon", IDI_CAPTIONICON},

+	{LPGENT("Delete All Reminders"), "DeleteReminder", IDI_DELETEREMINDER},

+	{LPGENT("View Reminders"), "ViewReminders", IDI_VIEWREMINDERS},

+	{LPGENT("Not on Top Caption Icon"), "CaptionIconNotTop", IDI_CAPTIONICONNOTTOP},

+	{LPGENT("Hide Note Icon"), "HideNote", IDI_HIDENOTE},

+	{LPGENT("Remove Note Icon"), "RemoveNote", IDI_REMOVENOTE},

+	{LPGENT("Reminder Icon"), "Reminder", IDI_REMINDER},

+	{LPGENT("Bring All to Front"), "BringFront", IDI_BRINGFRONT},

+	{LPGENT("Play Sound Icon"), "PlaySound", IDI_PLAYSOUND},

+	{LPGENT("View Notes"), "ViewNotes", IDI_VIEWNOTES},

+	{LPGENT("New Note"), "NewNote", IDI_NOTEICON},

+	{LPGENT("New Reminder"), "NewReminder", IDI_ADDREMINDER}

 };

 

 HANDLE hIconLibItem[SIZEOF(iconList)];

@@ -130,14 +130,14 @@ void InitIcons(void)
 	sid.cbSize = sizeof(SKINICONDESC);

 	sid.ptszDefaultFile = szFile;

 	sid.pszName = szSettingName;

-	sid.pszSection = MODULENAME;

-	sid.flags = SIDF_PATH_TCHAR;

+	sid.ptszSection = _T(MODULENAME);

+	sid.flags = SIDF_ALL_TCHAR;

 

 	for (i = 0; i < SIZEOF(iconList); i++) 

 	{

 		mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", MODULENAME, iconList[i].szName);

 

-		sid.pszDescription = iconList[i].szDescr;

+		sid.ptszDescription = iconList[i].szDescr;

 		sid.iDefaultIndex = -iconList[i].defIconID;

 		hIconLibItem[i] = Skin_AddIcon(&sid);

 	}	

@@ -150,9 +150,10 @@ int OnOptInitialise(WPARAM w, LPARAM L)
 	odp.position = 900002000;

 	odp.hInstance = hinstance;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_STNOTEOPTIONS);

-	odp.pszTitle = _T(SECTIONNAME);

-	odp.pszGroup = _T("Plugins");

+	odp.ptszTitle = _T(SECTIONNAME);

+	odp.ptszGroup = _T("Plugins");

 	odp.pfnDlgProc = DlgProcOptions;

+	odp.flags = ODPF_TCHAR;

 	Options_AddPage(w, &odp);

 	return 0;

 }

@@ -181,9 +182,9 @@ static void InitServices()
 {

 	// register sounds

 

-	SkinAddNewSoundEx("AlertReminder", "Alerts", "Reminder triggered");

-	SkinAddNewSoundEx("AlertReminder2", "Alerts", "Reminder triggered (Alternative 1)");

-	SkinAddNewSoundEx("AlertReminder3", "Alerts", "Reminder triggered (Alternative 2)");

+	SkinAddNewSoundExT("AlertReminder", LPGENT("Alerts"), LPGENT("Reminder triggered"));

+	SkinAddNewSoundExT("AlertReminder2", LPGENT("Alerts"), LPGENT("Reminder triggered (Alternative 1)"));

+	SkinAddNewSoundExT("AlertReminder3", LPGENT("Alerts"), LPGENT("Reminder triggered (Alternative 2)"));

 

 	// register menu command services

 

@@ -217,19 +218,19 @@ int OnModulesLoaded(WPARAM wparam,LPARAM lparam)
 

 	cmi.cbSize = sizeof(cmi);

 	cmi.pszContactOwner = NULL;

-	cmi.pszPopupName = "Notes && Reminders";

-	cmi.flags = CMIM_ICON | CMIF_ICONFROMICOLIB;

+	cmi.ptszPopupName = LPGENT("Notes && Reminders");

+	cmi.flags = CMIF_TCHAR | CMIF_ICONFROMICOLIB;

 

 	cmi.position = 1600000000;

 	cmi.icolibItem = hIconLibItem[2];

-	cmi.pszName = "New &Note";

+	cmi.ptszName = LPGENT("New &Note");

 	cmi.pszService = MODULENAME"/MenuCommandAddNew";

 	if (g_AddContListMI) Menu_AddContactMenuItem(&cmi);

 	Menu_AddMainMenuItem(&cmi);

 

 	cmi.position = 1600000001;

 	cmi.icolibItem = hIconLibItem[0];

-	cmi.pszName = "New &Reminder";

+	cmi.ptszName = LPGENT("New &Reminder");

 	cmi.pszService = MODULENAME"/MenuCommandNewReminder";

 	if (g_AddContListMI) Menu_AddContactMenuItem(&cmi);

 	Menu_AddMainMenuItem(&cmi);

@@ -238,28 +239,28 @@ int OnModulesLoaded(WPARAM wparam,LPARAM lparam)
 

 	cmi.position = 1600100000;

 	cmi.icolibItem = hIconLibItem[3];

-	cmi.pszName = "&Show / Hide Notes";

+	cmi.ptszName = LPGENT("&Show / Hide Notes");

 	cmi.pszService = MODULENAME"/MenuCommandShowHide";

 	if (g_AddContListMI) Menu_AddContactMenuItem(&cmi);

 	Menu_AddMainMenuItem(&cmi);

 

 	cmi.position = 1600100001;

 	cmi.icolibItem = hIconLibItem[13];

-	cmi.pszName = "Vie&w Notes";

+	cmi.ptszName = LPGENT("Vie&w Notes");

 	cmi.pszService = MODULENAME"/MenuCommandViewNotes";

 	if (g_AddContListMI) Menu_AddContactMenuItem(&cmi);

 	Menu_AddMainMenuItem(&cmi);

 

 	cmi.position = 1600100002;

 	cmi.icolibItem = hIconLibItem[1];

-	cmi.pszName = "&Delete All Notes";

+	cmi.ptszName = LPGENT("&Delete All Notes");

 	cmi.pszService = MODULENAME"/MenuCommandDeleteAll";

 	if (g_AddContListMI) Menu_AddContactMenuItem(&cmi);

 	Menu_AddMainMenuItem(&cmi);

 

 	cmi.position = 1600100003;

 	cmi.icolibItem = hIconLibItem[11];

-	cmi.pszName = "&Bring All to Front";

+	cmi.ptszName = LPGENT("&Bring All to Front");

 	cmi.pszService = MODULENAME"/MenuCommandBringAllFront";

 	if (g_AddContListMI) Menu_AddContactMenuItem(&cmi);

 	Menu_AddMainMenuItem(&cmi);

@@ -268,14 +269,14 @@ int OnModulesLoaded(WPARAM wparam,LPARAM lparam)
 

 	cmi.position = 1600200000;

 	cmi.icolibItem = hIconLibItem[6];

-	cmi.pszName = "&View Reminders";

+	cmi.ptszName = LPGENT("&View Reminders");

 	cmi.pszService = MODULENAME"/MenuCommandViewReminders";

 	if (g_AddContListMI) Menu_AddContactMenuItem(&cmi);

 	Menu_AddMainMenuItem(&cmi);

 

 	cmi.position = 1600200001;

 	cmi.icolibItem = hIconLibItem[5];

-	cmi.pszName = "D&elete All Reminders";

+	cmi.ptszName = LPGENT("D&elete All Reminders");

 	cmi.pszService = MODULENAME"/MenuCommandDeleteReminders";

 	if (g_AddContListMI) Menu_AddContactMenuItem(&cmi);

 	Menu_AddMainMenuItem(&cmi);

@@ -347,15 +348,15 @@ extern "C" __declspec(dllexport) int Load(void)
 

 	g_isWin2kPlus = IsWinVer2000Plus();

 

-	hRichedDll = LoadLibrary("RICHED20.DLL");

+	hRichedDll = LoadLibrary(_T("RICHED20.DLL"));

 	if (!hRichedDll)

 	{

-		if (MessageBox(0, Translate("Miranda could not load the Note & Reminders plugin, RICHED20.DLL is missing. If you are using Windows 95 or WINE please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda."), SECTIONNAME, MB_YESNO | MB_ICONINFORMATION) != IDYES)

+		if (MessageBox(0, TranslateT("Miranda could not load the Note & Reminders plugin, RICHED20.DLL is missing. If you are using Windows 95 or WINE please make sure you have riched20.dll installed. Press 'Yes' to continue loading Miranda."), _T(SECTIONNAME), MB_YESNO | MB_ICONINFORMATION) != IDYES)

 			return 1;

 		return 0;

 	}

 

-	hUserDll = LoadLibrary("user32.dll");

+	hUserDll = LoadLibrary(_T("user32.dll"));

 	if (hUserDll) 

 	{

 		MySetLayeredWindowAttributes = (BOOL (WINAPI *)(HWND,COLORREF,BYTE,DWORD))GetProcAddress(hUserDll,"SetLayeredWindowAttributes");

@@ -367,7 +368,7 @@ extern "C" __declspec(dllexport) int Load(void)
 		MyMonitorFromWindow = NULL;

 	}

 

-	hKernelDll = LoadLibrary("kernel32.dll");

+	hKernelDll = LoadLibrary(_T("kernel32.dll"));

 	if (hKernelDll) 

 	{

 		MyTzSpecificLocalTimeToSystemTime = (BOOL (WINAPI*)(LPTIME_ZONE_INFORMATION,LPSYSTEMTIME,LPSYSTEMTIME))GetProcAddress(hKernelDll,"TzSpecificLocalTimeToSystemTime");

diff --git a/plugins/!NotAdopted/NotesAndReminders/src/miscutils.cpp b/plugins/NotesAndReminders/src/miscutils.cpp
index b4de98404c..b4de98404c 100644
--- a/plugins/!NotAdopted/NotesAndReminders/src/miscutils.cpp
+++ b/plugins/NotesAndReminders/src/miscutils.cpp
diff --git a/plugins/!NotAdopted/NotesAndReminders/src/miscutils.h b/plugins/NotesAndReminders/src/miscutils.h
index 104de5313c..104de5313c 100644
--- a/plugins/!NotAdopted/NotesAndReminders/src/miscutils.h
+++ b/plugins/NotesAndReminders/src/miscutils.h
diff --git a/plugins/!NotAdopted/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp
index 67bc7c3439..389bd0e904 100644
--- a/plugins/!NotAdopted/NotesAndReminders/src/notes.cpp
+++ b/plugins/NotesAndReminders/src/notes.cpp
@@ -46,7 +46,7 @@
 

 #define PENLINK ENLINK *

 

-#define NOTE_WND_CLASS "MIM_StickyNote"

+#define NOTE_WND_CLASS _T("MIM_StickyNote")

 

 

 #define IDM_COLORPRESET_BG 41000

@@ -65,36 +65,36 @@ struct ColorPreset
 

 static struct ColorPreset clrPresets[] =

 {

-	{"Black", RGB(0,0,0)},

-	{"Maroon", RGB(128,0,0)},

-	{"Green", RGB(0,128,0)},

-	{"Olive", RGB(128,128,0)},

-	{"Navy", RGB(0,0,128)},

-	{"Purple", RGB(128,0,128)},

-	{"Teal", RGB(0,128,128)},

-	{"Gray", RGB(128,128,128)},

-	{"Silver", RGB(192,192,192)},

-	{"Red", RGB(255,0,0)},

-	{"Orange", RGB(255,155,0)},

-	{"Lime", RGB(0,255,0)},

-	{"Yellow", RGB(255,255,0)},

-	{"Blue", RGB(0,0,255)},

-	{"Fuchsia", RGB(255,0,255)},

-	{"Aqua", RGB(0,255,255)},

-	{"White", RGB(255,255,255)}

+	{LPGENT("Black"), RGB(0,0,0)},

+	{LPGENT("Maroon"), RGB(128,0,0)},

+	{LPGENT("Green"), RGB(0,128,0)},

+	{LPGENT("Olive"), RGB(128,128,0)},

+	{LPGENT("Navy"), RGB(0,0,128)},

+	{LPGENT("Purple"), RGB(128,0,128)},

+	{LPGENT("Teal"), RGB(0,128,128)},

+	{LPGENT("Gray"), RGB(128,128,128)},

+	{LPGENT("Silver"), RGB(192,192,192)},

+	{LPGENT("Red"), RGB(255,0,0)},

+	{LPGENT("Orange"), RGB(255,155,0)},

+	{LPGENT("Lime"), RGB(0,255,0)},

+	{LPGENT("Yellow"), RGB(255,255,0)},

+	{LPGENT("Blue"), RGB(0,0,255)},

+	{LPGENT("Fuchsia"), RGB(255,0,255)},

+	{LPGENT("Aqua"), RGB(0,255,255)},

+	{LPGENT("White"), RGB(255,255,255)}

 };

 

 

 TREEELEMENT *g_Stickies = NULL;

 

 

-int CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,

+INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,

 								  WPARAM wParam,LPARAM lParam);

-int CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,

+INT_PTR CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,

 								  LPARAM lParam);

 void JustSaveNotes(void);

-int PluginMenuCommandAddNew(WPARAM w,LPARAM l);

-int PluginMenuCommandDeleteAll(WPARAM w,LPARAM l);

+INT_PTR PluginMenuCommandAddNew(WPARAM w,LPARAM l);

+INT_PTR PluginMenuCommandDeleteAll(WPARAM w,LPARAM l);

 void GetTriggerTimeString(const ULARGE_INTEGER *When, char *s, UINT strSize, BOOL bUtc);

 void OnListResize(HWND Dialog);

 void UpdateGeomFromWnd(HWND Dialog, int *geom, int *colgeom, int nCols);

@@ -703,7 +703,7 @@ void PurgeNotes(void)
 

 void OnDeleteNote(HWND hdlg, STICKYNOTE *SN)

 {

-	if (MessageBox(hdlg, Translate("Are you sure you want to delete this note?"), SECTIONNAME, MB_OKCANCEL) == IDOK)

+	if (MessageBox(hdlg, TranslateT("Are you sure you want to delete this note?"), _T(SECTIONNAME), MB_OKCANCEL) == IDOK)

 	{

 		DestroyWindow(hdlg);

 		TreeDelete(&g_Stickies,SN);

@@ -1034,10 +1034,10 @@ static BOOL DoContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam)
 			HMENU hFg = GetSubMenu(hSub, FindMenuItem(hSub, _T("Text Color")));

 

 			for (i=0; i<SIZEOF(clrPresets); i++)

-				InsertMenu(hBg, i, MF_BYPOSITION|MF_OWNERDRAW, IDM_COLORPRESET_BG+i, TranslateT(clrPresets[i].szName));

+				InsertMenu(hBg, i, MF_BYPOSITION|MF_OWNERDRAW, IDM_COLORPRESET_BG+i, TranslateTS(clrPresets[i].szName));

 

 			for (i=0; i<SIZEOF(clrPresets); i++)

-				InsertMenu(hFg, i, MF_BYPOSITION|MF_OWNERDRAW, IDM_COLORPRESET_FG+i, TranslateT(clrPresets[i].szName));

+				InsertMenu(hFg, i, MF_BYPOSITION|MF_OWNERDRAW, IDM_COLORPRESET_FG+i, TranslateTS(clrPresets[i].szName));

 		}

 	}

 

@@ -1188,7 +1188,7 @@ static UINT_PTR CALLBACK CFHookProc(HWND hdlg, UINT msg, WPARAM wParam, LPARAM l
 }

 

 

-int CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK StickyNoteWndProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam)

 {

 	switch (message)

 	{

@@ -1910,7 +1910,7 @@ static BOOL DoListContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam,STICKYNOTE
 }

 

 

-int CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK DlgProcViewNotes(HWND Dialog,UINT Message,WPARAM wParam,LPARAM lParam)

 {

     LV_COLUMN lvCol;

     NMLISTVIEW *NM;

diff --git a/plugins/!NotAdopted/NotesAndReminders/src/options.cpp b/plugins/NotesAndReminders/src/options.cpp
index 8e15946db9..026d7e37a4 100644
--- a/plugins/!NotAdopted/NotesAndReminders/src/options.cpp
+++ b/plugins/NotesAndReminders/src/options.cpp
@@ -281,7 +281,7 @@ void RegisterFontServiceFonts()
 		_tcsncpy(fontid.deffontsettings.szFace, fontOptionsList[i].szDefFace, SIZEOF(fontid.deffontsettings.szFace));

 		_tcsncpy(fontid.backgroundName, fontOptionsList[i].szBkgName, SIZEOF(fontid.backgroundName));

 

-		FontRegister(&fontid);

+		FontRegisterT(&fontid);

 	}

 

 	colorid.cbSize = sizeof(ColourIDT);

@@ -297,7 +297,7 @@ void RegisterFontServiceFonts()
 		colorid.defcolour = colourOptionsList[i].defColour;

 		strncpy(colorid.setting, colourOptionsList[i].szSettingName, SIZEOF(colorid.setting));

 

-		ColourRegister(&colorid);

+		ColourRegisterT(&colorid);

 	}

 

 	hkFontChange = HookEvent(ME_FONT_RELOAD, FS_FontsChanged);

@@ -306,14 +306,13 @@ void RegisterFontServiceFonts()
 

 void LoadNRFont(int i, LOGFONT *lf, COLORREF *colour)

 {

-	COLORREF col;

     FontIDT fontid = {0};

 

     fontid.cbSize = sizeof(fontid);

     _tcsncpy(fontid.group, LPGENT(SECTIONNAME), SIZEOF(fontid.group));

     _tcsncpy(fontid.name, fontOptionsList[i].szDescr, SIZEOF(fontid.name));

 

-    col = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)lf);

+    COLORREF col = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)lf);

 

 	if (colour)

 	{

@@ -366,7 +365,7 @@ static void TrimString(TCHAR *s)
 }

 

 

-int CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam)

 {

 	BOOL LB;

 	WORD SzT;

@@ -504,11 +503,11 @@ int CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam)
 				ofn.lStructSize = sizeof(ofn);

 #endif

 				ofn.hwndOwner = hdlg;

-				ofn.lpstrFilter = "Executable Files\0*.exe\0All Files\0*.*\0\0";

+				ofn.lpstrFilter = _T("Executable Files\0*.exe\0All Files\0*.*\0\0");

 				ofn.lpstrFile = s;

 				ofn.nMaxFile = SIZEOF(s);

-				ofn.lpstrTitle = Translate("Select Executable");

-				ofn.lpstrInitialDir = ".";

+				ofn.lpstrTitle = TranslateT("Select Executable");

+				ofn.lpstrInitialDir = _T(".");

 				ofn.Flags = OFN_FILEMUSTEXIST|OFN_LONGNAMES;

 				if ( IsWinVer98Plus() )

 				{

@@ -528,13 +527,13 @@ int CALLBACK DlgProcOptions(HWND hdlg,UINT message,WPARAM wParam,LPARAM lParam)
 		case IDC_RESET:

 			{

 				SAFE_FREE((void**)&g_RemindSMS);

-				SetDlgItemText(hdlg,IDC_REMINDEMAIL,"");

+				SetDlgItemText(hdlg,IDC_REMINDEMAIL,_T(""));

 				if (g_lpszAltBrowser)

 				{

 					mir_free(g_lpszAltBrowser);

 					g_lpszAltBrowser = NULL;

 				}

-				SetDlgItemText(hdlg,IDC_EDIT_ALTBROWSER,"");

+				SetDlgItemText(hdlg,IDC_EDIT_ALTBROWSER,_T(""));

 				g_ShowNotesAtStart = TRUE;

 				g_AddContListMI = TRUE;

 				g_ShowScrollbar = TRUE; // 4.2

diff --git a/plugins/!NotAdopted/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index 2b3eb77f3b..4183892d09 100644
--- a/plugins/!NotAdopted/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -52,11 +52,11 @@ static SOCKET S;
 int WS_Send(SOCKET s,char *data,int datalen);

 unsigned long WS_ResolveName(char *name,WORD *port,int defaultPort);

 

-int CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,

+INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,

 								   WPARAM wParam,LPARAM lParam);

-int CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,

+INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,

 								LPARAM lParam);

-int CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,

+INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,

 								  LPARAM lParam);

 

 void Send(char *user, char *host, char *Msg, char* server);

@@ -816,16 +816,14 @@ void GetTriggerTimeString(const ULARGE_INTEGER *When, char *s, UINT strSize, BOO
 }

 

 

-int OpenTriggeredReminder(WPARAM w, LPARAM l)

+INT_PTR OpenTriggeredReminder(WPARAM w, LPARAM l)

 {

-	REMINDERDATA *pReminder;

-

 	if (!l)

 		return 0;

 

 	l = ((CLISTEVENT*)l)->lParam;

 

-	pReminder = (REMINDERDATA*)FindReminder((DWORD)l);

+	REMINDERDATA *pReminder = (REMINDERDATA*)FindReminder((DWORD)l);

 	if (!pReminder || !pReminder->SystemEventQueued)

 		return 0;

 

@@ -1792,7 +1790,7 @@ static void OnDateChanged(HWND Dialog, UINT nDateID, UINT nTimeID, UINT nRefTime
 }

 

 

-int CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARAM lParam)

 {

 	int I;

 

@@ -2043,7 +2041,7 @@ int CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARAM
 									m += h * 60;

 									if (!m)

 									{

-										MessageBox(Dialog, Translate("The specified time offset is invalid."), SECTIONNAME, MB_OK|MB_ICONWARNING);

+										MessageBox(Dialog, TranslateT("The specified time offset is invalid."), _T(SECTIONNAME), MB_OK|MB_ICONWARNING);

 										return TRUE;

 									}

 

@@ -2125,7 +2123,7 @@ int CALLBACK DlgProcNotifyReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARAM
 	return FALSE;

 }

 

-int CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK DlgProcNewReminder(HWND Dialog,UINT Message,WPARAM wParam,LPARAM lParam)

 {

 	HICON hIcon = NULL;

 	switch (Message)

@@ -2583,15 +2581,12 @@ void UpdateGeomFromWnd(HWND Dialog, int *geom, int *colgeom, int nCols)
 

 static BOOL DoListContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam,REMINDERDATA *pReminder)

 {

-	HWND hwndListView;

-    HMENU hMenuLoad,FhMenu;

-	MENUITEMINFO mii;

-

-	hwndListView = (HWND)wParam;

+	HWND hwndListView = (HWND)wParam;

 	if (hwndListView != GetDlgItem(AhWnd,IDC_LISTREMINDERS)) return FALSE;

-	hMenuLoad = LoadMenu(hinstance,"MNU_REMINDERPOPUP");

-	FhMenu = GetSubMenu(hMenuLoad,0);

+	HMENU hMenuLoad = LoadMenu(hinstance,_T("MNU_REMINDERPOPUP"));

+	HMENU FhMenu = GetSubMenu(hMenuLoad,0);

 

+	MENUITEMINFO mii;

 	mii.cbSize = sizeof(mii);

 	mii.fMask = MIIM_STATE;

 	mii.fState = MFS_DEFAULT;

@@ -2608,7 +2603,7 @@ static BOOL DoListContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam,REMINDERDAT
 	return TRUE;

 }

 

-int CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPARAM lParam)

+INT_PTR CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPARAM lParam)

 {

     LV_COLUMN lvCol;

     NMLISTVIEW *NM;

@@ -2635,7 +2630,7 @@ int CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPARAM
 		return 0;

 	case WM_RELOAD:

 		{

-			SetDlgItemText(Dialog,IDC_REMINDERDATA,"");

+			SetDlgItemText(Dialog,IDC_REMINDERDATA,_T(""));

 			InitListView(GetDlgItem(Dialog,IDC_LISTREMINDERS));

 			return TRUE;

 		}

@@ -2660,16 +2655,14 @@ int CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPARAM
 		break;

 	case WM_INITDIALOG:

 		{

-			HWND H;

-

 			HICON hIcon = Skin_GetIconByHandle(hIconLibItem[6], ICON_SMALL);

 			SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_SMALL, (LPARAM)hIcon);

 			hIcon = Skin_GetIconByHandle(hIconLibItem[6], ICON_BIG);

 			SendMessage(Dialog, WM_SETICON, (WPARAM)ICON_BIG, (LPARAM)hIcon);

 

 			TranslateDialogDefault(Dialog);

-			SetDlgItemText(Dialog,IDC_REMINDERDATA,"");

-			H = GetDlgItem(Dialog,IDC_LISTREMINDERS);

+			SetDlgItemText(Dialog,IDC_REMINDERDATA,_T(""));

+			HWND H = GetDlgItem(Dialog,IDC_LISTREMINDERS);

 			lvCol.mask = LVCF_TEXT | LVCF_WIDTH;

 			S = Translate("Reminder text");

 			lvCol.pszText = S;

@@ -2779,9 +2772,9 @@ int CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPARAM
 					return TRUE;

 				}

 			case IDM_DELETEALLREMINDERS:

-				if (RemindersList && MessageBox(Dialog, Translate("Are you sure you want to delete all reminders?"), SECTIONNAME, MB_OKCANCEL) == IDOK)

+				if (RemindersList && MessageBox(Dialog, TranslateT("Are you sure you want to delete all reminders?"), _T(SECTIONNAME), MB_OKCANCEL) == IDOK)

 				{

-					SetDlgItemText(Dialog,IDC_REMINDERDATA,"");

+					SetDlgItemText(Dialog,IDC_REMINDERDATA,_T(""));

 					DeleteReminders();

 					InitListView(GetDlgItem(Dialog,IDC_LISTREMINDERS));

 				}

@@ -2795,9 +2788,9 @@ int CALLBACK DlgProcViewReminders(HWND Dialog,UINT Message,WPARAM wParam,LPARAM
 					{

 						I = ListView_GetSelectionMark(H);

 						if (I != -1

-							&& MessageBox(Dialog, Translate("Are you sure you want to delete this reminder?"), SECTIONNAME, MB_OKCANCEL) == IDOK)

+							&& MessageBox(Dialog, TranslateT("Are you sure you want to delete this reminder?"), _T(SECTIONNAME), MB_OKCANCEL) == IDOK)

 						{

-							SetDlgItemText(Dialog,IDC_REMINDERDATA,"");

+							SetDlgItemText(Dialog,IDC_REMINDERDATA,_T(""));

 							DeleteReminder((REMINDERDATA*)TreeGetAt(RemindersList, I));

 							JustSaveReminders();

 							InitListView(H);

diff --git a/plugins/!NotAdopted/NotesAndReminders/src/resource.h b/plugins/NotesAndReminders/src/resource.h
index 0ddf8b4031..0ddf8b4031 100644
--- a/plugins/!NotAdopted/NotesAndReminders/src/resource.h
+++ b/plugins/NotesAndReminders/src/resource.h