NewEventNotify moved to Unicode(patch from person), langpack_english files updated.

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

7 files changed, 187 insertions, 118 deletions

diff --git a/plugins/NewEventNotify/main.c b/plugins/NewEventNotify/main.c
index 5b019f0b5a..c6240c0402 100644
--- a/plugins/NewEventNotify/main.c
+++ b/plugins/NewEventNotify/main.c
@@ -289,36 +289,38 @@ int CheckMsgWnd(HANDLE hContact)
 		else 

 			return 0;

 	}

-	else 

+	/*else 

 	{	// old way: find it by using the window class & title

-		char newtitle[256];

-		char *szProto,*szStatus,*contactName;

+		TCHAR *newtitle = _T("");

+		TCHAR *szStatus, *contactName;

+		char *szProto;

 

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

-		contactName= (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact,0);

-		szStatus= (char*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, szProto?DBGetContactSettingWord(hContact,szProto,"Status",ID_STATUS_OFFLINE):ID_STATUS_OFFLINE,0);

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

+		contactName= (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact,0);

+		szStatus= (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, szProto ? DBGetContactSettingWord(hContact,szProto,"Status",ID_STATUS_OFFLINE) : ID_STATUS_OFFLINE,0);

 

 	// vj: This code was added by preeze and it does not work:

 	// vlko: it maybe work with other plugins 

-		_snprintf(newtitle,sizeof(newtitle),"%s  (%s)",contactName,szStatus);

-		if(FindWindow("TMsgWindow",newtitle))

+		_sntprintf(newtitle,sizeof(newtitle),_T("%s  (%s)"),contactName,szStatus);

+		if(FindWindowA("TMsgWindow",(char *)newtitle))

 			return 2;

 

-		_snprintf(newtitle,sizeof(newtitle),"[%s  (%s)]",contactName,szStatus);

-		if(FindWindow("TfrmContainer",newtitle))

+		_sntprintf(newtitle,sizeof(newtitle),_T("[%s  (%s)]"),contactName,szStatus);

+		if(FindWindowA("TfrmContainer",(char *)newtitle))

 			return 1;

 

 	// vj: I have restored this code from original plugin's source: (NewEventNotify 0.0.4)

-		_snprintf(newtitle,sizeof(newtitle),"%s (%s): %s",contactName,szStatus,Translate("Message Session"));

-		if(FindWindow("#32770",newtitle)) // JK, this works for old SRMMs (1.0.4.x) and for mine SRMMJ

+		_sntprintf(newtitle,sizeof(newtitle),_T("%s (%s): %s"),contactName,szStatus,Translate("Message Session"));

+		if(FindWindowA("#32770",(char *)newtitle)) // JK, this works for old SRMMs (1.0.4.x) and for mine SRMMJ

 			return 1;

 

-		_snprintf(newtitle,sizeof(newtitle),"%s (%s): %s",contactName,szStatus,Translate("Message Received"));

-		if(FindWindow("#32770",newtitle))

+		_sntprintf(newtitle,sizeof(newtitle),_T("%s (%s): %s"),contactName,szStatus,Translate("Message Received"));

+		if(FindWindowA("#32770",(char *)newtitle))

 			return 2;

 

 		return 0;

-	}

+	}*/

+	return 1;

 }

 

 

diff --git a/plugins/NewEventNotify/neweventnotify-translation.txt b/plugins/NewEventNotify/neweventnotify-translation.txt
new file mode 100644
index 0000000000..3df8e8a907
--- /dev/null
+++ b/plugins/NewEventNotify/neweventnotify-translation.txt
@@ -0,0 +1,56 @@
+; Common strings that belong to many files

+;[]

+

+; ../../plugins/NewEventNotify/main.c

+;[Message Received]

+;[Message Session]

+

+; ../../plugins/NewEventNotify/menuitem.c

+;[PopUps]

+

+; ../../plugins/NewEventNotify/popup.c

+;[ added you to the contact list]

+;[ requested authorization]

+;[Number of new message: ]

+;[Plugin Test]

+;[Received %d contacts.]

+;[This is a sample URL event ;-)]

+;[This is a sample file event :-D]

