diff --git a/.gitattributes b/.gitattributes
index 0977ea6cd2..cf1815723a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -922,6 +922,7 @@ Common/DocxFormat/Source/XML/libxml2/mac_build/libxml2/libxml2.xcodeproj/xcuserd
 Common/DocxFormat/Source/XML/libxml2/mac_build/libxml2/libxml2.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad svnc_tsvn_003alogminsize=5
 Common/DocxFormat/Source/XML/libxml2/mac_build/libxml2/libxml2.xcodeproj/xcuserdata/alexey.musinov.xcuserdatad/xcschemes svnc_tsvn_003alogminsize=5
 Common/DocxFormat/Source/XlsxFormat/ExternalLinks svnc_tsvn_003alogminsize=5
+/DesktopEditor svn_global_002dignores=build%0A
 DesktopEditor/ChromiumBasedEditors svnc_tsvn_003alogminsize=5
 DesktopEditor/ChromiumBasedEditors/app svnc_tsvn_003alogminsize=5
 DesktopEditor/ChromiumBasedEditors/app/cefbuilds svnc_tsvn_003alogminsize=5
diff --git a/.gitignore b/.gitignore
index 834479e31c..9460f8c3c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,6 +83,7 @@ ASCOfficePPTXFile/Debug
 ASCOfficePPTXFile/PPTXFormat/!_
 ASCOfficePPTXFile/PPTXFormat/_
 ASCOfficePPTXFile/Release
+DesktopEditor/build
 _tags/rev_61879/ASCImageStudio3/AVSImageRaw3/trunk/dcraw_8-94/Output
 _tags/rev_61879/ASCImageStudio3/AVSImageRaw3/trunk/dcraw_8-94/Test/AVSImageRawSimpleConverter/bin
 _tags/rev_61879/ASCImageStudio3/AVSImageRaw3/trunk/dcraw_8-94/Test/AVSImageRawSimpleConverter/obj
diff --git a/ASCHTMLRenderer/ASCHTMLRendererLib.vcproj b/ASCHTMLRenderer/ASCHTMLRendererLib.vcproj
index 21a10d56c6..11c12df60c 100644
--- a/ASCHTMLRenderer/ASCHTMLRendererLib.vcproj
+++ b/ASCHTMLRenderer/ASCHTMLRendererLib.vcproj
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfMFC="0"
 			UseOfATL="0"
@@ -180,8 +180,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfATL="1"
 			ATLMinimizesCRunTimeLibraryUsage="false"
@@ -216,7 +216,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalIncludeDirectories="&quot;../DesktopEditor/freetype-2.5.2/include&quot;;&quot;../DesktopEditor/agg-2.4/include&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;DESKTOP_EDITOR_GRAPHICS"
-				RuntimeLibrary="1"
+				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
@@ -496,10 +496,18 @@
 			<Filter
 				Name="Emf"
 				>
+				<File
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfClip.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfFile.h"
 					>
 				</File>
+				<File
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfObjects.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfObjects.h"
 					>
@@ -508,6 +516,10 @@
 					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfOutputDevice.h"
 					>
 				</File>
+				<File
+					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPath.cpp"
+					>
+				</File>
 				<File
 					RelativePath="..\DesktopEditor\raster\Metafile\Emf\EmfPlayer.cpp"
 					>
diff --git a/ASCHTMLRenderer/CASCImage.cpp b/ASCHTMLRenderer/CASCImage.cpp
index ee1ccbadea..8655fa0888 100644
--- a/ASCHTMLRenderer/CASCImage.cpp
+++ b/ASCHTMLRenderer/CASCImage.cpp
@@ -5,79 +5,6 @@
 
 #if defined(_WIN32) || defined (_WIN64)
 	
-	#include "../Common/GdiPlusEx.h"
-	#import "../Redist/ASCMediaCore3.dll"			named_guids raw_interfaces_only rename_namespace("MediaCore"), exclude("tagRECT")
-	#include "../Common/MediaFormatDefine.h"
-	
-	namespace NSGdiMeta
-	{
-		static BOOL ByteArrayToMediaData(BYTE* pArray, int nWidth, int nHeight, Aggplus::CImage** ppImage, BOOL bFlipVertical = TRUE)
-		{
-			if (!ppImage || nWidth < 1 || nHeight < 1)
-				return FALSE;
-
-			*ppImage = new Aggplus::CImage;
-			Aggplus::CImage* pImage = *ppImage;
-
-			// specify settings
-			long nBufferSize = 4 * nWidth * nHeight;
-			long nStride;
-			if(TRUE == bFlipVertical)
-				nStride = -4 * nWidth;
-			else
-				nStride = 4 * nWidth;
-			BYTE* pBuffer = new BYTE[nBufferSize];
-			memcpy(pBuffer, pArray, nBufferSize);
-			pImage->Create(pBuffer, nWidth, nHeight, nStride);
-
-			return TRUE;
-		}
-			
-		static BOOL GdiPlusBitmapToMediaData(Gdiplus::Bitmap* pBitmap, Aggplus::CImage** ppImage, BOOL bFlipVertical = TRUE)
-		{
-			if (!pBitmap)
-				return FALSE;
-
-			int nWidth = pBitmap->GetWidth();
-			int nHeight = pBitmap->GetHeight();
-
-			double dHorDpi = (double)pBitmap->GetHorizontalResolution();
-			double dVerDpi = (double)pBitmap->GetVerticalResolution();
-
-			int nWidthDest	= (int)(96.0 * nWidth / dHorDpi);
-			int nHeightDest = (int)(96.0 * nHeight / dVerDpi);
-
-			if (nWidth == nWidthDest && nHeight == nHeightDest)
-			{
-				Gdiplus::Rect oRect(0, 0, nWidth, nHeight);
-				Gdiplus::BitmapData oBitmapData;
-
-				if (pBitmap->LockBits(&oRect, Gdiplus::ImageLockModeRead, PixelFormat32bppARGB, &oBitmapData) != Gdiplus::Ok)
-					return FALSE;
-
-				BOOL bSuccess = ByteArrayToMediaData((BYTE*)oBitmapData.Scan0, nWidth, nHeight, ppImage, bFlipVertical);
-				
-				pBitmap->UnlockBits(&oBitmapData);
-
-				return bSuccess;
-			}
-
-			BYTE* pData = new BYTE[4 * nWidthDest * nHeightDest];
-			Gdiplus::Bitmap oBitmap(nWidthDest, nHeightDest, 4 * nWidthDest, PixelFormat32bppARGB, pData);
-
-			Gdiplus::Graphics* pGraphics = Gdiplus::Graphics::FromImage(&oBitmap);
-
-			pGraphics->SetInterpolationMode(Gdiplus::InterpolationModeBilinear);
-			pGraphics->DrawImage(pBitmap, 0, 0, nWidthDest, nHeightDest);
-
-			RELEASEOBJECT(pGraphics);
-
-			BOOL bSuccess = ByteArrayToMediaData(pData, nWidthDest, nHeightDest, ppImage, bFlipVertical);
-			RELEASEARRAYOBJECTS(pData);
-
-			return bSuccess;
-		}
-	}
 #else
 	#include <unistd.h>
 #endif
