17 files changed, 431 insertions, 1282 deletions

diff --git a/ieview/Options.cpp b/ieview/Options.cpp
index 2dcfafd..8ffbdb2 100644
--- a/ieview/Options.cpp
+++ b/ieview/Options.cpp
@@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define _WIN32_WINNT  0x0501

 #include "Options.h"

 #include "resource.h"

-//#include "Smiley.h"

 #include "Template.h"

 #include "Utils.h"

 #include "m_MathModule.h"

@@ -428,11 +427,17 @@ int IEViewOptInit(WPARAM wParam, LPARAM lParam)
 	odp.cbSize = sizeof(odp);

 	odp.position = 0;

 	odp.hInstance = hInstance;

-	odp.ptszGroup = TranslateT("Message Sessions");

-	odp.ptszTitle = TranslateT("IEView");

+	odp.ptszGroup = _T("Message Sessions");

+	odp.ptszTitle = _T("IEView");

 	odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;

 	odp.nIDBottomSimpleControl = 0;

-	for (i = 0; i < SIZEOF(tabPages); i++) {

+	odp.pszTemplate = MAKEINTRESOURCEA(tabPages[0].dlgId);

+	odp.pfnDlgProc = tabPages[0].dlgProc;

+	odp.ptszTab = tabPages[0].tabName;

+	CallService(MS_OPT_ADDPAGE, wParam, (LPARAM) & odp);

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

+	odp.ptszTitle = _T("Message Log");

+	for (i = 1; i < SIZEOF(tabPages); i++) {

 		odp.pszTemplate = MAKEINTRESOURCEA(tabPages[i].dlgId);

 		odp.pfnDlgProc = tabPages[i].dlgProc;

 		odp.ptszTab = tabPages[i].tabName;

@@ -497,6 +502,13 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 			}

 			EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLE_MATHMODULE), Options::isMathModule());

 			EnableWindow(GetDlgItem(hwndDlg, IDC_SMILEYS_IN_NAMES), Options::isSmileyAdd());

+			EnableWindow(GetDlgItem(hwndDlg, IDC_EMBED_SIZE), IsDlgButtonChecked(hwndDlg, IDC_ENABLE_EMBED));

+			TCHAR* size[] = {  _T("320õ205"), _T("480 x 385") , _T("560 x 349"), _T("640 x 390")};

+			for (i = 0; i < SIZEOF(size); ++i){

+				int item=SendDlgItemMessage(hwndDlg,IDC_EMBED_SIZE,CB_ADDSTRING,0,(LPARAM)TranslateTS(size[i]));

+				SendDlgItemMessage(hwndDlg,IDC_EMBED_SIZE,CB_SETITEMDATA,item,(LPARAM)0);

+			}

+			SendDlgItemMessage(hwndDlg,IDC_EMBED_SIZE,CB_SETCURSEL,Options::getEmbedsize(),0);	

 			return TRUE;

 		}

 	case WM_COMMAND:

@@ -508,8 +520,12 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
             case IDC_ENABLE_PNGHACK:

             case IDC_SMILEYS_IN_NAMES:

             case IDC_NO_BORDER:

+			case IDC_EMBED_SIZE:

+				MarkChanges(1, hwndDlg);

+				break;

 			case IDC_ENABLE_EMBED:

 				MarkChanges(1, hwndDlg);

+				EnableWindow(GetDlgItem(hwndDlg, IDC_EMBED_SIZE), IsDlgButtonChecked(hwndDlg, IDC_ENABLE_EMBED));

 				break;

 			}

 		}

@@ -542,6 +558,7 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 				}

 				Options::setGeneralFlags(i);

 				ApplyChanges(1);

+				Options::setEmbedsize(SendDlgItemMessage(hwndDlg,IDC_EMBED_SIZE,CB_GETCURSEL,0,0));

 				return TRUE;

 			}

 		}

@@ -554,7 +571,7 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 

 static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {

 	BOOL bChecked;

-	char path[MAX_PATH];

+	char path[MAX_PATH], filter[MAX_PATH];

 	switch (msg) {

 	case WM_INITDIALOG:

 		{

@@ -592,26 +609,30 @@ static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 				MarkChanges(2, hwndDlg);

 				break;

 			case IDC_BROWSE_TEMPLATES:

-				if (BrowseFile(hwndDlg, "Template (*.ivt)\0*.ivt\0All Files\0*.*\0\0", "ivt", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.ivt)%c*.ivt%c%s%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "ivt", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path);

 					UpdateTemplateIcons(hwndDlg, path);

 					MarkChanges(2, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_BACKGROUND_IMAGE:

-				if (BrowseFile(hwndDlg, "All Images (*.jpg,*.gif,*.png,*.bmp)\0*.jpg;*.gif;*.png;*.bmp\0All Files\0*.*\0\0", "jpg", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.jpg,*.gif,*.png,*.bmp)%c*.ivt%c%s%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "jpg", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg,IDC_BACKGROUND_IMAGE_FILENAME,path);

 					MarkChanges(2, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path);

 					MarkChanges(2, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS_RTL:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME_RTL, path);

 					MarkChanges(2, hwndDlg);

 				}

@@ -690,7 +711,7 @@ static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 

 static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {

 	BOOL bChecked = FALSE;

-	char path[MAX_PATH];

+	char path[MAX_PATH], filter[MAX_PATH];

 	switch (msg) {

 	case WM_INITDIALOG:

 		{

@@ -728,26 +749,30 @@ static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 				MarkChanges(4, hwndDlg);

 				break;

 			case IDC_BROWSE_TEMPLATES:

-				if (BrowseFile(hwndDlg, "Template (*.ivt)\0*.ivt\0All Files\0*.*\0\0", "ivt", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.ivt)%c*.ivt%c%s%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "ivt", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path);

 					UpdateTemplateIcons(hwndDlg, path);

 					MarkChanges(4, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_BACKGROUND_IMAGE:

-				if (BrowseFile(hwndDlg, "All Images (*.jpg,*.gif,*.png,*.bmp)\0*.jpg;*.gif;*.png;*.bmp\0All Files\0*.*\0\0", "jpg", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.jpg,*.gif,*.png,*.bmp)%c*.ivt%c%s%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "jpg", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg,IDC_BACKGROUND_IMAGE_FILENAME,path);

 					MarkChanges(4, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path);

 					MarkChanges(4, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS_RTL:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME_RTL, path);

 					MarkChanges(4, hwndDlg);

 				}

@@ -826,7 +851,7 @@ static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 

 static INT_PTR CALLBACK IEViewGroupChatsOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) {

 	BOOL bChecked;

-	char path[MAX_PATH];

+	char path[MAX_PATH], filter[MAX_PATH];

 	switch (msg) {

 	case WM_INITDIALOG:

 		{

@@ -865,26 +890,30 @@ static INT_PTR CALLBACK IEViewGroupChatsOptDlgProc(HWND hwndDlg, UINT msg, WPARA
 				MarkChanges(8, hwndDlg);

 				break;

 			case IDC_BROWSE_TEMPLATES:

-				if (BrowseFile(hwndDlg, "Template (*.ivt)\0*.ivt\0All Files\0*.*\0\0", "ivt", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.ivt)%c*.ivt%c%s%c*.*%c%c", Translate("Template"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "ivt", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_TEMPLATES_FILENAME, path);

 					UpdateTemplateIcons(hwndDlg, path);

 					MarkChanges(8, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_BACKGROUND_IMAGE:

-				if (BrowseFile(hwndDlg, "All Images (*.jpg,*.gif,*.png,*.bmp)\0*.jpg;*.gif;*.png;*.bmp\0All Files\0*.*\0\0", "jpg", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.jpg,*.gif,*.png,*.bmp)%c*.ivt%c%s%c*.*%c%c", Translate("All Images"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "jpg", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg,IDC_BACKGROUND_IMAGE_FILENAME,path);

 					MarkChanges(8, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME, path);

 					MarkChanges(8, hwndDlg);

 				}

 				break;

 			case IDC_BROWSE_EXTERNALCSS_RTL:

-				if (BrowseFile(hwndDlg, "Style Sheet (*.css)\0*.css\0All Files\0*.*\0\0", "css", path, sizeof(path))) {

+				mir_snprintf(filter, SIZEOF(filter), "%s (*.css)%c*.ivt%c%s%c*.*%c%c", Translate("Style Sheet"), 0, 0, Translate("All Files"), 0, 0, 0);

+				if (BrowseFile(hwndDlg, filter, "css", path, SIZEOF(path))) {

 					SetDlgItemTextA(hwndDlg, IDC_EXTERNALCSS_FILENAME_RTL, path);

 					MarkChanges(8, hwndDlg);

 				}

@@ -1487,7 +1516,7 @@ void Options::init() {
 	}

 

 

-	generalFlags = DBGetContactSettingDword(NULL, ieviewModuleName, DBS_BASICFLAGS, 0);

+	generalFlags = DBGetContactSettingDword(NULL, ieviewModuleName, DBS_BASICFLAGS, 13);

 

 	/* TODO: move to buildProtocolList method */

 	int protoCount;

@@ -1515,7 +1544,7 @@ void Options::init() {
 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_SRMM_MODE);

 		proto->setSRMMMode(DBGetContactSettingByte(NULL, ieviewModuleName, dbsName, FALSE));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_SRMM_FLAGS);

-		proto->setSRMMFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, FALSE));

+		proto->setSRMMFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, 16128));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_SRMM_BACKGROUND);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

@@ -1550,7 +1579,7 @@ void Options::init() {
 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_CHAT_MODE);

 		proto->setChatMode(DBGetContactSettingByte(NULL, ieviewModuleName, dbsName, FALSE));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_CHAT_FLAGS);

-		proto->setChatFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, FALSE));

+		proto->setChatFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, 16128));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_CHAT_BACKGROUND);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

@@ -1585,7 +1614,7 @@ void Options::init() {
 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_HISTORY_MODE);

 		proto->setHistoryMode(DBGetContactSettingByte(NULL, ieviewModuleName, dbsName, FALSE));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_HISTORY_FLAGS);

-		proto->setHistoryFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, FALSE));

