git-svn-id:...

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

ASCImageStudio3/ASCImagePaint3/AVSImagePaint3.cpp → ASCImageStudio3/ASCImagePaint3/ASCImagePaint3.cpp

-// AVSImagePaint3.cpp : Implementation of DLL Exports.
+// ASCImagePaint3.cpp : Implementation of DLL Exports.
 
 #include "stdafx.h"
 #include "resource.h"
@@ -6,9 +6,9 @@
 // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
 [module(dll, 
 		uuid = "{084DA982-7EA0-4af3-A44D-97259DFBEC6F}", 
-		name = "AVSImagePaint3", 
-		helpstring = "AVSImagePaint 3",
-		resource_name = "IDR_AVSIMAGEPAINT3")];
+		name = "ASCImagePaint3", 
+		helpstring = "ASCImagePaint 3",
+		resource_name = "IDR_ASCIMAGEPAINT3")];
 
 #include "ImagePaint3.h"
 #include "ImageTextStatic3.h"

ASCImageStudio3/ASCImagePaint3/AVSImagePaint3.rc → ASCImageStudio3/ASCImagePaint3/ASCImagePaint3.rc

@@ -89,10 +89,10 @@ END
 
 STRINGTABLE  
 BEGIN
-	IDS_PROJNAME					"AVSImagePaint3"
+	IDS_PROJNAME					"ASCImagePaint3"
 END
 
-IDR_AVSIMAGEPAINT3 REGISTRY "AVSImagePaint3.rgs"
+IDR_ASCIMAGEPAINT3 REGISTRY "ASCImagePaint3.rgs"
 ////////////////////////////////////////////////////////////////////////////
 
 

ASCImageStudio3/ASCImagePaint3/AVSImagePaint3.rgs → ASCImageStudio3/ASCImagePaint3/ASCImagePaint3.rgs

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

ASCImageStudio3/ASCImagePaint3/AVSImagePaint3.sln → ASCImageStudio3/ASCImagePaint3/ASCImagePaint3.sln

 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSImagePaint3", "AVSImagePaint3.vcproj", "{26D5CD98-3577-4A31-8766-97293230E43E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCImagePaint3", "ASCImagePaint3.vcproj", "{26D5CD98-3577-4A31-8766-97293230E43E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

ASCImageStudio3/ASCImagePaint3/AVSImagePaint3.vcproj → ASCImageStudio3/ASCImagePaint3/ASCImagePaint3.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSImagePaint3"
+	Name="ASCImagePaint3"
 	ProjectGUID="{26D5CD98-3577-4A31-8766-97293230E43E}"
-	RootNamespace="AVSImagePaint3"
+	RootNamespace="ASCImagePaint3"
 	Keyword="AtlProj"
 	>
 	<Platforms>
@@ -44,16 +44,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSImagePaint3.tlb"
-				HeaderFileName="AVSImagePaint3.h"
+				TypeLibraryName="$(IntDir)/ASCImagePaint3.tlb"
+				HeaderFileName="ASCImagePaint3.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSImagePaint3_i.c"
-				ProxyFileName="AVSImagePaint3_p.c"
+				InterfaceIdentifierFileName="ASCImagePaint3_i.c"
+				ProxyFileName="ASCImagePaint3_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../Common;../../../../Common;../../AVSVideoStudio3/Common"
+				AdditionalIncludeDirectories="../Common;../../Common"
 				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -78,12 +78,12 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/AVSImagePaint3.dll"
+				OutputFile="$(OutDir)/ASCImagePaint3.dll"
 				LinkIncremental="2"
-				MergedIDLBaseFileName="_AVSImagePaint3.idl"
+				MergedIDLBaseFileName="_ASCImagePaint3.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSImagePaint3.lib"
+				ImportLibrary="$(OutDir)/ASCImagePaint3.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -125,7 +125,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"
@@ -142,16 +142,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSImagePaint3.tlb"
-				HeaderFileName="AVSImagePaint3.h"
+				TypeLibraryName="$(IntDir)/ASCImagePaint3.tlb"
+				HeaderFileName="ASCImagePaint3.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSImagePaint3_i.c"
-				ProxyFileName="AVSImagePaint3_p.c"
+				InterfaceIdentifierFileName="ASCImagePaint3_i.c"
+				ProxyFileName="ASCImagePaint3_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../Common;../../../../Common;../../AVSVideoStudio3/Common"
+				AdditionalIncludeDirectories="../Common;../../Common"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -176,14 +176,14 @@
 			<Tool
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
-				OutputFile="$(OutDir)/AVSImagePaint3.dll"
+				OutputFile="$(OutDir)/ASCImagePaint3.dll"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSImagePaint3.idl"
+				MergedIDLBaseFileName="_ASCImagePaint3.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSImagePaint3.lib"
+				ImportLibrary="$(OutDir)/ASCImagePaint3.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -210,7 +210,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Copy to redist"
-				CommandLine="copy $(TargetPath) ..\..\..\..\AVS\Redist\AVSImagePaint3.dll"
+				CommandLine="copy $(TargetPath) ..\..\Redist\ASCImagePaint3.dll"
 			/>
 		</Configuration>
 		<Configuration
@@ -225,7 +225,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
@@ -243,16 +243,16 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSImagePaint3.tlb"
-				HeaderFileName="AVSImagePaint3.h"
+				TypeLibraryName="$(IntDir)/ASCImagePaint3.tlb"
+				HeaderFileName="ASCImagePaint3.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSImagePaint3_i.c"
-				ProxyFileName="AVSImagePaint3_p.c"
+				InterfaceIdentifierFileName="ASCImagePaint3_i.c"
+				ProxyFileName="ASCImagePaint3_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../Common;../../../../Common;../../AVSVideoStudio3/Common"
+				AdditionalIncludeDirectories="../Common;../../Common"
 				PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_USRDLL;_ATL_ATTRIBUTES"
 				StringPooling="true"
 				RuntimeLibrary="2"
@@ -279,12 +279,12 @@
 				IgnoreImportLibrary="true"
 				OutputFile="$(OutDir)/ASCImagePaint3.dll"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSImagePaint3.idl"
+				MergedIDLBaseFileName="_ASCImagePaint3.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSImagePaint3.lib"
+				ImportLibrary="$(OutDir)/ASCImagePaint3.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -323,7 +323,7 @@
 			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
 			>
 			<File
-				RelativePath="AVSImagePaint3.cpp"
+				RelativePath="ASCImagePaint3.cpp"
 				>
 			</File>
 			<File
@@ -417,11 +417,11 @@
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
 			<File
-				RelativePath="AVSImagePaint3.rc"
+				RelativePath="ASCImagePaint3.rc"
 				>
 			</File>
 			<File
-				RelativePath="AVSImagePaint3.rgs"
+				RelativePath="ASCImagePaint3.rgs"
 				>
 			</File>
 		</Filter>
@@ -433,7 +433,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\AVSVideoStudio3\Common\ImageStudioUtils.h"
+				RelativePath="..\..\Common\ImageStudioUtils.h"
 				>
 			</File>
 			<File
@@ -441,7 +441,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\AVSVideoStudio3\Common\MediaFormatDefine.h"
+				RelativePath="..\..\Common\MediaFormatDefine.h"
 				>
 			</File>
 			<File

ASCImageStudio3/ASCImagePaint3/Resource.h

 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by AVSImagePaint3.rc
+// Used by ASCImagePaint3.rc
 //
 
 #define IDS_PROJNAME                    100
-#define IDR_AVSIMAGEPAINT3				101
+#define IDR_ASCIMAGEPAINT3				101
 
 // Next default values for new objects
 //