+;[This is a sample message event :-)]

+;[This is a sample other event ;-D]

+

+; ../../plugins/NewEventNotify/resource.rc

+;[Background]

+;[Dismiss Event]

+;[Dismiss Popup]

+;[Don't show Popup when Message-Dialog is already open]

+;[Edit]

+;[File]

+;[General Options]

+;[Hide Popup when sending new message]

+;[Last message display first]

+;[Last message display last]

+;[Left Click Actions]

+;[Merge popups from one user]

+;[Message]

+;[Message-Event only]

+;[No popups for RSS contacts]

+;[No popups for read messages]

+;[Notify me of ...]

+;[Number of begin shown messages]

+;[Open Event]

+;[Open Reply-Dialog instead of reading the Message]

+;[Others]

+;[Popup Options]

+;[Preview]

+;[Right Click Actions]

+;[Show Date]

+;[Show Headers]

+;[Show Preview of Event in Popup]

+;[Show Time]

+;[Show entry in the PopUps menu]

+;[Temporarily disable Event Popups]

+;[Text]

+;[Time Expires Actions]

+;[Time to expires]

+;[URL]

diff --git a/plugins/NewEventNotify/neweventnotify.h b/plugins/NewEventNotify/neweventnotify.h
index cf1fed29c0..b70ecbb38a 100644
--- a/plugins/NewEventNotify/neweventnotify.h
+++ b/plugins/NewEventNotify/neweventnotify.h
@@ -118,15 +118,15 @@
 //---------------------------

 //---Translateable Strings

 

-#define POPUP_COMMENT_MESSAGE "Message"

-#define POPUP_COMMENT_URL "URL"

-#define POPUP_COMMENT_FILE "File"

-#define POPUP_COMMENT_CONTACTS "Contacts"

-#define POPUP_COMMENT_ADDED "You were added!"

-#define POPUP_COMMENT_AUTH "Requests your authorisation"

-#define POPUP_COMMENT_WEBPAGER "ICQ Web pager"

-#define POPUP_COMMENT_EMAILEXP "ICQ Email express"

-#define POPUP_COMMENT_OTHER "Unknown Event"

+#define POPUP_COMMENT_MESSAGE _T("Message")

+#define POPUP_COMMENT_URL _T("URL")

+#define POPUP_COMMENT_FILE _T("File")

+#define POPUP_COMMENT_CONTACTS _T("Contacts")

+#define POPUP_COMMENT_ADDED _T("You were added!")

+#define POPUP_COMMENT_AUTH _T("Requests your authorisation")

+#define POPUP_COMMENT_WEBPAGER _T("ICQ Web pager")

+#define POPUP_COMMENT_EMAILEXP _T("ICQ Email express")

+#define POPUP_COMMENT_OTHER _T("Unknown Event")

 

 #define OPTIONS_GROUP "PopUps"

 #define OPTIONS_TITLE "Event Notify"

diff --git a/plugins/NewEventNotify/neweventnotify.vcxproj b/plugins/NewEventNotify/neweventnotify.vcxproj
index ea2c4b1c0f..d8741c62c3 100644
--- a/plugins/NewEventNotify/neweventnotify.vcxproj
+++ b/plugins/NewEventNotify/neweventnotify.vcxproj
@@ -26,24 +26,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseOfMfc>false</UseOfMfc>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseOfMfc>false</UseOfMfc>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

     <WholeProgramOptimization>true</WholeProgramOptimization>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseOfMfc>false</UseOfMfc>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

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

     <ConfigurationType>DynamicLibrary</ConfigurationType>

     <UseOfMfc>false</UseOfMfc>

-    <CharacterSet>MultiByte</CharacterSet>

+    <CharacterSet>Unicode</CharacterSet>

   </PropertyGroup>

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

   <ImportGroup Label="ExtensionSettings">

@@ -78,7 +78,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <OutDir>$(SolutionDir)$(Configuration)\Plugins\</OutDir>

     <IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>

-    <LinkIncremental>false</LinkIncremental>

+    <LinkIncremental>

+    </LinkIncremental>

   </PropertyGroup>

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

     <OutDir>$(SolutionDir)$(Configuration)64\Plugins\</OutDir>

@@ -110,7 +111,8 @@
     <ResourceCompile>

       <Culture>0x0415</Culture>

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

-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>

+      <IgnoreStandardIncludePath>

+      </IgnoreStandardIncludePath>

     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -122,6 +124,7 @@
       <SubSystem>Console</SubSystem>

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

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <RandomizedBaseAddress>true</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

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

@@ -147,7 +150,8 @@
     <ResourceCompile>

       <Culture>0x0415</Culture>

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

-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>

+      <IgnoreStandardIncludePath>

+      </IgnoreStandardIncludePath>

     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -156,7 +160,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

+      <SubSystem>Windows</SubSystem>

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

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

@@ -166,13 +170,15 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>

       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

       <StringPooling>true</StringPooling>

-      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <FunctionLevelLinking>false</FunctionLevelLinking>

       <Optimization>Full</Optimization>

       <SuppressStartupBanner>true</SuppressStartupBanner>

       <WarningLevel>Level3</WarningLevel>

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

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

       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <BufferSecurityCheck>false</BufferSecurityCheck>

+      <PrecompiledHeader>NotUsing</PrecompiledHeader>

     </ClCompile>

     <Midl>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -184,7 +190,8 @@
     <ResourceCompile>

       <Culture>0x0415</Culture>

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

-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>

+      <IgnoreStandardIncludePath>

+      </IgnoreStandardIncludePath>

     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -193,11 +200,12 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

+      <SubSystem>Windows</SubSystem>

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

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OptimizeReferences>true</OptimizeReferences>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <RandomizedBaseAddress>true</RandomizedBaseAddress>

     </Link>

   </ItemDefinitionGroup>

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

@@ -222,7 +230,8 @@
     <ResourceCompile>

       <Culture>0x0415</Culture>

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

-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>

+      <IgnoreStandardIncludePath>

+      </IgnoreStandardIncludePath>

     </ResourceCompile>

     <Bscmake>

       <SuppressStartupBanner>true</SuppressStartupBanner>

@@ -231,7 +240,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>

       <LinkDLL>true</LinkDLL>

       <GenerateDebugInformation>true</GenerateDebugInformation>

-      <SubSystem>Console</SubSystem>

+      <SubSystem>Windows</SubSystem>

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

       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>

       <OptimizeReferences>true</OptimizeReferences>

diff --git a/plugins/NewEventNotify/options.c b/plugins/NewEventNotify/options.c
index 5e45cee607..401ab0941d 100644
--- a/plugins/NewEventNotify/options.c
+++ b/plugins/NewEventNotify/options.c
@@ -308,7 +308,7 @@ int OptionsAdd(HINSTANCE hInst, WPARAM addInfo)
 	odp.cbSize = sizeof(odp);

 //	odp.position = 100000000;

 	odp.hInstance = hInst;

-	odp.pszTemplate = MAKEINTRESOURCE(IDD_OPT);

+	odp.pszTemplate = (char *)MAKEINTRESOURCE(IDD_OPT);

 	odp.ptszTitle = NENTranslateT(OPTIONS_TITLE, wsTitle);

 	odp.ptszGroup = NENTranslateT(OPTIONS_GROUP, wsGroup);

 //	odp.groupPosition = 910000000;

diff --git a/plugins/NewEventNotify/popup.c b/plugins/NewEventNotify/popup.c
index 3ba52fded7..966b0630fe 100644
--- a/plugins/NewEventNotify/popup.c
+++ b/plugins/NewEventNotify/popup.c
@@ -99,12 +99,12 @@ static void FreePopupEventData(PLUGIN_DATA* pdata)
 		if (eventData->next)

 		{

 			eventData = eventData->next;

-			free(eventData->prev);

+			mir_free(eventData->prev);

 			eventData->prev = NULL;

 		}

 		else

 		{

-			free(eventData);

+			mir_free(eventData);

 			eventData = NULL;

 		}

 	}		

