first version of WebView that compiles in Unicode (but certaily doesn't work)

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

1 files changed, 489 insertions, 904 deletions

diff --git a/plugins/WebView/src/webview_alerts.cpp b/plugins/WebView/src/webview_alerts.cpp
index 285d3d34ea..fb2e287127 100644
--- a/plugins/WebView/src/webview_alerts.cpp
+++ b/plugins/WebView/src/webview_alerts.cpp
@@ -1,376 +1,239 @@
 /*

- * A plugin for Miranda IM which displays web page text in a window Copyright

- * (C) 2005 Vincent Joyce.

- *

- * Miranda IM: the free icq client for MS Windows  Copyright (C) 2000-2

- * Richard Hughes, Roland Rabien & Tristan Van de Vreede

- *

- * This program is free software; you can redistribute it and/or modify it

- * under the terms of the GNU General Public License as published by the Free

- * Software Foundation; either version 2 of the License, or (at your option)

- * any later version.

- *

- * This program is distributed in the hope that it will be useful, but

- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY

- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

- * for more details.

- *

- * You should have received a copy of the GNU General Public License along

- * with this program; if not, write to the Free Software Foundation, Inc., 59

- * Temple Place - Suite 330, Boston, MA  02111-1307, USA.

- */

+* A plugin for Miranda IM which displays web page text in a window Copyright

+* (C) 2005 Vincent Joyce.

+*

+* Miranda IM: the free icq client for MS Windows  Copyright (C) 2000-2

+* Richard Hughes, Roland Rabien & Tristan Van de Vreede

+*

+* This program is free software; you can redistribute it and/or modify it

+* under the terms of the GNU General Public License as published by the Free

+* Software Foundation; either version 2 of the License, or (at your option)

+* any later version.

+*

+* This program is distributed in the hope that it will be useful, but

+* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY

+* or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License

+* for more details.

+*

+* You should have received a copy of the GNU General Public License along

+* with this program; if not, write to the Free Software Foundation, Inc., 59

+* Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+*/

 

 #include "stdafx.h"

+#include "webview.h"

 

-static HANDLE hWindowList = NULL;

-

-/**********************************/

-int CALLBACK    PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)

+/*****************************************************************************/