@@ -127,107 +54,6 @@ namespace NSHtmlRenderer
 		// Это не Wmf & Emf
 		m_pMetafile->Close();
 
-#if defined(_WIN32) || defined (_WIN64)
-		CGdiPlusInit oCGdiPlusInit;
-		oCGdiPlusInit.Init();
-		Gdiplus::Metafile *pMetaFile = new Gdiplus::Metafile( bsFilePath.c_str() );
-		if ( NULL != pMetaFile )
-		{
-			// Похоже это метафайл, конвертируем его в Wmf с помощью Gdi
-			HENHMETAFILE hEmf = pMetaFile->GetHENHMETAFILE();
-			if ( NULL != hEmf )
-			{
-				UINT unSize = Gdiplus::Metafile::EmfToWmfBits( hEmf, 0, NULL, MM_ANISOTROPIC, Gdiplus::EmfToWmfBitsFlagsIncludePlaceable);
-
-				if (0 != unSize)
-				{
-					BYTE *pBuffer = new BYTE[unSize];
-					INT nConvertedSize = Gdiplus::Metafile::EmfToWmfBits( hEmf, unSize, pBuffer, MM_ANISOTROPIC, Gdiplus::EmfToWmfBitsFlagsEmbedEmf );
-
-					HMETAFILE hWmf = SetMetaFileBitsEx( unSize, pBuffer );
-
-					FILE *pFile = NULL;
-					std::wstring wstrTempFileName(m_wsTempFilePath.GetBuffer(), m_wsTempFilePath.GetLength());
-					WmfOpenTempFile( &wstrTempFileName, &pFile, _T("wb+"), _T(".wmf"), NULL );
-					if ( !pFile )
-					{
-						DeleteMetaFile( hWmf );
-						DeleteEnhMetaFile( hEmf );
-						delete[] pBuffer;
-						delete pMetaFile;
-
-						m_lImageType = c_lImageTypeUnknown;
-					}
-					else
-					{
-						::fclose( pFile );
-
-						// Сохраняем Wmf
-						HMETAFILE hTempWmf = CopyMetaFile( hWmf, m_wsTempFilePath.GetBuffer() );
-						DeleteMetaFile( hTempWmf );
-
-						// Открываем Wmf
-						if ( m_pMetafile->LoadFromFile( m_wsTempFilePath.GetBuffer()) == true)
-						{
-							// Wmf нормально открылся
-							if (m_pMetafile->GetType() == 1)
-							{
-								m_lImageType =  c_lImageTypeMetafile | c_lMetaWmf;
-
-								DeleteMetaFile( hWmf );
-								DeleteEnhMetaFile( hEmf );
-								delete[] pBuffer;
-								delete pMetaFile;
-
-								return;		
-							}
-							else
-							{
-								// Исходный файл Emf, но после конвертации в Wmf он не открылся
-								m_lImageType =  c_lImageTypeMetafile | c_lMetaEmf;
-							}
-						}
-						else
-						{
-							// Сконвертированный файл не прочитался
-							m_pMetafile->Close();
-							m_lImageType = c_lImageTypeUnknown;
-						}
-
-						DeleteMetaFile( hWmf );
-						DeleteEnhMetaFile( hEmf );
-						delete[] pBuffer;
-						delete pMetaFile;
-					}
-				}
-				else
-				{
-					DeleteEnhMetaFile( hEmf );
-					delete pMetaFile;
-				}
-				if (TRUE)
-				{
-					Gdiplus::Bitmap* pBitmap = new Gdiplus::Bitmap(bsFilePath.c_str());
-
-					Aggplus::CImage* pImage = NULL;
-					BOOL bIsSuccess = NSGdiMeta::GdiPlusBitmapToMediaData(pBitmap, &pImage, FALSE);
-					RELEASEOBJECT(pBitmap);
-
-					if (bIsSuccess)
-					{
-						m_lImageType = c_lImageTypeBitmap;
-						m_pMediaData = pImage;
-						return;
-					}
-					RELEASEOBJECT(pImage);
-					return;
-				}
-			}
-		}
-#else
-
-#endif
-		//todo
 		{
 			m_pMediaData = new Aggplus::CImage(bsFilePath);
             if(Aggplus::Ok == m_pMediaData->GetLastStatus())
diff --git a/ASCHTMLRenderer/CMetafile.cpp b/ASCHTMLRenderer/CMetafile.cpp
index cf1d10c573..02e60fa5ed 100644
--- a/ASCHTMLRenderer/CMetafile.cpp
+++ b/ASCHTMLRenderer/CMetafile.cpp
@@ -176,70 +176,5 @@ namespace NSHtmlRenderer
 			// �� ������ ������ ��������� path
 			pRenderer->PathCommandEnd();
 		}