@@ -195,7 +195,7 @@ static BOOL CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
       break;

 		case UM_FREEPLUGINDATA:

 			PopupCount--;

-      free(pdata);

+      mir_free(pdata);

 			return TRUE;

 		case UM_INITPOPUP:

 			pdata->hWnd = hWnd;

@@ -234,9 +234,9 @@ static BOOL CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 

 static TCHAR* event_to_tchar(char* pBlob, DWORD flags)

 {

-  if (flags & DBEF_UTF)

-    return utf8_to_tchar(pBlob);

-  else

+//  if (flags & DBEF_UTF)

+//    return utf8_to_tchar(pBlob);

+//  else

     return ansi_to_tchar(pBlob);

 }

 

@@ -257,15 +257,15 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
         { // utf-8 in blob

           comment1 = utf8_to_tchar(dbei->pBlob);

         } 

-        else if (dbei->cbBlob == (strlennull(dbei->pBlob)+1)*(sizeof(WCHAR)+1))

+        else if (dbei->cbBlob == (strlennull((char *)dbei->pBlob)+1)*(sizeof(WCHAR)+1))

         { // wchar in blob (the old hack)

           if (g_UnicodeCore)

-            comment1 = strdupT((TCHAR*)(dbei->pBlob + strlennull(dbei->pBlob) + 1));

+            comment1 = strdupT((TCHAR*)(dbei->pBlob + strlennull((char *)dbei->pBlob) + 1));

           else

             comment1 = strdupT((TCHAR*)dbei->pBlob);

         } 

         else