+int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)

 {

-	HANDLE hContact;

-	char popupurl[300];

-	DBVARIANT dbv;

-

-	hContact = PUGetContact(hWnd);

-	

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

-	DBGetContactSetting(hContact, MODULENAME, URL_KEY, &dbv);

-	_snprintf(popupurl, sizeof(popupurl), "%s", dbv.pszVal);

-	DBFreeVariant(&dbv);

-

-	switch (message)

-	{

+	switch (message) {

 	case WM_COMMAND:

 	case WM_CONTEXTMENU:

-	{

-		if (message == WM_COMMAND) // left click

-		{ 

- 	     if(hContact != NULL)  

- { 

-        // open data window

-

-			if ((db_get_b(NULL, MODULENAME, LCLK_WINDOW_KEY, 0)))

-			{

-				NotifyEventHooks(hHookDisplayDataAlert, (int) hContact, 0);

-				forkthread(GetData, 0, hContact);

-				PUDeletePopUp(hWnd);

-			}

-			// open url

-			if ((db_get_b(NULL, MODULENAME, LCLK_WEB_PGE_KEY, 0)))

-			{

-				CallService(MS_UTILS_OPENURL, (WPARAM) 1, (LPARAM) popupurl);

-				PUDeletePopUp(hWnd);

-				db_set_w((HANDLE) wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

-			}

-			// dismiss

-			if ((db_get_b(NULL, MODULENAME, LCLK_DISMISS_KEY, 0)))

-			{

-				PUDeletePopUp(hWnd);

-			}

-			

-			

- }	

-        

-        else if(hContact == NULL)

-       PUDeletePopUp(hWnd);  

-			

+		HANDLE hContact = PUGetContact(hWnd);

+		ptrT url( db_get_tsa(hContact, MODULENAME, URL_KEY));

+

+		if (message == WM_COMMAND) { // left click

+			if(hContact != NULL) { 

+				// open data window

+				if ( db_get_b(NULL, MODULENAME, LCLK_WINDOW_KEY, 0)) {

+					NotifyEventHooks(hHookDisplayDataAlert, (int) hContact, 0);

+					mir_forkthread(GetData, hContact);

+					PUDeletePopup(hWnd);

+				}

+				// open url

+				if ( db_get_b(NULL, MODULENAME, LCLK_WEB_PGE_KEY, 0)) {

+					CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url);

+					PUDeletePopup(hWnd);

+					db_set_w((HANDLE)wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

+				}

+				// dismiss

+				if ( db_get_b(NULL, MODULENAME, LCLK_DISMISS_KEY, 1))

+					PUDeletePopup(hWnd);

+			}	

+			else if (hContact == NULL)

+				PUDeletePopup(hWnd);  

 		} 

-        

-        

-        

-        else if (message == WM_CONTEXTMENU) // right click

-

-		{ 

-       if(hContact != NULL)  

-         {   

- 

- // open datA window

-

-			if ((db_get_b(NULL, MODULENAME, RCLK_WINDOW_KEY, 0)))

-			{

-				NotifyEventHooks(hHookDisplayDataAlert, (int) hContact, 0);

-				forkthread(GetData, 0, hContact);

-				PUDeletePopUp(hWnd);

-			}

-			// open url

-			if ((db_get_b(NULL, MODULENAME, RCLK_WEB_PGE_KEY, 0)))

-			{

-				CallService(MS_UTILS_OPENURL, (WPARAM) 1, (LPARAM) popupurl);

-				PUDeletePopUp(hWnd);

-				db_set_w((HANDLE) wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

-			}

-			// dismiss

-			if ((db_get_b(NULL, MODULENAME, RCLK_DISMISS_KEY, 0)))

-			{

-				PUDeletePopUp(hWnd);

+		else if (message == WM_CONTEXTMENU) { // right click

+			if (hContact != NULL) {   

+				// open datA window

+				if ( db_get_b(NULL, MODULENAME, RCLK_WINDOW_KEY, 0)) {

+					NotifyEventHooks(hHookDisplayDataAlert, (int) hContact, 0);

+					mir_forkthread(GetData, hContact);

+					PUDeletePopup(hWnd);

+				}

+				// open url

+				if ( db_get_b(NULL, MODULENAME, RCLK_WEB_PGE_KEY, 1)) {

+					CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)url);

+					PUDeletePopup(hWnd);

+					db_set_w((HANDLE)wParam, MODULENAME, "Status", ID_STATUS_ONLINE); 

+				}

+				// dismiss

+				if ( db_get_b(NULL, MODULENAME, RCLK_DISMISS_KEY, 0))

+					PUDeletePopup(hWnd);

 			}

+			else if(hContact == NULL)

+				PUDeletePopup(hWnd);   

 		}

-       else if(hContact == NULL)

-        PUDeletePopUp(hWnd);   

-         }

-         

- 

-		

-	}

-	break;

+		break;

 	}

 

 	return DefWindowProc(hWnd, message, wParam, lParam);

 }

-/*********************************/

 

-/*******************/

-int WDisplayDataAlert(void *AContact)

+/*****************************************************************************/

+int WDisplayDataAlert(void *hContact)

 {

-	NotifyEventHooks(hHookDisplayDataAlert, (int) AContact, 0);

+	NotifyEventHooks(hHookDisplayDataAlert, (int) hContact, 0);

 	return 0;

 }

-/**************/

 

-/*******************/

-int WAlertPopup(WPARAM hContact, char *displaytext)

+/*****************************************************************************/

+int WAlertPopup(HANDLE hContact, TCHAR *displaytext)

 {

-	NotifyEventHooks(hHookAlertPopup, (WPARAM) hContact, (LPARAM) displaytext);

+	NotifyEventHooks(hHookAlertPopup, (WPARAM)hContact, (LPARAM)displaytext);

 	return 0;

 }

-/**************/

 

-/*******************/

-//int WAlertPopup(WPARAM hContact, char *displaytext)

-int WAlertWPopup(WPARAM hContact, WCHAR *displaytext)

+/*****************************************************************************/

+int WErrorPopup(HANDLE hContact, TCHAR *textdisplay)

 {

-	NotifyEventHooks(hHookAlertWPopup, (WPARAM) hContact, (LPARAM) displaytext);

+	NotifyEventHooks(hHookErrorPopup, (WPARAM)hContact, (LPARAM) textdisplay);

 	return 0;

 }

-/**************/

-

 

-/*******************/

-int WErrorPopup(char *namecontact, char *textdisplay)

+/*****************************************************************************/

+int WAlertOSD(HANDLE hContact, TCHAR *displaytext)

 {

-	NotifyEventHooks(hHookErrorPopup, (WPARAM) namecontact, (LPARAM) textdisplay);

+	NotifyEventHooks(hHookAlertOSD, (WPARAM)hContact, (LPARAM) displaytext);

 	return 0;

 }

-/**************/

-/*******************/

-int WAlertOSD(WPARAM hContact, char *displaytext)

+

+/*****************************************************************************/

+int WPopupAlert(WPARAM wParam, LPARAM lParam)

 {

-	NotifyEventHooks(hHookAlertOSD, (WPARAM) hContact, (LPARAM) displaytext);

-	return 0;

-}

-/**************/

+	POPUPDATAW ppd = { 0 };

 

-/********************/

+	if( ((HANDLE)wParam) != NULL) {

+		DBVARIANT dbv;

+		db_get_ts((HANDLE)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv);

+		lstrcpyn(ppd.lptzContactName, dbv.ptszVal, SIZEOF(ppd.lptzContactName));

+		db_free(&dbv);

+	}

+	else lstrcpy(ppd.lptzContactName, _A2T(MODULENAME));

 

-int WPopupAlert(WPARAM wParam, WCHAR *displaytext)

-{

-    POPUPDATAW ppd;

-	DWORD delay = 0;

-	DWORD colorBack, colorText;

-	char contactname[255];

-	DBVARIANT dbv;

-	char delaystr[4];

-	

-		// setup the popup

-	ZeroMemory(&ppd, sizeof(POPUPDATAW));

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

+	ppd.lchContact = (HANDLE)wParam;

+	ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE));

 

-if( ((HANDLE)wParam) != NULL)

-{

-	DBGetContactSetting((HANDLE) wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv);

-	_snprintf(contactname, sizeof(contactname), "%s", dbv.pszVal);

-	DBFreeVariant(&dbv);

-}

-else

-_snprintf(contactname, sizeof(contactname), "%s", MODULENAME);

-	

-	

- ppd.lchContact = (HANDLE) wParam;

- //

- MultiByteToWideChar(CP_UTF8, 0, contactname, -1, ppd.lptzContactName, strlen(contactname)); 

- //

- ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE));

- //

- if ((wcslen(displaytext) == MAX_SECONDLINE) ||  (wcslen(displaytext) > MAX_SECONDLINE))

-		     _snwprintf(ppd.lptzText,MAX_SECONDLINE -1, displaytext);

-		    else if (wcslen(displaytext) < MAX_SECONDLINE)

-		     swprintf(ppd.lptzText, displaytext);

-

- //

-	if ((db_get_b(NULL, MODULENAME, POP_USECUSTCLRS_KEY, 0)))

-	{

-		colorBack = db_get_dw(NULL, MODULENAME, POP_BG_CLR_KEY, 0);

-		colorText = db_get_dw(NULL, MODULENAME, POP_TXT_CLR_KEY, 0);

+	TCHAR *displaytext = (TCHAR*)lParam;

+	if ((wcslen(displaytext) == MAX_SECONDLINE) ||  (wcslen(displaytext) > MAX_SECONDLINE))

+		mir_snwprintf(ppd.lptzText, SIZEOF(ppd.lptzText), displaytext);

+	else if (wcslen(displaytext) < MAX_SECONDLINE)

+		mir_snwprintf(ppd.lptzText, SIZEOF(ppd.lptzText), displaytext);

+

+	if ( db_get_b(NULL, MODULENAME, POP_USECUSTCLRS_KEY, 0)) {

+		ppd.colorBack = db_get_dw(NULL, MODULENAME, POP_BG_CLR_KEY, Def_color_bg);

+		ppd.colorBack = db_get_dw(NULL, MODULENAME, POP_TXT_CLR_KEY, Def_color_txt);

 	}

-	if ((db_get_b(NULL, MODULENAME, POP_USEWINCLRS_KEY, 0)))

-	{

-		colorBack = GetSysColor(COLOR_BTNFACE);

-		colorText = GetSysColor(COLOR_WINDOWTEXT);

+	if ( db_get_b(NULL, MODULENAME, POP_USEWINCLRS_KEY, 0)) {

+		ppd.colorBack = GetSysColor(COLOR_BTNFACE);

+		ppd.colorBack = GetSysColor(COLOR_WINDOWTEXT);

 	}

-	if ((db_get_b(NULL, MODULENAME, POP_USESAMECLRS_KEY, 0)))

-	{

-		colorBack = BackgoundClr;

-		colorText = TextClr;

+	if ( db_get_b(NULL, MODULENAME, POP_USESAMECLRS_KEY, 1)) {

+		ppd.colorBack = BackgoundClr;

+		ppd.colorBack = TextClr;

 	}

-	        ppd.colorBack = colorBack;

-		    ppd.colorText = colorText;

- //

- ppd.PluginWindowProc = NULL;

- //

- //ppd.iSeconds = (atol("5"));

- delay = db_get_dw(NULL, MODULENAME, POP_DELAY_KEY, 0);

- ppd.iSeconds = delay;

- //

-       

- if (ServiceExists(MS_POPUP_ADDPOPUPW))

- CallService(MS_POPUP_ADDPOPUPW, (WPARAM) &ppd, 0);

- 

- 

- 

- 

- 

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

-    

-//    if ((db_get_b(NULL, MODULENAME, INBUILTPOP_KEY, 0)))

-//     PUShowMessage(displaytext, SM_NOTIFY);  

-//     else

-//     {

-//    } 

+

+	ppd.PluginWindowProc = NULL;

+	ppd.iSeconds = db_get_dw(NULL, MODULENAME, POP_DELAY_KEY, 0);

+

+	if (ServiceExists(MS_POPUP_ADDPOPUPW))

+		CallService(MS_POPUP_ADDPOPUPW, (WPARAM)&ppd, 0);

 

 	return 0;

-	

 }

-/********************/

-/********************/

 

-int PopupAlert(WPARAM wParam, char *displaytext)

+/*****************************************************************************/

+int PopupAlert(WPARAM wParam, LPARAM lParam)

 {

-    POPUPDATAEX ppd;

-	DWORD delay = 0;

-	DWORD colorBack, colorText;

-	char contactname[255];

-	DBVARIANT dbv;

-	char delaystr[4];

-	

-		// setup the popup

-	ZeroMemory(&ppd, sizeof(POPUPDATA));

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

+	POPUPDATA ppd = { 0 };

+	if (((HANDLE)wParam) != NULL) {

+		DBVARIANT dbv;

+		db_get_s((HANDLE)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv);

+		lstrcpynA(ppd.lptzContactName, dbv.pszVal, SIZEOF(ppd.lptzContactName));

+		db_free(&dbv);

+	}

+	else lstrcpyA(ppd.lptzContactName, MODULENAME);

 

-if( ((HANDLE)wParam) != NULL)

-{

-	DBGetContactSetting((HANDLE) wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv);

-	_snprintf(contactname, sizeof(contactname), "%s", dbv.pszVal);

-	DBFreeVariant(&dbv);

-}

-else

-_snprintf(contactname, sizeof(contactname), "%s", MODULENAME);

-	

-	

-	

- ppd.lchContact = (HANDLE) wParam;

- strcpy(ppd.lpzContactName, contactname);

- ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE));

- //

- //sprintf(ppd.lpzText, Translate("This is a preview popup."));

- if ((strlen(displaytext) == MAX_SECONDLINE) ||  (strlen(displaytext) > MAX_SECONDLINE))

-		     _snprintf(ppd.lpzText,MAX_SECONDLINE -1, "%s", displaytext);

-		    else if (strlen(displaytext) < MAX_SECONDLINE)

-		     sprintf(ppd.lpzText, Translate(displaytext));

- //

-	if ((db_get_b(NULL, MODULENAME, POP_USECUSTCLRS_KEY, 0)))

-	{

-		colorBack = db_get_dw(NULL, MODULENAME, POP_BG_CLR_KEY, 0);

-		colorText = db_get_dw(NULL, MODULENAME, POP_TXT_CLR_KEY, 0);

+	ppd.lchContact = (HANDLE)wParam;

+	ppd.lchIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_SITE));

+

+	char *displaytext = (char*)lParam;

+	if ((strlen(displaytext) == MAX_SECONDLINE) ||  (strlen(displaytext) > MAX_SECONDLINE))

+		mir_snprintf(ppd.lpzText, SIZEOF(ppd.lpzText), "%s", displaytext);

+	else if (strlen(displaytext) < MAX_SECONDLINE)

+		mir_snprintf(ppd.lpzText, SIZEOF(ppd.lpzText), Translate(displaytext));

+

+	if ( db_get_b(NULL, MODULENAME, POP_USECUSTCLRS_KEY, 0)) {

+		ppd.colorBack = db_get_dw(NULL, MODULENAME, POP_BG_CLR_KEY, Def_color_bg);

+		ppd.colorText = db_get_dw(NULL, MODULENAME, POP_TXT_CLR_KEY, Def_color_txt);

 	}

-	if ((db_get_b(NULL, MODULENAME, POP_USEWINCLRS_KEY, 0)))

-	{

-		colorBack = GetSysColor(COLOR_BTNFACE);

-		colorText = GetSysColor(COLOR_WINDOWTEXT);

+	if ( db_get_b(NULL, MODULENAME, POP_USEWINCLRS_KEY, 0)) {

+		ppd.colorBack = GetSysColor(COLOR_BTNFACE);

+		ppd.colorText = GetSysColor(COLOR_WINDOWTEXT);

 	}

-	if ((db_get_b(NULL, MODULENAME, POP_USESAMECLRS_KEY, 0)))

-	{

-		colorBack = BackgoundClr;

-		colorText = TextClr;

+	if ( db_get_b(NULL, MODULENAME, POP_USESAMECLRS_KEY, 1)) {

+		ppd.colorBack = BackgoundClr;

+		ppd.colorText = TextClr;

 	}

-	        ppd.colorBack = colorBack;

-		    ppd.colorText = colorText;

- //

- ppd.PluginWindowProc = NULL;

- //

- //ppd.iSeconds = (atol("5"));

- delay = db_get_dw(NULL, MODULENAME, POP_DELAY_KEY, 0);

- ppd.iSeconds = delay;

- //

-         

- if (ServiceExists(MS_POPUP_ADDPOPUPEX))

- CallService(MS_POPUP_ADDPOPUPEX, (WPARAM) &ppd, 0);

-         

- 

- 

- 

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

-    

-//    if ((db_get_b(NULL, MODULENAME, INBUILTPOP_KEY, 0)))

-//     PUShowMessage(displaytext, SM_NOTIFY);  

-//     else

-//     {

-//    } 

-

-	return 0;

-	

-}

-/********************/

-

-/********************/

 

-int OSDAlert(WPARAM wParam, char *displaytext)

-{

-	char contactname[255];

-	DBVARIANT dbv;

-	char newdisplaytext[2000];

+	ppd.PluginWindowProc = NULL;

+	ppd.iSeconds = db_get_dw(NULL, MODULENAME, POP_DELAY_KEY, 0);

 

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

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

+	if (ServiceExists(MS_POPUP_ADDPOPUP))

+		CallService(MS_POPUP_ADDPOPUP, (WPARAM)&ppd, 0);

 

+	return 0;

+}

 

-if(((HANDLE)wParam) != NULL)

+/*****************************************************************************/

+int OSDAlert(WPARAM wParam, LPARAM lParam)

 {

-	DBGetContactSetting((HANDLE) wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv);

-	_snprintf(contactname, sizeof(contactname), "%s", dbv.pszVal);

-	DBFreeVariant(&dbv);

-}

-else

-_snprintf(contactname, sizeof(contactname), "%s", MODULENAME);

+	char contactname[255], newdisplaytext[2000];

 

+	if (((HANDLE)wParam) != NULL) {

+		DBVARIANT dbv;

+		db_get_s((HANDLE)wParam, MODULENAME, PRESERVE_NAME_KEY, &dbv);

+		lstrcpynA(contactname, dbv.pszVal, SIZEOF(contactname));

+		db_free(&dbv);

+	}

+	else lstrcpyA(contactname, MODULENAME);

 

-	_snprintf(newdisplaytext, sizeof(newdisplaytext), "%s: %s", contactname, Translate(displaytext));

+	char *displaytext = (char*)lParam;

+	mir_snprintf(newdisplaytext, sizeof(newdisplaytext), "%s: %s", contactname, Translate(displaytext));

 

 	if (ServiceExists("OSD/Announce"))

 		CallService("OSD/Announce", (WPARAM) newdisplaytext, 0);

 

 	return 0;

 }

-/********************/

 

-/*****************/

-void ErrorMsgs(char *contactname, char *displaytext)

+/*****************************************************************************/

+int ErrorMsgs(WPARAM wParam, LPARAM lParam)

 {

 	char newdisplaytext[2000];

+	char *contactname = (char*)wParam, *displaytext = (char*)lParam;

 

-	if (!(db_get_b(NULL, MODULENAME, SUPPRESS_ERR_KEY, 0)))

-	{

-		if ((ServiceExists(MS_POPUP_ADDPOPUP) != 0) && ((db_get_b(NULL, MODULENAME, ERROR_POPUP_KEY, 0))))

-		{

+	if ( !db_get_b(NULL, MODULENAME, SUPPRESS_ERR_KEY, 0)) {

+		if ((ServiceExists(MS_POPUP_ADDPOPUP) != 0) && ((db_get_b(NULL, MODULENAME, ERROR_POPUP_KEY, 0)))) {

 			_snprintf(newdisplaytext, sizeof(newdisplaytext), "%s\n%s", contactname, displaytext);

 			PUShowMessage(newdisplaytext, SM_WARNING);

-		} else if ((ServiceExists("OSD/Announce") != 0) && ((db_get_b(NULL, MODULENAME, ERROR_POPUP_KEY, 0))))

-		{

+		}

+		else if ( ServiceExists("OSD/Announce") && db_get_b(NULL, MODULENAME, ERROR_POPUP_KEY, 0)) {

 			_snprintf(newdisplaytext, sizeof(newdisplaytext), "%s: %s", contactname, Translate(displaytext));

 			CallService("OSD/Announce", (WPARAM) newdisplaytext, 0);

-		} else if (ServiceExists(MS_CLIST_SYSTRAY_NOTIFY))

-		{

+		}

+		else if (ServiceExists(MS_CLIST_SYSTRAY_NOTIFY)) {

 			MIRANDASYSTRAYNOTIFY webview_tip = {0};

-

 			webview_tip.cbSize = sizeof(MIRANDASYSTRAYNOTIFY);

 			webview_tip.szProto = NULL;

 			webview_tip.szInfoTitle = contactname;

@@ -378,115 +241,73 @@ void ErrorMsgs(char *contactname, char *displaytext)
 			webview_tip.dwInfoFlags = NIIF_ERROR;

 			webview_tip.uTimeout = 15000;

 			CallService(MS_CLIST_SYSTRAY_NOTIFY, 0, (LPARAM) &webview_tip);

-		} // ////////////

-

+		}

 	}

+	return 0;

 }

-/********************/

 

-/***************************/

-void SaveToFile(char *AContact, char *truncated)

+/*****************************************************************************/

+void SaveToFile(HANDLE hContact, char *truncated)

 {

-	FILE  *pfile;

-	char*mode;

-	DBVARIANT dbv;

-	char url[300];

-	char contactname[100];

-

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

-	DBGetContactSetting(AContact, "CList", "MyHandle", &dbv);

-	_snprintf(contactname, sizeof(contactname), "%s", dbv.pszVal);

-	DBFreeVariant(&dbv);

-

-	if (!(db_get_b(AContact, MODULENAME, APPEND_KEY, 0)))

+	char *mode;

+	if (!db_get_b(hContact, MODULENAME, APPEND_KEY, 0))

 		mode = "w";

 	else

 		mode = "a";

 

-	url[0] = '\0';

-

-	DBGetContactSetting(AContact, MODULENAME, URL_KEY, &dbv);

+	char url[300]; url[0] = '\0';

+	DBVARIANT dbv;

+	db_get_s(hContact, MODULENAME, URL_KEY, &dbv);

 	_snprintf(url, sizeof(url), "%s", dbv.pszVal);

+	db_free(&dbv);

 

-	DBFreeVariant(&dbv);

-

-	DBGetContactSetting(AContact, MODULENAME, FILE_KEY, &dbv);

-	if ((pfile = fopen(dbv.pszVal, mode)) == NULL)

-	{

-		WErrorPopup(contactname, Translate("Cannot write to file"));

-	} else

-	{

-//

-

-		char tstr[128];

-		char timestring[128];

-		char timeprefix[32];

-		char temptime1[32];

-		char temptime2[32];

-		char temptime[128];

-		time_t ftime;

-		struct tm      *nTime;

-

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

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

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

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

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

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

+	db_get_s(hContact, MODULENAME, FILE_KEY, &dbv);

+	FILE *pfile = fopen(dbv.pszVal, mode);

+	if (pfile == NULL)

+		WErrorPopup(hContact, TranslateT("Cannot write to file"));

+	else {

+		char timestring[128], timeprefix[32];

+		char temptime1[32], temptime2[32];

 

 		setlocale(LC_ALL, "");

 

-		ftime = time(NULL);

-		nTime = localtime(&ftime);

+		time_t ftime = time(NULL);

+		struct tm *nTime = localtime(&ftime);

 

-		_snprintf(timeprefix, sizeof(timeprefix), " %s ", (Translate("Last updated on")));

+		mir_snprintf(timeprefix, sizeof(timeprefix), " %s ", Translate("Last updated on"));

 		strftime(temptime1, 32, " %a, %b %d, %Y ", nTime);

 		strftime(temptime2, 32, " %I:%M %p.", nTime);

-		_snprintf(timestring, sizeof(timestring), "(%s)%s\n%s,%s\n", MODULENAME, url, temptime1, temptime2);

+		mir_snprintf(timestring, sizeof(timestring), "(%s)%s\n%s,%s\n", MODULENAME, url, temptime1, temptime2);

 

 		fputs(timestring, pfile);

-//

-

 		fwrite(truncated, strlen(truncated), 1, pfile);

-

 		fputs("\n\n", pfile);

-

 		fclose(pfile);

 	}

 

-	DBFreeVariant(&dbv);

+	db_free(&dbv);

 }

 

-/***************************/

-

-/**************************/

-int ProcessAlerts(HANDLE AContact, char *truncated, char *tstr, char *contactname, int notpresent)

+/*****************************************************************************/

+int ProcessAlerts(HANDLE hContact, char *truncated, char *tstr, char *contactname, int notpresent)

 {

-

 	char alertstring[255];

-	char displaystring[300];

+	TCHAR displaystring[300];

 	FILE  *pcachefile;

-	char cachepath[MAX_PATH];

-	char cachedirectorypath[MAX_PATH];

-	char newcachepath[MAX_PATH + 50];

-	char*cacheend;

 	DBVARIANT tdbv;

 	int wasAlert = 0;

 

-	//

 	int statalertpos = 0, disalertpos = 0, statalertposend = 0;

 	char*alertpos;

 	char Alerttempstring[300], Alerttempstring2[300];

 	static char cachecompare[MAXSIZE1];

 	static char raw[MAXSIZE1];

 

-	//

 	char tempraw[MAXSIZE1];

-	char statustext[200];

 	int alertIndex = 0;

 	int eventIndex = 0;

 

-//MessageBox(NULL, contactname, "pro-contname2", MB_OK);  

+	//MessageBox(NULL, contactname, "pro-contname2", MB_OK);  

 

 	ZeroMemory(&tempraw, sizeof(tempraw));

 	ZeroMemory(&raw, sizeof(raw));

@@ -494,61 +315,33 @@ int ProcessAlerts(HANDLE AContact, char *truncated, char *tstr, char *contactnam
 	strncpy(tempraw, truncated, sizeof(tempraw));

 

 	ZeroMemory(&alertstring, sizeof(alertstring));

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

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

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

 	ZeroMemory(&Alerttempstring, sizeof(Alerttempstring));

 	ZeroMemory(&Alerttempstring2, sizeof(Alerttempstring2));

 	ZeroMemory(&cachecompare, sizeof(cachecompare));

 

-	//

-

 	// alerts

-	if ((db_get_b(AContact, MODULENAME, ENABLE_ALERTS_KEY, 0))) // ALERTS

-	 //

-	// ARE

-	// ENABLED

-

-	{

-

-		if (!DBGetContactSetting(AContact, MODULENAME, ALRT_INDEX_KEY, &tdbv)) // TYPES

-		        //

-		// OF

-		// ALERTS

-

-		{

-			alertIndex = db_get_b(AContact, MODULENAME, ALRT_INDEX_KEY, 0);

-			DBFreeVariant(&tdbv);

-

-			if (!DBGetContactSetting(AContact, MODULENAME, EVNT_INDEX_KEY, &tdbv))

-			{

-

-				eventIndex = db_get_b(AContact, MODULENAME, EVNT_INDEX_KEY, 0);

-				DBFreeVariant(&tdbv);

+	if ( db_get_b(hContact, MODULENAME, ENABLE_ALERTS_KEY, 0)) { // ALERTS

+		if (!db_get_s(hContact, MODULENAME, ALRT_INDEX_KEY, &tdbv)) { // TYPES

+			alertIndex = db_get_b(hContact, MODULENAME, ALRT_INDEX_KEY, 0);

+			db_free(&tdbv);

+

+			if (!db_get_s(hContact, MODULENAME, EVNT_INDEX_KEY, &tdbv)) {

+				eventIndex = db_get_b(hContact, MODULENAME, EVNT_INDEX_KEY, 0);

+				db_free(&tdbv);

 			}

-			if ((notpresent))

-			{

-				if (alertIndex == 0) // Popup

-

-				{

+			if ((notpresent)) {

+				if (alertIndex == 0) { // Popup

 					Sleep(1000);

-					sprintf(displaystring, "%s", (Translate("Start/end strings not found or strings not set.")));

-					WAlertPopup((WPARAM) AContact, displaystring);

+					WAlertPopup(hContact, TranslateT("Start/end strings not found or strings not set."));

 					// contactlist name//

-					if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-						db_set_s(AContact, "CList", "MyHandle", tstr);

-				} //

-

-				else if (alertIndex == 1) // log to file

-

-				{

-					if (!DBGetContactSetting(AContact, MODULENAME, FILE_KEY, &tdbv))

-					{

+					if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+						db_set_s(hContact, "CList", "MyHandle", tstr);

+				}

+				else if (alertIndex == 1) { // log to file

+					if ( !db_get_s(hContact, MODULENAME, FILE_KEY, &tdbv)) {

 						int AmountWspcRem = 0;

 

-						if (!(db_get_b(AContact, MODULENAME, SAVE_AS_RAW_KEY, 0)))

-						{

-							//

+						if ( !db_get_b(hContact, MODULENAME, SAVE_AS_RAW_KEY, 0)) {

 							CodetoSymbol(tempraw);

 							Sleep(100); // avoid 100% CPU

 

@@ -564,89 +357,63 @@ int ProcessAlerts(HANDLE AContact, char *truncated, char *tstr, char *contactnam
 							EraseSymbols(tempraw);

 							Sleep(100); // avoid 100% CPU

 

-							AmountWspcRem = db_get_b(AContact, MODULENAME, RWSPACE_KEY, 0);

+							AmountWspcRem = db_get_b(hContact, MODULENAME, RWSPACE_KEY, 0);

 							RemoveInvis(tempraw, AmountWspcRem);

 							Sleep(100); // avoid 100% CPU

 

 							Removewhitespace(tempraw);

 						}

-						//

-						SaveToFile(AContact, tempraw);

-						DBFreeVariant(&tdbv);

-						// contactlist name//

-						if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-							db_set_s(AContact, "CList", "MyHandle", tstr);

-					}

-				} //

-

-				else if (alertIndex == 3) // osd

 

-				{

-					WAlertOSD((WPARAM) AContact, Translate("Alert start/end strings not found or strings not set."));

-					// contactlist name//

-					if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-						db_set_s(AContact, "CList", "MyHandle", tstr);

-				} else if (eventIndex == 2) // window

+						SaveToFile(hContact, tempraw);

+						db_free(&tdbv);

 

-				{

-					WDisplayDataAlert(AContact);

-					// contactlist name//

-					if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-						db_set_s(AContact, "CList", "MyHandle", tstr);

+						if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+							db_set_s(hContact, "CList", "MyHandle", tstr);

+					}

+				} 

+				else if (alertIndex == 3) {

+					WAlertOSD(hContact, TranslateT("Alert start/end strings not found or strings not set."));

+					if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+						db_set_s(hContact, "CList", "MyHandle", tstr);

+				}

+				else if (eventIndex == 2) {

+					WDisplayDataAlert(hContact);

 

-					HWND hwndDlg = (WindowList_Find(hWindowList, AContact));

+					if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+						db_set_s(hContact, "CList", "MyHandle", tstr);

 

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

-					_snprintf(statustext, sizeof(statustext), " %s", Translate("Start/end strings not found or strings not set."));

-					SetDlgItemText(hwndDlg, IDC_STATUSBAR, statustext);

-				} //

+					HWND hwndDlg = (WindowList_Find(hWindowList, hContact));

 

-				else

-					MessageBox(NULL, Translate("Start/end strings not found or strings not set."), MODULENAME, MB_OK);

+					SetDlgItemText(hwndDlg, IDC_STATUSBAR, TranslateT("Start/end strings not found or strings not set."));

+				}

+				else MessageBox(NULL, TranslateT("Start/end strings not found or strings not set."), _T(MODULENAME), MB_OK);

 			}

-			if (eventIndex == 0) // string present

-

-			{

 

-				if (!DBGetContactSetting(AContact, MODULENAME, ALERT_STRING_KEY, &tdbv))

-				{

+			if (eventIndex == 0) { // string present

+				if ( !db_get_s(hContact, MODULENAME, ALERT_STRING_KEY, &tdbv)) {

 					strncpy(alertstring, tdbv.pszVal, sizeof(alertstring));

-					DBFreeVariant(&tdbv);

-

-					if ((strstr(tempraw, alertstring)) != 0)

-					{ // // ENDALERT EVENT:CHECK FOR STRING

+					db_free(&tdbv);

 

+					if ((strstr(tempraw, alertstring)) != 0) { // // ENDALERT EVENT:CHECK FOR STRING

 						// there was an alert

 						wasAlert = 1;

 

 						// play sound?

 						SkinPlaySound("webviewalert");

 						//

-						if ((!notpresent))

-						{

-

-							if (alertIndex == 0) // popup

-

-							{

-								sprintf(displaystring, "%s \"%s\" %s.", (Translate("The string")), alertstring, (Translate("has been found on the web page")));

-								WAlertPopup((WPARAM) AContact, displaystring);

+						if ((!notpresent)) {

+							if (alertIndex == 0) { // popup

+								mir_sntprintf(displaystring, SIZEOF(displaystring), _T("%s \"%S\" %s."), Translate("The string"), alertstring, Translate("has been found on the web page"));

+								WAlertPopup(hContact, displaystring);

 

 								// contactlist name//

-								if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-									db_set_s(AContact, "CList", "MyHandle", tstr);

+								if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+									db_set_s(hContact, "CList", "MyHandle", tstr);

 							} //

-

-							else if (alertIndex == 1) // LOG

-

-							{

-								if (!DBGetContactSetting(AContact, MODULENAME, FILE_KEY, &tdbv))

-								{

-

+							else if (alertIndex == 1) {

+								if (!db_get_s(hContact, MODULENAME, FILE_KEY, &tdbv)) {

 									int AmountWspcRem = 0;

-

-									if (!(db_get_b(AContact, MODULENAME, SAVE_AS_RAW_KEY, 0)))

-									{

-										//

+									if ( !db_get_b(hContact, MODULENAME, SAVE_AS_RAW_KEY, 0)) {

 										CodetoSymbol(tempraw);

 										Sleep(100); // avoid 100% CPU

 

@@ -662,130 +429,96 @@ int ProcessAlerts(HANDLE AContact, char *truncated, char *tstr, char *contactnam
 										EraseSymbols(tempraw);

 										Sleep(100); // avoid 100% CPU

 

-										AmountWspcRem = db_get_b(AContact, MODULENAME, RWSPACE_KEY, 0);

+										AmountWspcRem = db_get_b(hContact, MODULENAME, RWSPACE_KEY, 0);

 										RemoveInvis(tempraw, AmountWspcRem);

 										Sleep(100); // avoid 100% CPU

 

 										Removewhitespace(tempraw);

-										//

 									}

-									SaveToFile(AContact, tempraw);

-									DBFreeVariant(&tdbv);

-									// contactlist name//

-									if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-										db_set_s(AContact, "CList", "MyHandle", tstr);

-								}

-							} //

-

-							else if (alertIndex == 3) // osd

+									SaveToFile(hContact, tempraw);

+									db_free(&tdbv);

 

-							{

-								sprintf(displaystring, "%s \"%s\" %s.", (Translate("The string")), alertstring, (Translate("has been found on the web page")));

-								WAlertOSD((WPARAM) AContact, displaystring);

+									if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+										db_set_s(hContact, "CList", "MyHandle", tstr);

+								}

+							}

+							else if (alertIndex == 3) {

+								mir_sntprintf(displaystring, SIZEOF(displaystring), _T("%s \"%s\" %s."), TranslateT("The string"), alertstring, TranslateT("has been found on the web page"));

+								WAlertOSD(hContact, displaystring);

 

 								// contactlist name//

-								if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-									db_set_s(AContact, "CList", "MyHandle", tstr);

-							} else if (alertIndex == 2) // window

-

-							{

-								WDisplayDataAlert(AContact);

+								if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+									db_set_s(hContact, "CList", "MyHandle", tstr);

+							}

+							else if (alertIndex == 2) {

+								WDisplayDataAlert(hContact);

 								// contactlist name//

-								if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-									db_set_s(AContact, "CList", "MyHandle", tstr);

-

-								HWND hwndDlg = (WindowList_Find(hWindowList, AContact));

+								if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+									db_set_s(hContact, "CList", "MyHandle", tstr);

 

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

-								_snprintf(statustext, sizeof(statustext), " %s", Translate("Download successful; about to process data..."));

-								SetDlgItemText(hwndDlg, IDC_STATUSBAR, statustext);

-							} //

-

-							else

-								MessageBox(NULL, Translate("Unknown Alert Type."), MODULENAME, MB_OK);

+								HWND hwndDlg = WindowList_Find(hWindowList, hContact);

+								SetDlgItemText(hwndDlg, IDC_STATUSBAR, TranslateT("Download successful; about to process data..."));

+							}

+							else MessageBox(NULL, TranslateT("Unknown Alert Type."), _T(MODULENAME), MB_OK);

 						}

-						//

-					} // // END ALERT EVENT:CHECK FOR STRING

-

-				} // alert string

-

-			} else if (eventIndex == 1) // webpage changed

-

-			{

-

+					}

+				}

+			}

+			else if (eventIndex == 1) { // webpage changed

 				// TEST GET NAME FOR CACHE

+				TCHAR cachepath[MAX_PATH], cachedirectorypath[MAX_PATH], newcachepath[MAX_PATH + 50];

 				GetModuleFileName(hInst, cachepath, sizeof(cachepath));

-				cacheend = strrchr(cachepath, '\\');

+				TCHAR *cacheend = _tcsrchr(cachepath, '\\');

 				cacheend++;

 				*cacheend = '\0';

 

-				_snprintf(cachedirectorypath, sizeof(cachedirectorypath), "%s%s%s", cachepath, MODULENAME, "cache\\");

+				mir_sntprintf(cachedirectorypath, SIZEOF(cachedirectorypath), _T("%s%S%S"), cachepath, MODULENAME, "cache\\");

 				CreateDirectory(cachedirectorypath, NULL);

-				_snprintf(newcachepath, sizeof(newcachepath), "%s%s%s%s%s", cachepath, MODULENAME, "cache\\", contactname, ".txt");

+				mir_sntprintf(newcachepath, SIZEOF(newcachepath), _T("%s%S%S%S%S"), cachepath, MODULENAME, "cache\\", contactname, ".txt");

 				// file exists?

-				if ((_access(newcachepath, 0)) != -1)

-				{

-					if ((pcachefile = fopen(newcachepath, "r")) == NULL)

-					{

-						WErrorPopup(contactname, Translate("Cannot read from file"));

-					} else

-					{

+				if ( _taccess(newcachepath, 0) != -1) {

+					if ((pcachefile = _tfopen(newcachepath, _T("r"))) == NULL)

+						WErrorPopup(contactname, TranslateT("Cannot read from file"));

+					else {

 						ZeroMemory(&cachecompare, sizeof(cachecompare));

 						fread(cachecompare, sizeof(cachecompare), 1, pcachefile);

 						fclose(pcachefile);

 					}

 				}

 				// write to cache

-				if ((pcachefile = fopen(newcachepath, "w")) == NULL)

-				{

-					WErrorPopup(contactname, Translate("Cannot write to file 1"));

-					 MessageBox(NULL, newcachepath, "1", MB_OK);  

-				} else

-				{

- 

+				if ((pcachefile = _tfopen(newcachepath, _T("w"))) == NULL)

+					WErrorPopup(contactname, TranslateT("Cannot write to file 1"));

+				else {

 					fwrite(tempraw, strlen(tempraw), 1, pcachefile); //smaller cache

 					fclose(pcachefile);

-				   db_set_s(AContact, MODULENAME, CACHE_FILE_KEY, newcachepath);

+					db_set_ts(hContact, MODULENAME, CACHE_FILE_KEY, newcachepath);

 				}

 				// end write to cache

 

-    if (strncmp(tempraw, cachecompare, (strlen(tempraw))) != 0) //lets try this instead

-				{

-

+				if (strncmp(tempraw, cachecompare, strlen(tempraw)) != 0) { //lets try this instead

 					// play sound?

 					SkinPlaySound("webviewalert");

 					// there was an alert

 					wasAlert = 1;

 

-					if ((!notpresent))

-					{

-

-						if (alertIndex == 0) // popup

-

-						{

-							WAlertPopup((WPARAM) AContact, Translate("The Web Page Has Changed."));

+					if (!notpresent) {

+						if (alertIndex == 0) { // popup

+							WAlertPopup(hContact, TranslateT("The Web Page Has Changed."));

 							// contactlist name//

-							if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-								db_set_s(AContact, "CList", "MyHandle", tstr);

-						} //

-

-						else if (alertIndex == 3) // osd

-

-						{

-							WAlertOSD((WPARAM) AContact, Translate("The Web Page Has Changed."));

+							if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+								db_set_s(hContact, "CList", "MyHandle", tstr);

+						}

+						else if (alertIndex == 3) { // osd

+							WAlertOSD(hContact, TranslateT("The Web Page Has Changed."));

 							// contactlist name//

-							if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-								db_set_s(AContact, "CList", "MyHandle", tstr);

-						} else if (alertIndex == 1) // log

-

-						{

-							if (!DBGetContactSetting(AContact, MODULENAME, FILE_KEY, &tdbv))

-							{

+							if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+								db_set_s(hContact, "CList", "MyHandle", tstr);

+						}

+						else if (alertIndex == 1) { // log

+							if (!db_get_s(hContact, MODULENAME, FILE_KEY, &tdbv)) {

 								int AmountWspcRem = 0;

 

-								if (!(db_get_b(AContact, MODULENAME, SAVE_AS_RAW_KEY, 0)))

-								{

-									//

+								if ( !db_get_b(hContact, MODULENAME, SAVE_AS_RAW_KEY, 0)) {

 									CodetoSymbol(tempraw);

 									Sleep(100); // avoid 100% CPU

 

@@ -801,131 +534,96 @@ int ProcessAlerts(HANDLE AContact, char *truncated, char *tstr, char *contactnam
 									EraseSymbols(tempraw);

 									Sleep(100); // avoid 100% CPU

 

-									AmountWspcRem = db_get_b(AContact, MODULENAME, RWSPACE_KEY, 0);

+									AmountWspcRem = db_get_b(hContact, MODULENAME, RWSPACE_KEY, 0);

 									RemoveInvis(tempraw, AmountWspcRem);

 									Sleep(100); // avoid 100% CPU

 

 									Removewhitespace(tempraw);

 								}

-								//

-								SaveToFile(AContact, tempraw);

-								DBFreeVariant(&tdbv);

+

+								SaveToFile(hContact, tempraw);

+								db_free(&tdbv);

 								// contactlist name//

-								if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-									db_set_s(AContact, "CList", "MyHandle", tstr);

+								if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+									db_set_s(hContact, "CList", "MyHandle", tstr);

 							}

-						} //

-

-						else if (alertIndex == 2) // window

-

-						{

-							WDisplayDataAlert(AContact);

+						}

+						else if (alertIndex == 2) { // window

+							WDisplayDataAlert(hContact);

 							// contactlist name//

-							if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-								db_set_s(AContact, "CList", "MyHandle", tstr);

-						} //

-

-						else

-							MessageBox(NULL, Translate("Unknown Alert Type."), MODULENAME, MB_OK);

+							if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+								db_set_s(hContact, "CList", "MyHandle", tstr);

+						}

+						else MessageBox(NULL, TranslateT("Unknown Alert Type."), _T(MODULENAME), MB_OK);

 					}

 				}

 			}

-//

 

-			if (eventIndex == 2) // part of webpage changed

+			if (eventIndex == 2) { // part of webpage changed

+				db_get_s(hContact, MODULENAME, ALRT_S_STRING_KEY, &tdbv);

+				mir_snprintf(Alerttempstring, sizeof(Alerttempstring), "%s", tdbv.pszVal);

+				db_free(&tdbv);

 

-			{

-

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

-				//

-				DBGetContactSetting(AContact, MODULENAME, ALRT_S_STRING_KEY, &tdbv);

-				_snprintf(Alerttempstring, sizeof(Alerttempstring), "%s", tdbv.pszVal);

-				DBFreeVariant(&tdbv);

-				//

-				DBGetContactSetting(AContact, MODULENAME, ALRT_E_STRING_KEY, &tdbv);

-				_snprintf(Alerttempstring2, sizeof(Alerttempstring2), "%s", tdbv.pszVal);

-				DBFreeVariant(&tdbv);

-				//

+				db_get_s(hContact, MODULENAME, ALRT_E_STRING_KEY, &tdbv);

+				mir_snprintf(Alerttempstring2, sizeof(Alerttempstring2), "%s", tdbv.pszVal);

+				db_free(&tdbv);

 

 				// putting data into string

-				if (((strstr(tempraw, Alerttempstring)) != 0) && ((strstr(tempraw, Alerttempstring2)) != 0))

-				{

+				if (((strstr(tempraw, Alerttempstring)) != 0) && ((strstr(tempraw, Alerttempstring2)) != 0)) {

 

-//start string

+					//start string

 					alertpos = strstr(tempraw, Alerttempstring);

 					statalertpos = alertpos - tempraw;

-//

+

 					ZeroMemory(&alertpos, sizeof(alertpos));

-//end string

+					//end string

 					alertpos = strstr(tempraw, Alerttempstring2);

-					statalertposend = alertpos - tempraw + strlen(Alerttempstring2);

-//

-					if (statalertpos > statalertposend)

-					{

+					statalertposend = alertpos - tempraw + (int)strlen(Alerttempstring2);

+

+					if (statalertpos > statalertposend) {

 						memset(&tempraw, ' ', statalertpos);

 						ZeroMemory(&alertpos, sizeof(alertpos));

 						alertpos = strstr(tempraw, Alerttempstring2);

-						statalertposend = alertpos - tempraw + strlen(Alerttempstring2);

+						statalertposend = alertpos - tempraw + (int)strlen(Alerttempstring2);

 					}

-					if (statalertpos < statalertposend)

-					{

+

+					if (statalertpos < statalertposend) {

 						ZeroMemory(&raw, sizeof(raw));

 

-//start string

+						//start string

 						alertpos = strstr(tempraw, Alerttempstring);

 						statalertpos = alertpos - tempraw;

-//

 

-//end string

+						//end string

 						alertpos = strstr(tempraw, Alerttempstring2);

-						statalertposend = alertpos - tempraw + strlen(Alerttempstring2);

-//

+						statalertposend = alertpos - tempraw + (int)strlen(Alerttempstring2);

 

-						if (statalertpos > statalertposend)

-						{

+						if (statalertpos > statalertposend) {

 							memset(&tempraw, ' ', statalertpos);

 							ZeroMemory(&alertpos, sizeof(alertpos));

 							alertpos = strstr(tempraw, Alerttempstring2);

-							statalertposend = alertpos - tempraw + strlen(Alerttempstring2);

+							statalertposend = alertpos - tempraw + (int)strlen(Alerttempstring2);

 						}

 						disalertpos = 0;

 

-//write selected data to string

+						//write selected data to string

 						strncpy(raw, &tempraw[statalertpos], (statalertposend - statalertpos));

 						raw[(statalertposend - statalertpos)] = '\0';

-

 					}

 				} // end putting data into string

-

-				else // start and/or end string not present

-

-				{

-

-					if (alertIndex == 0) // popup

-

-					{

+				else { // start and/or end string not present

+					if (alertIndex == 0) { // popup

 						Sleep(1000);

-						sprintf(displaystring, "%s", (Translate("Alert start/end strings not found or strings not set.")));

-						WAlertPopup((WPARAM) AContact, displaystring);

+						WAlertPopup(hContact, TranslateT("Alert start/end strings not found or strings not set."));

 						// contactlist name//

-						if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-							db_set_s(AContact, "CList", "MyHandle", tstr);

-					} //

-

-					else if (alertIndex == 1) // LOG

-

-					{

-						if (!(notpresent)) // dont log to file twice if both types

-						       // of start/end strings not present

-

-						{

-							if (!DBGetContactSetting(AContact, MODULENAME, FILE_KEY, &tdbv))

-							{

+						if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+							db_set_s(hContact, "CList", "MyHandle", tstr);

+					}

+					else if (alertIndex == 1) { // LOG

+						if (!notpresent) { // dont log to file twice if both types of start/end strings not present

+							if ( !db_get_s(hContact, MODULENAME, FILE_KEY, &tdbv)) {

 								int AmountWspcRem = 0;

-

-								if (!(db_get_b(AContact, MODULENAME, SAVE_AS_RAW_KEY, 0)))

-								{

-									//

+								if ( !db_get_b(hContact, MODULENAME, SAVE_AS_RAW_KEY, 0)) {

 									CodetoSymbol(tempraw);

 									Sleep(100); // avoid 100% CPU

 

@@ -941,124 +639,95 @@ int ProcessAlerts(HANDLE AContact, char *truncated, char *tstr, char *contactnam
 									EraseSymbols(tempraw);

 									Sleep(100); // avoid 100% CPU

 

-									AmountWspcRem = db_get_b(AContact, MODULENAME, RWSPACE_KEY, 0);

+									AmountWspcRem = db_get_b(hContact, MODULENAME, RWSPACE_KEY, 0);

 									RemoveInvis(tempraw, AmountWspcRem);

 									Sleep(100); // avoid 100% CPU

 

 									Removewhitespace(tempraw);

 								}

-								//

-								SaveToFile(AContact, tempraw);

-								DBFreeVariant(&tdbv);

-								// contactlist name//

-								if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-									db_set_s(AContact, "CList", "MyHandle", tstr);

+

+								SaveToFile(hContact, tempraw);

+								db_free(&tdbv);

+								// contactlist name

+								if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+									db_set_s(hContact, "CList", "MyHandle", tstr);

 							}

 						}

-					} //

-

-					else if (alertIndex == 3) // osd

-

-					{

-						WAlertOSD((WPARAM) AContact, Translate("Alert start/end strings not found or strings not set."));

+					} 

+					else if (alertIndex == 3) { // osd

+						WAlertOSD(hContact, TranslateT("Alert start/end strings not found or strings not set."));

 						// contactlist name//

-						if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-							db_set_s(AContact, "CList", "MyHandle", tstr);

-					} else if (alertIndex == 2) // window

-

-					{

-						WDisplayDataAlert(AContact);

+						if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+							db_set_s(hContact, "CList", "MyHandle", tstr);

+					}

+					else if (alertIndex == 2) { // window

+						WDisplayDataAlert(hContact);

 						// contactlist name//

-						if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-							db_set_s(AContact, "CList", "MyHandle", tstr);

-

-						HWND hwndDlg = (WindowList_Find(hWindowList, AContact));

+						if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+							db_set_s(hContact, "CList", "MyHandle", tstr);

 

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

-						_snprintf(statustext, sizeof(statustext), " %s", Translate("Alert start/end strings not found or strings not set."));

-						SetDlgItemText(hwndDlg, IDC_STATUSBAR, statustext);

-					} //

+						HWND hwndDlg = (WindowList_Find(hWindowList, hContact));

+						SetDlgItemText(hwndDlg, IDC_STATUSBAR, TranslateT("Alert start/end strings not found or strings not set."));

+					}

+					else MessageBox(NULL, TranslateT("Alert start/end strings not found or strings not set."), _T(MODULENAME), MB_OK);

 

-					else

-						MessageBox(NULL, Translate("Alert start/end strings not found or strings not set."), MODULENAME, MB_OK);

-					db_set_w(AContact, MODULENAME, "Status", ID_STATUS_AWAY);

+					db_set_w(hContact, MODULENAME, "Status", ID_STATUS_AWAY);

 				}

 

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

-

-				if (((strstr(tempraw, Alerttempstring)) != 0) && ((strstr(tempraw, Alerttempstring2)) != 0))

-				{

-

+				///////////////

+				if (((strstr(tempraw, Alerttempstring)) != 0) && ((strstr(tempraw, Alerttempstring2)) != 0)) {

 					// TEST GET NAME FOR CACHE

-					GetModuleFileName(hInst, cachepath, sizeof(cachepath));

-					cacheend = strrchr(cachepath, '\\');

+					TCHAR cachepath[MAX_PATH], cachedirectorypath[MAX_PATH], newcachepath[MAX_PATH + 50];

+					GetModuleFileName(hInst, cachepath, SIZEOF(cachepath));

+					TCHAR *cacheend = _tcsrchr(cachepath, '\\');

 					cacheend++;

 					*cacheend = '\0';

 

-					_snprintf(cachedirectorypath, sizeof(cachedirectorypath), "%s%s%s", cachepath, MODULENAME, "cache\\");

+					mir_sntprintf(cachedirectorypath, SIZEOF(cachedirectorypath), _T("%s%S%S"), cachepath, MODULENAME, "cache\\");

 					CreateDirectory(cachedirectorypath, NULL);

-					_snprintf(newcachepath, sizeof(newcachepath), "%s%s%s%s%s", cachepath, MODULENAME, "cache\\", contactname, ".txt");

+					mir_sntprintf(newcachepath, SIZEOF(newcachepath), _T("%s%S%S%S%S"), cachepath, MODULENAME, "cache\\", contactname, ".txt");

 					// file exists?

-					if ((_access(newcachepath, 0)) != -1)

-					{

-						if ((pcachefile = fopen(newcachepath, "r")) == NULL)

-						{

-							WErrorPopup(contactname, Translate("Cannot read from file"));

-						} else

-						{

+					if ( _taccess(newcachepath, 0) != -1) {

+						if ((pcachefile = _tfopen(newcachepath, _T("r"))) == NULL)

+							WErrorPopup(contactname, TranslateT("Cannot read from file"));

+						else {

 							ZeroMemory(&cachecompare, sizeof(cachecompare));

 							fread(cachecompare, sizeof(cachecompare), 1, pcachefile);

 							fclose(pcachefile);

 						}

 					}

 					// write to cache

-					if ((pcachefile = fopen(newcachepath, "w")) == NULL)

-					{

-						WErrorPopup(contactname, Translate("Cannot write to file 2"));

-					} else

-					{

-  fwrite(raw, strlen(raw), 1, pcachefile); //smaller cache

- 	   db_set_s(AContact, MODULENAME, CACHE_FILE_KEY, newcachepath);

+					if ((pcachefile = _tfopen(newcachepath, _T("w"))) == NULL)

+						WErrorPopup(contactname, TranslateT("Cannot write to file 2"));

+					else {

+						fwrite(raw, strlen(raw), 1, pcachefile); //smaller cache

+						db_set_ts(hContact, MODULENAME, CACHE_FILE_KEY, newcachepath);

 						fclose(pcachefile);

 					}

 					// end write to cache

-        if (strncmp(raw, cachecompare, (strlen(raw))) != 0) //lets try this instead

-					{

-

+					if (strncmp(raw, cachecompare, (strlen(raw))) != 0) { //lets try this instead

 						// play sound?

 						SkinPlaySound("webviewalert");

 						// there was an alert

 						wasAlert = 1;

 

-						if ((!notpresent))

-						{

-

-							if (alertIndex == 0) // popup

-

-							{

-								WAlertPopup((WPARAM) AContact, Translate("Specific Part Of The Web Page Has Changed."));

+						if (!notpresent) {

+							if (alertIndex == 0) { // popup

+								WAlertPopup(hContact, TranslateT("Specific Part Of The Web Page Has Changed."));

 								// contactlist name//

-								if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-									db_set_s(AContact, "CList", "MyHandle", tstr);

-							} //

-

-							else if (alertIndex == 3) // osd

-

-							{

-								WAlertOSD((WPARAM) AContact, Translate("Specific Part Of The Web Page Has Changed."));

+								if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+									db_set_s(hContact, "CList", "MyHandle", tstr);

+							}

+							else if (alertIndex == 3) { // osd

+								WAlertOSD(hContact, TranslateT("Specific Part Of The Web Page Has Changed."));

 								// contactlist name//

-								if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-									db_set_s(AContact, "CList", "MyHandle", tstr);

-							} else if (alertIndex == 1) // log to file

-

-							{

-								if (!DBGetContactSetting(AContact, MODULENAME, FILE_KEY, &tdbv))

-								{

+								if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+									db_set_s(hContact, "CList", "MyHandle", tstr);

+							}

+							else if (alertIndex == 1) { // log to file

+								if (!db_get_s(hContact, MODULENAME, FILE_KEY, &tdbv)) {

 									int AmountWspcRem = 0;

-

-									if (!(db_get_b(AContact, MODULENAME, SAVE_AS_RAW_KEY, 0)))

-									{

-										//

+									if ( !db_get_b(hContact, MODULENAME, SAVE_AS_RAW_KEY, 0)) {

 										CodetoSymbol(tempraw);

 										Sleep(100); // avoid 100% CPU

 

@@ -1074,233 +743,149 @@ int ProcessAlerts(HANDLE AContact, char *truncated, char *tstr, char *contactnam
 										EraseSymbols(tempraw);

 										Sleep(100); // avoid 100% CPU

 

-										AmountWspcRem = db_get_b(AContact, MODULENAME, RWSPACE_KEY, 0);

+										AmountWspcRem = db_get_b(hContact, MODULENAME, RWSPACE_KEY, 0);

 										RemoveInvis(tempraw, AmountWspcRem);

 										Sleep(100); // avoid 100% CPU

 

 										Removewhitespace(tempraw);

 									}

-									//

-									SaveToFile(AContact, tempraw);

-									DBFreeVariant(&tdbv);

-									// contactlist name//

-									if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-										db_set_s(AContact, "CList", "MyHandle", tstr);

-								}

-							} //

 

-							else if (alertIndex == 2) // window

-

-							{

-								WDisplayDataAlert(AContact);

+									SaveToFile(hContact, tempraw);

+									db_free(&tdbv);

+									// contactlist name

+									if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+										db_set_s(hContact, "CList", "MyHandle", tstr);

+								}

+							}

+							else if (alertIndex == 2) { // window

+								WDisplayDataAlert(hContact);

 								// contactlist name//

-								if ((db_get_b(AContact, MODULENAME, APND_DATE_NAME_KEY, 0)))

-									db_set_s(AContact, "CList", "MyHandle", tstr);

-							} //

-

-							else

-								MessageBox(NULL, Translate("Unknown Alert Type."), MODULENAME, MB_OK);

+								if ( db_get_b(hContact, MODULENAME, APND_DATE_NAME_KEY, 0))

+									db_set_s(hContact, "CList", "MyHandle", tstr);

+							}

+							else MessageBox(NULL, TranslateT("Unknown Alert Type."), _T(MODULENAME), MB_OK);

 						}

 					}

 				}

 			}

-//

 		} // alert type

-

 	}

 	// end alerts

 

-//if always log to file option is enabled do this

-	if (wasAlert)

-	{

-		if (alertIndex != 1) // dont do for log to file alert

-

-		{

-			if ((db_get_b(AContact, MODULENAME, ALWAYS_LOG_KEY, 0)))

-			{

-				if (!DBGetContactSetting(AContact, MODULENAME, FILE_KEY, &tdbv))

-				{

-					int AmountWspcRem = 0;

+	//if always log to file option is enabled do this

+	if (wasAlert && alertIndex != 1) { // dont do for log to file alert

+		if ( db_get_b(hContact, MODULENAME, ALWAYS_LOG_KEY, 0)) {

+			if (!db_get_s(hContact, MODULENAME, FILE_KEY, &tdbv)) {

+				int AmountWspcRem = 0;

 

-					if (!(db_get_b(AContact, MODULENAME, SAVE_AS_RAW_KEY, 0)))

-					{

-						//

-						CodetoSymbol(tempraw);

-						Sleep(100); // avoid 100% CPU

+				if ( !db_get_b(hContact, MODULENAME, SAVE_AS_RAW_KEY, 0)) {

+					CodetoSymbol(tempraw);

+					Sleep(100); // avoid 100% CPU

 

-						EraseBlock(tempraw);

-						Sleep(100); // avoid 100% CPU

+					EraseBlock(tempraw);

+					Sleep(100); // avoid 100% CPU

 

-						FastTagFilter(tempraw);

-						Sleep(100); // avoid 100% CPU

+					FastTagFilter(tempraw);

+					Sleep(100); // avoid 100% CPU

 

-						NumSymbols(tempraw);

-						Sleep(100); // avoid 100% CPU

+					NumSymbols(tempraw);

+					Sleep(100); // avoid 100% CPU

 

-						EraseSymbols(tempraw);

-						Sleep(100); // avoid 100% CPU

+					EraseSymbols(tempraw);

+					Sleep(100); // avoid 100% CPU

 

-						AmountWspcRem = db_get_b(AContact, MODULENAME, RWSPACE_KEY, 0);

-						RemoveInvis(tempraw, AmountWspcRem);

-						Sleep(100); // avoid 100% CPU

+					AmountWspcRem = db_get_b(hContact, MODULENAME, RWSPACE_KEY, 0);

+					RemoveInvis(tempraw, AmountWspcRem);

+					Sleep(100); // avoid 100% CPU

 

-						Removewhitespace(tempraw);

-					}

-					//

-					SaveToFile(AContact, tempraw);

-					DBFreeVariant(&tdbv);

+					Removewhitespace(tempraw);

 				}

+

+				SaveToFile(hContact, tempraw);

+				db_free(&tdbv);

 			}

 		}

 	}

 	strncpy(truncated, tempraw, strlen(truncated));

-

 	return wasAlert;

 }

-/**************************/

 

-/***********************/

-int DataWndAlertCommand(void *AContact)

+/*****************************************************************************/

+int DataWndAlertCommand(WPARAM wParam, LPARAM lParam)

 {

-	HWND hwndDlg;

-

-	if ((hwndDlg = (WindowList_Find(hWindowList, (HANDLE) AContact))))

-	{

+	HANDLE hContact = (HANDLE)wParam;

+	if ( WindowList_Find(hWindowList, hContact))

 		return 0;

-	}

-	hwndDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_DISPLAY_DATA), NULL, DlgProcDisplayData, (LPARAM) (HANDLE) AContact);

-

-	if (db_get_b(AContact, MODULENAME, ON_TOP_KEY, 0))

-	{

-		SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) ((HICON) LoadImage(hInst, MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0)));

-		if ((db_get_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, 0)))

-		{

-			SetWindowPos(

-			        hwndDlg,

-			        HWND_TOPMOST,

-			        db_get_dw(AContact, MODULENAME, "WVx", 100), // Xposition,

-			        db_get_dw(AContact, MODULENAME, "WVy", 100), // Yposition,

-			        db_get_dw(AContact, MODULENAME, "WVwidth", 100), // WindowWidth,

-			        db_get_dw(AContact, MODULENAME, "WVheight", 100), // WindowHeight,

-			        0);

-		} else

-		{

-			SetWindowPos(

-			        hwndDlg,

-			        HWND_TOPMOST,

-			        Xposition,

-			        Yposition,

-			        WindowWidth,

-			        WindowHeight,

-			        0);

-		}

 

-	}

-	if (!(db_get_b(AContact, MODULENAME, ON_TOP_KEY, 0)))

-	{//

-		SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) ((HICON) LoadImage(hInst, MAKEINTRESOURCE(IDI_UNSTICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0)));

-

-		if ((db_get_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, 0)))

-		{

-			SetWindowPos(

-			        hwndDlg,

-			        HWND_NOTOPMOST,

-			        db_get_dw(AContact, MODULENAME, "WVx", 100), // Xposition,

-			        db_get_dw(AContact, MODULENAME, "WVy", 100), // Yposition,

-			        db_get_dw(AContact, MODULENAME, "WVwidth", 100), // WindowWidth,

-			        db_get_dw(AContact, MODULENAME, "WVheight", 100), // WindowHeight,

-			        0);

-		} else

-		{

-			SetWindowPos(

-			        hwndDlg,

-			        HWND_NOTOPMOST,

-			        Xposition,

-			        Yposition,

-			        WindowWidth,

-			        WindowHeight,

-			        0);

-		}

-	}

+	HWND hwndDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_DISPLAY_DATA), NULL, DlgProcDisplayData, (LPARAM)hContact);

+	HWND hTopmost = db_get_b(hContact, MODULENAME, ON_TOP_KEY, 0) ? HWND_TOPMOST : HWND_NOTOPMOST;

+	SendDlgItemMessage(hwndDlg, IDC_STICK_BUTTON, BM_SETIMAGE, IMAGE_ICON, (LPARAM) ((HICON) LoadImage(hInst, MAKEINTRESOURCE(IDI_STICK), IMAGE_ICON, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0)));

+	if ( db_get_b(NULL, MODULENAME, SAVE_INDIVID_POS_KEY, 0))

+		SetWindowPos(hwndDlg, hTopmost,

+			db_get_dw(hContact, MODULENAME, "WVx", 100), // Xposition,

+			db_get_dw(hContact, MODULENAME, "WVy", 100), // Yposition,

+			db_get_dw(hContact, MODULENAME, "WVwidth", 100), // WindowWidth,

+			db_get_dw(hContact, MODULENAME, "WVheight", 100), 0); // WindowHeight,

+	else

+		SetWindowPos(hwndDlg, HWND_TOPMOST, Xposition, Yposition, WindowWidth, WindowHeight, 0);

+

 	ShowWindow(hwndDlg, SW_SHOW);

 	SetActiveWindow(hwndDlg);

-

 	return 0;

 }

 

-/***********************/

-/***************************/

-static void     ReadFromFile(void *AContact)

+/*****************************************************************************/

+void ReadFromFile(HANDLE hContact)

 {

-	FILE  *pfile;

 	DBVARIANT dbv;

-	char contactname[100];

 	char truncated[MAXSIZE1];

-    int  AmountWspcRem = 0;

-    int  fileexists = 0;         

-

-	

-	 HWND hwndDlg = (WindowList_Find(hWindowList, AContact));

-	 

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

-	DBGetContactSetting(AContact, "CList", "MyHandle", &dbv);

-	_snprintf(contactname, sizeof(contactname), "%s", dbv.pszVal);

-	DBFreeVariant(&dbv);

-

-

-

-////

-	DBGetContactSetting(AContact, MODULENAME, CACHE_FILE_KEY, &dbv);		

-////

-	if ((pfile = fopen(dbv.pszVal, "r")) == NULL)

-	{

-		//WErrorPopup(contactname, Translate("Cannot read from cache file"));

-			 SendToRichEdit(hwndDlg,

-   Translate("Cannot read from cache file"),

-   TextClr,

-   BackgoundClr);

-   	fileexists =0;

+	int  AmountWspcRem = 0;

+	int  fileexists = 0;         

+

+	HWND hwndDlg = WindowList_Find(hWindowList, hContact);

+

+	char contactname[100];

+	db_get_s(hContact, "CList", "MyHandle", &dbv);

+	mir_snprintf(contactname, sizeof(contactname), "%s", dbv.pszVal);

+	db_free(&dbv);

+

+	db_get_s(hContact, MODULENAME, CACHE_FILE_KEY, &dbv);		

+	FILE *pfile;

+	if ((pfile = fopen(dbv.pszVal, "r")) == NULL) {

+		SendToRichEdit(hwndDlg, Translate("Cannot read from cache file"), TextClr, BackgoundClr);

+		fileexists = 0;

 	} 

-    else

-	{

-	fread(truncated, sizeof(truncated), 1, pfile);

-	fclose(pfile);

-	fileexists =1;

+	else {

+		fread(truncated, sizeof(truncated), 1, pfile);

+		fclose(pfile);

+		fileexists =1;

 	}

 

-	DBFreeVariant(&dbv);

-	

- if(fileexists) {///

-	

- CodetoSymbol(truncated);

-									Sleep(100); // avoid 100% CPU

+	db_free(&dbv);

 

-									EraseBlock(truncated);

-									Sleep(100); // avoid 100% CPU

+	if(fileexists) {

+		CodetoSymbol(truncated);

+		Sleep(100); // avoid 100% CPU

 

-									FastTagFilter(truncated);

-									Sleep(100); // avoid 100% CPU

+		EraseBlock(truncated);

+		Sleep(100); // avoid 100% CPU

 

-									NumSymbols(truncated);

-									Sleep(100); // avoid 100% CPU

+		FastTagFilter(truncated);

+		Sleep(100); // avoid 100% CPU

 

-									EraseSymbols(truncated);

-									Sleep(100); // avoid 100% CPU

+		NumSymbols(truncated);

+		Sleep(100); // avoid 100% CPU

 

-									AmountWspcRem = db_get_b(AContact, MODULENAME, RWSPACE_KEY, 0);

-									RemoveInvis(truncated, AmountWspcRem);

-									Sleep(100); // avoid 100% CPU

+		EraseSymbols(truncated);

+		Sleep(100); // avoid 100% CPU

 

-									Removewhitespace(truncated);

+		AmountWspcRem = db_get_b(hContact, MODULENAME, RWSPACE_KEY, 0);

+		RemoveInvis(truncated, AmountWspcRem);

+		Sleep(100); // avoid 100% CPU

 

-	 SendToRichEdit(hwndDlg,

-   truncated,

-   TextClr,

-   BackgoundClr);

-   

-     SetDlgItemText(hwndDlg, IDC_STATUSBAR, Translate("Loaded From Cache")); 

-     

-     } ///        

-}

+		Removewhitespace(truncated);

 

-/***************************/

+		SendToRichEdit(hwndDlg, truncated, TextClr, BackgoundClr);

+		SetDlgItemText(hwndDlg, IDC_STATUSBAR, TranslateT("Loaded From Cache")); 

+	}

+}