git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@63570 954022d7-b5bf-4e40-9824-e11837661b57

ASCHTMLRenderer/lib/htmlrenderer.pro

@@ -61,11 +61,9 @@ HEADERS +=  \
     src/Document.h \
     src/FontManager.h \
     src/FontManagerBase.h \
-    src/StringWriter.h \
     src/SVGWriter.h \
     src/SVGWriter2.h \
     src/Text.h \
-    src/TextItem.h \
     src/VectorGraphicsWriter.h \
     src/VectorGraphicsWriter2.h \
     src/VMLWriter.h \

ASCHTMLRenderer/lib/include/HTMLRenderer.h

@@ -82,11 +82,11 @@ public:
     virtual HRESULT put_FontFaceIndex(const int& lFaceIndex);
 
 //-------- Функции для вывода текста --------------------------------------------------------
-    virtual HRESULT CommandDrawTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
-    virtual HRESULT CommandDrawText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
+    virtual HRESULT CommandDrawTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT CommandDrawText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h);
 
-    virtual HRESULT CommandDrawTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
-    virtual HRESULT CommandDrawTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
+    virtual HRESULT CommandDrawTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT CommandDrawTextEx(const std::wstring& bsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& x, const double& y, const double& w, const double& h);
 
 //-------- Маркеры для команд ---------------------------------------------------------------
     virtual HRESULT BeginCommand(const DWORD& lType);
@@ -105,11 +105,11 @@ public:
     virtual HRESULT PathCommandStart();
     virtual HRESULT PathCommandGetCurrentPoint(double* x, double* y);
 
-    virtual HRESULT PathCommandTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
-    virtual HRESULT PathCommandText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
+    virtual HRESULT PathCommandTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT PathCommandText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h);
 
-    virtual HRESULT PathCommandTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
-    virtual HRESULT PathCommandTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
+    virtual HRESULT PathCommandTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT PathCommandTextEx(const std::wstring& bsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& x, const double& y, const double& w, const double& h);
 
 //-------- Функции для вывода изображений ---------------------------------------------------
     virtual HRESULT DrawImage(IGrObject* pImage, const double& x, const double& y, const double& w, const double& h);

ASCHTMLRenderer/lib/include/HTMLRenderer2.h

@@ -82,11 +82,11 @@ public:
     virtual HRESULT put_FontFaceIndex(const int& lFaceIndex);
 
 //-------- Функции для вывода текста --------------------------------------------------------
-    virtual HRESULT CommandDrawTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
-    virtual HRESULT CommandDrawText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
+    virtual HRESULT CommandDrawTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT CommandDrawText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h);
 
-    virtual HRESULT CommandDrawTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
-    virtual HRESULT CommandDrawTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
+    virtual HRESULT CommandDrawTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT CommandDrawTextEx(const std::wstring& bsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& x, const double& y, const double& w, const double& h);
 
 //-------- Маркеры для команд ---------------------------------------------------------------
     virtual HRESULT BeginCommand(const DWORD& lType);
@@ -105,11 +105,11 @@ public:
     virtual HRESULT PathCommandStart();
     virtual HRESULT PathCommandGetCurrentPoint(double* x, double* y);
 
-    virtual HRESULT PathCommandTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
-    virtual HRESULT PathCommandText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
+    virtual HRESULT PathCommandTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT PathCommandText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h);
 
-    virtual HRESULT PathCommandTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
-    virtual HRESULT PathCommandTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
+    virtual HRESULT PathCommandTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT PathCommandTextEx(const std::wstring& bsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& x, const double& y, const double& w, const double& h);
 
 //-------- Функции для вывода изображений ---------------------------------------------------
     virtual HRESULT DrawImage(IGrObject* pImage, const double& x, const double& y, const double& w, const double& h);

ASCHTMLRenderer/lib/include/HTMLRenderer3.h

@@ -82,11 +82,11 @@ public:
     virtual HRESULT put_FontFaceIndex(const int& lFaceIndex);
 
 //-------- Функции для вывода текста --------------------------------------------------------
-    virtual HRESULT CommandDrawTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
-    virtual HRESULT CommandDrawText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
+    virtual HRESULT CommandDrawTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT CommandDrawText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h);
 
-    virtual HRESULT CommandDrawTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
-    virtual HRESULT CommandDrawTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
+    virtual HRESULT CommandDrawTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT CommandDrawTextEx(const std::wstring& bsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& x, const double& y, const double& w, const double& h);
 
 //-------- Маркеры для команд ---------------------------------------------------------------
     virtual HRESULT BeginCommand(const DWORD& lType);