-          comment1 = ansi_to_tchar(dbei->pBlob);

+          comment1 = (TCHAR *)(dbei->pBlob);

       }

       commentFix = POPUP_COMMENT_MESSAGE;

       break;

@@ -273,17 +273,17 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
 

 		case EVENTTYPE_URL:

       // url

-			if (dbei->pBlob) comment2 = ansi_to_tchar(dbei->pBlob);

+			if (dbei->pBlob) comment2 = (TCHAR *)(dbei->pBlob);

       // comment

-			if (dbei->pBlob) comment1 = ansi_to_tchar(dbei->pBlob + strlennull(dbei->pBlob) + 1);

+			if (dbei->pBlob) comment1 = (TCHAR *)(dbei->pBlob + strlennull((char *)dbei->pBlob) + 1);

 			commentFix = POPUP_COMMENT_URL;

 			break;

 

 		case EVENTTYPE_FILE:

       // filenames

-			if (dbei->pBlob) comment2 = event_to_tchar(dbei->pBlob + 4, dbei->flags);

+			if (dbei->pBlob) comment2 = event_to_tchar((char *)dbei->pBlob + 4, dbei->flags);

       // description

-			if (dbei->pBlob) comment1 = event_to_tchar(dbei->pBlob + strlennull(dbei->pBlob + 4) + 1, dbei->flags);

+			if (dbei->pBlob) comment1 = event_to_tchar((char *)dbei->pBlob + strlennull((char *)dbei->pBlob + 4) + 1, dbei->flags);

 			commentFix = POPUP_COMMENT_FILE;

 			break;

 

@@ -293,8 +293,8 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
     case EVENTTYPE_CONTACTS:

       if (dbei->pBlob)

       { // count contacts in event

-        char* pcBlob = dbei->pBlob;

-        char* pcEnd = dbei->pBlob + dbei->cbBlob;

+        char* pcBlob = (char *)dbei->pBlob;

+        char* pcEnd = (char *)dbei->pBlob + dbei->cbBlob;

         int nContacts;

         TCHAR szBuf[512];

         WCHAR szTmp[512];

@@ -310,11 +310,11 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
         }

         if (g_UnicodeCore)

         {

-          _snwprintf((WCHAR*)szBuf, SIZEOF(szBuf), (WCHAR*)NENTranslateT("Received %d contacts.", szTmp), nContacts);

+          _sntprintf((WCHAR*)szBuf, SIZEOF(szBuf), (WCHAR*)NENTranslateT("Received %d contacts.", szTmp), nContacts);

           ((WCHAR*)szBuf)[255] = 0;

         }

         else

-          _snprintfT(szBuf, SIZEOF(szBuf), NENTranslateT("Received %d contacts.", szTmp), nContacts);

