(1.0.0.7) ASC version

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52372 954022d7-b5bf-4e40-9824-e11837661b57
2026-04-07 13:55:33 +08:00 · 2013-11-22 08:23:42 +00:00
parent 4ef3eb63b6
commit 471bad9d03
11 changed files with 78 additions and 539 deletions
--- a/ASCFontConverter/ASCFontConverter.cpp
+++ b/ASCFontConverter/ASCFontConverter.cpp
@ -1,16 +1,14 @@
-// AVSFontConverter.cpp : Implementation of DLL Exports.
-
-
+// ASCFontConverter.cpp : Implementation of DLL Exports.
 #include "stdafx.h"
 #include "resource.h"


 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{0F344B85-C7D3-483A-BA29-3ABFD701ADD0}", 
-		 name = "AVSFontConverter", 
-		 helpstring = "AVSFontConverter 1.0 Type Library",
-		 resource_name = "IDR_AVSFONTCONVERTER") ]
-class CAVSFontConverterModule
+		 name = "ASCFontConverter", 
+		 helpstring = "ASCFontConverter 1.0 Type Library",
+		 resource_name = "IDR_ASCFONTCONVERTER") ]
+class CASCFontConverterModule
 {
 public:
 // Override CAtlDllModuleT members
--- a/ASCFontConverter/ASCFontConverter.rc
+++ b/ASCFontConverter/ASCFontConverter.rc
@ -2,7 +2,7 @@
 //
 #include "resource.h"
 #define COMPONENT_NAME "FontConverter"
-#include "../../../../Common/FileInfo.h"
+#include "../Common/FileInfo.h"
 #include "version.h"

 #define APSTUDIO_READONLY_SYMBOLS
@ -86,10 +86,10 @@ END

 STRINGTABLE  
 BEGIN
-	IDS_PROJNAME					"AVSFontConverter"
+	IDS_PROJNAME					"ASCFontConverter"
 END

-IDR_AVSFONTCONVERTER REGISTRY "AVSFontConverter.rgs"
+IDR_ASCFONTCONVERTER REGISTRY "ASCFontConverter.rgs"
 ////////////////////////////////////////////////////////////////////////////


--- a/ASCFontConverter/ASCFontConverter.rgs
+++ b/ASCFontConverter/ASCFontConverter.rgs
@ -0,0 +1,11 @@
+HKCR
+{
+	NoRemove AppID
+	{
+		'%APPID%' = s 'ASCFontConverter'
+		'ASCFontConverter.DLL'
+		{
+			val AppID = s '%APPID%'
+		}
+	}
+}
--- a/ASCFontConverter/ASCFontConverter.sln
+++ b/ASCFontConverter/ASCFontConverter.sln
@ -1,7 +1,7 @@

-Microsoft Visual Studio Solution File, Format Version 10.00
+Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSFontConverter", "AVSFontConverter.vcproj", "{BC0A8A11-2017-473D-8AB1-86A55116A2F5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCFontConverter", "ASCFontConverter.vcproj", "{BC0A8A11-2017-473D-8AB1-86A55116A2F5}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
--- a/ASCFontConverter/ASCFontConverter.vcproj
+++ b/ASCFontConverter/ASCFontConverter.vcproj
@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9,00"
-	Name="AVSFontConverter"
+	Version="8,00"
+	Name="ASCFontConverter"
 	ProjectGUID="{BC0A8A11-2017-473D-8AB1-86A55116A2F5}"
 	Keyword="AtlProj"
-	TargetFrameworkVersion="196613"
 	>
 	<Platforms>
 		<Platform
@ -42,15 +41,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSFontConverter.tlb"
-				HeaderFileName="AVSFontConverter.h"
+				TypeLibraryName="$(IntDir)/ASCFontConverter.tlb"
+				HeaderFileName="ASCFontConverter.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSFontConverter_i.c"
-				ProxyFileName="AVSFontConverter_p.c"
+				InterfaceIdentifierFileName="ASCFontConverter_i.c"
+				ProxyFileName="ASCFontConverter_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
+				AdditionalIncludeDirectories="../OfficeCore/Fonts/FreeType"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@ -75,12 +75,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/AVSFontConverter.dll"
+				OutputFile="$(OutDir)/ASCFontConverter.dll"
 				LinkIncremental="2"
-				MergedIDLBaseFileName="_AVSFontConverter.idl"
+				MergedIDLBaseFileName="_ASCFontConverter.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSFontConverter.lib"
+				ImportLibrary="$(OutDir)/ASCFontConverter.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@ -101,6 +101,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
@ -118,7 +121,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="X:\AVS\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
+				CommandLine="..\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@ -135,14 +138,15 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSFontConverter.tlb"
-				HeaderFileName="AVSFontConverter.h"
+				TypeLibraryName="$(IntDir)/ASCFontConverter.tlb"
+				HeaderFileName="ASCFontConverter.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSFontConverter_i.c"
-				ProxyFileName="AVSFontConverter_p.c"
+				InterfaceIdentifierFileName="ASCSFontConverter_i.c"
+				ProxyFileName="ASCFontConverter_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../OfficeCore/Fonts/FreeType"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="2"
@ -165,15 +169,15 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				OutputFile="../../../Redist/AVSOfficeStudio/AVSFontConverter.dll"
+				OutputFile="../Redist/ASCFontConverter.dll"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSFontConverter.idl"
+				MergedIDLBaseFileName="_ASCFontConverter.idl"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSFontConverter.lib"
+				ImportLibrary="$(OutDir)/ASCFontConverter.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@ -194,6 +198,9 @@
 			<Tool
 				Name="VCAppVerifierTool"
 			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Performing registration"
@ -210,13 +217,33 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSFontConverter.cpp"
+				RelativePath=".\ASCFontConverter.cpp"
 				>
 			</File>
 			<File
 				RelativePath=".\FontConverter.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\FontFileEncodings.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\FontFileTrueType.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\FontFileType1.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\FontFileType1C.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Hash.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\stdafx.cpp"
 				>
@ -237,6 +264,10 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\StringExt.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@ -266,11 +297,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSFontConverter.rc"
+				RelativePath=".\ASCFontConverter.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSFontConverter.rgs"
+				RelativePath=".\ASCFontConverter.rgs"
 				>
 			</File>
 		</Filter>
--- a/ASCFontConverter/AVSFontConverter.rgs
+++ b/ASCFontConverter/AVSFontConverter.rgs
@ -1,11 +0,0 @@
-HKCR
-{
-	NoRemove AppID
-	{
-		'%APPID%' = s 'AVSFontConverter'
-		'AVSFontConverter.DLL'
-		{
-			val AppID = s '%APPID%'
-		}
-	}
-}
--- a/ASCFontConverter/AVSFontConverter_vs2005.sln
+++ b/ASCFontConverter/AVSFontConverter_vs2005.sln
@ -1,22 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSFontConverter", "AVSFontConverter_vs2005.vcproj", "{BC0A8A11-2017-473D-8AB1-86A55116A2F5}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-		ReleaseASC|Win32 = ReleaseASC|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.Debug|Win32.Build.0 = Debug|Win32
-		{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.Release|Win32.ActiveCfg = Release|Win32
-		{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.Release|Win32.Build.0 = Release|Win32
-		{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.ReleaseASC|Win32.ActiveCfg = ReleaseASC|Win32
-		{BC0A8A11-2017-473D-8AB1-86A55116A2F5}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/ASCFontConverter/AVSFontConverter_vs2005.vcproj
+++ b/ASCFontConverter/AVSFontConverter_vs2005.vcproj
@ -1,465 +0,0 @@
-<?xml version="1.0" encoding="windows-1251"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="AVSFontConverter"
-	ProjectGUID="{BC0A8A11-2017-473D-8AB1-86A55116A2F5}"
-	Keyword="AtlProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSFontConverter.tlb"
-				HeaderFileName="AVSFontConverter.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSFontConverter_i.c"
-				ProxyFileName="AVSFontConverter_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\..\AVSImageStudio3\AVSGraphics\Objects\Font\FreeType\"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/AVSFontConverter.dll"
-				LinkIncremental="2"
-				MergedIDLBaseFileName="_AVSFontConverter.idl"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSFontConverter.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSFontConverter.tlb"
-				HeaderFileName="AVSFontConverter.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSFontConverter_i.c"
-				ProxyFileName="AVSFontConverter_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\AVSImageStudio3\AVSGraphics\Objects\Font\FreeType\"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				OutputFile="../../../Redist/AVSOfficeStudio/AVSFontConverter.dll"
-				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSFontConverter.idl"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSFontConverter.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
-			/>
-		</Configuration>
-		<Configuration
-			Name="ReleaseASC|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="2"
-			UseOfATL="1"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
-				ExcludedFromBuild="true"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-				TargetEnvironment="1"
-				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSFontConverter.tlb"
-				HeaderFileName="AVSFontConverter.h"
-				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSFontConverter_i.c"
-				ProxyFileName="AVSFontConverter_p.c"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\..\AVSImageStudio3\AVSGraphics\Objects\Font\FreeType\"
-				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG;ASCBUILD"
-				Culture="1049"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="true"
-				OutputFile="../../../..\ASC\Redist/ASCOfficeStudio/ASCFontConverter.dll"
-				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSFontConverter.idl"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSFontConverter.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				Description="Performing registration"
-				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\AVSFontConverter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\FontConverter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\stdafx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="ReleaseASC|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\Consts.h"
-				>
-			</File>
-			<File
-				RelativePath=".\FontConverter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Hash.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Hash.h"
-				>
-			</File>
-			<File
-				RelativePath=".\MemoryUtils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stdafx.h"
-				>
-			</File>
-			<File
-				RelativePath=".\StringExt.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\StringExt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Utils.h"
-				>
-			</File>
-			<File
-				RelativePath=".\version.h"
-				>
-			</File>
-			<Filter
-				Name="FontFile"
-				>
-				<File
-					RelativePath=".\FontFileBase.h"
-					>
-				</File>
-				<File
-					RelativePath=".\FontFileEncodings.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\FontFileEncodings.h"
-					>
-				</File>
-				<File
-					RelativePath=".\FontFileTrueType.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\FontFileTrueType.h"
-					>
-				</File>
-				<File
-					RelativePath=".\FontFileType1.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\FontFileType1.h"
-					>
-				</File>
-				<File
-					RelativePath=".\FontFileType1C.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\FontFileType1C.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\AVSFontConverter.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\AVSFontConverter.rgs"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
--- a/ASCFontConverter/Resource.h
+++ b/ASCFontConverter/Resource.h
@ -4,7 +4,7 @@
 //

 #define IDS_PROJNAME                    100
-#define IDR_AVSFONTCONVERTER	101
+#define IDR_ASCFONTCONVERTER			101

 // Next default values for new objects
 // 
--- a/ASCFontConverter/stdafx.h
+++ b/ASCFontConverter/stdafx.h
@ -47,8 +47,5 @@
 #include <ft2build.h>
 #include FT_FREETYPE_H

-//#ifdef _VS_2005
-#pragma comment (lib, "..\\..\\AVSImageStudio3\\AVSGraphics\\Objects\\Font\\FreeType\\freetype242_vs2005.lib")
-
-
+#pragma comment (lib, "../OfficeCore/Fonts/FreeType/freetype242_vs2005.lib")
 using namespace ATL;
--- a/ASCFontConverter/version.h
+++ b/ASCFontConverter/version.h
@ -2,6 +2,6 @@
 //1
 //0
 //0
-//6
-#define INTVER 1,0,0,6
-#define STRVER "1,0,0,6\0"
+//7
+#define INTVER 1,0,0,7
+#define STRVER "1,0,0,7\0"