@@ -105,11 +105,11 @@ public:
     virtual HRESULT PathCommandStart();
     virtual HRESULT PathCommandGetCurrentPoint(double* x, double* y);
 
-    virtual HRESULT PathCommandTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
-    virtual HRESULT PathCommandText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset);
+    virtual HRESULT PathCommandTextCHAR(const LONG& c, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT PathCommandText(const std::wstring& bsText, const double& x, const double& y, const double& w, const double& h);
 
-    virtual HRESULT PathCommandTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
-    virtual HRESULT PathCommandTextEx(const std::wstring& bsUnicodeText, const std::wstring& bsGidText, const double& x, const double& y, const double& w, const double& h, const double& baselineOffset, const DWORD& lFlags);
+    virtual HRESULT PathCommandTextExCHAR(const LONG& c, const LONG& gid, const double& x, const double& y, const double& w, const double& h);
+    virtual HRESULT PathCommandTextEx(const std::wstring& bsUnicodeText, const unsigned int* pGids, const unsigned int nGidsCount, const double& x, const double& y, const double& w, const double& h);
 
 //-------- Функции для вывода изображений ---------------------------------------------------
     virtual HRESULT DrawImage(IGrObject* pImage, const double& x, const double& y, const double& w, const double& h);

ASCHTMLRenderer/lib/src/Common.h

@@ -3,6 +3,7 @@
 
 #include "../../../DesktopEditor/common/Types.h"
 #include "../../../DesktopEditor/common/File.h"
+#include "../../../DesktopEditor/common/Directory.h"
 #include "../../../DesktopEditor/raster/BgraFrame.h"
 #include "../../../DesktopEditor/graphics/Matrix.h"
 #include "../../../DesktopEditor/graphics/structures.h"

ASCHTMLRenderer/lib/src/FontManager.h

-#pragma once
-
-#include "..\stdafx.h"
-#include "Const.h"
-#include "Common.h"
-#include "StringWriter.h"
-#include "..\Graphics\Structures.h"
-#include "..\Graphics\Matrix.h"
+#ifndef _ASC_HTMLRENDERER_FM_H_
+#define _ASC_HTMLRENDERER_FM_H_
 
 #include "FontManagerBase.h"
 
@@ -18,10 +12,10 @@ namespace NSHtmlRenderer
 	class CFontManager : public CFontManagerBase
 	{
 	public:
-		NSStructures::CFont*			m_pFont;
-		NSHtmlRenderer::CMatrix*		m_pTransform;
+        NSStructures::CFont*	m_pFont;
+        Aggplus::CMatrix*		m_pTransform;
 
-		double							m_dSpaceWidthMM;
+        double					m_dSpaceWidthMM;
 
 	public:
 		CFontManager() : m_pFont(NULL), CFontManagerBase()
@@ -44,7 +38,7 @@ namespace NSHtmlRenderer
 
 			m_pFont->Size = dSizeFont;
 
-			if (m_pFont->IsEqual2(&m_oFont.m_oFont))
+            if (IsEqual2(m_pFont, &m_oFont.m_oFont))
 			{
 				m_pFont->Size = dSize;
 				return;
@@ -55,7 +49,7 @@ namespace NSHtmlRenderer
 
 			bool bIsPath = false;
 
-			if (_T("") == m_pFont->Path)
+            if (L"" == m_pFont->Path)
 			{
 				CFontManagerBase::LoadFontByName(m_oFont.m_oFont.Name, m_oFont.m_oFont.Size, m_oFont.m_oFont.GetStyle());
 			}
@@ -72,21 +66,16 @@ namespace NSHtmlRenderer
 			CalculateSpace();
 		}
 
-		AVSINLINE void CalculateSpace()
+        inline void CalculateSpace()
 		{
-			LONG lGid = 0;
-			m_pManager->GetStringGID(&lGid);
-			m_pManager->SetStringGID(FALSE);
+            LONG lGid = m_pManager->m_bStringGID;
+            m_pManager->SetStringGID(FALSE);
 			
-			m_pManager->LoadString(L" ", 0, 0);
-			float _x = 0;
-			float _y = 0;
-			float _w = 0;
-			float _h = 0;
+            m_pManager->LoadString1(L" ", 0, 0);
 
-			m_pManager->MeasureString2(&_x, &_y, &_w, &_h);
+            TBBox _box = m_pManager->MeasureString2();
 
-			m_dSpaceWidthMM = (double)_w * c_dPixToMM;
+            m_dSpaceWidthMM = (double)(_box.fMaxX - _box.fMinX) * c_dPixToMM;
 			if (0 >= m_dSpaceWidthMM)
 			{
 				m_dSpaceWidthMM = 1.0;
@@ -95,4 +84,6 @@ namespace NSHtmlRenderer
 			m_pManager->SetStringGID(lGid);
 		}
 	};
-}
\ No newline at end of file
+}
+
+#endif // _ASC_HTMLRENDERER_FM_H_