+          _snprintfT(szBuf, SIZEOF(szBuf), (char *)NENTranslateT("Received %d contacts.", szTmp), nContacts);

         comment1 = strdupT(szBuf);

       }

       commentFix = POPUP_COMMENT_CONTACTS;

@@ -330,27 +330,27 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
     case EVENTTYPE_ADDED:

       if (dbei->pBlob)

       {

-        char szUin[16];

+        TCHAR szUin[16];

         TCHAR szBuf[2048];

         TCHAR* szNick = NULL;

-        char *pszNick = dbei->pBlob + 8;

-        char *pszFirst = pszNick + strlennull(pszNick) + 1;

-        char *pszLast = pszFirst + strlennull(pszFirst) + 1;

-        char *pszEmail = pszLast + strlennull(pszLast) + 1;

-

-        _snprintf(szUin, 16, "%d", *((DWORD*)dbei->pBlob));

-        if (strlennull(pszNick) > 0)

-          szNick = event_to_tchar(pszNick, dbei->flags);

-        else if (strlennull(pszEmail) > 0)

-          szNick = event_to_tchar(pszEmail, dbei->flags);

+        TCHAR *pszNick = (TCHAR *)dbei->pBlob + 8;

+        TCHAR *pszFirst = pszNick + strlennull((char *)pszNick) + 1;

+        TCHAR *pszLast = pszFirst + strlennull((char *)pszFirst) + 1;

+        TCHAR *pszEmail = pszLast + strlennull((char *)pszLast) + 1;

+

+        _sntprintf(szUin, 16, _T("%d"), *((DWORD*)dbei->pBlob));

+        if (strlennull((char *)pszNick) > 0)

+          szNick = pszNick;

+        else if (strlennull((char *)pszEmail) > 0)

+          szNick = pszEmail;

         else if (*((DWORD*)dbei->pBlob) > 0)

-          szNick = ansi_to_tchar(szUin);

+          szNick = szUin;

 

         if (szNick)

         {

           strcpyT(szBuf, szNick);

           strcatT(szBuf, NENTranslateT(" added you to the contact list", (WCHAR*)szBuf + strlenT(szBuf) + 1));

-          free(szNick);

+          mir_free(szNick);

           comment1 = strdupT(szBuf);

         }

       }

@@ -360,27 +360,27 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
 		case EVENTTYPE_AUTHREQUEST:

       if (dbei->pBlob)

       {

-        char szUin[16];

+        TCHAR szUin[16];

         TCHAR szBuf[2048];

         TCHAR* szNick = NULL;

-        char *pszNick = dbei->pBlob + 8;

-        char *pszFirst = pszNick + strlennull(pszNick) + 1;

-        char *pszLast = pszFirst + strlennull(pszFirst) + 1;

-        char *pszEmail = pszLast + strlennull(pszLast) + 1;

-

-        _snprintf(szUin, 16, "%d", *((DWORD*)dbei->pBlob));

-        if (strlennull(pszNick) > 0)

-          szNick = event_to_tchar(pszNick, dbei->flags);

-        else if (strlennull(pszEmail) > 0)

-          szNick = event_to_tchar(pszEmail, dbei->flags);

+        TCHAR *pszNick = (TCHAR *)dbei->pBlob + 8;

+        TCHAR *pszFirst = pszNick + strlennull((char *)pszNick) + 1;

+        TCHAR *pszLast = pszFirst + strlennull((char *)pszFirst) + 1;

+        TCHAR *pszEmail = pszLast + strlennull((char *)pszLast) + 1;

+

+        _snwprintf(szUin, 16, _T("%d"), *((DWORD*)dbei->pBlob));

+        if (strlennull((char *)pszNick) > 0)

+          szNick = pszNick;

+        else if (strlennull((char *)pszEmail) > 0)

+          szNick = pszEmail;

         else if (*((DWORD*)dbei->pBlob) > 0)

-          szNick = ansi_to_tchar(szUin);

+          szNick = szUin;

 

         if (szNick)

         {

           strcpyT(szBuf, szNick);

           strcatT(szBuf, NENTranslateT(" requested authorization", (WCHAR*)szBuf + strlenT(szBuf) + 1));

-          free(szNick);

+          mir_free(szNick);

           comment1 = strdupT(szBuf);

         }

       }

