git-svn-id:...

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

ASCImageStudio3/ASCImageFile3/AVSImageFile3.cpp → ASCImageStudio3/ASCImageFile3/ASCImageFile3.cpp

-// AVSImageFile3.cpp : Implementation of DLL Exports.
+// ASCImageFile3.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 = "{E3305D24-A207-4431-BC43-2C09A53CB9B6}", 
-		 name = "AVSImageFile3", 
-		 helpstring = "AVSImageFile 3",
-		 resource_name = "IDR_AVSIMAGEFILE3") ];
+		 name = "ASCImageFile3", 
+		 helpstring = "ASCImageFile 3",
+		 resource_name = "IDR_ASCIMAGEFILE3") ];
 
 #include "ImageFile3.h"
\ No newline at end of file

ASCImageStudio3/ASCImageFile3/AVSImageFile3.rc → ASCImageStudio3/ASCImageFile3/ASCImageFile3.rc

@@ -117,7 +117,7 @@ END
 // REGISTRY
 //
 
-IDR_AVSIMAGEFILE3        REGISTRY                "AVSImageFile3.rgs"
+IDR_ASCIMAGEFILE3        REGISTRY                "ASCImageFile3.rgs"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -126,7 +126,7 @@ IDR_AVSIMAGEFILE3        REGISTRY                "AVSImageFile3.rgs"
 
 STRINGTABLE 
 BEGIN
-    IDS_PROJNAME            "AVSImageFile"
+    IDS_PROJNAME            "ASCImageFile"
 END
 
 #endif    // English (U.S.) resources

ASCImageStudio3/ASCImageFile3/AVSImageFile3.rgs → ASCImageStudio3/ASCImageFile3/ASCImageFile3.rgs

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