-		//else if (2 == lFileType)
-		//{		
-		//	if (bIsGraphics)
-		//	{
-		//		pRenderer->DrawImageFromFile(strFile, dX, dY, dW, dH);
-		//		return;
-		//	}
-
-		//	NSDocumentViewer::CDIB oSection;
-
-		//	double dDpiX = 0;
-		//	double dDpiY = 0;
-		//	pRenderer->get_DpiX(&dDpiX);
-		//	pRenderer->get_DpiY(&dDpiY);
-
-		//	LONG lPixW = (LONG)dW * dDpiX / NSDocumentViewer::c_dInch_to_MM;
-		//	LONG lPixH = (LONG)dH * dDpiX / NSDocumentViewer::c_dInch_to_MM;
-
-		//	oSection.Create(lPixW, lPixH, dDpiX, dDpiY);
-
-		//	LONG lCount = lPixW * lPixH;
-		//	memset(oSection.m_pBits, 0xFF, 4 * lCount);
-
-		//	HDC hDC = GetDC(NULL);
-
-		//	HDC memDC = CreateCompatibleDC(hDC);
-		//	ReleaseDC(0, hDC);
-
-		//	HBITMAP hOldBitmap = (HBITMAP)SelectObject(memDC, oSection.m_hBitmap);
-
-		//	RECT oRectPlay;
-		//	oRectPlay.left		= 0;
-		//	oRectPlay.top		= 0;
-		//	oRectPlay.right		= lPixW;
-		//	oRectPlay.bottom	= lPixH;
-
-		//	HENHMETAFILE hMeta = GetEnhMetaFile(strFile);
-
-		//	PlayEnhMetaFile(memDC, hMeta, &oRectPlay);
-		//	DeleteEnhMetaFile(hMeta);
-
-		//	MediaCore::IAVSUncompressedVideoFrame* pMediaData = NULL;
-		//	CoCreateInstance(MediaCore::CLSID_CAVSUncompressedVideoFrame, NULL, CLSCTX_INPROC, MediaCore::IID_IAVSUncompressedVideoFrame, (void**)&pMediaData);
-
-		//	pMediaData->put_ColorSpace(CSP_VFLIP | CSP_BGRA);
-		//	pMediaData->put_Width(lPixW);
-		//	pMediaData->put_Height(lPixH);
-		//	pMediaData->SetDefaultStrides();
-		//	pMediaData->AllocateBuffer(-1);
-
-		//	BYTE* pPixels = NULL;
-		//	pMediaData->get_Buffer(&pPixels);
-		//	memcpy(pPixels, oSection.m_pBits, 4 * lPixW * lPixH);
-
-		//	DeleteObject(hOldBitmap);
-		//	DeleteDC(memDC);
-
-		//	IUnknown* punkImage = NULL;
-		//	pMediaData->QueryInterface(IID_IUnknown, (void**)&punkImage);
-
-		//	RELEASEINTERFACE(pMediaData);
-
-		//	pRenderer->DrawImage(punkImage, dX, dY, dW, dH);
-		//	RELEASEINTERFACE(punkImage);
-		//}
 	}
 }
diff --git a/ASCOfficeDocxFile2/ASCOfficeDocxFile2.sln b/ASCOfficeDocxFile2/ASCOfficeDocxFile2.sln
index 709bdd9a34..60b187df8d 100644
--- a/ASCOfficeDocxFile2/ASCOfficeDocxFile2.sln
+++ b/ASCOfficeDocxFile2/ASCOfficeDocxFile2.sln
@@ -3,9 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficeDocxFile2", "ASCOfficeDocxFile2.vcproj", "{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}"
 	ProjectSection(ProjectDependencies) = postProject
