git-svn-id:...

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

ASCImageStudio3/ASCVectorImage/ASCVectorImage/AVSVectorImage.cpp → ASCImageStudio3/ASCVectorImage/ASCVectorImage/ASCVectorImage.cpp

-// AVSVectorImage.cpp : Implementation of DLL Exports.
+// ASCVectorImage.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 = "{7C2233E1-0296-4EFE-B6E5-0C82D47A3288}", 
-		 name = "AVSVectorImage", 
-		 helpstring = "AVSVectorImage 1.0 Type Library",
-		 resource_name = "IDR_AVSVECTORIMAGE") ]
+		 name = "ASCVectorImage", 
+		 helpstring = "ASCVectorImage 1.0 Type Library",
+		 resource_name = "IDR_ASCVECTORIMAGE") ]
 class CAVSVectorImageModule
 {
 public:

ASCImageStudio3/ASCVectorImage/ASCVectorImage/AVSVectorImage.rc → ASCImageStudio3/ASCVectorImage/ASCVectorImage/ASCVectorImage.rc

 // Microsoft Visual C++ generated resource script.
 //
 #include "resource.h"
+#define COMPONENT_NAME "VectorImage"
+#include "../../../Common/FileInfo.h"
+
+#include "version.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -52,8 +56,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,3
- PRODUCTVERSION 1,0,0,3
+ FILEVERSION INTVER
+ PRODUCTVERSION INTVER
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -66,32 +70,31 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "000904b0"
+        BLOCK "040904B0"
         BEGIN
-            VALUE "CompanyName", "Online Media Technologies Ltd."
-            VALUE "FileDescription", "AVSVectorImage ActiveX DLL"
-            VALUE "FileVersion", "1.0.0.3"
-            VALUE "InternalName", "AVSVectorImage ActiveX DLL"
-            VALUE "LegalCopyright", "Online Media Technologies Ltd. Copyright 2010"
-            VALUE "LegalTrademarks", "Online Media Technologies Ltd."
-            VALUE "OriginalFilename", "AVSVectorImage.dll"
-            VALUE "ProductName", "AVSVectorImage ActiveX DLL"
-            VALUE "ProductVersion", "1.0.0.3"
+            VALUE "CompanyName", COMPANY_NAME
+            VALUE "FileDescription", FILE_DESCRIPTION_ACTIVEX
+            VALUE "FileVersion", STRVER
+            VALUE "InternalName", COMPONENT_FILE_NAME_DLL
+            VALUE "LegalCopyright", LEGAL_COPYRIGHT
+            VALUE "LegalTrademarks", LEGAL_COPYRIGHT
+            VALUE "OriginalFilename", COMPONENT_FILE_NAME_DLL
+            VALUE "ProductName", FILE_DESCRIPTION_ACTIVEX
+            VALUE "ProductVersion", STRVER
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x9, 1200
+        VALUE "Translation", 0x409, 1200
     END
 END
 
-
 /////////////////////////////////////////////////////////////////////////////
 //
 // REGISTRY
 //
 
-IDR_AVSVECTORIMAGE      REGISTRY                "AVSVectorImage.rgs"
+IDR_ASCVECTORIMAGE      REGISTRY                "ASCVectorImage.rgs"
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -100,7 +103,7 @@ IDR_AVSVECTORIMAGE      REGISTRY                "AVSVectorImage.rgs"
 
 STRINGTABLE 
 BEGIN
-    IDS_PROJNAME            "AVSVectorImage"
+    IDS_PROJNAME            "ASCVectorImage"
 END
 
 #endif    // Russian resources

ASCImageStudio3/ASCVectorImage/ASCVectorImage/AVSVectorImage.rgs → ASCImageStudio3/ASCVectorImage/ASCVectorImage/ASCVectorImage.rgs

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

ASCImageStudio3/ASCVectorImage/ASCVectorImage/AVSVectorImage.vcproj → ASCImageStudio3/ASCVectorImage/ASCVectorImage/ASCVectorImage.vcproj

@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8,00"
-	Name="AVSVectorImage"
+	Name="ASCVectorImage"
 	ProjectGUID="{D9E5CB83-635D-4234-B53A-2A299FB14B49}"
-	RootNamespace="AVSVectorImage"
+	RootNamespace="ASCVectorImage"
 	Keyword="AtlProj"
 	>
 	<Platforms>
@@ -43,11 +43,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSVectorImage.tlb"
-				HeaderFileName="AVSVectorImage.h"
+				TypeLibraryName="$(IntDir)/ASCVectorImage.tlb"
+				HeaderFileName="ASCVectorImage.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSVectorImage_i.c"
-				ProxyFileName="AVSVectorImage_p.c"
+				InterfaceIdentifierFileName="ASCVectorImage_i.c"
+				ProxyFileName="ASCVectorImage_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -78,13 +78,13 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="..\Debug\agg2D.lib"
-				OutputFile="$(OutDir)/AVSVectorImage.dll"
+				OutputFile="$(OutDir)/ASCVectorImage.dll"
 				LinkIncremental="2"
 				IgnoreAllDefaultLibraries="false"
-				MergedIDLBaseFileName="_AVSVectorImage.idl"
+				MergedIDLBaseFileName="_ASCVectorImage.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/AVSVectorImage.lib"
+				ImportLibrary="$(OutDir)/ASCVectorImage.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -143,11 +143,11 @@
 				MkTypLibCompatible="false"
 				TargetEnvironment="1"
 				GenerateStublessProxies="true"
-				TypeLibraryName="$(IntDir)/AVSVectorImage.tlb"
-				HeaderFileName="AVSVectorImage.h"
+				TypeLibraryName="$(IntDir)/ASCVectorImage.tlb"
+				HeaderFileName="ASCVectorImage.h"
 				DLLDataFileName=""
-				InterfaceIdentifierFileName="AVSVectorImage_i.c"
-				ProxyFileName="AVSVectorImage_p.c"
+				InterfaceIdentifierFileName="ASCVectorImage_i.c"
+				ProxyFileName="ASCVectorImage_p.c"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -175,14 +175,14 @@
 				Name="VCLinkerTool"
 				IgnoreImportLibrary="true"
 				AdditionalDependencies="..\Release\agg2D.lib"
-				OutputFile="$(OutDir)/AVSVectorImage.dll"
+				OutputFile="$(OutDir)/ASCVectorImage.dll"
 				LinkIncremental="1"
-				MergedIDLBaseFileName="_AVSVectorImage.idl"
+				MergedIDLBaseFileName="_ASCVectorImage.idl"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/AVSVectorImage.lib"
+				ImportLibrary="$(OutDir)/ASCVectorImage.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -222,7 +222,7 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath=".\AVSVectorImage.cpp"
+				RelativePath=".\ASCVectorImage.cpp"
 				>
 			</File>
 			<File
@@ -278,11 +278,11 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
-				RelativePath=".\AVSVectorImage.rc"
+				RelativePath=".\ASCVectorImage.rc"
 				>
 			</File>
 			<File
-				RelativePath=".\AVSVectorImage.rgs"
+				RelativePath=".\ASCVectorImage.rgs"
 				>
 			</File>
 		</Filter>

ASCImageStudio3/ASCVectorImage/ASCVectorImage/ReadMe.txt

 ========================================================================
-    ACTIVE TEMPLATE LIBRARY : AVSVectorImage Project Overview
+    ACTIVE TEMPLATE LIBRARY : ASCVectorImage Project Overview
 ========================================================================
 
-AppWizard has created this AVSVectorImage project for you to use as the starting point for
+AppWizard has created this ASCVectorImage project for you to use as the starting point for
 writing your Dynamic Link Library (DLL).
 This project is implemented with Visual C++ attributes.
 
 This file contains a summary of what you will find in each of the files that
 make up your project.
 
-AVSVectorImage.vcproj
+ASCVectorImage.vcproj
     This is the main project file for VC++ projects generated using an Application Wizard. 
     It contains information about the version of Visual C++ that generated the file, and 
     information about the platforms, configurations, and project features selected with the
     Application Wizard.
 
-_AVSVectorImage.idl
+_ASCVectorImage.idl
     This file will be generated by the compiler when the project is built. It will contain the IDL 
     definitions of the type library, the interfaces and co-classes defined in your project.
     This file will be processed by the MIDL compiler to generate:
-        C++ interface definitions and GUID declarations (_AVSVectorImage.h)
-        GUID definitions                                (_AVSVectorImage_i.c)
-        A type library                                  (_AVSVectorImage.tlb)
-        Marshaling code                                 (_AVSVectorImage_p.c and dlldata.c)
-AVSVectorImage.cpp
+        C++ interface definitions and GUID declarations (_ASCVectorImage.h)
+        GUID definitions                                (_ASCVectorImage_i.c)
+        A type library                                  (_ASCVectorImage.tlb)
+        Marshaling code                                 (_ASCVectorImage_p.c and dlldata.c)
+ASCVectorImage.cpp
     This file contains the object map and the implementation of your DLL's exports.
-AVSVectorImage.rc
+ASCVectorImage.rc
     This is a listing of all of the Microsoft Windows resources that the
     program uses.
 
-AVSVectorImage.def
+ASCVectorImage.def
     This module-definition file provides the linker with information about the exports
     required by your DLL. It contains exports for:
         DllGetClassObject  
@@ -43,7 +43,7 @@ Other standard files:
 
 StdAfx.h, StdAfx.cpp
     These files are used to build a precompiled header (PCH) file
-    named AVSVectorImage.pch and a precompiled types file named StdAfx.obj.
+    named ASCVectorImage.pch and a precompiled types file named StdAfx.obj.
 
 Resource.h
     This is the standard header file that defines resource IDs.
@@ -51,14 +51,14 @@ Resource.h
 /////////////////////////////////////////////////////////////////////////////
 Proxy/stub DLL project and module definition file:
 
-AVSVectorImageps.vcproj
+ASCVectorImageps.vcproj
     This file is the project file for building a proxy/stub DLL if necessary.
 	The IDL file in the main project must contain at least one interface and you must 
 	first compile the IDL file before building the proxy/stub DLL.	This process generates
-	dlldata.c, AVSVectorImage_i.c and AVSVectorImage_p.c which are required
+	dlldata.c, ASCVectorImage_i.c and ASCVectorImage_p.c which are required
 	to build the proxy/stub DLL.
 
-AVSVectorImageps.def
+ASCVectorImageps.def
     This module definition file provides the linker with information about the exports
     required by the proxy/stub.
 /////////////////////////////////////////////////////////////////////////////

ASCImageStudio3/ASCVectorImage/ASCVectorImage/Resource.h

 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by AVSVectorImage.rc
+// Used by ASCVectorImage.rc
 //
 
 #define IDS_PROJNAME                    100
-#define IDR_AVSVECTORIMAGE	101
+#define IDR_ASCVECTORIMAGE	101
 
 // Next default values for new objects
 // 

ASCImageStudio3/ASCVectorImage/ASCVectorImage/dlldata.c

@@ -19,11 +19,13 @@
 extern "C"   {
 #endif
 
+EXTERN_PROXY_FILE( _ASCVectorImage )
 EXTERN_PROXY_FILE( _AVSVectorImage )
 
 
 PROXYFILE_LIST_START
 /* Start of list */
+  REFERENCE_PROXY_FILE( _ASCVectorImage ),
   REFERENCE_PROXY_FILE( _AVSVectorImage ),
 /* End of list */
 PROXYFILE_LIST_END

ASCImageStudio3/ASCVectorImage/ASCVectorImage/stdafx.h

@@ -41,7 +41,7 @@
 #include <atlctl.h>
 #include <atlhost.h>
 
-#import "X:\AVS\Redist\AVSMediaCore3.dll"					named_guids rename_namespace("MediaCore"),		raw_interfaces_only, exclude("tagRECT")
+#import "../../../Redist/ASCMediaCore3.dll"					named_guids rename_namespace("MediaCore"),		raw_interfaces_only, exclude("tagRECT")
 
 
 using namespace ATL;
\ No newline at end of file

ASCImageStudio3/ASCVectorImage/ASCVectorImage/version.h

+#pragma once
+//1
+//0
+//0
+//1
+#define INTVER 1,0,0,1
+#define STRVER "1,0,0,1\0"