Index: src/ch/ExceptionEx.h
===================================================================
diff -u -r3493e9fc470285b0a0b417d50be281467a071eb7 -r4c272b19c74694c428c943011f279ec064fbd894
--- src/ch/ExceptionEx.h	(.../ExceptionEx.h)	(revision 3493e9fc470285b0a0b417d50be281467a071eb7)
+++ src/ch/ExceptionEx.h	(.../ExceptionEx.h)	(revision 4c272b19c74694c428c943011f279ec064fbd894)
@@ -86,12 +86,12 @@
 		// call base class RegisterInfo
 
 		// function has to register the info to be displayed (called from within GetInfo)
-		RegisterProp(pInfo+0, _T("Source file"), PropType::dtString, &m_szSourceFile);
-		RegisterProp(pInfo+1, _T("Line"), PropType::dtDword, &m_dwSourceLine);
-		RegisterProp(pInfo+2, _T("Function"), PropType::dtString, &m_szFunction);
-		RegisterProp(pInfo+3, _T("Reason"), PropType::dtPtrToString, &m_pszReason);
-		RegisterProp(pInfo+4, _T("App error"), PropType::dtDword, &m_dwReason);
-		RegisterProp(pInfo+5, _T("System error"), PropType::dtSysError, &m_dwError);
+		RegisterProp(pInfo+0, _T("Source file"), dtString, &m_szSourceFile);
+		RegisterProp(pInfo+1, _T("Line"), dtDword, &m_dwSourceLine);
+		RegisterProp(pInfo+2, _T("Function"), dtString, &m_szFunction);
+		RegisterProp(pInfo+3, _T("Reason"), dtPtrToString, &m_pszReason);
+		RegisterProp(pInfo+4, _T("App error"), dtDword, &m_dwReason);
+		RegisterProp(pInfo+5, _T("System error"), dtSysError, &m_dwError);
 
 		return 6;
 	};
@@ -103,7 +103,7 @@
 		TCHAR szBuf[1024];
 		va_list marker;
 		va_start(marker, pszReason);
-		_vstprintf(szBuf, pszReason, marker);
+		_vsntprintf(szBuf, 1024, pszReason, marker);
 		va_end(marker);
 		TCHAR *pszData=new TCHAR[_tcslen(szBuf)+1];
 		_tcscpy(pszData, szBuf);
@@ -136,31 +136,31 @@
 			// format this line
 			switch(pepi[i].eType)
 			{
-			case PropType::dtString:
+			case dtString:
 				{
 					if (pszDesc)
-						_stprintf(szData, _T("\r\n\t%s: %s"), pepi[i].szName, (TCHAR*)pepi[i].pData);
+						_sntprintf(szData, 1024, _T("\r\n\t%s: %s"), pepi[i].szName, (TCHAR*)pepi[i].pData);
 					else
-						_stprintf(szData, _T("%s: %s\r\n"), pepi[i].szName, (TCHAR*)pepi[i].pData);
+						_sntprintf(szData, 1024, _T("%s: %s\r\n"), pepi[i].szName, (TCHAR*)pepi[i].pData);
 					break;
 				}
-			case PropType::dtPtrToString:
+			case dtPtrToString:
 				{
 					if (pszDesc)
-						_stprintf(szData, _T("\r\n\t%s: %s"), pepi[i].szName, *((TCHAR**)pepi[i].pData));
+						_sntprintf(szData, 1024, _T("\r\n\t%s: %s"), pepi[i].szName, *((TCHAR**)pepi[i].pData));
 					else
-						_stprintf(szData, _T("%s: %s\r\n"), pepi[i].szName, *((TCHAR**)pepi[i].pData));
+						_sntprintf(szData, 1024, _T("%s: %s\r\n"), pepi[i].szName, *((TCHAR**)pepi[i].pData));
 					break;
 				}
-			case PropType::dtDword:
+			case dtDword:
 				{
 					if (pszDesc)
-						_stprintf(szData, _T("\r\n\t%s: %lu"), pepi[i].szName, *((DWORD*)pepi[i].pData));
+						_sntprintf(szData, 1024, _T("\r\n\t%s: %lu"), pepi[i].szName, *((DWORD*)pepi[i].pData));
 					else
-						_stprintf(szData, _T("%s: %lu\r\n"), pepi[i].szName, *((DWORD*)pepi[i].pData));
+						_sntprintf(szData, 1024, _T("%s: %lu\r\n"), pepi[i].szName, *((DWORD*)pepi[i].pData));
 					break;
 				}
-			case PropType::dtSysError:
+			case dtSysError:
 				{
 					// get info about the last error (always treated as a system error)
 					TCHAR szSystem[512];
@@ -171,9 +171,9 @@
 						szSystem[dwPos]=_T('\0');
 
 					if (pszDesc)
-						_stprintf(szData, _T("\r\n\t%s: %lu (%s)"), pepi[i].szName, *((DWORD*)pepi[i].pData), szSystem);
+						_sntprintf(szData, 1024, _T("\r\n\t%s: %lu (%s)"), pepi[i].szName, *((DWORD*)pepi[i].pData), szSystem);
 					else
-						_stprintf(szData, _T("%s: %lu (%s)\r\n"), pepi[i].szName, *((DWORD*)pepi[i].pData), szSystem);
+						_sntprintf(szData, 1024, _T("%s: %lu (%s)\r\n"), pepi[i].szName, *((DWORD*)pepi[i].pData), szSystem);
 
 					break;
 				}