-		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
+		{DC24710E-8DF2-4A7A-B7C3-2313E294143C} = {DC24710E-8DF2-4A7A-B7C3-2313E294143C}
+		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
+		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
+		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
+		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6} = {3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\Common\DocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
@@ -24,20 +28,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "font_engine", "..\DesktopEd
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCHTMLRenderer", "..\ASCHTMLRenderer\ASCHTMLRendererLib.vcproj", "{DC24710E-8DF2-4A7A-B7C3-2313E294143C}"
 	ProjectSection(ProjectDependencies) = postProject
-		{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
-		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
-		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
-		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
-		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
+		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
+		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
+		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
+		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
+		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
+		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
+		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
+		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
+		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
+		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
+		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
+		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
+		{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
@@ -77,10 +81,6 @@ Global
 		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
-		ReleaseOpenSource|Win32 = ReleaseOpenSource|Win32
-		ReleaseOpenSource|x64 = ReleaseOpenSource|x64
-		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
-		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Debug|Win32.ActiveCfg = Debug|Win32
@@ -91,12 +91,6 @@ Global
 		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|Win32.Build.0 = Release|Win32
 		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|x64.ActiveCfg = Release|x64
 		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.Release|x64.Build.0 = Release|x64
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.ReleaseOpenSource|Win32.ActiveCfg = ReleaseOpenSource|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.ReleaseOpenSource|Win32.Build.0 = ReleaseOpenSource|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.ReleaseOpenSource|x64.ActiveCfg = ReleaseOpenSource|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseOpenSource|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseOpenSource|Win32
-		{D02A88E6-5B2B-4A15-A4F6-C057F698FC53}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseOpenSource|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.Build.0 = Debug|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.ActiveCfg = Debug|x64
@@ -105,12 +99,6 @@ Global
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|Win32.Build.0 = Release|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.ActiveCfg = Release|x64
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Release|x64.Build.0 = Release|x64
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|Win32.ActiveCfg = ReleaseOpenSource|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|Win32.Build.0 = ReleaseOpenSource|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseOpenSource|x64.ActiveCfg = ReleaseOpenSource|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseOpenSource|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseOpenSource|Win32
-		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseOpenSource|Win32
 		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.ActiveCfg = Debug|Win32
 		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.Build.0 = Debug|Win32
 		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|x64.ActiveCfg = Debug|x64
@@ -119,12 +107,6 @@ Global
 		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.Build.0 = Release|Win32
 		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.ActiveCfg = Release|x64
 		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|x64.Build.0 = Release|x64
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
@@ -133,12 +115,6 @@ Global
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
 		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|Win32.ActiveCfg = Release Singlethreaded|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|Win32.Build.0 = Release Singlethreaded|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|x64.ActiveCfg = Release Singlethreaded|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release Singlethreaded|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseWithoutAsm|Win32.Build.0 = Release Singlethreaded|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseWithoutAsm|x64.ActiveCfg = Release Singlethreaded|Win32
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|Win32.Build.0 = Debug|Win32
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|x64.ActiveCfg = Debug|x64
@@ -147,12 +123,6 @@ Global
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|Win32.Build.0 = Release|Win32
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|x64.ActiveCfg = Release|x64
 		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|x64.Build.0 = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|Win32.Build.0 = Debug|Win32
 		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Debug|x64.ActiveCfg = Debug|x64
@@ -161,12 +131,6 @@ Global
 		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|Win32.Build.0 = Release|Win32
 		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|x64.ActiveCfg = Release|x64
 		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.Release|x64.Build.0 = Release|x64
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{DC24710E-8DF2-4A7A-B7C3-2313E294143C}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.Build.0 = Debug|Win32
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.ActiveCfg = Debug|x64
@@ -175,12 +139,6 @@ Global
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.Build.0 = Release|Win32
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.ActiveCfg = Release|x64
 		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.Build.0 = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|Win32.Build.0 = Debug|Win32
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|x64.ActiveCfg = Debug|x64
@@ -189,12 +147,6 @@ Global
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|Win32.Build.0 = Release|Win32
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|x64.ActiveCfg = Release|x64
 		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|x64.Build.0 = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|Win32.ActiveCfg = Debug|Win32
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|Win32.Build.0 = Debug|Win32
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|x64.ActiveCfg = Debug|x64
@@ -203,12 +155,6 @@ Global
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|Win32.Build.0 = Release|Win32
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|x64.ActiveCfg = Release|x64
 		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|x64.Build.0 = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|Win32.ActiveCfg = Debug|Win32
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|Win32.Build.0 = Debug|Win32
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|x64.ActiveCfg = Debug|x64
@@ -217,12 +163,6 @@ Global
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|Win32.Build.0 = Release|Win32
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|x64.ActiveCfg = Release|x64
 		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|x64.Build.0 = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|Win32.Build.0 = Debug|Win32
 		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|x64.ActiveCfg = Debug|x64
@@ -231,12 +171,6 @@ Global
 		{40A69F40-063E-43FD-8543-455495D8733E}.Release|Win32.Build.0 = Release|Win32
 		{40A69F40-063E-43FD-8543-455495D8733E}.Release|x64.ActiveCfg = Release|x64
 		{40A69F40-063E-43FD-8543-455495D8733E}.Release|x64.Build.0 = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|Win32.Build.0 = Debug|Win32
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|x64.ActiveCfg = Debug|x64
@@ -245,12 +179,6 @@ Global
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|Win32.Build.0 = Release|Win32
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|x64.ActiveCfg = Release|x64
 		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|x64.Build.0 = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|Win32.Build.0 = Debug|Win32
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|x64.ActiveCfg = Debug|x64
@@ -259,12 +187,6 @@ Global
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|Win32.Build.0 = Release|Win32
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|x64.ActiveCfg = Release|x64
 		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|x64.Build.0 = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|Win32.ActiveCfg = Debug|Win32
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|Win32.Build.0 = Debug|Win32
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|x64.ActiveCfg = Debug|x64
@@ -273,12 +195,6 @@ Global
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|Win32.Build.0 = Release|Win32
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|x64.ActiveCfg = Release|x64
 		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|x64.Build.0 = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|Win32.Build.0 = Debug|Win32
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|x64.ActiveCfg = Debug|x64
@@ -287,12 +203,6 @@ Global
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|Win32.Build.0 = Release|Win32
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|x64.ActiveCfg = Release|x64
 		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|x64.Build.0 = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|Win32.ActiveCfg = Debug|Win32
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|Win32.Build.0 = Debug|Win32
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|x64.ActiveCfg = Debug|x64
@@ -301,12 +211,6 @@ Global
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|Win32.Build.0 = Release|Win32
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|x64.ActiveCfg = Release|x64
 		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|x64.Build.0 = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|Win32.Build.0 = Debug|Win32
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|x64.ActiveCfg = Debug|x64
@@ -315,12 +219,6 @@ Global
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|Win32.Build.0 = Release|Win32
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|x64.ActiveCfg = Release|x64
 		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|x64.Build.0 = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.ActiveCfg = Debug|Win32
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.Build.0 = Debug|Win32
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.ActiveCfg = Debug|x64
@@ -329,12 +227,6 @@ Global
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.Build.0 = Release|Win32
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.ActiveCfg = Release|x64
 		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.Build.0 = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.ActiveCfg = Debug|x64
@@ -343,12 +235,6 @@ Global
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.Build.0 = Release|Win32
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.ActiveCfg = Release|x64
 		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.Build.0 = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|Win32.Build.0 = Debug|Win32
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Debug|x64.ActiveCfg = Debug|x64
@@ -357,12 +243,6 @@ Global
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|Win32.Build.0 = Release|Win32
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.ActiveCfg = Release|x64
 		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.Release|x64.Build.0 = Release|x64
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseOpenSource|x64.ActiveCfg = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseWithoutAsm|Win32.Build.0 = Release|Win32
-		{3F3CB5A1-BB01-49C1-9342-4A69E30F9EF6}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcproj b/ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcproj
index 44a7be256d..e5c3465162 100644
--- a/ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcproj
+++ b/ASCOfficeDocxFile2/ASCOfficeDocxFile2.vcproj
@@ -20,7 +20,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
@@ -56,7 +56,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/XML/include&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType&quot;;&quot;$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat&quot;;&quot;../DesktopEditor/freetype-2.5.2/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\Common\DocxFormat\Source\XML\libxml2\XML\include&quot;;&quot;$(SolutionDir)\..\DesktopEditor\freetype-2.5.2\include&quot;"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;USE_AVSOFFICESTUDIO_XMLUTILS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -120,7 +120,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
 			UseOfMFC="0"
@@ -156,7 +156,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/XML/include&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType&quot;;&quot;$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat&quot;;&quot;../DesktopEditor/freetype-2.5.2/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\Common\DocxFormat\Source\XML\libxml2\XML\include&quot;;&quot;$(SolutionDir)\..\DesktopEditor\freetype-2.5.2\include&quot;"
 				PreprocessorDefinitions="_DEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;USE_AVSOFFICESTUDIO_XMLUTILS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -220,10 +220,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="2"
-			UseOfATL="1"
+			UseOfATL="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
 			>
@@ -255,8 +255,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/XML/include&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType&quot;;&quot;$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat&quot;;&quot;../DesktopEditor/freetype-2.5.2/include&quot;"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;USE_AVSOFFICESTUDIO_XMLUTILS;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION;DONT_WRITE_EMBEDDED_FONTS"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\Common\DocxFormat\Source\XML\libxml2\XML\include&quot;;&quot;$(SolutionDir)\..\DesktopEditor\freetype-2.5.2\include&quot;"
+				PreprocessorDefinitions="NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION;DONT_WRITE_EMBEDDED_FONTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -321,10 +321,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="2"
-			UseOfATL="1"
+			UseOfATL="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
 			CharacterSet="1"
 			>
@@ -356,7 +356,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/Zm1000"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)/../Common/DocxFormat/Source/XML/libxml2/XML/include&quot;;&quot;$(SolutionDir)&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects&quot;;&quot;$(SolutionDir)/../../AVSImageStudio3/AVSGraphics/Objects/Font/FreeType&quot;;&quot;$(SolutionDir)/../Common/DocxFormat/Source/DocxFormat&quot;;&quot;../DesktopEditor/freetype-2.5.2/include&quot;"
+				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\Common\DocxFormat\Source\XML\libxml2\XML\include&quot;;&quot;$(SolutionDir)\..\DesktopEditor\freetype-2.5.2\include&quot;"
 				PreprocessorDefinitions="NDEBUG;_USRDLL;_ATL_ATTRIBUTES;_USE_XMLLITE_READER_;USE_LITE_READER;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;BUILD_CONFIG_FULL_VERSION;DONT_WRITE_EMBEDDED_FONTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
diff --git a/ASCOfficeDocxFile2/version.h b/ASCOfficeDocxFile2/version.h
index 00a489c6f7..a3e29cf2a7 100644
--- a/ASCOfficeDocxFile2/version.h
+++ b/ASCOfficeDocxFile2/version.h
@@ -2,6 +2,6 @@
 //2
 //0
 //1
-//314
-#define INTVER 2,0,1,314
-#define STRVER "2,0,1,314\0"
+//320
+#define INTVER 2,0,1,320
+#define STRVER "2,0,1,320\0"
diff --git a/ASCOfficePPTXFile/Editor/imagemanager.h b/ASCOfficePPTXFile/Editor/imagemanager.h
index 22de55adff..7209a32507 100644
--- a/ASCOfficePPTXFile/Editor/imagemanager.h
+++ b/ASCOfficePPTXFile/Editor/imagemanager.h
@@ -17,6 +17,7 @@ using namespace NSFontCutter;
 #include "WMFToImageConverter.h"
 #include "../../Common/MediaFormatDefine.h"
 #include "../../DesktopEditor/raster/ImageFileFormatChecker.h"
+#include "../../DesktopEditor/raster/Metafile/MetaFile.h"
 #include "../../DesktopEditor/raster/BgraFrame.h"
 #include "../../DesktopEditor/graphics/Image.h"
 
@@ -127,7 +128,7 @@ namespace NSShapeImageGen
 		LONG							m_lDstFormat;
 
 #ifdef BUILD_CONFIG_FULL_VERSION
-		NSWMFToImageConverter::CImageExt	m_oExt;
+		NSWMFToImageConverter::CImageExt	m_oImageExt;
 #endif
 
 		CFontManager* m_pFontManager;
@@ -303,7 +304,7 @@ namespace NSShapeImageGen
 			m_pFontManager = pFontManager;
 
 #ifdef BUILD_CONFIG_FULL_VERSION
-			m_oExt.SetFontManager(pFontManager);
+			m_oImageExt.SetFontManager(pFontManager);
 #endif
 		}
 	protected:
@@ -477,7 +478,7 @@ namespace NSShapeImageGen
 			if (m_mapImagesFile.end() == pPair)
 			{
 #ifdef BUILD_CONFIG_FULL_VERSION
-				LONG lImageType = m_oExt.GetImageType(strFileName);
+				LONG lImageType = m_oImageExt.GetImageType(strFileName);
 
 				if (1 == lImageType || 2 == lImageType)
 				{
@@ -490,14 +491,13 @@ namespace NSShapeImageGen
                     strSaveItem = m_strDstMedia + FILE_SEPARATOR_STR + strSaveItem;
 
                     double dKoef = 100 * 96 / 25.4;
-					bool bIsSuccess = m_oExt.Convert(strFileName, LONG(dWidth * dKoef), LONG(dHeight * dKoef), strSaveItem + _T("svg"));
+					bool bIsSuccess = m_oImageExt.Convert(strFileName, LONG(dWidth * dKoef), LONG(dHeight * dKoef), strSaveItem + _T("svg"));
 					if (bIsSuccess)
-					{
-                        if (itWMF == oInfo.m_eType) strSaveItem += _T("wmf");
-                        else                        strSaveItem += _T("emf");
+					{//svg
+							 if (itWMF == oInfo.m_eType)	strSaveItem += _T("wmf");
+                        else if (itEMF == oInfo.m_eType)	strSaveItem += _T("emf");
 
                         OOX::CPath pathSaveItem = strSaveItem;
-
                         CDirectory::CopyFile(strFileName, pathSaveItem.GetPath(), NULL, NULL);
 
 						m_mapImagesFile.insert(std::pair<CString,CImageInfo>(strFileName, oInfo));
@@ -506,10 +506,35 @@ namespace NSShapeImageGen
 					}
 					else
 					{
-						//������ wmf/emf ���������������� � Bitmap ��� ������
+						::MetaFile::CMetaFile metaFileRaster(m_pFontManager->m_pApplication);
+
+						if (metaFileRaster.LoadFromFile(strFileName))
+						{
+							//������ ���������� wmf/emf
+							strSaveItem.Format(_T("image%d.png"), oInfo.m_lID);
+							strSaveItem = m_strDstMedia + FILE_SEPARATOR_STR + strSaveItem;
+							
+							metaFileRaster.ConvertToRaster(strSaveItem, 4 /*CXIMAGE_FORMAT_PNG*/,  lWidth, lHeight);
+							
+							bIsSuccess = NSFile::CFileBinary::Exists(string2std_string(strSaveItem));
+
+							if (bIsSuccess)
+							{					
+								oInfo.m_eType = itPNG;
+
+								m_mapImagesFile.insert(std::pair<CString,CImageInfo>(strSaveItem, oInfo));
+								m_listImages.push_back(oInfo);
+								return oInfo;
+							}
+						}		
+					}
+					if (bIsSuccess == false)
+					{
 						NSHtmlRenderer::CASCImage oImage;
 						oImage.put_FontManager(m_pFontManager);
+
 						oImage.LoadFromFile(std::wstring(strFileName.GetString()));
+
 						Aggplus::CImage* pImage = oImage.get_BitmapImage();
 						if(NULL != pImage)
 						{
@@ -559,7 +584,7 @@ namespace NSShapeImageGen
 			LONG lHeight	= (LONG)(dHeight * 96 / 25.4);
 
 #ifdef BUILD_CONFIG_FULL_VERSION
-			LONG lImageType = m_oExt.GetImageType(strFileName);
+			LONG lImageType = m_oImageExt.GetImageType(strFileName);
 
 			if (1 == lImageType || 2 == lImageType)
 			{
@@ -573,9 +598,9 @@ namespace NSShapeImageGen
                strSaveItem = m_strDstMedia + FILE_SEPARATOR_STR + strSaveItem;
 
 				double dKoef = 100 * 96 / 25.4;
-				bool bIsSuccess = m_oExt.Convert(strFileName, LONG(dWidth * dKoef), LONG(dHeight * dKoef), strSaveItem + _T("svg"));
+				bool bIsSuccess = m_oImageExt.Convert(strFileName, LONG(dWidth * dKoef), LONG(dHeight * dKoef), strSaveItem + _T("svg"));
 				if (bIsSuccess)
-				{
+				{//svg
                     if (itWMF == oInfo.m_eType)	strSaveItem += _T("wmf");
                     else                        strSaveItem += _T("emf");
 
diff --git a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj
index 992a011c61..72e9fcb887 100644
--- a/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj
+++ b/ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj
@@ -20,7 +20,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfATL="0"
@@ -86,7 +86,7 @@
 		</Configuration>
 		<Configuration
 			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfMFC="0"
@@ -154,7 +154,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
@@ -177,11 +177,11 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories="..\..\Common\ASCDocxFormat\Source\Utility;..\..\Common\ASCDocxFormat\Source\XML;..\..\Common\ASCDocxFormat\Source;..\..\Common\DocxFormat\Source\XML\libxml2\XML\include;&quot;..\..\DesktopEditor\freetype-2.5.2\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;NODOCX;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;_AVS_PPT_SHAPE_INCLUDE_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;AVS_USE_CONVERT_PPTX_TOCUSTOM_VML;BUILD_CONFIG_FULL_VERSION;DONT_WRITE_EMBEDDED_FONTS"
+				PreprocessorDefinitions="NDEBUG;_LIB;_USE_MATH_DEFINES;NODOCX;PPTX_DEF;PPT_DEF;ENABLE_PPT_TO_PPTX_CONVERT;_AVS_PPT_SHAPE_INCLUDE_;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;BUILD_CONFIG_FULL_VERSION;DONT_WRITE_EMBEDDED_FONTS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -199,7 +199,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\Common\ASCDocxFormat\Lib\Release"
+				AdditionalLibraryDirectories=""
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -219,7 +219,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
@@ -265,7 +265,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories="..\..\Common\ASCDocxFormat\Lib\Release"
+				AdditionalLibraryDirectories=""
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -294,6 +294,14 @@
 			<File
 				RelativePath="..\ASCOfficeDrawingConverter.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -314,6 +322,14 @@
 						AdditionalOptions="/bigobj"
 					/>
 				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+					/>
+				</FileConfiguration>
 				<FileConfiguration
 					Name="Release|x64"
 					>
@@ -326,6 +342,14 @@
 			<File
 				RelativePath="..\..\Common\DocxFormat\Source\XML\libxml2\libxml2.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\Common\DocxFormat\Source\XML\stringcommon.cpp"
@@ -363,6 +387,14 @@
 			<File
 				RelativePath="..\Editor\FontPicker.cpp"
 				>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\..\ASCPresentationEditor\OfficeDrawing\Layout.cpp"
@@ -467,6 +499,7 @@
 						>
 						<Tool
 							Name="VCCLCompilerTool"
+							Optimization="0"
 							PrecompiledHeaderThrough="./StdAfx.h"
 						/>
 					</FileConfiguration>
@@ -1293,6 +1326,14 @@
 					<File
 						RelativePath="..\.\PPTXFormat\Logic\SpTree.cpp"
 						>
+						<FileConfiguration
+							Name="Release|Win32"
+							>
+							<Tool
+								Name="VCCLCompilerTool"
+								Optimization="0"
+							/>
+						</FileConfiguration>
 					</File>
 					<File
 						RelativePath="..\.\PPTXFormat\Logic\SpTree.h"
@@ -2314,6 +2355,7 @@
 								>
 								<Tool
 									Name="VCCLCompilerTool"
+									Optimization="0"
 									PrecompiledHeaderThrough="./StdAfx.h"
 								/>
 							</FileConfiguration>
@@ -2394,6 +2436,7 @@
 								>
 								<Tool
 									Name="VCCLCompilerTool"
+									Optimization="0"
 									PrecompiledHeaderThrough="./StdAfx.h"
 								/>
 							</FileConfiguration>
@@ -2466,6 +2509,7 @@
 								>
 								<Tool
 									Name="VCCLCompilerTool"
+									Optimization="0"
 									PrecompiledHeaderThrough="./StdAfx.h"
 								/>
 							</FileConfiguration>
@@ -2569,6 +2613,14 @@
 						<File
 							RelativePath="..\.\PPTXFormat\Logic\TxBody.cpp"
 							>
+							<FileConfiguration
+								Name="Release|Win32"
+								>
+								<Tool
+									Name="VCCLCompilerTool"
+									Optimization="0"
+								/>
+							</FileConfiguration>
 						</File>
 						<File
 							RelativePath="..\.\PPTXFormat\Logic\TxBody.h"
@@ -2646,6 +2698,7 @@
 								>
 								<Tool
 									Name="VCCLCompilerTool"
+									Optimization="0"
 									PrecompiledHeaderThrough="./StdAfx.h"
 								/>
 							</FileConfiguration>
@@ -2702,6 +2755,7 @@
 								>
 								<Tool
 									Name="VCCLCompilerTool"
+									Optimization="0"
 									PrecompiledHeaderThrough="./StdAfx.h"
 								/>
 							</FileConfiguration>
@@ -2762,6 +2816,7 @@
 								>
 								<Tool
 									Name="VCCLCompilerTool"
+									Optimization="0"
 									PrecompiledHeaderThrough="./StdAfx.h"
 								/>
 							</FileConfiguration>
@@ -2822,6 +2877,7 @@
 								>
 								<Tool
 									Name="VCCLCompilerTool"
+									Optimization="0"
 									PrecompiledHeaderThrough="./StdAfx.h"
 								/>
 							</FileConfiguration>
@@ -2902,6 +2958,7 @@
 								>
 								<Tool
 									Name="VCCLCompilerTool"
+									Optimization="0"
 									PrecompiledHeaderThrough="./StdAfx.h"
 								/>
 							</FileConfiguration>
diff --git a/Common/DocxFormat/Projects/DocxFormat2005.vcproj b/Common/DocxFormat/Projects/DocxFormat2005.vcproj
index 662740b964..9a48e6827a 100644
--- a/Common/DocxFormat/Projects/DocxFormat2005.vcproj
+++ b/Common/DocxFormat/Projects/DocxFormat2005.vcproj
@@ -19,7 +19,7 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="..\Lib\Debug"
+			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			UseOfATL="0"
@@ -65,7 +65,7 @@
 				Name="VCLibrarianTool"
 				AdditionalDependencies="urlmon.lib"
 				AdditionalLibraryDirectories=""
-				IgnoreAllDefaultLibraries="true"
+				IgnoreAllDefaultLibraries="false"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -153,7 +153,7 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="..\Lib\Release"
+			OutputDirectory="$(ConfigurationName)"
 			IntermediateDirectory="$(ConfigurationName)"
 			ConfigurationType="4"
 			CharacterSet="1"
@@ -197,7 +197,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories=".\..\Source\XML\libxml2\win_build\Release"
+				AdditionalLibraryDirectories=""
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -262,7 +262,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				AdditionalLibraryDirectories=".\..\Source\XML\libxml2\win_build\Release"
+				AdditionalLibraryDirectories=""
 			/>
 			<Tool
 				Name="VCALinkTool"
diff --git a/DesktopEditor/raster/Metafile/Emf/EmfFile.h b/DesktopEditor/raster/Metafile/Emf/EmfFile.h
index 3cfe0f3cea..94c37787cd 100644
--- a/DesktopEditor/raster/Metafile/Emf/EmfFile.h
+++ b/DesktopEditor/raster/Metafile/Emf/EmfFile.h
@@ -466,10 +466,10 @@ namespace MetaFile
 			double dW = dR - dL;
 			double dH = dB - dT;
 
-			int lL = (int)std::floor(dL + 0.5);
-			int lT = (int)std::floor(dT + 0.5);
-			int lR = (int)std::floor(dW + 0.5) + lL;
-			int lB = (int)std::floor(dH + 0.5) + lT;
+			int lL = (int)floor(dL + 0.5);
+			int lT = (int)floor(dT + 0.5);
+			int lR = (int)floor(dW + 0.5) + lL;
+			int lB = (int)floor(dH + 0.5) + lT;
 
 			// �� ������ �� ������ �������� ����, ����� ����� �� ��� � oBounds, �� ���� �����, ��� ��� �� ���.
 			m_oHeader.oFrameToBounds.lLeft   = lL;
diff --git a/DesktopEditor/raster/Metafile/MetaFile.cpp b/DesktopEditor/raster/Metafile/MetaFile.cpp
index 8c6c0f4c52..75e4ff7438 100644
--- a/DesktopEditor/raster/Metafile/MetaFile.cpp
+++ b/DesktopEditor/raster/Metafile/MetaFile.cpp
@@ -174,12 +174,12 @@ namespace MetaFile
 			nHeight = (int)((double)nWidth * dH / dW);
 		}
 
-		double dDpiX, dDpiY;
-		oRenderer.get_DpiX(&dDpiX);
-		oRenderer.get_DpiX(&dDpiY);
+		//double dDpiX, dDpiY;
+		//oRenderer.get_DpiX(&dDpiX);
+		//oRenderer.get_DpiX(&dDpiY);
 
-		double dWidth  = nWidth * 72 / 25.4 / dDpiX;
-		double dHeight = nHeight * 72 / 25.4 / dDpiY;
+		double dWidth  = nWidth ;//* 72 / 25.4 / dDpiX;
+		double dHeight = nHeight ;//* 72 / 25.4 / dDpiY;
 
 		BYTE* pBgraData = new BYTE[nWidth * nHeight * 4];
 		CBgraFrame oFrame;
diff --git a/DesktopEditor/raster/Metafile/Wmf/WmfUtils.h b/DesktopEditor/raster/Metafile/Wmf/WmfUtils.h
index a7f0f47a52..b231bb418d 100644
--- a/DesktopEditor/raster/Metafile/Wmf/WmfUtils.h
+++ b/DesktopEditor/raster/Metafile/Wmf/WmfUtils.h
@@ -183,8 +183,13 @@ static bool WmfOpenTempFile(std::wstring *pwsName, FILE **ppFile, wchar_t *wsMod
 	for (int nIndex = 0; nIndex < 1000; ++nIndex)
 	{
 		wsFileName = wsTemp;
-        wsFileName.append(std::to_wstring(nTime + nIndex));
-
+#if defined(_WIN32) || defined (_WIN64)
+		wchar_t buff[32] ={};
+		_itow(nTime + nIndex, buff, 10);
+		wsFileName.append(buff, wcslen(buff));
+#else
+		wsFileName.append(std::to_wstring(nTime + nIndex));
+#endif
 		if (wsExt)
 		{
 			wsFileName.append(wsExt);
diff --git a/DesktopEditor/raster/raster_vs2005.vcproj b/DesktopEditor/raster/raster_vs2005.vcproj
index b6f4af449e..e622063955 100644
--- a/DesktopEditor/raster/raster_vs2005.vcproj
+++ b/DesktopEditor/raster/raster_vs2005.vcproj
@@ -50,7 +50,7 @@
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile=".\Release/raster.pch"
+				PrecompiledHeaderFile=""
 				AssemblerListingLocation="$(ConfigurationName)\"
 				ObjectFile="$(ConfigurationName)\"
 				ProgramDataBaseFileName="$(ConfigurationName)\"