ASCHTMLRenderer/lib/src/HTMLRenderer.cpp

@@ -5,6 +5,9 @@
 #include "VectorGraphicsWriter2.h"
 #include "CanvasWriter.h"
 #include "SVGWriter2.h"
+#include "FontManager.h"
+#include "Text.h"
+#include "Document.h"
 
 class CASCHTMLRenderer_Private
 {

ASCHTMLRenderer/lib/src/StringWriter.h

-#pragma once
-#include "../../DesktopEditor/common/File.h"
-#include "TextItem.h"
-#include "Common.h"
-
-class CDstInfo
-{
-public:
-	CString m_strDstFilePath;
-	CString m_strAdditionalPath;
-	CString m_strDstMedia;
-    bool	m_bIsWeb;
-
-public:
-	CDstInfo()
-	{
-		m_strDstFilePath	= _T("");
-		m_strAdditionalPath = _T("");
-		m_strDstMedia		= _T("");
-		m_bIsWeb			= false;
-	}
-	CDstInfo(const CDstInfo& oInfo)
-	{
-		*this = oInfo;
-	}
-	CDstInfo& operator=(const CDstInfo& oSrc)
-	{
-		m_strDstFilePath	= oSrc.m_strDstFilePath;
-		m_strAdditionalPath = oSrc.m_strAdditionalPath;
-		m_strDstMedia		= oSrc.m_strDstMedia;
-		m_bIsWeb			= oSrc.m_bIsWeb;
-		return *this;
-	}
-};
-
-namespace NSStrings
-{
-	class CStringWriter : public CTextItem
-	{
-	public:
-		CStringWriter() : CTextItem()
-		{
-		}
-		virtual ~CStringWriter()
-		{
-		}
-
-	public:
-		
-		AVSINLINE void WriteString(CString& sString)
-		{
-			size_t nLen = (size_t)sString.GetLength();
-
-			#ifdef _UNICODE
-                CTextItem::WriteString(sString.GetBuffer(), nLen);
-			#else
-                CStringW str = (CStringW)sString;
-                WriteString(str.GetBuffer(), nLen);
-			#endif
-		}
-		AVSINLINE void WriteString(wchar_t* pString, const size_t& nLen)
-		{
-			CTextItem::WriteString(pString, nLen);
-		}
-		AVSINLINE void Write(CStringWriter& oWriter)
-		{
-			CTextItem::WriteString(oWriter.m_pData, oWriter.m_lSizeCur);
-		}
-	};
-}

ASCHTMLRenderer/lib/src/TextItem.h

-#pragma once
-//#include "../stdafx.h"
-
-#if defined(_WIN32) || defined (_WIN64)
-	#include <atlbase.h>
-	#include <atlstr.h>
-#else
-	#include "../../Common/DocxFormat/Source/Base/ASCString.h"
-#endif
-
-#ifndef AVSINLINE
-#if defined(_MSC_VER)
-#define AVSINLINE __forceinline
-#else
-#define AVSINLINE inline
-#endif
-#endif
-
-namespace NSStrings
-{
-	class CTextItem
-	{
-	protected:
-		wchar_t*	m_pData;
-		size_t		m_lSize;
-
-		wchar_t*	m_pDataCur;
-		size_t		m_lSizeCur;
-
-	public:
-		CTextItem()
-		{
-			m_pData = NULL;
-			m_lSize = 0;
-
-			m_pDataCur	= m_pData;
-			m_lSizeCur	= m_lSize;
-		}
-		CTextItem(const CTextItem& oSrc)
-		{
-			m_pData = NULL;
-			*this = oSrc;
-		}
-		CTextItem& operator=(const CTextItem& oSrc)
-		{
-			RELEASEMEM(m_pData);
-
-			m_lSize		= oSrc.m_lSize;
-			m_lSizeCur	= oSrc.m_lSizeCur;
-			m_pData		= (wchar_t*)malloc(m_lSize * sizeof(wchar_t));
-
-			memcpy(m_pData, oSrc.m_pData, m_lSizeCur * sizeof(wchar_t));
-							
-			m_pDataCur = m_pData + m_lSizeCur;
-
-			return *this;
-		}
-
-		CTextItem(const size_t& nLen)
-		{
-			m_lSize = nLen;
-			m_pData = (wchar_t*)malloc(m_lSize * sizeof(wchar_t));
-				
-			m_lSizeCur = 0;
-			m_pDataCur = m_pData;
-		}
-		CTextItem(wchar_t* pData, const size_t& nLen)
-		{
-			m_lSize = nLen;
-			m_pData = (wchar_t*)malloc(m_lSize * sizeof(wchar_t));
-
-			memcpy(m_pData, pData, m_lSize * sizeof(wchar_t));
-				
-			m_lSizeCur = m_lSize;
-			m_pDataCur = m_pData + m_lSize;
-		}
-		CTextItem(wchar_t* pData, BYTE* pUnicodeChecker = NULL)
-		{
-			size_t nLen = GetStringLen(pData);
-
-			m_lSize = nLen;
-			m_pData = (wchar_t*)malloc(m_lSize * sizeof(wchar_t));
-
-			memcpy(m_pData, pData, m_lSize * sizeof(wchar_t));
-				
-			m_lSizeCur = m_lSize;
-			m_pDataCur = m_pData + m_lSize;
-
-			if (NULL != pUnicodeChecker)
-			{
-				wchar_t* pMemory = m_pData;
-				while (pMemory < m_pDataCur)
-				{
-					if (!pUnicodeChecker[*pMemory])
-						*pMemory = wchar_t(' ');
-					++pMemory;
-				}
-			}
-		}
-		virtual ~CTextItem()
-		{
-			RELEASEMEM(m_pData);
-		}
-
-		AVSINLINE void AddSize(const size_t& nSize)
-		{
-			if (NULL == m_pData)
-			{
-				m_lSize = nSize > 1000 ? nSize : 1000;
-				m_pData = (wchar_t*)malloc(m_lSize * sizeof(wchar_t));
-				
-				m_lSizeCur = 0;
-				m_pDataCur = m_pData;
-				return;
-			}
-
-			if ((m_lSizeCur + nSize) > m_lSize)
-			{
-				while ((m_lSizeCur + nSize) > m_lSize)
-				{
-					m_lSize *= 2;
-				}
-
-				wchar_t* pRealloc = (wchar_t*)realloc(m_pData, m_lSize * sizeof(wchar_t));
-				if (NULL != pRealloc)
-				{
-					// реаллок сработал
-					m_pData		= pRealloc;
-					m_pDataCur	= m_pData + m_lSizeCur;
-				}
-				else
-				{
-					wchar_t* pMalloc = (wchar_t*)malloc(m_lSize * sizeof(wchar_t));
-					memcpy(pMalloc, m_pData, m_lSizeCur * sizeof(wchar_t));
-
-					free(m_pData);
-					m_pData		= pMalloc;
-					m_pDataCur	= m_pData + m_lSizeCur;
-				}
-			}
-		}
-
-	public:
-		
-		AVSINLINE void operator+=(const CTextItem& oTemp)
-		{
-			WriteString(oTemp.m_pData, oTemp.m_lSizeCur);
-		}
-		AVSINLINE void operator+=(CString& oTemp)
-		{
-			size_t nLen = (size_t)oTemp.GetLength();
-
-			#ifdef _UNICODE
-                WriteString(oTemp.GetBuffer(), nLen);
-			#else
-                CStringW str = (CStringW)oTemp;
-                WriteString(str.GetBuffer(), nLen);
-			#endif
-		}
-		AVSINLINE wchar_t operator[](const size_t& nIndex)
-		{
-			if (nIndex < m_lSizeCur)
-				return m_pData[nIndex];
-
-			return 0;
-		}
-
-		AVSINLINE void SetText(BSTR& bsText)
-		{
-			ClearNoAttack();
-			size_t nLen = GetStringLen(bsText);
-
-			WriteString(bsText, nLen);
-
-			for (size_t i = 0; i < nLen; ++i)
-			{
-				if (WCHAR(8233) == m_pData[i])
-					m_pData[i] = WCHAR(' ');
-			}
-		}
-		AVSINLINE void AddSpace()
-		{
-			AddSize(1);
-			*m_pDataCur = wchar_t(' ');
-
-			++m_lSizeCur;
-			++m_pDataCur;
-		}
-		AVSINLINE void CorrectUnicode(const BYTE* pUnicodeChecker)
-		{
-			if (NULL != pUnicodeChecker)
-			{
-				wchar_t* pMemory = m_pData;
-				while (pMemory < m_pDataCur)
-				{
-					if (!pUnicodeChecker[*pMemory])
-						*pMemory = wchar_t(' ');
-					++pMemory;
-				}
-			}
-		}
-		AVSINLINE void RemoveLastSpaces()
-		{
-			wchar_t* pMemory = m_pDataCur - 1;
-			while ((pMemory > m_pData) && (wchar_t(' ') == *pMemory))
-			{
-				--pMemory;
-				--m_lSizeCur;
-				--m_pDataCur;
-			}
-
-		}
-		AVSINLINE bool IsSpace()
-		{
-			if (1 != m_lSizeCur)
-				return false;
-			return (wchar_t(' ') == *m_pData);
-		}
-		
-	public:
-        AVSINLINE void WriteString(const wchar_t* pString, const size_t& nLen)
-		{
-			AddSize(nLen);
-
-            memcpy(m_pDataCur, pString, nLen * sizeof(wchar_t));
-
-            m_pDataCur += nLen;
-			m_lSizeCur += nLen;
-		}
-		AVSINLINE size_t GetCurSize()
-		{
-			return m_lSizeCur;
-		}
-		AVSINLINE void SetCurSize(ULONG lCurSize)
-		{
-			m_lSizeCur = (size_t)lCurSize;
-			m_pDataCur = m_pData + m_lSizeCur;
-		}
-		AVSINLINE size_t GetSize()
-		{
-			return m_lSize;
-		}
-		AVSINLINE void Clear()
-		{
-			RELEASEMEM(m_pData);
-			
-			m_pData = NULL;
-			m_lSize = 0;
-
-			m_pDataCur	= m_pData;
-			m_lSizeCur	= 0;
-		}
-		AVSINLINE void ClearNoAttack()
-		{
-			m_pDataCur	= m_pData;
-			m_lSizeCur	= 0;
-		}
-
-        AVSINLINE size_t GetStringLen(const wchar_t* pData)
-		{
-            const wchar_t* s = pData;
-			for (; *s != 0; ++s);
-			return (size_t)(s - pData);
-		}
-
-		AVSINLINE CString GetCString()
-		{
-			CString str(m_pData, (int)m_lSizeCur);
-			return str;
-		}
-		AVSINLINE wchar_t* GetBuffer()
-		{
-			return m_pData;
-		}
-
-		AVSINLINE void AddCharNoCheck(const WCHAR& wc)
-		{
-			*m_pDataCur++ = wc;
-			++m_lSizeCur;
-		}
-		AVSINLINE void AddIntNoCheck(int val)
-		{
-			if (0 == val)
-			{
-				*m_pDataCur++ = (WCHAR)'0';
-				++m_lSizeCur;
-				return;
-			}
-			if (val < 0)
-			{
-				val = -val;
-				*m_pDataCur++ = (WCHAR)'-';
-				++m_lSizeCur;
-			}
-
-			int len = 0;
-			int oval = val;
-			while (oval > 0)
-			{
-				oval /= 10;
-				++len;
-			}
-
-			oval = 1;
-			while (val > 0)
-			{
-				m_pDataCur[len - oval] = (WCHAR)('0' + (val % 10));
-				++oval;
-				val /= 10;
-			}
-
-			m_pDataCur += len;
-			m_lSizeCur += len;
-		}
-
-		AVSINLINE void AddIntNoCheckDel10(int val)
-		{
-			if (0 == val)
-			{
-				*m_pDataCur++ = (WCHAR)'0';
-				++m_lSizeCur;
-				return;
-			}
-			if (val < 0)
-			{
-				val = -val;
-				*m_pDataCur++ = (WCHAR)'-';
-				++m_lSizeCur;
-			}
-
-			int len = 0;
-			int oval = val;
-			while (oval > 0)
-			{
-				oval /= 10;
-				++len;
-			}
-
-			oval = 1;
-			int nLastS = (val % 10);
-			if (0 != nLastS)
-			{
-				++len;
-				m_pDataCur[len - oval] = (WCHAR)('0' + nLastS);
-				++oval;
-				m_pDataCur[len - oval] = (WCHAR)('.');
-				++oval;
-				val /= 10;
-			}
-			else
-			{
-				--len;
-				val /= 10;
-			}
-
-			while (val > 0)
-			{
-				m_pDataCur[len - oval] = (WCHAR)('0' + (val % 10));
-				++oval;
-				val /= 10;
-			}
-
-			m_pDataCur += len;
-			m_lSizeCur += len;
-		}
-
-		AVSINLINE void AddStringNoCheck(const wchar_t* pData, const int& len)
-        {
-            memcpy(m_pDataCur, pData, len * sizeof(wchar_t));
-
-            m_pDataCur += len;
-			m_lSizeCur += len;
-		}
-		AVSINLINE void AddSpaceNoCheck()
-		{
-			*m_pDataCur = WCHAR(' ');
-
-            ++m_pDataCur;
-			++m_lSizeCur;
-		}
-	};
-}