+		proto->setHistoryFlags(DBGetContactSettingDword(NULL, ieviewModuleName, dbsName, 16128));

 		sprintf(dbsName, "%s.%s", proto->getProtocolName(), DBS_HISTORY_BACKGROUND);

 		if (!DBGetContactSetting(NULL,  ieviewModuleName, dbsName, &dbv)) {

 			strcpy(tmpPath, dbv.pszVal);

@@ -1656,6 +1685,14 @@ int	Options::getGeneralFlags() {
 	return generalFlags;

 }

 

+void Options::setEmbedsize(int size){

+	DBWriteContactSettingDword(NULL, ieviewModuleName, "Embedsize", (DWORD) size);

+}

+

+int Options::getEmbedsize(){

+	return DBGetContactSettingDword(NULL, ieviewModuleName, "Embedsize", 0);

+}

+

 bool Options::isMathModule() {

 	return bMathModule;

 }

diff --git a/ieview/Options.h b/ieview/Options.h
index 139c71b..58f758c 100644
--- a/ieview/Options.h
+++ b/ieview/Options.h
@@ -232,6 +232,8 @@ public:
 

 	static void     		setGeneralFlags(int flags);

 	static int				getGeneralFlags();

+	static void     		setEmbedsize(int size);

+	static int				getEmbedsize();

 

 	static bool             isMathModule();

 	static bool             isSmileyAdd();

diff --git a/ieview/TextToken.cpp b/ieview/TextToken.cpp
index f33a42b..bfa2913 100644
--- a/ieview/TextToken.cpp
+++ b/ieview/TextToken.cpp
@@ -652,10 +652,31 @@ void TextToken::toString(wchar_t **str, int *sizeAlloced) {
 							int len = match2 != NULL ? match2 - match : wcslen(match);

 							match = mir_wstrdup(match);

 							match[len] = 0;

-							int width = 640;

-							int height = 390;

+							int width ;

+							int height;

+							int Embedsize = Options::getEmbedsize();

+							switch (Embedsize){

+							case 0:

+								width = 320;

+								height = 205;

+								break;

+							case 1:

+								width = 480;

+								height = 385;

+								break;

+							case 2:

+								width = 560;

+								height = 349;

+								break;

+							case 3:

+								width = 640;

+								height = 390;

+								break;

+

+							};

+

 							Utils::appendText(str, sizeAlloced, L"<div><object width=\"%d\" height=\"%d\">\

-																 <param name=\"movie\" value=\"http://www.youtube.com/v/%s&feature=player_embedded&version=3\"/>\

+																	 <param name=\"movie\" value=\"http://www.youtube.com/v/%s&feature=player_embedded&version=3\"/>\

 																 <param name=\"allowFullScreen\" value=\"true\"/>\

 																 <param name=\"allowScriptAccess\" value=\"true\"/>\

 																 <embed src=\"http://www.youtube.com/v/%s&feature=player_embedded&version=3\" type=\"application/x-shockwave-flash\" allowfullscreen=\"true\" allowScriptAccess=\"always\" width=\"%d\" height=\"%d\"/>\

diff --git a/ieview/Version.h b/ieview/Version.h
new file mode 100644
index 0000000..283b79a
--- /dev/null
+++ b/ieview/Version.h
@@ -0,0 +1,28 @@
+#define __MAJOR_VERSION				1

+#define __MINOR_VERSION				3

+#define __RELEASE_NUM				0

+#define __BUILD_NUM					3

+

+#define __FILEVERSION_STRING		__MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

+#define __FILEVERSION_DOTS			__MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

+

+#define __STRINGIFY_IMPL(x)			#x

+#define __STRINGIFY(x)				__STRINGIFY_IMPL(x)

+#define __VERSION_STRING			__STRINGIFY(__FILEVERSION_DOTS)

+

+#ifdef _UNICODE

+#if defined(WIN64) || defined(_WIN64)

+	#define __PLUGIN_NAME "IEView (Unicode x64)"

+#else

+	#define __PLUGIN_NAME "IEView (Unicode)"

+#endif

+#else

+	#define __PLUGIN_NAME "IEView"

+#endif

+#define __INTERNAL_NAME				"IEView"

+#define __FILENAME					"IEView.dll"

+#define __DESCRIPTION 				"IE Based Chat Log."

+#define __AUTHOR					"Piotr Piastucki, Francois Mean"

+#define __AUTHOREMAIL				"the_leech@users.berlios.de"

+#define __AUTHORWEB					"http://developer.berlios.de/projects/mgoodies"

+#define __COPYRIGHT					"© 2005-2011 Piotr Piastucki, Francois Mean"

diff --git a/ieview/Version.rc b/ieview/Version.rc
new file mode 100644
index 0000000..e637f0c
--- /dev/null
+++ b/ieview/Version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.

+//

+#include "afxres.h"

+#include "version.h"

+

+#ifdef _WIN32

+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

+#endif //_WIN32

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END

diff --git a/ieview/ieview.rc b/ieview/ieview.rc
index 8fe8a18..68a498c 100644
--- a/ieview/ieview.rc
+++ b/ieview/ieview.rc
@@ -1,62 +1,60 @@
+// Microsoft Visual C++ generated resource script.

+//

 #include "resource.h"

-#ifdef __MINGW32__

-	#define WINVER 0x500

-	#define _WIN32_IE 0x500

-#endif

-#include <windows.h>

-#ifndef IDC_STATIC

-#define IDC_STATIC (-1)

-#endif

-#include <commctrl.h>

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) || defined(__MINGW32__)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif

-#ifdef APSTUDIO_INVOKED

 

-1 TEXTINCLUDE DISCARDABLE

-BEGIN

-    "resource.h\0"

-END

+#define APSTUDIO_READONLY_SYMBOLS

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

+//

+// Generated from the TEXTINCLUDE 2 resource.

+//

+#include "afxres.h"

 

-2 TEXTINCLUDE DISCARDABLE

-BEGIN

-    "#include ""winres.h""\r\n"

-    "\0"

-END

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

+#undef APSTUDIO_READONLY_SYMBOLS

 

-3 TEXTINCLUDE DISCARDABLE

-BEGIN

-    "\r\n"

-    "\0"

-END

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

+// àíãëèéñêèé (ÑØÀ) resources

 

-#endif    // APSTUDIO_INVOKED

+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

+#ifdef _WIN32

+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

+#pragma code_page(1252)

+#endif //_WIN32

 

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

+//

+// Menu

+//

 

-IDR_CONTEXTMENU MENU DISCARDABLE

+IDR_CONTEXTMENU MENU 

 BEGIN

     POPUP "", MENUBREAK

     BEGIN

-		MENUITEM "Copy",            ID_MENU_COPY, GRAYED

-		MENUITEM "Copy Link",    	ID_MENU_COPYLINK, GRAYED

-		MENUITEM SEPARATOR

-		MENUITEM "Select All",    	ID_MENU_SELECTALL

-		MENUITEM SEPARATOR

-		MENUITEM "Save Image As...",ID_MENU_SAVEIMAGE, GRAYED

-		MENUITEM SEPARATOR

-		MENUITEM "Print",    		ID_MENU_PRINT

-		MENUITEM "Clear Log",    	ID_MENU_CLEARLOG

-		MENUITEM "Show source",		ID_MENU_SHOWSOURCE

-	END

+        MENUITEM "Copy",                        ID_MENU_COPY, GRAYED

+        MENUITEM "Copy Link",                   ID_MENU_COPYLINK, GRAYED

+        MENUITEM SEPARATOR

+        MENUITEM "Select All",                  ID_MENU_SELECTALL

+        MENUITEM SEPARATOR

+        MENUITEM "Save Image As...",            ID_MENU_SAVEIMAGE, GRAYED

+        MENUITEM SEPARATOR

+        MENUITEM "Print",                       ID_MENU_PRINT

+        MENUITEM "Clear Log",                   ID_MENU_CLEARLOG

+        MENUITEM "Show source",                 ID_MENU_SHOWSOURCE

+    END

 END

 

-IDI_RTL_ON		ICON    DISCARDABLE     "icos/rtl_on.ico"

-IDI_RTL_OFF		ICON    DISCARDABLE     "icos/rtl_off.ico"

 

-IDI_GROUP_ON		ICON    DISCARDABLE     "icos/group_on.ico"

-IDI_GROUP_OFF		ICON    DISCARDABLE     "icos/group_off.ico"

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

+//

+// Icon

+//

+

+// Icon with lowest ID value placed first to ensure application icon

+// remains consistent on all systems.

+IDI_RTL_ON              ICON                    "icos/rtl_on.ico"

+IDI_RTL_OFF             ICON                    "icos/rtl_off.ico"

+IDI_GROUP_ON            ICON                    "icos/group_on.ico"

+IDI_GROUP_OFF           ICON                    "icos/group_off.ico"

 

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -64,142 +62,78 @@ IDI_GROUP_OFF		ICON    DISCARDABLE     "icos/group_off.ico"
 //

 

 IDD_GENERAL_OPTIONS DIALOGEX 0, 0, 306, 228

-STYLE DS_FIXEDSYS | WS_CHILD

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    GROUPBOX        "Options",IDC_SIMPLE,4,2,297,138

-    CONTROL         "Enable BBCodes",IDC_ENABLE_BBCODES,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,14,19,265,10

-    LTEXT           "Currently the following BBCodes are supported: [b][i][u][s][img][size][color][url]",IDC_SIMPLE, 26,31,265,12

-    CONTROL         "Enable support for Flash files in smileys and BBCodes",IDC_ENABLE_FLASH,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,14,46,265,10

-    CONTROL         "Enable workaround for PNG transparency",IDC_ENABLE_PNGHACK,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,14,61,265,10

-    CONTROL         "Enable MathModule support",IDC_ENABLE_MATHMODULE,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,14,76,265,10

-    CONTROL         "Replace smileys in user names",IDC_SMILEYS_IN_NAMES,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,14,91,265,10

-    CONTROL         "Hide window border",IDC_NO_BORDER,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,14,106,265,10

-    CONTROL         "Embed YouTube videos",IDC_ENABLE_EMBED,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,14,121,265,10

+    GROUPBOX        "Options",IDC_STATIC,4,2,297,155

+    CONTROL         "Enable BBCodes",IDC_ENABLE_BBCODES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,19,265,10

+    LTEXT           "Currently the following BBCodes are supported: [b][i][u][s][img][size][color][url]",IDC_STATIC,26,31,265,12

+    CONTROL         "Enable support for Flash files in smileys and BBCodes",IDC_ENABLE_FLASH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,46,265,10

+    CONTROL         "Enable workaround for PNG transparency",IDC_ENABLE_PNGHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,61,265,10

+    CONTROL         "Enable MathModule support",IDC_ENABLE_MATHMODULE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,76,265,10

+    CONTROL         "Replace smileys in user names",IDC_SMILEYS_IN_NAMES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,91,265,10

+    CONTROL         "Hide window border",IDC_NO_BORDER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,106,265,10

+    CONTROL         "Embed YouTube videos",IDC_ENABLE_EMBED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,121,265,10

+    LTEXT           "Size:",IDC_STATIC,26,138,30,8

+    COMBOBOX        IDC_EMBED_SIZE,57,136,56,130,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP

 END

 

 IDD_SRMM_OPTIONS DIALOGEX 0, 0, 306, 228

-STYLE DS_FIXEDSYS | WS_CHILD

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    GROUPBOX        "Mode",IDC_SIMPLE,4,2,297,222

-

-    CONTROL         "Compatibility Mode",IDC_MODE_COMPATIBLE,"Button",BS_AUTORADIOBUTTON,118,15,80,10

-    CONTROL         "Use External CSS",IDC_MODE_CSS,"Button",BS_AUTORADIOBUTTON,118,58,

-                    86,10

-    CONTROL         "Use Templates",IDC_MODE_TEMPLATE,"Button",BS_AUTORADIOBUTTON,118,

-                    112,86,10

-    CONTROL         "",IDC_PROTOLIST,"SysTreeView32",TVS_DISABLEDRAGDROP |

-                    TVS_SHOWSELALWAYS | TVS_CHECKBOXES | WS_BORDER |

-                    WS_TABSTOP,10,15,100,143

-

-    CONTROL         "Background image",IDC_BACKGROUND_IMAGE,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,118,26,70,10

-    CONTROL         "Scroll with text",IDC_SCROLL_BACKGROUND_IMAGE,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,190,26,110,10

- 	EDITTEXT        IDC_BACKGROUND_IMAGE_FILENAME,118,36,153,12,ES_AUTOHSCROLL

+    GROUPBOX        "Mode",IDC_STATIC,4,2,297,222

+    CONTROL         "Compatibility Mode",IDC_MODE_COMPATIBLE,"Button",BS_AUTORADIOBUTTON,118,15,100,10

+    CONTROL         "Use External CSS",IDC_MODE_CSS,"Button",BS_AUTORADIOBUTTON,118,58,86,10

+    CONTROL         "Use Templates",IDC_MODE_TEMPLATE,"Button",BS_AUTORADIOBUTTON,118,112,86,10

+    CONTROL         "",IDC_PROTOLIST,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_CHECKBOXES | WS_BORDER | WS_HSCROLL | WS_TABSTOP,10,15,100,143

+    CONTROL         "Background image",IDC_BACKGROUND_IMAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,26,86,10

+    CONTROL         "Scroll with text",IDC_SCROLL_BACKGROUND_IMAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,206,26,93,10

+    EDITTEXT        IDC_BACKGROUND_IMAGE_FILENAME,118,36,153,12,ES_AUTOHSCROLL

     PUSHBUTTON      "...",IDC_BROWSE_BACKGROUND_IMAGE,278,36,15,11

-//    LTEXT         	"CSS file",IDC_STATIC,118,63,86,10

- 	EDITTEXT        IDC_EXTERNALCSS_FILENAME,118,68,153,12,ES_AUTOHSCROLL

+    EDITTEXT        IDC_EXTERNALCSS_FILENAME,118,68,153,12,ES_AUTOHSCROLL

     PUSHBUTTON      "...",IDC_BROWSE_EXTERNALCSS,278,68,15,11

-//    LTEXT         	"Template file",IDC_STATIC,118,112,86,10

- 	EDITTEXT        IDC_TEMPLATES_FILENAME,118,122,153,12,ES_AUTOHSCROLL

-	PUSHBUTTON      "...",IDC_BROWSE_TEMPLATES,278,122,15,11

-

-	ICON			IDI_GROUP_OFF, IDC_GROUPSUPPORT,245,135,11,11

-	ICON			IDI_RTL_OFF, IDC_RTLSUPPORT,260,135,11,11

-

-    GROUPBOX        "Template Options",IDC_SIMPLE,10,161,284,57

-    CONTROL         "Use message grouping", IDC_LOG_GROUP_MESSAGES,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,20,173,125,10

-    CONTROL         "Show nicknames",IDC_LOG_SHOW_NICKNAMES,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,20,183,125,10

-    CONTROL         "Show time",IDC_LOG_SHOW_TIME,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,20,193,125,10

-    CONTROL         "Show seconds",IDC_LOG_SHOW_SECONDS,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,30,203,110,10

-    CONTROL         "Show date",IDC_LOG_SHOW_DATE,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,145,173,120,10

-    CONTROL         "Use long date format",IDC_LOG_LONG_DATE,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,157,183,110,10

-    CONTROL         "Use relative timestamp", IDC_LOG_RELATIVE_DATE,"Button",BS_AUTOCHECKBOX |

-                    WS_TABSTOP,157,193,110,10

-

+    EDITTEXT        IDC_TEMPLATES_FILENAME,118,122,153,12,ES_AUTOHSCROLL

+    PUSHBUTTON      "...",IDC_BROWSE_TEMPLATES,278,122,15,11

+    ICON            IDI_GROUP_OFF,IDC_GROUPSUPPORT,245,135,20,20

+    ICON            IDI_RTL_OFF,IDC_RTLSUPPORT,260,135,20,20

+    GROUPBOX        "Template Options",IDC_STATIC,10,161,284,57

+    CONTROL         "Use message grouping",IDC_LOG_GROUP_MESSAGES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,173,125,10

+    CONTROL         "Show nicknames",IDC_LOG_SHOW_NICKNAMES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,183,125,10

+    CONTROL         "Show time",IDC_LOG_SHOW_TIME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,193,125,10

+    CONTROL         "Show seconds",IDC_LOG_SHOW_SECONDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,30,203,110,10

+    CONTROL         "Show date",IDC_LOG_SHOW_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,173,120,10

+    CONTROL         "Use long date format",IDC_LOG_LONG_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,183,110,10

+    CONTROL         "Use relative timestamp",IDC_LOG_RELATIVE_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,193,110,10

 END

 

-/*

-IDD_SMILEYSELECTION DIALOGEX 10, 10, 234, 150

-STYLE DS_SETFONT | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_BORDER | WS_SYSMENU | NOT WS_VISIBLE

-EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

 

-END

-*/

-#ifndef _MAC

+#ifdef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

 //

-// Version

+// TEXTINCLUDE

 //

 

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 1,3,0,3

- PRODUCTVERSION 1,3,0,3

- FILEFLAGSMASK 0x3fL

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x40004L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

+1 TEXTINCLUDE 

 BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "041504e3"

-        BEGIN

-            VALUE "Comments", "\0"

-            VALUE "CompanyName", "http://developer.berlios.de/projects/mgoodies\0"

-            VALUE "FileDescription", "IEView Plugin for Miranda IM\0"

-            VALUE "FileVersion", "1.3.0.3\0"

-            VALUE "InternalName", "ieview\0"

-            VALUE "LegalCopyright", "Copyright (c) 2005-2011 Piotr Piastucki\0"

-            VALUE "LegalTrademarks", "\0"

-            VALUE "OriginalFilename", "ieview.dll\0"

-            VALUE "PrivateBuild", "\0"

-            VALUE "ProductName", "IEView Plugin\0"

-            VALUE "ProductVersion", "1.3.0.3\0"

-            VALUE "SpecialBuild", "\0"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x415, 1251

-    END

+    "resource.h\0"

 END

 

-#endif    // !_MAC

-

+3 TEXTINCLUDE 

+BEGIN

+    "\r\0"

+END

 

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

-//

-// Icon

-//

+2 TEXTINCLUDE 

+BEGIN

+    "#include ""afxres.h""\r\0"

+END

 

+#endif    // APSTUDIO_INVOKED

 

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-#endif    // English (U.S.) resources

+#endif    // àíãëèéñêèé (ÑØÀ) resources

 /////////////////////////////////////////////////////////////////////////////

 

 

diff --git a/ieview/ieview.vcxproj.filters b/ieview/ieview.vcxproj.filters
new file mode 100644
index 0000000..5f6023c
--- /dev/null
+++ b/ieview/ieview.vcxproj.filters
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <ClCompile Include="ChatHTMLBuilder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="HistoryHTMLBuilder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="HTMLBuilder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="IEView.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ieview_main.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ieview_services.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="MUCCHTMLBuilder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="Options.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="ScriverHTMLBuilder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="TabSRMMHTMLBuilder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="Template.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="TemplateHTMLBuilder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="TextToken.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="Utils.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="ChatHTMLBuilder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="HistoryHTMLBuilder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="HTMLBuilder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="IEView.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="ieview_common.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="ieview_services.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="MUCCHTMLBuilder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="Options.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="ScriverHTMLBuilder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="TabSRMMHTMLBuilder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="Template.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="TemplateHTMLBuilder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="TextToken.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="Utils.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="Version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="ieview.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+    <ResourceCompile Include="Version.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{a72da5d2-0d60-47f9-afae-fbccf75ff6c7}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{7fb0c9c3-1e65-40e9-8b79-b660578ee919}</UniqueIdentifier>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{4691e0ac-0fe6-41ec-abe1-aca54f39e986}</UniqueIdentifier>

+    </Filter>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/ieview/ieview_common.h b/ieview/ieview_common.h
index 543d505..54fc066 100644
--- a/ieview/ieview_common.h
+++ b/ieview/ieview_common.h
@@ -31,7 +31,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef IEVIEW_COMMON_H

 #define IEVIEW_COMMON_H

 

-#define MIRANDA_VER 0x0600

+#define MIRANDA_VER 0x0900

+#define MIRANDA_CUSTOM_LP

 

 #include <windows.h>

 #include <commctrl.h>

diff --git a/ieview/ieview_main.cpp b/ieview/ieview_main.cpp
index 91970ac..ecde73e 100644
--- a/ieview/ieview_main.cpp
+++ b/ieview/ieview_main.cpp
@@ -23,6 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "ieview_services.h"

 #include "Options.h"

 #include "Utils.h"

+#include "Version.h"

 

 char *ieviewModuleName;

 HINSTANCE hInstance;

@@ -30,16 +31,17 @@ PLUGINLINK *pluginLink;
 char *workingDirUtf8;

 static int ModulesLoaded(WPARAM wParam, LPARAM lParam);

 static int PreShutdown(WPARAM wParam, LPARAM lParam);

+int hLangpack;

 

 PLUGININFOEX pluginInfoEx = {

-	sizeof(PLUGININFOEX),

-	"IEView",

-	PLUGIN_MAKE_VERSION(1,3,0,3),

-	"IE Based Chat Log (1.3.0.3 "__DATE__")",

-	"Piotr Piastucki, Francois Mean",

-	"the_leech@users.berlios.de",

-	"(c) 2005-2011 Piotr Piastucki, Francois Mean",

-	"http://developer.berlios.de/projects/mgoodies",

+    sizeof(PLUGININFOEX),

+	__PLUGIN_NAME,

+	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

+	__DESCRIPTION,

+	__AUTHOR,

+	__AUTHOREMAIL,

+	__COPYRIGHT,

+	__AUTHORWEB,

 	UNICODE_AWARE,

 	0,

 	{0x0495171b,   0x7137,   0x4ded,    {0x97, 0xf8, 0xce, 0x6f, 0xed, 0x67, 0xd6, 0x91}}

@@ -88,14 +90,15 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link)
 

 	pluginLink = link;

 	mir_getMMI( &mmi );

+	mir_getLP(&pluginInfoEx);

 

 	Utils::hookEvent_Ex(ME_OPT_INITIALISE, IEViewOptInit);

 	Utils::hookEvent_Ex(ME_SYSTEM_MODULESLOADED, ModulesLoaded);

 	Utils::hookEvent_Ex(ME_SYSTEM_PRESHUTDOWN, PreShutdown);

 

-	Utils::createServiceFunction_Ex(MS_IEVIEW_WINDOW, (MIRANDASERVICE)HandleIEWindow);

-	Utils::createServiceFunction_Ex(MS_IEVIEW_EVENT, (MIRANDASERVICE)HandleIEEvent);

-	Utils::createServiceFunction_Ex(MS_IEVIEW_EVENT,(MIRANDASERVICE) HandleIENavigate);

+	Utils::createServiceFunction_Ex(MS_IEVIEW_WINDOW, HandleIEWindow);

+	Utils::createServiceFunction_Ex(MS_IEVIEW_EVENT, HandleIEEvent);

+	Utils::createServiceFunction_Ex(MS_IEVIEW_EVENT, HandleIENavigate);

 	hHookOptionsChanged = CreateHookableEvent(ME_IEVIEW_OPTIONSCHANGED);

 	return 0;

 }

diff --git a/ieview/ieview_services.cpp b/ieview/ieview_services.cpp
index ab27b1e..a9745e4 100644
--- a/ieview/ieview_services.cpp
+++ b/ieview/ieview_services.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Options.h"

 #include "ieview_common.h"

 

-int HandleIEWindow(WPARAM wParam, LPARAM lParam) {

+INT_PTR HandleIEWindow(WPARAM wParam, LPARAM lParam) {

 	IEVIEWWINDOW *window = (IEVIEWWINDOW *) lParam;

 	IEView::init();

 	Options::init();

@@ -82,7 +82,7 @@ int HandleIEWindow(WPARAM wParam, LPARAM lParam) {
 	return 0;

 }

 

-int HandleIEEvent(WPARAM wParam, LPARAM lParam) {

+INT_PTR HandleIEEvent(WPARAM wParam, LPARAM lParam) {

 	IEVIEWEVENT *event = (IEVIEWEVENT *) lParam;

 	IEView::init();

 	Options::init();

@@ -103,7 +103,7 @@ int HandleIEEvent(WPARAM wParam, LPARAM lParam) {
 	return 0;

 }

 

-int HandleIENavigate(WPARAM wParam, LPARAM lParam) {

+INT_PTR HandleIENavigate(WPARAM wParam, LPARAM lParam) {

 	IEVIEWNAVIGATE *navigate = (IEVIEWNAVIGATE *) lParam;

 	IEView::init();

 	Options::init();

diff --git a/ieview/ieview_services.h b/ieview/ieview_services.h
index 89d4a0f..a25f8ea 100644
--- a/ieview/ieview_services.h
+++ b/ieview/ieview_services.h
@@ -23,9 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 

 #include "ieview_common.h"

 

-extern int HandleIEWindow(WPARAM wParam, LPARAM lParam);

-extern int HandleIEEvent(WPARAM wParam, LPARAM lParam);

-extern int HandleIENavigate(WPARAM wParam, LPARAM lParam);

+extern INT_PTR HandleIEWindow(WPARAM wParam, LPARAM lParam);

+extern INT_PTR HandleIEEvent(WPARAM wParam, LPARAM lParam);

+extern INT_PTR HandleIENavigate(WPARAM wParam, LPARAM lParam);

 

 #endif

 

diff --git a/ieview/m_MathModule.h b/ieview/m_MathModule.h
deleted file mode 100644
index 04ae06a..0000000
--- a/ieview/m_MathModule.h
+++ /dev/null
@@ -1,263 +0,0 @@
-#ifndef M_MATHMODULE_H_

-#define M_MATHMODULE_H_

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

-

-

-/*

-           **************************

-           *     2                  *

-        ** *    x  + 2 Pi

-          **  *************  +  R

-           *     Sin(wt)

-           *

-

-                   Math-Module

-                 **************

-

-      Miranda Plugin by Stephan Kassemeyer

-

-

-   MathModule API  -  (c) Stephan Kassemeyer

-                  8 May, 2004

-

-*/

-

-

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

-

-/*

-   Miranda Service-functions defined by MathModule

-   call with the

-   int (*CallService)(const char * servicename,WPARAM,LPARAM)

-   that you get from miranda when Miranda calls the

-   Load(PLUGINLINK * link)

-   of your PlugIn-dll

-   the CallService function then is:

-   link->CallServiceSync(Servicename,wparam,lparam)

-*/

-

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

-

-#define MATH_RTF_REPLACE_FORMULAE "Math/RtfReplaceFormulae"

-// replace all formulas in a RichEdit with bitmaps.

-// wParam = 0

-// lParam = *TMathRichedit Info

-// return: TRUE if replacement succeeded, FALSE if not (disable by user?).

-typedef struct

-{

-    HWND hwndRichEditControl;  // handle of richedit.

-    CHARRANGE* sel;    // NULL: replace all.

-    int disableredraw;

-}    TMathRicheditInfo;

-// WARNING:   !!!

-// Strange things happen if you use this function twice on the same CHARRANGE:

-// if Math-startDelimiter == Math-endDelimiter, there is the following problem:

-// it might be that someone forgot an endDelimiter, this results in a lonesome startdelimiter.

-// if you try to MATH_REPLACE_FORMULAE the second time, startDelimiters and endDelimiters are mixed up.

-// The same problem occours if we have empty formulae, because two succeding delimiters are

-// replaced with a single delimiter.

-

-

-#define MTH_GETBITMAP "Math/GetBitmap"

-//returns Bitmap that represents the formula given in lparam (string-pointer)

-//this formula has NO Delimiters.

-//wparam=0

-//lparam=(*char)Formula

-//result=(HBITMAP) bitmap

-//!!! the bitmap must be deleted with DeleteObject(hobject)

-//example:

-//HBITMAP Bmp=(HBITMAP)CallService(MTH_GETBITMAP,0, (LPARAM)formula);

-

-#define MTH_GET_GIF "Math/GetGif"

-// this renders a formula given in lparam and produces a gif-image in a temporary-folder

-// and returns the filename (full path). Be sure to copy the file if you want to preserve it,

-// because the files are managed as a ring-buffer, if 99 files already exist, this

-// function overwrites the first one.

-// wparam=0

-// lparam=*char text  // formula WITHOUT delimiters

-// result=(*char)path

-// !!! the result-buffer must be deleted with MTH_FREE_GIFPATH

-#define MTH_GET_GIF_UNICODE "Math/GetGifUnicode"

-// wparam=0

-// lparam=*wchar_t text

-// result=*char path

-// !!! the result-buffer must be deleted with MTH_FREE_GIFPATH

-#define MTH_FREE_GIFPATH "Math/FreeRTFBitmapText"

-

-#define MTH_GET_RTF_BITMAPTEXT "Math/GetRTFBitmapText"

-// returns rich-text stream that includes bitmaps from text given in lparam

-// text included between MATH_GET_STARTDELIMITER and MATH_GETENDDELIMITER

-// hereby is replaced with a rtf-bitmap-stream that represents the corresponding formula

-// wparam=0

-// lparam=*char text

-// result=*char rtfstream

-// !!! the result-buffer must be deleted with MTH_FREE_RTF_BITMAPTEXT

-#define MTH_FREE_RTF_BITMAPTEXT "Math/FreeRTFBitmapText"

-// deletes the buffer that MTH_GET_RTF_BITMAPTEXT has created.

-// wparam=0

-// lparam=(*char) buffer

-// result=0

-

-#define MTH_GET_HTML_SOURCE "Math/GetHTMLSource"

-// this is similar to MTH_GET_RTF_BITMAPTEXT, but

-// as we cannot include embedded images, the bitmaps are saved in a

-// temporary directory (relative to Miranda-dir) and the images are linked into

-// the html-source

-// wparam=0

-// lparam=*char text  // this has to be html-source already. this function only adds formula-links.

-// result=*char htmlsource

-// !!! the result-buffer must be deleted with MTH_FREE_HTML_BUFFER

-#define MTH_GET_HTML_SOURCE_UNICODE "Math/GetHTMLSourceUnicode"

-// wparam=0

-// lparam=*wchar_t text

-// result=*wchar_t htmlsource

-#define MTH_FREE_HTML_BUFFER "Math/FreeRTFBitmapText"

-// deletes string-buffers that MathModule has created.

-// wparam=(bool) unicode  // 0 if no unicode-buffer; 1 if unicode-buffer !!!

-// lparam=(*char) buffer

-// result=0

-

-

-// **********parameter functions:

-                       

-#define MATH_SET_PARAMS "Math/SetParams"

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

-// sets a parameter (only integer values) specified in  wparam

-// wparam=paramcode

-// lparam=parametervalue

-// paramcodes:

-    #define MATH_PARAM_BKGCOLOR 0   // (COLORREF) std-rgb-color or TRANSPARENT_Color

-                                    // you can make the BKGCOLOR Transparent (default) by using this color:

-                                    #define TRANSPARENT_Color 0xffffffff -1  // this is default

-    #define MATH_PARAM_FONTCOLOR 1   // (COLORREF) std-rgb-color

-    #define MATH_PARAM_RESIZE_HWND 2            // (HWND) preview window resizes RESIZE_HWND when it is being resized.

-    #define MATH_PARAM_ToolboxEdit_HWND 3       // (HWND) If this hwnd (of an edit-box) is set, MathModule can insert Formula-elements from the Math-Toolbox.

-

-#define MATH_GET_PARAMS "Math/GetParams"

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

-// get a parameter (only integer values) specified in wparam

-// wparam=paramcode

-// lparam=lparamOfPARAM // see below

-// paramcodes and returnvalues:

-    #define MATH_PARAM_STARTDELIMITER 4 // retval: *char delimiter // the delimiter that marks the beginning of a formula

-                                      // !!! the result-buffer must be deleted with MTH_FREE_MATH_BUFFER

-                                      // lparam=0

-    #define MATH_PARAM_ENDDELIMITER 5 // retval: *char delimiter // the delimiter that marks the end of a formula

-                                      // !!! the result-buffer must be deleted with MTH_FREE_MATH_BUFFER

-                                      // lparam=0

-// ************end parameter functions.

-

-#define MTH_FREE_MATH_BUFFER "Math/FreeRTFBitmapText"

-// deletes string-buffers that MathModule has created. (at the moment only the *DELIMITER-services create such strings)

-// wparam=0

-// lparam=(*char) buffer

-// result=0

-

-

-

-// ********* preview-window functions

-

-#define MTH_SHOW "Math/Show"

-// shows the preview-window

-// wparam=0

-// lparam=0

-// result=0

-

-#define MTH_HIDE "Math/Hide"

-// hides the preview-window

-// wparam=0

-// lparam=0

-// result=0

-

-#define MTH_RESIZE "Math/Resize"

-// sets the size of the preview-window

-// wparam=0

-// lparam=(*TMathWindowInfo)

-// result=0

-typedef struct

-{

-    int top;

-	int left;

-	int right;

-	int bottom;

-}	TMathWindowInfo;

-

-#define MTH_SETFORMULA "Math/SetFormula"

-// sets the text that the preview-window should parse to display formulas found inside

-// wparam=0

-// lparam=(*char) text

-// result=0

-

-#define MTH_GET_PREVIEW_HEIGHT "Math/getPreviewHeight"

-// returns the height of the whole preview-window (including system-menu-bar)

-// consider this when maximizing a window to that preview-window is hooked on top or bottom

-// it returns the height no matter whether preview-window is visible or not

-// wparam=0

-// lparam=0

-// result=(int) height

-

-#define MTH_GET_PREVIEW_SHOWN "Math/getPreviewShown"

-// returns 1 if preview window is visible

-// returns 0 if preview window is invisible

-// result=(int) shown

-

-//---------------end preview functions

-

-

-#define MTH_SUBSTITUTE_DELIMITER "Math/SubstituteDelimiter"

-// replaces Substitute in an edit-box given in lparam-structure with internal Math-Delimiter.

-// MathSrmm uses this for the shortcut-functionality

-// I do not recommend to use this, it's not Unicode-safe

-// wparam=0

-// lparam=(TMathSubstInfo) substInfo

-// result=0

-typedef struct

-{

-	HWND EditHandle;

-	char* Substitute;

-}	TMathSubstInfo;

-

-

-

-

-

-//

-// ---- here are some obsolete services. I plan to remove them soon. Use MATH_SET_PARAMS or MATH_GET_PARAMS instead !!

-//

-

-#define MATH_SETBKGCOLOR "Math/SetBackGroundColor"

-// changes the background color of the next formula to be rendered.

-// wparam=0

-// lparam=(COLORREF) color

-// result=0

-

-#define MTH_Set_ToolboxEditHwnd "Math/SetTBhwnd"

-// If this hwnd (of an edit-box) is set, MathModule can insert Formula-elements from the Math-Toolbox.

-// wparam=0

-// lparam=handle

-

-#define MTH_Set_Resize_HWND "Math/SetResizeHWND" //übergibt fenster-Handle des aktuellen Message-Dialogs

-// If MathModule knows the handle of a SRMM-based window, following features exist:

-// - preview window resizes Math-Srmm when it is being resized.

-// wparam=0

-// lparam=handle

-// result=0

-

-#define MATH_GET_STARTDELIMITER "Math/GetStartDelimiter"

-// returns the delimiter that marks the beginning of a formula

-// wparam=0

-// lparam=0

-// result=*char Delimiter

-// !!! the result-buffer must be deleted with MTH_FREE_MATH_BUFFER

-

-#define MATH_GETENDDELIMITER "Math/GetEndDelimiter"

-// returns the delimiter that marks the end of a formula

-// wparam=0

-// lparam=0

-// result=*char Delimiter

-// !!! the result-buffer must be deleted with MTH_FREE_MATH_BUFFER

-

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

-#endif

-//#ifndef M_MATHMODULE_H_

-

diff --git a/ieview/m_avatars.h b/ieview/m_avatars.h
deleted file mode 100644
index 8a38642..0000000
--- a/ieview/m_avatars.h
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
-
-Miranda IM: the free IM client for Microsoft* Windows*
-
-Copyright 2000-2004 Miranda ICQ/IM project, 
-all portions of this codebase are copyrighted to the people 
-listed in contributors.txt.
-
-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.
-
-Avatar service 
-
-- load and maintain a cache of contact avatars.
-- draw avatars to a given target device context
-- maintain per protocol fallback images
-
-The avatar service builds on top of Mirandas core bitmap loading service (MS_UTILS_LOADBITMAP).
-However, if imgdecoder.dll is installed in mirandas main or Plugins directory, it can be used
-to support PNG images. The avatar service loads 32bit PNG images and peforms alpha channel
-premultiplication so that these images can be rendered by using the Win32 AlphaBlend() API.
-
-The cache grows on demand only, that is, no avatars are PREloaded. An avatar is only loaded
-if a plugin requests this by using the MS_AV_GETAVATAR service. Since avatars may update
-asynchronously, the avatar iamge may not be ready when a plugin calls the service. In that
-case, an event (ME_AV_AVATARCHANGED) is fired when a contacts avatar changes. This event
-is also fired, when a contact avatar changes automatically.
-
-The service takes care about protocol capabilites (does not actively fetch avatars for 
-protocols which do not report avatar capabilities via PF4_AVATARS or for protocols which
-have been disabled in the option dialog). It also does not actively fetch avatars for
-protocols which are in invisible status mode (may cause privacy issues and some protocols
-like MSN don't allow any outbound client communication when in invisible status mode).
-
-- TODO
-- maintain recent avatars (store the last hashes to avoid re-fetching)
-- cache expiration, based on least recently used algorithm.
-
-(c) 2005 by Nightwish, silvercircle@gmail.com
-
-*/
-
-#ifndef _M_AVATARS_H
-#define _M_AVATARS_H
-
-#define AVS_BITMAP_VALID 1
-#define AVS_BITMAP_EXPIRED 2        // the bitmap has been expired from the cache. (unused, currently.
-#define AVS_HIDEONCLIST 4
-#define AVS_PREMULTIPLIED 8         // set in the dwFlags member of the struct avatarCacheEntry for 32 bit transparent
-                                    // images when loaded with imgdecoder. These images can be rendered transparently
-                                    // using the AlphaBlend() API with AC_SRC_ALPHA
-#define AVS_PROTOPIC 16             // picture is a protocol picture
-#define AVS_CUSTOMTRANSPBKG 32      // Bitmap was changed to set the background color transparent
-#define AVS_HASTRANSPARENCY 64      // Bitmap has at least one pixel transparent
-#define AVS_OWNAVATAR 128			// is own avatar entry
-
-struct avatarCacheEntry {
-    DWORD cbSize;                   // set to sizeof(struct)
-    HANDLE hContact;                // contacts handle, 0, if it is a protocol avatar
-    HBITMAP hbmPic;                 // bitmap handle of the picutre itself
-    DWORD dwFlags;                  // see above for flag values
-    LONG bmHeight, bmWidth;         // bitmap dimensions
-    DWORD t_lastAccess;            // last access time (currently unused, but plugins should still
-                                    // use it whenever they access the avatar. may be used in the future
-                                    // to implement cache expiration
-    LPVOID lpDIBSection;
-    char szFilename[MAX_PATH];      // filename of the avatar (absolute path)
-};
-
-typedef struct avatarCacheEntry AVATARCACHEENTRY;
-
-#define AVDRQ_FALLBACKPROTO 1              // use the protocol picture as fallback (currently not used)
-#define AVDRQ_FAILIFNOTCACHED 2            // don't create a cache entry if it doesn't already exist. (currently not working)
-#define AVDRQ_ROUNDEDCORNER 4              // draw with rounded corners
-#define AVDRQ_DRAWBORDER 8                 // draw a border around the picture
-#define AVDRQ_PROTOPICT  16                // draw a protocol picture (if available).
-#define AVDRQ_HIDEBORDERONTRANSPARENCY 32  // hide border if bitmap has transparency
-#define AVDRQ_OWNPIC	64				   // draw own avatar (szProto is valid)
-
-// request to draw a contacts picture. See MS_AV_DRAWAVATAR service description
-
-typedef struct _avatarDrawRequest {
-    DWORD  cbSize;                  // set this to sizeof(AVATARDRAWREQUEST) - mandatory, service will return failure code if 
-                                    // cbSize is wrong
-    HANDLE hContact;                // the contact for which the avatar should be drawn. set it to 0 to draw a protocol picture
-    HDC    hTargetDC;               // target device context
-    RECT   rcDraw;                  // target rectangle. The avatar will be centered within the rectangle and scaled to fit.
-    DWORD  dwFlags;                 // flags (see above for valid bitflags)
-    DWORD  dwReserved;              // for future use
-    DWORD  dwInternal;              // don't use it
-    COLORREF clrBorder;             // color for the border  (used with AVDRQ_DRAWBORDER)
-    UCHAR  radius;                  // radius (used with AVDRQ_ROUNDEDCORNER)
-    UCHAR  alpha;                   // alpha value for semi-transparent avatars (valid values form 1 to 255, if it is set to 0
-                                    // the avatar won't be transparent.
-    char   *szProto;                // only used when AVDRQ_PROTOPICT or AVDRQ_OWNPIC is set
-} AVATARDRAWREQUEST;
-
-#define INITIAL_AVATARCACHESIZE 300
-#define CACHE_GROWSTEP 50
-
-#define AVS_MODULE "AVS_Settings"          // db settings module path
-#define PPICT_MODULE "AVS_ProtoPics"   // protocol pictures are saved here
-
-// obtain the bitmap handle of the avatar for the given contact
-// wParam = (HANDLE)hContact
-// lParam = 0;
-// returns: pointer to a struct avatarCacheEntry *, NULL on failure
-// if it returns a failure, the avatar may be ready later and the caller may receive
-// a notification via ME_AV_AVATARCHANGED
-// DONT modify the contents of the returned data structure
-
-#define MS_AV_GETAVATARBITMAP "SV_Avatars/GetAvatar"
-
-// obtain a avatar cache entry for one of my own avatars
-// wParam = 0
-// lParam = (char *)szProto  (protocol for which we need to obtain the own avatar information)
-// returns: pointer to a struct avatarCacheEntry *, NULL on failure
-// DONT modify the contents of the returned data structure
-
-#define MS_AV_GETMYAVATAR "SV_Avatars/GetMyAvatar"
-
-// protect the current contact picture from being overwritten by automatic
-// avatar updates. Actually, it only backups the contact picture filename
-// and will used the backuped version until the contact picture gets unlocked
-// again. So this service does not disable avatar updates, but it "fakes"
-// a locked contact picture to the users of the GetAvatar service.
-// 
-// wParam = (HANDLE)hContact
-// lParam = 1 -> lock the avatar, lParam = 0 -> unlock
-
-#define MS_AV_PROTECTAVATAR "SV_Avatars/ProtectAvatar"
-
-// set (and optionally protect) a local contact picture for the given hContact
-// 
-// wParam = (HANDLE)hContact
-// lParam = either a full picture filename or NULL. If lParam == NULL, the service
-// will open a file selection dialog.
-
-#define MS_AV_SETAVATAR "SV_Avatars/SetAvatar"
-
-// Call avatar option dialog for contact
-// 
-// wParam = (HANDLE)hContact
-
-#define MS_AV_CONTACTOPTIONS "SV_Avatars/ContactOptions"
-
-// draw an avatar picture
-// 
-// wParam = 0 (not used)
-// lParam = AVATARDRAWREQUEST *avdr
-// draw a contact picture to a destination device context. see description of
-// the AVATARDRAWREQUEST structure for more information on how to use this
-// service.
-// return value: 0 -> failure, avatar probably not available, or not ready. The drawing
-// service DOES schedule an avatar update so your plugin will be notified by the ME_AV_AVATARCHANGED
-// event when the requested avatar is ready for use.
-
-#define MS_AV_DRAWAVATAR "SV_Avatars/Draw"
-
-// fired when the contacts avatar changes
-// wParam = hContact
-// lParam = struct avatarCacheEntry *cacheEntry
-// the event CAN pass a NULL pointer in lParam which means that the avatar has changed,
-// but is no longer valid (happens, when a contact removes his avatar, for example).
-// DONT DESTROY the bitmap handle passed in the struct avatarCacheEntry *
-// 
-// It is also possible that this event passes 0 as wParam (hContact), in which case,
-// a protocol picture (pseudo - avatar) has been changed. 
- 
-#define ME_AV_AVATARCHANGED "SV_Avatars/AvatarChanged"
-
-// fired when one of our own avatars was changed
-// wParam = (char *)szProto (protocol for which a new avatar was set)
-// lParam = AVATARCACHEENTRY *ace (new cache entry, NULL if the new avatar is not valid)
- 
-#define ME_AV_MYAVATARCHANGED "SV_Avatars/MyAvatarChanged"
-
-#endif
diff --git a/ieview/m_ieview.h b/ieview/m_ieview.h
deleted file mode 100644
index b50fd13..0000000
--- a/ieview/m_ieview.h
+++ /dev/null
@@ -1,193 +0,0 @@
-/*

-

-IEView Plugin for Miranda IM

-Copyright (C) 2005-2010  Piotr Piastucki

-

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

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

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

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

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

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-

-*/

-#ifndef M_IEVIEW_INCLUDED

-#define M_IEVIEW_INCLUDED

-

-#define MS_IEVIEW_WINDOW   "IEVIEW/NewWindow"

-#define MS_IEVIEW_EVENT    "IEVIEW/Event"

-#define MS_IEVIEW_NAVIGATE "IEVIEW/Navigate"

-

-#define ME_IEVIEW_OPTIONSCHANGED  "IEVIEW/OptionsChanged"

-

-/* IEView window commands */

-#define IEW_CREATE  1               // create new window (control)

-#define IEW_DESTROY 2               // destroy control

-#define IEW_SETPOS  3               // set window position and size

-#define IEW_SCROLLBOTTOM 4          // scroll text to bottom

-

-/* IEView window type/mode */

-#define IEWM_TABSRMM  1             // TabSRMM-compatible HTML builder

-#define IEWM_SCRIVER  3             // Scriver-compatible HTML builder

-#define IEWM_MUCC     4             // MUCC group chats GUI

-#define IEWM_CHAT     5             // chat.dll group chats GUI

-#define IEWM_HISTORY  6             // history viewer

-#define IEWM_BROWSER  256           // empty browser window

-

-typedef struct {

-	int			cbSize;             // size of the strusture

-	int			iType;				// one of IEW_* values

-	DWORD		dwMode;				// compatibility mode - one of IEWM_* values

-	DWORD		dwFlags;			// flags, one of IEWF_* values

-	HWND		parent;             // parent window HWND

-	HWND 		hwnd;               // IEW_CREATE returns WebBrowser control's HWND here

-	int			x;                  // IE control horizontal position

-	int			y;                  // IE control vertical position

-	int			cx;                 // IE control horizontal size

-	int			cy;                 // IE control vertical size

-

-} IEVIEWWINDOW;

-

-#define IEEDF_UNICODE 			0x00000001          // if set pszText is a pointer to wchar_t string instead of char string

-#define IEEDF_UNICODE_TEXT		0x00000001          // if set pszText is a pointer to wchar_t string instead of char string

-#define IEEDF_UNICODE_NICK		0x00000002          // if set pszNick is a pointer to wchar_t string instead of char string

-#define IEEDF_UNICODE_TEXT2		0x00000004          // if set pszText2 is a pointer to wchar_t string instead of char string

-

-/* The following flags are valid only for message events (IEED_EVENT_MESSAGE) */

-#define IEEDF_FORMAT_FONT		0x00000100 // if set pszFont (font name) is valid and should be used

-#define IEEDF_FORMAT_SIZE		0x00000200 // if set fontSize is valid and should be used

-#define IEEDF_FORMAT_COLOR		0x00000400 // if set color is valid and should be used

-#define IEEDF_FORMAT_STYLE		0x00000800 // if set fontSize is valid and should be used

-

-#define IEEDF_READ				0x00001000 // if set

-#define IEEDF_SENT				0x00002000 // if set

-#define IEEDF_RTL				0x00004000 // if set

-

-#define IEED_EVENT_MESSAGE			0x0001 // message

-#define IEED_EVENT_STATUSCHANGE		0x0002 // status change

-#define IEED_EVENT_FILE				0x0003 // file

-#define IEED_EVENT_URL				0x0004 // url

-#define IEED_EVENT_ERRMSG           0x0005 // error message

-#define IEED_EVENT_SYSTEM           0x0006 // system event

-

-#define IEED_MUCC_EVENT_MESSAGE		0x0001 // message

-#define IEED_MUCC_EVENT_TOPIC		0x0002 // topic change

-#define IEED_MUCC_EVENT_JOINED		0x0003 // user joined

-#define IEED_MUCC_EVENT_LEFT		0x0004 // user left

-#define IEED_MUCC_EVENT_ERROR		0x0005 // error

-

-/* MUCC-related dwData bit flags */

-#define IEEDD_MUCC_SHOW_NICK		0x00000001

-#define IEEDD_MUCC_MSG_ON_NEW_LINE	0x00000002

-#define IEEDD_MUCC_SHOW_DATE		0x00000010

-#define IEEDD_MUCC_SHOW_TIME		0x00000020

-#define IEEDD_MUCC_SECONDS			0x00000040

-#define IEEDD_MUCC_LONG_DATE		0x00000080

-

-#define IEED_GC_EVENT_HIGHLIGHT 	0x8000

-#define IEED_GC_EVENT_MESSAGE   	0x0001

-#define IEED_GC_EVENT_TOPIC     	0x0002

-#define IEED_GC_EVENT_JOIN      	0x0003

-#define IEED_GC_EVENT_PART      	0x0004

-#define IEED_GC_EVENT_QUIT      	0x0006

-#define IEED_GC_EVENT_NICK      	0x0007

-#define IEED_GC_EVENT_ACTION    	0x0008

-#define IEED_GC_EVENT_KICK      	0x0009

-#define IEED_GC_EVENT_NOTICE    	0x000A

-#define IEED_GC_EVENT_INFORMATION   0x000B

-#define IEED_GC_EVENT_ADDSTATUS     0x000C

-#define IEED_GC_EVENT_REMOVESTATUS  0x000D

-

-/* GC-related dwData bit flags */

-#define IEEDD_GC_SHOW_NICK			0x00000001

-#define IEEDD_GC_SHOW_TIME			0x00000002

-#define IEEDD_GC_SHOW_ICON			0x00000004

-#define IEEDD_GC_MSG_ON_NEW_LINE	0x00001000

-

-#define IE_FONT_BOLD			0x000100	// Bold font flag

-#define IE_FONT_ITALIC			0x000200	// Italic font flag

-#define IE_FONT_UNDERLINE		0x000400	// Underlined font flags

-

-typedef struct tagIEVIEWEVENTDATA {

-	int			cbSize;

-	int			iType;				// Event type, one of MUCC_EVENT_* values

-	DWORD		dwFlags;			// Event flags - IEEF_*

-	const char *fontName;			// Text font name

-	int			fontSize;			// Text font size (in pixels)

-	int         fontStyle;          // Text font style (combination of IE_FONT_* flags)

-	COLORREF	color;				// Text color

-	union {

-		const TCHAR *ptszNick;		// Nick, usage depends on type of event

-		const char *pszNick;		// Nick - ANSII

-		const wchar_t *pszNickW;    // Nick - Unicode

-	};

-	union {

-		const TCHAR *ptszText;		// Text, usage depends on type of event

-		const char *pszText;		// Text - ANSII

-		const wchar_t *pszTextW;	// Text - Unicode

-	};

-	DWORD		dwData;				// DWORD data e.g. status see IEEDD_* values

-	BOOL		bIsMe;				// TRUE if the event is related to the user

-	DWORD		time;				// Time of the event

-	struct tagIEVIEWEVENTDATA *next;

-	union {

-		const TCHAR *ptszText2;			// Text2, usage depends on type of event

-		const char *pszText2;			// Text2 - ANSII

-		const wchar_t *pszText2W;		// Text2 - Unicode

-	};

-} IEVIEWEVENTDATA;

-

-/* IEView events */

-#define IEE_LOG_DB_EVENTS  	1       // log specified number of DB events

-#define IEE_CLEAR_LOG		2       // clear log

-#define IEE_GET_SELECTION	3       // get selected text

-#define IEE_SAVE_DOCUMENT	4       // save current document

-#define IEE_LOG_MEM_EVENTS 	5       // log specified number of IEView events

-

-/* IEView event flags */

-#define IEEF_RTL          1           // turn on RTL support

-#define IEEF_NO_UNICODE   2           // disable Unicode support - valid for IEE_LOG_DB_EVENTS and IEE_GET_SELECTION events

-

-#define IEVIEWEVENT_SIZE_V1 28

-#define IEVIEWEVENT_SIZE_V2 32

-#define IEVIEWEVENT_SIZE_V3 36

-

-typedef struct {

-	int			cbSize;             // size of the strusture

-	int			iType;				// one of IEE_* values

-	DWORD		dwFlags;			// one of IEEF_* values

-	HWND		hwnd;               // HWND returned by IEW_CREATE

-	HANDLE      hContact;           // contact

-	union {

-		HANDLE 		hDbEventFirst;      // first event to log, when IEE_LOG_EVENTS returns it will contain

-										// the last event actually logged or NULL if no event was logged (IEE_LOG_EVENTS)

-		IEVIEWEVENTDATA *eventData;	    // the pointer to an array of IEVIEWEVENTDATA objects (IEE_LOG_IEV_EVENTS)

-	};

-	int 		count;              // number of events to log

-	int         codepage;           // ANSI codepage

-	const char *pszProto;			// Name of the protocol

-} IEVIEWEVENT;

-

-#define IEN_NAVIGATE 	1       // navigate to the given destination

-#define IENF_UNICODE	1       // if set urlW is used instead of urlW

-

-typedef struct {

-	int			cbSize;             // size of the strusture

-	int			iType;				// one of IEN_* values

-	DWORD		dwFlags;			// one of IEEF_* values

-	HWND		hwnd;               // HWND returned by IEW_CREATE

-	union {

-		const char *url;			// Text, usage depends on type of event

-		const wchar_t *urlW;		// Text - Unicode

-	};

-} IEVIEWNAVIGATE;

-

-#endif

-

diff --git a/ieview/m_metacontacts.h b/ieview/m_metacontacts.h
deleted file mode 100644
index fd85638..0000000
--- a/ieview/m_metacontacts.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*

-

-Miranda IM: the free IM client for Microsoft* Windows*

-

-Copyright © 2004 Universite Louis PASTEUR, STRASBOURG.

-Copyright © 2004 Scott Ellis (www.scottellis.com.au mail@scottellis.com.au)

-

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

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

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

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

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

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#ifndef M_METACONTACTS_H__

-#define M_METACONTACTS_H__ 1

-

-//gets the handle for the default contact

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns a handle to the default contact, or null on failure

-#define MS_MC_GETDEFAULTCONTACT				"MetaContacts/GetDefault"

-

-//gets the contact number for the default contact

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns a DWORD contact number, or -1 on failure

-#define MS_MC_GETDEFAULTCONTACTNUM			"MetaContacts/GetDefaultNum"

-

-//gets the handle for the 'most online' contact

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns a handle to the 'most online' contact

-#define MS_MC_GETMOSTONLINECONTACT			"MetaContacts/GetMostOnline"

-

-//gets the number of subcontacts for a metacontact

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns a DWORD representing the number of subcontacts for the given metacontact

-#define MS_MC_GETNUMCONTACTS				"MetaContacts/GetNumContacts"

-

-//gets the handle of a subcontact, using the subcontact's number

-//wParam=(HANDLE)hMetaContact

-//lParam=(DWORD)contact number

-//returns a handle to the specified subcontact

-#define MS_MC_GETSUBCONTACT					"MetaContacts/GetSubContact"

-

-//sets the default contact, using the subcontact's contact number

-//wParam=(HANDLE)hMetaContact

-//lParam=(DWORD)contact number

-//returns 0 on success

-#define MS_MC_SETDEFAULTCONTACTNUM			"MetaContacts/SetDefault"

-

-//sets the default contact, using the subcontact's handle

-//wParam=(HANDLE)hMetaContact

-//lParam=(HANDLE)hSubcontact

-//returns 0 on success

-#define MS_MC_SETDEFAULTCONTACT				"MetaContacts/SetDefaultByHandle"

-

-//forces the metacontact to send using a specific subcontact, using the subcontact's contact number

-//wParam=(HANDLE)hMetaContact

-//lParam=(DWORD)contact number

-//returns 0 on success

-#define MS_MC_FORCESENDCONTACTNUM			"MetaContacts/ForceSendContact"

-

-//forces the metacontact to send using a specific subcontact, using the subcontact's handle

-//wParam=(HANDLE)hMetaContact

-//lParam=(HANDLE)hSubcontact

-//returns 0 on success (will fail if 'force default' is in effect)

-#define MS_MC_FORCESENDCONTACT				"MetaContacts/ForceSendContactByHandle"

-

-//'unforces' the metacontact to send using a specific subcontact

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns 0 on success (will fail if 'force default' is in effect)

-#define MS_MC_UNFORCESENDCONTACT			"MetaContacts/UnforceSendContact"

-

-//'forces' or 'unforces' (i.e. toggles) the metacontact to send using it's default contact

-// overrides (and clears) 'force send' above, and will even force use of offline contacts

-// will send ME_MC_FORCESEND or ME_MC_UNFORCESEND event

-//wParam=(HANDLE)hMetaContact

-//lParam=0

-//returns 1(true) or 0(false) representing new state of 'force default'

-#define MS_MC_FORCEDEFAULT					"MetaContacts/ForceSendDefault"

-

-// method to get state of 'force' for a metacontact

-// wParam=(HANDLE)hMetaContact

-// lParam= (DWORD)&contact_number or NULL

-// 

-// if lparam supplied, the contact_number of the contatct 'in force' will be copied to the address it points to,

-// or if none is in force, the value (DWORD)-1 will be copied

-// (v0.8.0.8+ returns 1 if 'force default' is true with *lParam == default contact number, else returns 0 with *lParam as above)

-#define MS_MC_GETFORCESTATE					"MetaContacts/GetForceState"

-

-// fired when a metacontact's default contact changes (fired upon creation of metacontact also, when default is initially set)

-// wParam=(HANDLE)hMetaContact

-// lParam=(HANDLE)hDefaultContact

-#define ME_MC_DEFAULTTCHANGED				"MetaContacts/DefaultChanged"

-

-// fired when a metacontact's subcontacts change (fired upon creation of metacontact, when contacts are added or removed, and when 

-//	contacts are reordered) - a signal to re-read metacontact data

-// wParam=(HANDLE)hMetaContact

-// lParam=0

-#define ME_MC_SUBCONTACTSCHANGED			"MetaContacts/SubcontactsChanged"

-

-// fired when a metacontact is forced to send using a specific subcontact

-// wParam=(HANDLE)hMetaContact

-// lParam=(HANDLE)hForceContact 

-#define ME_MC_FORCESEND						"MetaContacts/ForceSend"

-

-// fired when a metacontact is 'unforced' to send using a specific subcontact

-// wParam=(HANDLE)hMetaContact

-// lParam=0 

-#define ME_MC_UNFORCESEND					"MetaContacts/UnforceSend"

-

-// method to get protocol name - used to be sure you're dealing with a "real" metacontacts plugin :)

-// wParam=lParam=0

-#define MS_MC_GETPROTOCOLNAME				"MetaContacts/GetProtoName"

-

-#endif

diff --git a/ieview/m_smileyadd.h b/ieview/m_smileyadd.h
deleted file mode 100644
index d7a5212..0000000
--- a/ieview/m_smileyadd.h
+++ /dev/null
@@ -1,252 +0,0 @@
-/*

-Miranda SmileyAdd Plugin

-Copyright (C) 2005-2010 Boris Krasnovskiy

-Copyright (C) 2003-2004 Rein-Peter de Boer

-

-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 version 2

-of the License.

-

-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, see <http://www.gnu.org/licenses/>.

-*/

-#include <richedit.h>

-

-#define SAFLRE_INSERTEMF  2     // insert smiley as EMF into RichEdit, otherwise bitmap inserted

-                                // this flag allows "true" transparency

-#define SAFLRE_OUTGOING  4      // Parsing outgoing message

-#define SAFLRE_NOCUSTOM  8      // Do not use custom smileys

-

-typedef struct 

-{

-    unsigned cbSize;            //size of the structure

-    HWND hwndRichEditControl;   //handle to the rich edit control

-    CHARRANGE* rangeToReplace;  //same meaning as for normal Richedit use (NULL = replaceall)

-    const char* Protocolname;   //protocol to use... if you have defined a protocol, u can 

-                                //use your own protocol name. SmileyAdd will automatically 

-                                //select the smileypack that is defined for your protocol.

-                                //Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"

-                                //if you prefer those icons. 

-                                //If not found or NULL, "Standard" will be used

-    unsigned flags;             //Flags (SAFLRE_*) that define the behaivior

-    BOOL disableRedraw;         //Parameter have been depricated, have no effect on operation

-    HANDLE hContact;            //Contact handle

-} SMADD_RICHEDIT3;

-

-//Replace smileys in a rich edit control... 

-//wParam = (WPARAM) 0; not used

-//lParam = (LPARAM) (SMADD_RICHEDIT3*) &smre;  //pointer to SMADD_RICHEDIT3

-//return: TRUE if API succeeded (all parameters were valid) , FALSE if not.

-#define MS_SMILEYADD_REPLACESMILEYS  "SmileyAdd/ReplaceSmileys"

-

-

-typedef struct 

-{

-    unsigned cbSize;            //size of the structure

-    char* Protocolname;         //protocol to use... if you have defined a protocol, you can 

-                                //use your own protocol name. Smiley add will automatically 

-                                //select the smileypack that is defined for your protocol.

-                                //Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"

-                                //if you prefer those icons. 

-                                //If not found or NULL: "Standard" will be used

-    int xPosition;              //Postition to place the selectwindow

-    int yPosition;              // "

-    int Direction;              //Direction (i.e. size upwards/downwards/etc) of the window 0, 1, 2, 3

-

-    HWND hwndTarget;            //Window, where to send the message when smiley is selected.

-    UINT targetMessage;         //Target message, to be sent.

-    LPARAM targetWParam;        //Target WParam to be sent (LParam will be char* to select smiley)

-                                //see the example file.

-    HWND hwndParent;            //Parent window for smiley dialog 

-    HANDLE hContact;            //Contact handle

-} SMADD_SHOWSEL3;

-

-//Show smiley selection window 

-//wParam = (WPARAM) 0; not used

-//lParam = (LPARAM) (SMADD_SHOWSEL3*) &smre;  //pointer to SMADD_SHOWSEL3

-//return: TRUE if API succeeded (all parameters were valid) , FALSE if not.

-#define MS_SMILEYADD_SHOWSELECTION  "SmileyAdd/ShowSmileySelection"

-

-

-typedef struct 

-{

-    unsigned cbSize;            //size of the structure

-    char* Protocolname;         //   "             "

-    HICON ButtonIcon;           //RETURN VALUE: this is filled with the icon handle

-                                //of the smiley that can be used on the button

-                                //if used with GETINFO2 handle must be destroyed by user!

-                                //NULL if the buttonicon is not defined...

-    int NumberOfVisibleSmileys; //Number of visible smileys defined.

-    int NumberOfSmileys;        //Number of total smileys defined

-    HANDLE hContact;            //Contact handle

-} SMADD_INFO2;

-

-//get button smiley icon

-//wParam = (WPARAM) 0; not used

-//lParam = (LPARAM) (SMADD_INFO2*) &smgi;  //pointer to SMADD_INFO2

-//return: TRUE if API succeeded (all parameters were valid) , FALSE if not.

-#define MS_SMILEYADD_GETINFO2 "SmileyAdd/GetInfo2"

-

-// Event notifies that SmileyAdd options have changed 

-// Message dialogs usually need to redraw it's content on reception of this event

-//wParam = Contact handle which options have changed, NULL if global options changed

-//lParam = (LPARAM) 0; not used

-#define ME_SMILEYADD_OPTIONSCHANGED  "SmileyAdd/OptionsChanged"

-

-#define SAFL_PATH      1        // provide smiley file path, icon otherwise 

-#define SAFL_UNICODE   2        // string fields in OPTIONSDIALOGPAGE are WCHAR*

-#define SAFL_OUTGOING  4        // Parsing outgoing message

-#define SAFL_NOCUSTOM  8        // Do not use custom smileys

-

-#if defined _UNICODE || defined UNICODE

-  #define SAFL_TCHAR     SAFL_UNICODE

-#else

-  #define SAFL_TCHAR     0

-#endif

-

-typedef struct 

-{

-    unsigned cbSize;            //size of the structure

-    const char* Protocolname;   //protocol to use... if you have defined a protocol, u can 

-                                //use your own protocol name. Smiley add wil automatically 

-                                //select the smileypack that is defined for your protocol.

-                                //Or, use "Standard" for standard smiley set. Or "ICQ", "MSN"

-                                //if you prefer those icons. 

-                                //If not found or NULL: "Standard" will be used

-    union {

-       TCHAR*   str;            //String to parse

-       char*    astr;

-       wchar_t* wstr;

-    };

-    unsigned flag;              //One of the SAFL_ flags specifies parsing requirements

-                                //This parameter should be filled by the user

-

-    unsigned numSmileys;        //Number of Smileys found, this parameter filled by SmileyAdd

-    unsigned oflag;             //One of the SAFL_ flags specifies content of the parse results

-                                //this parameter filled by SmileyAdd

-    HANDLE hContact;            //Contact handle

-} SMADD_BATCHPARSE2;

-

-typedef struct 

-{

-    unsigned startChar;         //Starting smiley character 

-                                //Because of iterative nature of the API caller should set this 

-                                //parameter to correct value

-    unsigned size;              //Number of characters in smiley (0 if not found)

-                                //Because of iterative nature of the API caller should set this 

-                                //parameter to correct value

-    union {

-      const TCHAR*   filepath;

-      const char*    afilepath;

-      const wchar_t* wfilepath;

-      HICON          hIcon;     //User responsible for destroying icon handle 

-    };

-} SMADD_BATCHPARSERES;

-

-//find all smileys in text, API parses the provided text and returns all smileys found

-//wParam = (WPARAM) 0; not used

-//lParam = (LPARAM) (SMADD_BATCHPARSE2*) &smgp;  //pointer to SMADD_BATCHPARSE2

-//function returns pointer to array SMADD_BATCHPARSERES records for each smiley found

-//if no smileys found NULL is returned

-//if non NULL value returned pointer must be freed with MS_SMILEYADD_BATCHFREE API

-#define MS_SMILEYADD_BATCHPARSE "SmileyAdd/BatchParse"

-

-//Free memory allocated by MS_SMILEYADD_BATCHPARSE

-//wParam = (WPARAM) 0; not used

-//lParam = (LPARAM) (SMADD_BATCHPARSERES*) &smgp;  //pointer to SMADD_BATCHPARSERES

-#define MS_SMILEYADD_BATCHFREE "SmileyAdd/BatchFree"

-

-typedef struct 

-{

-    unsigned cbSize;            //size of the structure

-    char* name;                 //smiley category name for reference

-    char* dispname;             //smiley category name for display 

-} SMADD_REGCAT;

-

-//Register smiley category

-//wParam = (WPARAM) 0; not used

-//lParam = (LPARAM) (SMADD_REGCAT*) &smgp; pointer to SMADD_REGCAT

-#define MS_SMILEYADD_REGISTERCATEGORY "SmileyAdd/RegisterCategory"

-

-//Register smiley category

-//wParam = (WPARAM) 0; not used

-//lParam = (LPARAM) Pointer to protocol name or NULL for all;

-#define MS_SMILEYADD_RELOAD "SmileyAdd/Reload"

-

-#ifndef MIID_SMILEY

-// {E03C71B2-6DEE-467e-A4F0-DD516745876A}

-#define MIID_SMILEY	{ 0xe03c71b2, 0x6dee, 0x467e, { 0xa4, 0xf0, 0xdd, 0x51, 0x67, 0x45, 0x87, 0x6a } }

-#endif

-

-/**

-	NM_FIREVIEWCHANGE is WM_NOTIFY Message for notify parent of host window about smiley are going to be repaint

-

-	The proposed action is next: Owner of RichEdit windows received NM_FIREVIEWCHANGE through WM_NOTIFY

-	twice first time before painting|invalidating (FVCN_PREFIRE) and second time - after (FVCN_POSTFIRE).

-	The Owner window may change any values of received FVCNDATA_NMHDR structure in order to raise needed action.

-	For example it may substitute FVCA_INVALIDATE to FVCA_CUSTOMDRAW event to force painting on self offscreen context.

-	

-	It can be:

-	FVCA_CUSTOMDRAW - in this case you need to provide valid HDC to draw on and valid RECT of smiley

-	FVCA_INVALIDATE - to invalidate specified rect of window 

-	FVCA_NONE		- skip any action. But be aware - animation will be stopped till next repainting of smiley.

-	FVCA_SENDVIEWCHANGE - to notify richedit ole about object changed. Be aware Richedit will fully reconstruct itself

-

-	Another point is moment of received smiley rect - it is only valid if FVCA_DRAW is initially set, 

-	and it is PROBABLY valid if FVCA_INVALIDATE is set. And it most probably invalid in case of FVCA_SENDVIEWCHANGE.

-	The smiley position is relative last full paint HDC. Usually it is relative to top-left corner of host 

-	richedit (NOT it client area) in windows coordinates. 

-

-*/

-

-// Type of Event one of

-#define FVCN_PREFIRE        1

-#define FVCN_POSTFIRE       2

-

-// Action of event are going to be done

-#define FVCA_NONE           0

-#define FVCA_DRAW           1   // do not modify hdc in case of _DRAW, Use _CUSTOMDRAW

-#define FVCA_CUSTOMDRAW     2

-//#define FVCA_INVALIDATE     3 (not supported)

-//#define FVCA_SENDVIEWCHANGE 4 (not supported)

-#define FVCA_SKIPDRAW		5

-

-// Extended NMHDR structure for WM_NOTIFY

-typedef struct  

-{   

-    //NMHDR structure

-    HWND hwndFrom;              // Window of smiley host

-    UINT idFrom;                // ignored

-    UINT code;                  // NM_FIREVIEWCHANGE

-    

-    size_t      cbSize;

-    BYTE        bEvent;         // FVCN_ value - pre- or post- painting

-    BYTE        bAction;        // FVCA_ keys

-    HDC         hDC;            // Canvas to draw on

-    RECT        rcRect;         // Valid/should be in case of FVCA_DRAW

-    COLORREF    clrBackground;  // color to fill background if fTransparent is not set

-    BOOL        fTransparent;   // if need to fill back color (not supported)

-    LPARAM      lParam;         // used by host window PreFire and PostFire event

-} FVCNDATA_NMHDR;

-

-// Code of WM_NOTIFY message (code)

-#define NM_FIREVIEWCHANGE   NM_FIRST+1;

-

-typedef struct 

-{

-    unsigned cbSize;             // size of the structure

-	HANDLE hContact;

-	int type;					 // 0 - directory, 1 - file;

-    TCHAR* path;                  // smiley category name for reference

-} SMADD_CONT;

-

-//Loads all smileys for the contact

-//wParam = (WPARAM) 0; not used

-//lParam = (LPARAM) (SMADD_CONT*) &dir;  // pointer to directory to load smiley from

-#define MS_SMILEYADD_LOADCONTACTSMILEYS  "SmileyAdd/LoadContactSmileys"

diff --git a/ieview/resource.h b/ieview/resource.h
index 672bd66..073073f 100644
--- a/ieview/resource.h
+++ b/ieview/resource.h
@@ -1,5 +1,4 @@
 /*

-

 IEView Plugin for Miranda IM

 Copyright (C) 2005-2010  Piotr Piastucki

 

@@ -16,78 +15,73 @@ 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.

-

 */

-#define IDI_RTL_ON			100

-#define IDI_RTL_OFF			101

-#define IDI_GROUP_ON			102

-#define IDI_GROUP_OFF			103

 

-#define IDD_SRMM_OPTIONS	          	153

+#define ID_MENU_COPY                    15

+#define ID_MENU_PRINT                   27

+#define ID_MENU_SELECTALL               31

+#define IDI_RTL_ON                      100

+#define IDI_RTL_OFF                     101

+#define IDI_GROUP_ON                    102

+#define IDI_GROUP_OFF                   103

+#define IDD_SRMM_OPTIONS                153

 #define IDD_GENERAL_OPTIONS             155

-

 #define IDR_CONTEXTMENU                 200

-

 #define IDC_BACKGROUND_IMAGE            1000

-#define IDC_BACKGROUND_IMAGE_FILENAME	1001

+#define IDC_BACKGROUND_IMAGE_FILENAME   1001

 #define IDC_BROWSE_BACKGROUND_IMAGE     1002

 #define IDC_SCROLL_BACKGROUND_IMAGE     1003

-

-#define IDC_ENABLE_BBCODES				1004

+#define IDC_ENABLE_BBCODES              1004

 #define IDC_ENABLE_FLASH                1005

 #define IDC_ENABLE_MATHMODULE           1006

-#define IDC_ENABLE_PNGHACK				1007

-#define IDC_SMILEYS_IN_NAMES			1008

-#define IDC_NO_BORDER					1009

-#define IDC_ENABLE_EMBED				1010

-

+#define IDC_ENABLE_PNGHACK              1007

+#define IDC_SMILEYS_IN_NAMES            1008

+#define IDC_NO_BORDER                   1009

+#define IDC_ENABLE_EMBED		1010

+#define IDC_EMBED_SIZE			1011

 #define IDC_EXTERNALCSS                 1020

-#define IDC_EXTERNALCSS_FILENAME		1021

-#define IDC_BROWSE_EXTERNALCSS 			1022

-#define IDC_EXTERNALCSS_FILENAME_RTL	1023

-#define IDC_BROWSE_EXTERNALCSS_RTL		1024

-

-#define IDC_TEMPLATES                 	1030

-#define IDC_TEMPLATES_FILENAME			1031

-#define IDC_BROWSE_TEMPLATES			1032

+#define IDC_EXTERNALCSS_FILENAME        1021

+#define IDC_BROWSE_EXTERNALCSS          1022

+#define IDC_EXTERNALCSS_FILENAME_RTL    1023

+#define IDC_BROWSE_EXTERNALCSS_RTL      1024

+#define IDC_TEMPLATES                   1030

+#define IDC_TEMPLATES_FILENAME          1031

+#define IDC_BROWSE_TEMPLATES            1032

 #define IDC_TEMPLATES_FILENAME_RTL      1033

-#define IDC_BROWSE_TEMPLATES_RTL		1034

-

-#define IDC_LOG_SHOW_NICKNAMES      	1043

-#define IDC_LOG_SHOW_TIME           	1044

-#define IDC_LOG_SHOW_DATE           	1045

-#define IDC_LOG_SHOW_SECONDS           	1046

-#define IDC_LOG_LONG_DATE				1047

-#define IDC_LOG_RELATIVE_DATE			1048

-

-#define IDC_LOG_GROUP_MESSAGES			1050

-

-#define IDC_GROUPCHAT_CSS       		1051

+#define IDC_BROWSE_TEMPLATES_RTL        1034

+#define IDC_LOG_SHOW_NICKNAMES          1043

+#define IDC_LOG_SHOW_TIME               1044

+#define IDC_LOG_SHOW_DATE               1045

+#define IDC_LOG_SHOW_SECONDS            1046

+#define IDC_LOG_LONG_DATE               1047

+#define IDC_LOG_RELATIVE_DATE           1048

+#define IDC_LOG_GROUP_MESSAGES          1050

+#define IDC_GROUPCHAT_CSS               1051

 #define IDC_GROUPCHAT_CSS_FILENAME      1052

-#define IDC_GROUPCHAT_CSS_BROWSE		1053

+#define IDC_GROUPCHAT_CSS_BROWSE        1053

 #define IDC_GROUPCHAT_TEMPLATES_BROWSE  1054

 #define IDC_GROUPCHAT_TEMPLATES_FILENAME 1055

 #define IDC_GROUPCHAT_TEMPLATES         1056

-

-#define IDC_MODE_COMPATIBLE				1060

-#define IDC_MODE_CSS					1061

-#define IDC_MODE_TEMPLATE				1062

-#define IDC_PROTOLIST					1063

-

+#define IDC_MODE_COMPATIBLE             1060

+#define IDC_MODE_CSS                    1061

+#define IDC_MODE_TEMPLATE               1062

+#define IDC_PROTOLIST                   1063

 #define IDC_RTLSUPPORT                  1070

 #define IDC_GROUPSUPPORT                1071

-

-#define IDC_SIMPLE                      1100

 #define IDC_TABS                        2000

-

-/*

- * Values taken from shdoclc.dll

- */

-#define ID_MENU_COPY     				15

-#define ID_MENU_PRINT                   27

-#define ID_MENU_SELECTALL 				31

 #define ID_MENU_SHOWSOURCE              2139

-#define ID_MENU_COPYLINK 				2262

-#define ID_MENU_SAVEIMAGE				2270

+#define ID_MENU_COPYLINK                2262

+#define ID_MENU_SAVEIMAGE               2270

 #define ID_MENU_SAVEHTML                6012

 #define ID_MENU_CLEARLOG                40000

+

+// Next default values for new objects

+// 

+#ifdef APSTUDIO_INVOKED

+#ifndef APSTUDIO_READONLY_SYMBOLS

+#define _APS_NEXT_RESOURCE_VALUE        101

+#define _APS_NEXT_COMMAND_VALUE         40001

+#define _APS_NEXT_CONTROL_VALUE         1000

+#define _APS_NEXT_SYMED_VALUE           101

+#endif

+#endif