own exception dialog removed from tabSRMM

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

8 files changed, 109 insertions, 280 deletions

diff --git a/plugins/TabSRMM/src/chat/muchighlight.cpp b/plugins/TabSRMM/src/chat/muchighlight.cpp
index 3b62c76969..796a8b5a88 100644
--- a/plugins/TabSRMM/src/chat/muchighlight.cpp
+++ b/plugins/TabSRMM/src/chat/muchighlight.cpp
@@ -65,13 +65,8 @@ void CMUCHighlight::init()
 	m_dwFlags = M.GetByte(CHAT_MODULE, "HighlightEnabled", MATCH_TEXT);

 	m_fHighlightMe = (M.GetByte(CHAT_MODULE, "HighlightMe", 1) ? true : false);

 

-	__try {

-		tokenize(m_TextPatternString, m_TextPatterns, m_iTextPatterns);

-		tokenize(m_NickPatternString, m_NickPatterns, m_iNickPatterns);

-	}

-	__except(CGlobals::Ex_ShowDialog(GetExceptionInformation(), __FILE__, __LINE__, L"MUC_HLT_TOKENIZER", false)) {

-		m_Valid = false;

-	}

+	tokenize(m_TextPatternString, m_TextPatterns, m_iTextPatterns);

+	tokenize(m_NickPatternString, m_NickPatterns, m_iNickPatterns);

 }

 

 void CMUCHighlight::tokenize(TCHAR *tszString, TCHAR**& patterns, UINT& nr)