@@ -392,7 +392,7 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
 //ASCIIZ    from name

 //ASCIIZ    from e-mail

     case ICQEVENTTYPE_WEBPAGER:

-			if (dbei->pBlob) comment1 = ansi_to_tchar(dbei->pBlob);

+			if (dbei->pBlob) comment1 = (TCHAR *)(dbei->pBlob);

 //			if (dbei->pBlob) comment1 = dbei->pBlob + strlennull(comment2) + 1;

 		  commentFix = POPUP_COMMENT_WEBPAGER;

 		  break;

@@ -402,7 +402,7 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
 //ASCIIZ    from name

 //ASCIIZ    from e-mail

     case ICQEVENTTYPE_EMAILEXPRESS:

-			if (dbei->pBlob) comment1 = ansi_to_tchar(dbei->pBlob);

+			if (dbei->pBlob) comment1 = (TCHAR *)(dbei->pBlob);

 //			if (dbei->pBlob) comment1 = dbei->pBlob + strlennull(comment2) + 1;

 		  commentFix = POPUP_COMMENT_EMAILEXP;

       break;

@@ -411,48 +411,50 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
     {

       if (ServiceExists(MS_DB_EVENT_GETTYPE))

       {

-        DBEVENTTYPEDESCR* pei = (DBEVENTTYPEDESCR*)CallService(MS_DB_EVENT_GETTYPE, (WPARAM)dbei->szModule, (LPARAM)dbei->eventType);

-        if (pei && pei->cbSize >= DBEVENTTYPEDESCR_SIZE_V1)

+        DBEVENTTYPEDESCR *pei = (DBEVENTTYPEDESCR *)CallService(MS_DB_EVENT_GETTYPE, (WPARAM)dbei->szModule, (LPARAM)dbei->eventType);

+		if ((pei && pei->cbSize) >= DBEVENTTYPEDESCR_SIZE)

         { // support for custom database event types

           if (dbei->pBlob)

           { // preview requested

             DBEVENTGETTEXT svc = {dbei, g_UnicodeCore ? DBVT_WCHAR : DBVT_ASCIIZ, CP_ACP};

-            TCHAR *pet = (TCHAR*)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&svc);

+            char *pet = (char *)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&svc);

             if (pet)

             { // we've got event text, move to our memory space

-              comment1 = strdupT(pet);

-              mir_free(pet);

+              comment1 = strdupT((TCHAR *)pet);

+              mir_free(&pet);

             }

           }

-          commentFix = pei->descr;

+          commentFix = (TCHAR *)pei->descr;

         }

         else

           commentFix = POPUP_COMMENT_OTHER;

-      }

-      else

-        commentFix = POPUP_COMMENT_OTHER;

+		

+		break;

+	  }

+     // else

+       // commentFix = POPUP_COMMENT_OTHER;

+

 

-      break;

     }

   }

 

   if (strlenT(comment1) > 0)

   {

-    free(comment2);

+    mir_free(comment2);

     return comment1;

   }

   if (strlenT(comment2) > 0)

   {

-    free(comment1);

+    mir_free(comment1);

     return comment2;

   }

-  free(comment1);

-  free(comment2);

+  mir_free(comment1);

+  mir_free(comment2);

 

   {

     WCHAR tmp[MAX_PATH];

 

-    return strdupT(NENTranslateT(commentFix, tmp));

+    return strdupT(NENTranslateT((char *)commentFix, tmp));

   }

 }

 

@@ -463,7 +465,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
   PLUGIN_DATA* pdata;

   DBEVENTINFO dbe = {0};

 	EVENT_DATA_EX* eventData;

-	TCHAR* sampleEvent;

+	char* sampleEvent;

 	long iSeconds;

   

 	//there has to be a maximum number of popups shown at the same time

@@ -483,7 +485,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 				pudw.colorBack = pluginOptions->bDefaultColorMsg ? 0 : pluginOptions->colBackMsg;

 				pudw.colorText = pluginOptions->bDefaultColorMsg ? 0 : pluginOptions->colTextMsg;

 				iSeconds = pluginOptions->iDelayMsg;