ASCImageStudio3/ASCImageFile3/AVSImageFile3.sln → ASCImageStudio3/ASCImageFile3/ASCImageFile3.sln

 
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSImageFile3", "AVSImageFile3.vcproj", "{17DC3001-566F-4B60-BF77-37BF94162C5D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCImageFile3", "ASCImageFile3.vcproj", "{17DC3001-566F-4B60-BF77-37BF94162C5D}"
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"

ASCImageStudio3/ASCImageFile3/AVSImageFile3.vcproj → ASCImageStudio3/ASCImageFile3/ASCImageFile3.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSImageFile3"
+	Name="ASCImageFile3"
 	ProjectGUID="{17DC3001-566F-4B60-BF77-37BF94162C5D}"
-	RootNamespace="AVSImageFile3"
+	RootNamespace="ASCImageFile3"
 	Keyword="AtlProj"
 	>
 	<Platforms>
@@ -44,16 +44,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSImageFile3.tlb"
-				HeaderFileName="AVSImageFile3.h"
+				TypeLibraryName="$(IntDir)/ASCImageFile3.tlb"
+				HeaderFileName="ASCImageFile3.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSImageFile3_i.c"
-				ProxyFileName="AVSImageFile3_p.c"
+				InterfaceIdentifierFileName="ASCImageFile3_i.c"
+				ProxyFileName="ASCImageFile3_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../Common;../../../../Common;../../AVSVideoStudio3/Common;Libs"
+				AdditionalIncludeDirectories="../Common;../../Common;Libs"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -79,13 +79,13 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="false"
 				AdditionalDependencies="graydither.lib Msimg32.lib"
-				OutputFile="$(OutDir)/AVSImageFile3.dll"
+				OutputFile="$(OutDir)/ASCImageFile3.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="Libs"
-				MergedIDLBaseFileName="_AVSImageFile3.idl"
+				MergedIDLBaseFileName="_ASCImageFile3.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSImageFile3.lib"
+				ImportLibrary="$(OutDir)/ASCImageFile3.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -144,16 +144,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSImageFile3.tlb"
-				HeaderFileName="AVSImageFile3.h"
+				TypeLibraryName="$(IntDir)/ASCImageFile3.tlb"
+				HeaderFileName="ASCImageFile3.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSImageFile3_i.c"
-				ProxyFileName="AVSImageFile3_p.c"
+				InterfaceIdentifierFileName="ASCImageFile3_i.c"
+				ProxyFileName="ASCImageFile3_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../Common;../../../../Common;../../AVSVideoStudio3/Common;Libs"
+				AdditionalIncludeDirectories="../Common;../../Common;Libs"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -179,15 +179,15 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="false"
 				AdditionalDependencies="graydither.lib Msimg32.lib"
-				OutputFile="$(OutDir)/AVSImageFile3.dll"
+				OutputFile="$(OutDir)/ASCImageFile3.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="Libs"
-				MergedIDLBaseFileName="_AVSImageFile3.idl"
+				MergedIDLBaseFileName="_ASCImageFile3.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSImageFile3.lib"
+				ImportLibrary="$(OutDir)/ASCImageFile3.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -214,7 +214,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy to redist"
-				CommandLine="copy $(TargetPath) ..\..\..\..\AVS\Redist\AVSImageFile3.dll"
+				CommandLine="copy $(TargetPath) ..\..\Redist\ASCImageFile3.dll"
 			/>
 		</Configuration>
 		<Configuration
@@ -229,7 +229,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="X:\AVS\Redist\VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
+				CommandLine="../../Redist/VersionControl.exe &quot;$(SolutionDir)\version.h&quot;"
 				ExcludedFromBuild="true"
 			/>
 			<Tool
@@ -247,16 +247,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSImageFile3.tlb"
-				HeaderFileName="AVSImageFile3.h"
+				TypeLibraryName="$(IntDir)/ASCImageFile3.tlb"
+				HeaderFileName="ASCImageFile3.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSImageFile3_i.c"
-				ProxyFileName="AVSImageFile3_p.c"
+				InterfaceIdentifierFileName="ASCImageFile3_i.c"
+				ProxyFileName="ASCImageFile3_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../Common;../../../../Common;../../AVSVideoStudio3/Common;Libs"
+				AdditionalIncludeDirectories="../Common;../../Common;Libs"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -285,12 +285,12 @@
 				OutputFile="$(OutDir)/ASCImageFile3.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="Libs"
-				MergedIDLBaseFileName="_AVSImageFile3.idl"
+				MergedIDLBaseFileName="_ASCImageFile3.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSImageFile3.lib"
+				ImportLibrary="$(OutDir)/ASCImageFile3.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -329,7 +329,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath="AVSImageFile3.cpp"
+				RelativePath="ASCImageFile3.cpp"
 				>
 			</File>
 			<File
@@ -407,11 +407,11 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath="AVSImageFile3.rc"
+				RelativePath="ASCImageFile3.rc"
 				>
 			</File>
 			<File
-				RelativePath="AVSImageFile3.rgs"
+				RelativePath="ASCImageFile3.rgs"
 				>
 			</File>
 		</Filter>
@@ -419,7 +419,7 @@
 			Name="Common Files"
 			>
 			<File
-				RelativePath="..\..\..\..\Common\GdiPlusEx.h"
+				RelativePath="..\..\Common\GdiPlusEx.h"
 				>
 			</File>
 			<File
@@ -431,7 +431,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\AVSVideoStudio3\Common\ImageStudioUtils.h"
+				RelativePath="..\..\Common\ImageStudioUtils.h"
 				>
 			</File>
 			<File
@@ -439,11 +439,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\AVSVideoStudio3\Common\MediaFormatDefine.h"
+				RelativePath="..\..\Common\MediaFormatDefine.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\Common\MemoryUtils.h"
+				RelativePath="..\..\Common\MemoryUtils.h"
 				>
 			</File>
 			<File

ASCImageStudio3/ASCImageFile3/Resource.h

 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by AVSImageFile3.rc
+// Used by ASCImageFile3.rc
 //
 
 #define IDS_PROJNAME                    100
-#define IDR_AVSIMAGEFILE3	101
+#define IDR_ASCIMAGEFILE3	101
 
 // Next default values for new objects
 //