@@ -126,70 +121,60 @@ int CMUCHighlight::match(const GCEVENT *pgce, const SESSION_INFO *psi, DWORD dwF
 	if (pgce == 0 || m_Valid == false)

 		return 0;

 

-	__try {

-		if ((m_dwFlags & MATCH_TEXT) && (dwFlags & MATCH_TEXT) && (m_fHighlightMe || m_iTextPatterns > 0) && psi != 0) {

-			TCHAR	*p = NEWTSTR_ALLOCA(pci->RemoveFormatting(pgce->ptszText));

-			CharLower(p);

+	if ((m_dwFlags & MATCH_TEXT) && (dwFlags & MATCH_TEXT) && (m_fHighlightMe || m_iTextPatterns > 0) && psi != 0) {

+		TCHAR	*p = NEWTSTR_ALLOCA(pci->RemoveFormatting(pgce->ptszText));

+		CharLower(p);

 

-			TCHAR	*tszMe = ((psi && psi->pMe) ? NEWTSTR_ALLOCA(psi->pMe->pszNick) : 0);

-			if (tszMe)

-				CharLower(tszMe);

+		TCHAR	*tszMe = ((psi && psi->pMe) ? NEWTSTR_ALLOCA(psi->pMe->pszNick) : 0);

+		if (tszMe)

+			CharLower(tszMe);

 

-			if (m_fHighlightMe && tszMe) {

-				result = wcsstr(p, tszMe) ? MATCH_TEXT : 0;

-				if (0 == m_iTextPatterns)

-					goto skip_textpatterns;

-			}

+		if (m_fHighlightMe && tszMe) {

+			result = wcsstr(p, tszMe) ? MATCH_TEXT : 0;

+			if (0 == m_iTextPatterns)

+				goto skip_textpatterns;

+		}

 

-			while (p && !result) {

-				while (*p && (*p == ' ' || *p == ',' || *p == '.' || *p == ':' || *p == ';' || *p == '?' || *p == '!'))

-					p++;

+		while (p && !result) {

+			while (*p && (*p == ' ' || *p == ',' || *p == '.' || *p == ':' || *p == ';' || *p == '?' || *p == '!'))

+				p++;

 

-				if (*p == 0)

-					break;

+			if (*p == 0)

+				break;

 

-				TCHAR *p1 = p;

-				while (*p1 && *p1 != ' ' && *p1 != ',' && *p1 != '.' && *p1 != ':' && *p1 != ';' && *p1 != '?' && *p1 != '!')

-					p1++;

+			TCHAR *p1 = p;

+			while (*p1 && *p1 != ' ' && *p1 != ',' && *p1 != '.' && *p1 != ':' && *p1 != ';' && *p1 != '?' && *p1 != '!')

+				p1++;

 

-				if (*p1)

-					*p1 = 0;

-				else

-					p1 = 0;

+			if (*p1)

+				*p1 = 0;

+			else

+				p1 = 0;

 

-				for (UINT i = 0; i < m_iTextPatterns && !result; i++)

-					result = wildcmpt(p, m_TextPatterns[i]) ? MATCH_TEXT : 0;

+			for (UINT i = 0; i < m_iTextPatterns && !result; i++)

+				result = wildcmpt(p, m_TextPatterns[i]) ? MATCH_TEXT : 0;

 

-				if (p1) {

-					*p1 = ' ';

-					p = p1 + 1;

-				}

-				else p = 0;

+			if (p1) {

+				*p1 = ' ';

+				p = p1 + 1;

 			}

+			else p = 0;

 		}

+	}

 

 skip_textpatterns:

 

-		/*

-		 * optinally, match the nickname against the list of nicks to highlight

-		 */

-		if ((m_dwFlags & MATCH_NICKNAME) && (dwFlags & MATCH_NICKNAME) && pgce->ptszNick && m_iNickPatterns > 0) {

-			for (UINT i = 0; i < m_iNickPatterns && !nResult; i++) {

-				if (pgce->ptszNick)

-					nResult = wildcmpt(pgce->ptszNick, m_NickPatterns[i]) ? MATCH_NICKNAME : 0;

-				if ((m_dwFlags & MATCH_UIN) && pgce->ptszUserInfo)

-					nResult = wildcmpt(pgce->ptszUserInfo, m_NickPatterns[i]) ? MATCH_NICKNAME : 0;

-			}

+	// optionally, match the nickname against the list of nicks to highlight

+	if ((m_dwFlags & MATCH_NICKNAME) && (dwFlags & MATCH_NICKNAME) && pgce->ptszNick && m_iNickPatterns > 0) {

+		for (UINT i = 0; i < m_iNickPatterns && !nResult; i++) {

+			if (pgce->ptszNick)

+				nResult = wildcmpt(pgce->ptszNick, m_NickPatterns[i]) ? MATCH_NICKNAME : 0;

+			if ((m_dwFlags & MATCH_UIN) && pgce->ptszUserInfo)

+				nResult = wildcmpt(pgce->ptszUserInfo, m_NickPatterns[i]) ? MATCH_NICKNAME : 0;

 		}

-

-		return(result | nResult);

 	}

-	__except (CGlobals::Ex_ShowDialog(GetExceptionInformation(), __FILE__, __LINE__, L"MUC_HIGHLIGHT_EXCEPTION", false))

-	{

-		m_Valid = false;

-		return 0;

-	}

-	return 0;

+

+	return(result | nResult);

 }

 

 /**

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 92dc53fd9b..622b0b86ad 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -521,7 +521,7 @@ static bool TabAutoComplete(HWND hwnd, MESSAGESUBDATA *dat, SESSION_INFO *si)
 

 	bool isTopic = false, isRoom = false;

 	TCHAR *pszName = NULL;

-	TCHAR *pszText = (TCHAR*)Utils::safeMirCalloc((iLen + 10) * sizeof(TCHAR));

+	TCHAR *pszText = (TCHAR*)mir_calloc((iLen + 10) * sizeof(TCHAR));

 

 	gt.flags = GT_DEFAULT;

 	gt.cb = (iLen + 9) * sizeof(TCHAR);

@@ -555,10 +555,7 @@ LBL_SkipEnd:
 			isTopic = TRUE;

 	}

 	if (dat->szSearchQuery == NULL) {

-		size_t len = (end - start) + 1;

-		dat->szSearchQuery = (TCHAR*)Utils::safeMirAlloc(sizeof(TCHAR) * len);

-		wcsncpy(dat->szSearchQuery, pszText + start, len);

-		dat->szSearchQuery[len - 1] = 0;

+		dat->szSearchQuery = mir_tstrndup(pszText + start, end - start);

 		dat->szSearchResult = mir_tstrdup(dat->szSearchQuery);

 		dat->lastSession = NULL;

 	}

@@ -578,7 +575,7 @@ LBL_SkipEnd:
 		if (end != start) {

 			ptrT szReplace;

 			if (!isRoom && !isTopic && g_Settings.bAddColonToAutoComplete && start == 0) {

-				szReplace = (TCHAR*)Utils::safeMirAlloc((wcslen(pszName) + 4) * sizeof(TCHAR));

+				szReplace = (TCHAR*)mir_alloc((wcslen(pszName) + 4) * sizeof(TCHAR));

 				wcscpy(szReplace, pszName);

 				wcscat(szReplace, L": ");

 				pszName = szReplace;

diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 7367d25c03..c346c06a79 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -1,32 +1,31 @@
 /*

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

- *

- * Copyright (c) 2000-09 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.

- *

- * part of tabSRMM messaging plugin for Miranda.

- *

- * (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors

- *

- * Plugin configuration variables and functions. Implemented as a class

- * though there will always be only a single instance.

- *

- */

+* Miranda NG: the free IM client for Microsoft* Windows*

+*

+* Copyright (c) 2000-09 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.

+*

+* part of tabSRMM messaging plugin for Miranda.

+*

+* (C) 2005-2010 by silvercircle _at_ gmail _dot_ com and contributors

+*

+* Plugin configuration variables and functions. Implemented as a class

+* though there will always be only a single instance.

+*/

 

 #include "commonheaders.h"

 

@@ -108,31 +107,24 @@ void CGlobals::reloadSystemStartup()
 	hookSystemEvents();

 }

 

-/**

- * this runs ONCE at startup when the Modules Loaded event is fired

- * by the core. all plugins are loaded and ready to use.

- * 

- * any initialation for 3rd party plugins must go here.

- */

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

+// this runs ONCE at startup when the Modules Loaded event is fired

+// by the core. all plugins are loaded and ready to use.

+//

+// any initialation for 3rd party plugins must go here.

+

 void CGlobals::reloadSystemModulesChanged()

 {

-	/*

-	 * smiley add

-	 */

+	// smiley add

 	if (ServiceExists(MS_SMILEYADD_REPLACESMILEYS)) {

 		PluginConfig.g_SmileyAddAvail = 1;

 		HookEvent(ME_SMILEYADD_OPTIONSCHANGED, ::SmileyAddOptionsChanged);

 	}

 

-	/*

-	 * Flashavatars

-	 */

+	// Flashavatars

 	g_FlashAvatarAvail = (ServiceExists(MS_FAVATAR_GETINFO) ? 1 : 0);

 

-	/*

-	 * ieView

-	 */

-

+	// ieView

 	BOOL bIEView = ServiceExists(MS_IEVIEW_WINDOW);

 	if (bIEView) {

 		BOOL bOldIEView = M.GetByte("ieview_installed", 0);

@@ -170,10 +162,10 @@ void CGlobals::reloadSystemModulesChanged()
 	m_useAeroPeek = M.GetByte("useAeroPeek", 1);

 }

 

-/**

- * reload plugin settings on startup and runtime. Most of these setttings can be

- * changed while plugin is running.

- */

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

+// reload plugin settings on startup and runtime.Most of these setttings can be

+// changed while plugin is running.

+

 void CGlobals::reloadSettings(bool fReloadSkins)

 {

 	m_ncm.cbSize = sizeof(NONCLIENTMETRICS);

@@ -250,9 +242,9 @@ void CGlobals::reloadSettings(bool fReloadSkins)
 		Skin->setupAeroSkins();

 }

 

-/**

- * reload "advanced tweaks" that can be applied w/o a restart

- */

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

+// reload "advanced tweaks" that can be applied w / o a restart

+

 void CGlobals::reloadAdv()

 {

 	g_bDisableAniAvatars = M.GetByte("adv_DisableAniAvatars", 0);

@@ -275,10 +267,10 @@ const HMENU CGlobals::getMenuBar()
 	return(m_MenuBar);

 }

 

-/**

- * hook core events. This runs in LoadModule()

- * only core events and services are guaranteed to exist at this time

- */

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

+// hook core events.This runs in LoadModule()

+// only core events and services are guaranteed to exist at this time

+

 void CGlobals::hookSystemEvents()

 {

 	HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded);

@@ -396,11 +388,10 @@ int CGlobals::ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-/**

- * watches various important database settings and reacts accordingly

- * needed to catch status, nickname and other changes in order to update open message

- * sessions.

- */

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

+// watches various important database settings and reacts accordingly

+// needed to catch status, nickname and other changes in order to update open message

+// sessions.

 

 int CGlobals::DBSettingChanged(WPARAM wParam, LPARAM lParam)

 {

@@ -503,9 +494,8 @@ int CGlobals::DBSettingChanged(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-/**

- * event fired when a contact has been deleted. Make sure to close its message session

- */

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

+// event fired when a contact has been deleted. Make sure to close its message session

 

 int CGlobals::DBContactDeleted(WPARAM wParam, LPARAM lParam)

 {

@@ -517,11 +507,11 @@ int CGlobals::DBContactDeleted(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-/**

- * Handle events from metacontacts protocol. Basically, just update

- * our contact cache and, if a message window exists, tell it to update

- * relevant information.

- */

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

+// Handle events from metacontacts protocol.Basically, just update

+// our contact cache and, if a message window exists, tell it to update

+// relevant information.

+

 int CGlobals::MetaContactEvent(WPARAM wParam, LPARAM lParam)

 {

 	if (wParam) {

@@ -665,12 +655,12 @@ void CGlobals::logStatusChange(WPARAM wParam, const CContactCache *c)
 	StreamInEvents(dat->hwnd, NULL, 1, 1, &dbei);

 }

 

-/**

- * on Windows 7, when using new task bar features (grouping mode and per tab

- * previews), autoswitching does not work relieably, so it is disabled.

- *

- * @return: true if configuration dictates autoswitch

- */

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

+// on Windows 7, when using new task bar features (grouping mode and per tab

+// previews), autoswitching does not work relieably, so it is disabled.

+//

+// @return: true if configuration dictates autoswitch

+ 

 bool CGlobals::haveAutoSwitch()

 {

 	if (m_bIsWin7) {

@@ -679,82 +669,3 @@ bool CGlobals::haveAutoSwitch()
 	}

 	return(m_AutoSwitchTabs ? true : false);

 }

-/**

- * exception handling - copy error message to clip board

- * @param hWnd: 	window handle of the edit control containing the error message

- */

-void CGlobals::Ex_CopyEditToClipboard(HWND hWnd)

-{

-	SendMessage(hWnd, EM_SETSEL, 0, 65535L);

-	SendMessage(hWnd, WM_COPY, 0 , 0);

-	SendMessage(hWnd, EM_SETSEL, 0, 0);

-}

-

-INT_PTR CALLBACK CGlobals::Ex_DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)

-{

-	WORD wNotifyCode, wID;

-

-	switch(uMsg) {

-		case WM_INITDIALOG: {

-				char szBuffer[2048];

-#ifdef _WIN64

-				mir_snprintf(szBuffer, SIZEOF(szBuffer),

-						"Exception %16.16X at address %16.16X occured in %s at line %d.\r\n\r\nEAX=%16.16X EBX=%16.16X ECX=%16.16X\r\nEDX=%16.16X ESI=%16.16X EDI=%16.16X\r\nEBP=%16.16X ESP=%16.16X EIP=%16.16X",

-						m_exRecord.ExceptionCode, m_exRecord.ExceptionAddress, m_exSzFile, m_exLine,

-						m_exCtx.Rax,m_exCtx.Rbx, m_exCtx.Rcx, m_exCtx.Rdx,

-						m_exCtx.Rsi, m_exCtx.Rdi, m_exCtx.Rbp, m_exCtx.Rsp, m_exCtx.Rip);

-#else

-				mir_snprintf(szBuffer, SIZEOF(szBuffer),

-						"Exception %8.8X at address %8.8X occured in %s at line %d.\r\n\r\nEAX=%8.8X EBX=%8.8X ECX=%8.8X\r\nEDX=%8.8X ESI=%8.8X EDI=%8.8X\r\nEBP=%8.8X ESP=%8.8X EIP=%8.8X",

-						m_exRecord.ExceptionCode, m_exRecord.ExceptionAddress, m_exSzFile, m_exLine,

-						m_exCtx.Eax,m_exCtx.Ebx, m_exCtx.Ecx, m_exCtx.Edx,

-						m_exCtx.Esi, m_exCtx.Edi, m_exCtx.Ebp, m_exCtx.Esp, m_exCtx.Eip);

-#endif

-				SetDlgItemTextA(hwndDlg, IDC_EXCEPTION_DETAILS, szBuffer);

-				SetFocus(GetDlgItem(hwndDlg, IDC_EXCEPTION_DETAILS));

-				SendDlgItemMessage(hwndDlg, IDC_EXCEPTION_DETAILS, WM_SETFONT, (WPARAM)GetStockObject(OEM_FIXED_FONT), 0);

-				SetDlgItemTextW(hwndDlg, IDC_EX_REASON, m_exReason);

-				Utils::enableDlgControl(hwndDlg, IDOK, m_exAllowContinue ? TRUE : FALSE);

-			}

-			break;

-

-		case WM_COMMAND:

-			wNotifyCode = HIWORD(wParam);

-			wID = LOWORD(wParam);

-			if (wNotifyCode == BN_CLICKED)

-			{

-				if (wID == IDOK || wID == IDCANCEL)

-					EndDialog(hwndDlg, wID);

-

-				if (wID == IDC_COPY_EXCEPTION)

-					Ex_CopyEditToClipboard(GetDlgItem(hwndDlg, IDC_EXCEPTION_DETAILS));

-			}

-

-			break;

-	}

-	return FALSE;

-}

-

-void CGlobals::Ex_Handler()

-{

-	if (m_exLastResult == IDCANCEL)

-		ExitProcess(1);

-}

-

-int CGlobals::Ex_ShowDialog(EXCEPTION_POINTERS *ep, const char *szFile, int line, wchar_t* szReason, bool fAllowContinue)

-{

-	char	szDrive[MAX_PATH], szDir[MAX_PATH], szName[MAX_PATH], szExt[MAX_PATH];

-

-	_splitpath(szFile, szDrive, szDir, szName, szExt);

-	memcpy(&m_exRecord, ep->ExceptionRecord, sizeof(EXCEPTION_RECORD));

-	memcpy(&m_exCtx, ep->ContextRecord, sizeof(CONTEXT));

-

-	mir_snprintf(m_exSzFile, MAX_PATH, "%s%s", szName, szExt);

-	mir_sntprintf(m_exReason, 256, L"An application error has occured: %s", szReason);

-	m_exLine = line;

-	m_exLastResult = DialogBoxParam(g_hInst, MAKEINTRESOURCE(IDD_EXCEPTION), 0, CGlobals::Ex_DlgProc, 0);

-	m_exAllowContinue = fAllowContinue;

-	if (IDCANCEL == m_exLastResult)

-		ExitProcess(1);

-	return 1;

-}

diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h
index 4bd7cc379c..79115baaaa 100644
--- a/plugins/TabSRMM/src/globals.h
+++ b/plugins/TabSRMM/src/globals.h
@@ -160,10 +160,6 @@ public:
 	

 	static void logStatusChange(WPARAM wParam, const CContactCache *c);

 

-	static void Ex_CopyEditToClipboard(HWND hWnd);

-	static void Ex_Handler();

-	static int  Ex_ShowDialog(EXCEPTION_POINTERS *ep, const char *szFile, int line, wchar_t* szReason, bool fAllowContinue);

-	static INT_PTR CALLBACK Ex_DlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);

 private:

 	bool m_TypingSoundAdded;

 

diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index 8008176c14..f4a741e976 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -59,7 +59,6 @@
 #define IDD_SKINTABDIALOG               312

 #define IDD_OPT_SKIN                    313

 #define IDD_OPTIONS_PLUS                333

-#define IDD_EXCEPTION                   400

 #define IDC_QMGR_REMOVE                 1000

 #define IDC_EXCEPTION_DETAILS           1000

 #define IDC_UNLOAD                      1000

diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index bade430b5a..55525d62c5 100644
--- a/plugins/TabSRMM/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
@@ -52,60 +52,6 @@ LRESULT TSAPI _dlgReturn(HWND hWnd, LRESULT result)
 	return result;

 }

 

-void* Utils::safeAlloc(const size_t size)

-{

-	__try {

-		unsigned char* _p = reinterpret_cast<unsigned char*>(mir_alloc(size));

-		*_p = 0;

-

-		return(reinterpret_cast<void*>(_p));

-	}

-	__except(CGlobals::Ex_ShowDialog(GetExceptionInformation(), __FILE__, __LINE__, L"MEMORY_ALLOCATION", false))

-	{

-		return 0;

-	}

-}

-

-void* Utils::safeCalloc(const size_t size)

-{

-	__try {

-		void* _p = safeAlloc(size);

-		::ZeroMemory(_p, size);

-		return(_p);

-	}

-	__except(CGlobals::Ex_ShowDialog(GetExceptionInformation(), __FILE__, __LINE__, L"MEMORY_ALLOCATION", false))

-	{

-		return 0;

-	}

-}

-

-void* Utils::safeMirAlloc(const size_t size)

-{

-	__try {

-		unsigned char* _p = reinterpret_cast<unsigned char*>(mir_alloc(size));

-		*_p = 0;

-

-		return(reinterpret_cast<void*>(_p));

-	}

-	__except(CGlobals::Ex_ShowDialog(GetExceptionInformation(), __FILE__, __LINE__, L"MIR_MEMORY_ALLOCATION", false))

-	{

-		return 0;

-	}

-}

-

-void* Utils::safeMirCalloc(const size_t size)

-{

-	__try {

-		void* _p = safeMirAlloc(size);

-		::ZeroMemory(_p, size);

-		return(_p);

-	}

-	__except(CGlobals::Ex_ShowDialog(GetExceptionInformation(), __FILE__, __LINE__, L"MIR_MEMORY_ALLOCATION", false))

-	{

-		return 0;

-	}

-}

-

 TCHAR* Utils::FilterEventMarkers(TCHAR *wszText)

 {

 	tstring text(wszText);

diff --git a/plugins/TabSRMM/src/utils.h b/plugins/TabSRMM/src/utils.h
index 107aca9e16..90ae419e8e 100644
--- a/plugins/TabSRMM/src/utils.h
+++ b/plugins/TabSRMM/src/utils.h
@@ -101,11 +101,6 @@ public:
 	static	void				TSAPI sanitizeFilename				(wchar_t *tszFilename);

 	static	void				TSAPI ensureTralingBackslash		(wchar_t *szPathname);

 

-	static 	void*				TSAPI safeAlloc						(const size_t size);

-	static	void*				TSAPI safeCalloc					(const size_t size);

-	static 	void*				TSAPI safeMirAlloc						(const size_t size);

-	static	void*				TSAPI safeMirCalloc					(const size_t size);

-

 	static	HMODULE				TSAPI loadSystemLibrary				(const wchar_t* szFilename);

 

 	static	INT_PTR CALLBACK		  PopupDlgProcError				(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);

diff --git a/plugins/TabSRMM/src/version.h b/plugins/TabSRMM/src/version.h
index 744749d81b..3cb9b306f1 100644
--- a/plugins/TabSRMM/src/version.h
+++ b/plugins/TabSRMM/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION       3

 #define __MINOR_VERSION       3

 #define __RELEASE_NUM         0

-#define __BUILD_NUM           2

+#define __BUILD_NUM           3

 

 #include <stdver.h>