-				sampleEvent = "This is a sample message event :-)";

+				sampleEvent = LPGEN("This is a sample message event :-)");

         break;

       case EVENTTYPE_URL:

         if (!(pluginOptions->maskNotify&MASK_URL)) return 1;

@@ -491,7 +493,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 				pudw.colorBack = pluginOptions->bDefaultColorUrl ? 0 : pluginOptions->colBackUrl;

 				pudw.colorText = pluginOptions->bDefaultColorUrl ? 0 : pluginOptions->colTextUrl;

 				iSeconds = pluginOptions->iDelayUrl;

-				sampleEvent = "This is a sample URL event ;-)";

+				sampleEvent = LPGEN("This is a sample URL event ;-)");

         break;

       case EVENTTYPE_FILE:

         if (!(pluginOptions->maskNotify&MASK_FILE)) return 1;

@@ -499,7 +501,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 				pudw.colorBack = pluginOptions->bDefaultColorFile ? 0 : pluginOptions->colBackFile;

 				pudw.colorText = pluginOptions->bDefaultColorFile ? 0 : pluginOptions->colTextFile;

 				iSeconds = pluginOptions->iDelayFile;

-				sampleEvent = "This is a sample file event :-D";

+				sampleEvent = LPGEN("This is a sample file event :-D");

         break;

       default:

         if (!(pluginOptions->maskNotify&MASK_OTHER)) return 1;

@@ -507,7 +509,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 				pudw.colorBack = pluginOptions->bDefaultColorOthers ? 0 : pluginOptions->colBackOthers;

 				pudw.colorText = pluginOptions->bDefaultColorOthers ? 0 : pluginOptions->colTextOthers;

 				iSeconds = pluginOptions->iDelayOthers;

-				sampleEvent = "This is a sample other event ;-D";

+				sampleEvent = LPGEN("This is a sample other event ;-D");

    			break;

     }

 

@@ -551,7 +553,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 	if ((hContact == NULL) && (hEvent == NULL))

 	{

 		strncpyT((TCHAR*)pudw.lptzContactName, NENTranslateT("Plugin Test", pudw.lpwzContactName), MAX_CONTACTNAME);

-		strncpyT((TCHAR*)pudw.lptzText, NENTranslateT(sampleEvent, pudw.lpwzText), MAX_SECONDLINE);

+		strncpyT((TCHAR*)pudw.lptzText, NENTranslateT((char *)sampleEvent, pudw.lpwzText), MAX_SECONDLINE);

 	}

 	else

 	{	// get the needed event data

@@ -560,7 +562,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
     strncpyT((TCHAR*)pudw.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, g_UnicodeCore ? GCDNF_UNICODE : 0), MAX_CONTACTNAME);

     szEventPreview = GetEventPreview(&dbe);

 		strncpyT((TCHAR*)pudw.lptzText, szEventPreview, MAX_SECONDLINE);

-    free(szEventPreview);

+    mir_free(szEventPreview);

 	}

     

 	PopupCount++;

@@ -574,7 +576,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 		if (CallService(MS_POPUP_ADDPOPUPW, (WPARAM)&pudw, 0) < 0)

 		{ // popup creation failed, release popupdata

 			FreePopupEventData(pdata);

-			free(pdata);

+			mir_free(pdata);

 		}

 	}

 	else // convert to ansi

@@ -595,22 +597,22 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
         strncpy(puda.lpzContactName, szAnsi, MAX_CONTACTNAME);

       else

         strcpy(puda.lpzContactName, "");

-      free(szAnsi);

+      mir_free(szAnsi);

       szAnsi = tchar_to_ansi((TCHAR*)pudw.lptzText);

       if (szAnsi)

         strncpy(puda.lpzText, szAnsi, MAX_SECONDLINE);

       else

         strcpy(puda.lpzText, "");

-      free(szAnsi);

+      mir_free(szAnsi);

     }

 		if (CallService(MS_POPUP_ADDPOPUPEX, (WPARAM)&puda, 0) < 0)

 		{ // popup creation failed, release popupdata

 			FreePopupEventData(pdata);

-			free(pdata);

+			mir_free(pdata);

 		}

 	}

 	if (dbe.pBlob)

