git-svn-id:...

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

ASCImageStudio3/AVSImageConverter/AVSImageConverter.cpp → ASCImageStudio3/ASCImageConverter/ASCImageConverter.cpp

-// AVSImageConverter.cpp : Implementation of DLL Exports.
+// ASCImageConverter.cpp : Implementation of DLL Exports.
 
 
 #include "stdafx.h"
@@ -6,9 +6,9 @@
 
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [ module(dll, uuid = "{730DDDB5-0109-49E1-BF73-2B62D9FF25CE}", 
-		 name = "AVSImageConverter", 
-		 helpstring = "AVSImageConverter 1.0 Type Library",
-		 resource_name = "IDR_AVSIMAGECONVERTER") ]
+		 name = "ASCImageConverter", 
+		 helpstring = "ASCImageConverter 1.0 Type Library",
+		 resource_name = "IDR_ASCIMAGECONVERTER") ]
 class CAVSImageConverterModule
 {
 public:

ASCImageStudio3/AVSImageConverter/AVSImageConverter.rc → ASCImageStudio3/ASCImageConverter/ASCImageConverter.rc

@@ -99,7 +99,7 @@ END
 // REGISTRY
 //
 
-IDR_AVSIMAGECONVERTER   REGISTRY                "AVSImageConverter.rgs"
+IDR_ASCIMAGECONVERTER   REGISTRY                "ASCImageConverter.rgs"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -108,7 +108,7 @@ IDR_AVSIMAGECONVERTER   REGISTRY                "AVSImageConverter.rgs"
 
 STRINGTABLE 
 BEGIN
-    IDS_PROJNAME            "AVSImageConverter"
+    IDS_PROJNAME            "ASCImageConverter"
 END
 
 #endif    // Russian resources

ASCImageStudio3/AVSImageConverter/AVSImageConverter.rgs → ASCImageStudio3/ASCImageConverter/ASCImageConverter.rgs

@@ -2,8 +2,8 @@ HKCR
 {
 	NoRemove AppID
 	{
-		'%APPID%' = s 'AVSImageConverter'
-		'AVSImageConverter.DLL'
+		'%APPID%' = s 'ASCImageConverter'
+		'ASCImageConverter.DLL'
 		{
 			val AppID = s '%APPID%'
 		}

ASCImageStudio3/AVSImageConverter/AVSImageConverter.sln → ASCImageStudio3/ASCImageConverter/ASCImageConverter.sln

 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSImageConverter", "AVSImageConverter.vcproj", "{CFE8498F-9D55-464B-962C-44EC2CA53D40}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCImageConverter", "ASCImageConverter.vcproj", "{CFE8498F-9D55-464B-962C-44EC2CA53D40}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

ASCImageStudio3/AVSImageConverter/AVSImageConverter.vcproj → ASCImageStudio3/ASCImageConverter/ASCImageConverter.vcproj

@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSImageConverter"
+	Name="ASCImageConverter"
 	ProjectGUID="{CFE8498F-9D55-464B-962C-44EC2CA53D40}"
 	Keyword="AtlProj"
 	>
@@ -41,11 +41,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSImageConverter.tlb"
-				HeaderFileName="AVSImageConverter.h"
+				TypeLibraryName="$(IntDir)/ASCImageConverter.tlb"
+				HeaderFileName="ASCImageConverter.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSImageConverter_i.c"
-				ProxyFileName="AVSImageConverter_p.c"
+				InterfaceIdentifierFileName="ASCImageConverter_i.c"
+				ProxyFileName="ASCImageConverter_p.c"
 				ValidateParameters="false"
 			/>
 			<Tool
@@ -79,7 +79,7 @@
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="wbemuuid.lib wmiutils.lib gdiplus.lib"
 				LinkIncremental="2"
-				MergedIDLBaseFileName="_AVSImageConverter.idl"
+				MergedIDLBaseFileName="_ASCImageConverter.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				TargetMachine="1"
@@ -120,7 +120,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\..\AVS\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
+				CommandLine="..\..\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -137,11 +137,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSImageConverter.tlb"
-				HeaderFileName="AVSImageConverter.h"
+				TypeLibraryName="$(IntDir)/ASCImageConverter.tlb"
+				HeaderFileName="ASCImageConverter.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSImageConverter_i.c"
-				ProxyFileName="AVSImageConverter_p.c"
+				InterfaceIdentifierFileName="ASCImageConverter_i.c"
+				ProxyFileName="ASCImageConverter_p.c"
 				ValidateParameters="false"
 			/>
 			<Tool
@@ -173,7 +173,7 @@
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="wbemuuid.lib wmiutils.lib gdiplus.lib"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSImageConverter.idl"
+				MergedIDLBaseFileName="_ASCImageConverter.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -204,7 +204,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy to redist"
-				CommandLine="copy $(TargetPath) ..\..\..\..\AVS\Redist\AVSImageConverter.dll"
+				CommandLine="copy $(TargetPath) ..\..\Redist\ASCImageConverter.dll"
 			/>
 		</Configuration>
 		<Configuration
@@ -218,7 +218,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="..\..\..\..\AVS\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
+				CommandLine="..\..\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
 				ExcludedFromBuild="true"
 			/>
 			<Tool
@@ -236,11 +236,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSImageConverter.tlb"
-				HeaderFileName="AVSImageConverter.h"
+				TypeLibraryName="$(IntDir)/ASCImageConverter.tlb"
+				HeaderFileName="ASCImageConverter.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSImageConverter_i.c"
-				ProxyFileName="AVSImageConverter_p.c"
+				InterfaceIdentifierFileName="ASCImageConverter_i.c"
+				ProxyFileName="ASCImageConverter_p.c"
 				ValidateParameters="false"
 			/>
 			<Tool
@@ -273,7 +273,7 @@
 				AdditionalDependencies="wbemuuid.lib wmiutils.lib gdiplus.lib"
 				OutputFile="$(OutDir)\ASCImageConverter.dll"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSImageConverter.idl"
+				MergedIDLBaseFileName="_ASCImageConverter.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
@@ -317,7 +317,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSImageConverter.cpp"
+				RelativePath=".\ASCImageConverter.cpp"
 				>
 			</File>
 			<File
@@ -389,11 +389,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSImageConverter.rc"
+				RelativePath=".\ASCImageConverter.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSImageConverter.rgs"
+				RelativePath=".\ASCImageConverter.rgs"
 				>
 			</File>
 			<File

ASCImageStudio3/AVSImageConverter/AVSXMLImageSource2.cpp → ASCImageStudio3/ASCImageConverter/ASCXMLImageSource2.cpp

-// AVSXMLImageSource2.cpp : Implementation of CAVSXMLImageSource2
+// ASCXMLImageSource2.cpp : Implementation of CASCXMLImageSource2
 
 #include "stdafx.h"
-#include "AVSXMLImageSource2.h"
+#include "ASCXMLImageSource2.h"
 
 
 // CAVSXMLImageSource2