-		free(dbe.pBlob);

+		mir_free(dbe.pBlob);

 

 	return 0;

 }

@@ -621,7 +623,7 @@ int PopupUpdate(HANDLE hContact, HANDLE hEvent)
 	PLUGIN_DATA* pdata;

 	DBEVENTINFO dbe = {0};

 	EVENT_DATA_EX* eventData;

-	TCHAR lpzText[MAX_SECONDLINE*2] = "\0\0";

+	TCHAR lpzText[MAX_SECONDLINE*2] = _T("\0\0");

 	char timestamp[MAX_DATASIZE] = "";

 	char formatTime[MAX_DATASIZE] = "";

 	int iEvent = 0;

@@ -696,7 +698,7 @@ int PopupUpdate(HANDLE hContact, HANDLE hEvent)
 				strncpy(formatTime, "%Y.%m.%d ", sizeof(formatTime));

 			if (pdata->pluginOptions->bShowTime)

 				strncat(formatTime, "%H:%M", sizeof(formatTime));

-			strftime(timestamp,sizeof(timestamp), formatTime, localtime(&dbe.timestamp));

+			strftime(timestamp,sizeof(timestamp), formatTime, localtime((time_t *)&dbe.timestamp));

 			if (g_UnicodeCore)

 				_snprintfT(lpzText, SIZEOF(lpzText), "%s[b][i]%S[/i][/b]\n", lpzText, timestamp);

 			else

@@ -706,10 +708,10 @@ int PopupUpdate(HANDLE hContact, HANDLE hEvent)
 			TCHAR* szEventPreview = GetEventPreview(&dbe);

 

 			_snprintfT(lpzText, SIZEOF(lpzText), "%s%s", lpzText, szEventPreview);

-			free(szEventPreview);

+			mir_free(szEventPreview);

 		}

 		if (dbe.pBlob)

-			free(dbe.pBlob);

+			mir_free(dbe.pBlob);

 		if (doReverse)

 		{

 			if ((iEvent >= pdata->pluginOptions->iNumberMsg && pdata->pluginOptions->iNumberMsg) || !eventData->next)

@@ -735,7 +737,7 @@ int PopupUpdate(HANDLE hContact, HANDLE hEvent)
 	{

 		char* szAnsi = tchar_to_ansi(lpzText);

 		CallService(MS_POPUP_CHANGETEXT, (WPARAM)pdata->hWnd, (LPARAM)szAnsi);

-		free(szAnsi);

+		mir_free(szAnsi);

 	}

 	return 0;

 }

diff --git a/plugins/NewEventNotify/utils.c b/plugins/NewEventNotify/utils.c
index 2e8abb08a3..750bb9b4ff 100644
--- a/plugins/NewEventNotify/utils.c
+++ b/plugins/NewEventNotify/utils.c
@@ -133,7 +133,7 @@ TCHAR* __fastcall NENTranslateT(const char* src, const WCHAR* unibuf)
 

   if (!strlennull(src))

   { // for the case of empty strings

-    return "";

+    return _T("");

   }

 

   if (g_UnicodeCore)

@@ -369,7 +369,7 @@ int utf8_encode(const char *from, char **to)
     return -1;

   }

 

-  unicode = (wchar_t*)_alloca((wchars + 1) * sizeof(unsigned short));

+  unicode = (wchar_t*)mir_alloc((wchars + 1) * sizeof(unsigned short));

   unicode[wchars] = 0;

 

   err = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, from,

@@ -407,7 +407,7 @@ int utf8_decode(const char *from, char **to)
     WCHAR *wszTemp = NULL;

     int inlen = strlennull(from);

 

-    wszTemp = (WCHAR *)_alloca(sizeof(WCHAR) * (inlen + 1));

+    wszTemp = (WCHAR *)mir_alloc(sizeof(WCHAR) * (inlen + 1));

 

     // Convert the UTF-8 string to UCS

     if (MultiByteToWideChar(CP_UTF8, 0, from, -1, wszTemp, inlen + 1))