Commit 57660eec authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov

git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52563 954022d7-b5bf-4e40-9824-e11837661b57
parent 626e02c8
// AVSImageJBig2.cpp : Implementation of DLL Exports. // ASCImageJBig2.cpp : Implementation of DLL Exports.
#include "stdafx.h" #include "stdafx.h"
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
// The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you // The module attribute causes DllMain, DllRegisterServer and DllUnregisterServer to be automatically implemented for you
[ module(dll, uuid = "{33853C40-C953-4206-901D-D03FC035CBD4}", [ module(dll, uuid = "{33853C40-C953-4206-901D-D03FC035CBD4}",
name = "AVSImageJBig2", name = "ASCImageJBig2",
helpstring = "AVSImageJBig2 1.0 Type Library", helpstring = "ASCImageJBig2 1.0 Type Library",
resource_name = "IDR_AVSIMAGEJBIG2") ] resource_name = "IDR_ASCIMAGEJBIG2") ]
class CAVSImageJBig2Module class CAVSImageJBig2Module
{ {
public: public:
......
...@@ -87,10 +87,10 @@ END ...@@ -87,10 +87,10 @@ END
STRINGTABLE STRINGTABLE
BEGIN BEGIN
IDS_PROJNAME "AVSImageJBig2" IDS_PROJNAME "ASCImageJBig2"
END END
IDR_AVSIMAGEJBIG2 REGISTRY "AVSImageJBig2.rgs" IDR_ASCIMAGEJBIG2 REGISTRY "ASCImageJBig2.rgs"
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
......
...@@ -2,8 +2,8 @@ HKCR ...@@ -2,8 +2,8 @@ HKCR
{ {
NoRemove AppID NoRemove AppID
{ {
'%APPID%' = s 'AVSImageJBig2' '%APPID%' = s 'ASCImageJBig2'
'AVSImageJBig2.DLL' 'ASCImageJBig2.DLL'
{ {
val AppID = s '%APPID%' val AppID = s '%APPID%'
} }
......
 
Microsoft Visual Studio Solution File, Format Version 10.00 Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008 # Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSImageJBig2", "AVSImageJBig2.vcproj", "{CA273012-D186-450B-ACEA-2619B30F927E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCImageJBig2", "ASCImageJBig2.vcproj", "{CA273012-D186-450B-ACEA-2619B30F927E}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9,00" Version="9,00"
Name="AVSImageJBig2" Name="ASCImageJBig2"
ProjectGUID="{CA273012-D186-450B-ACEA-2619B30F927E}" ProjectGUID="{CA273012-D186-450B-ACEA-2619B30F927E}"
Keyword="AtlProj" Keyword="AtlProj"
TargetFrameworkVersion="196613" TargetFrameworkVersion="196613"
...@@ -42,11 +42,11 @@ ...@@ -42,11 +42,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSImageJBig2.tlb" TypeLibraryName="$(IntDir)/ASCImageJBig2.tlb"
HeaderFileName="AVSImageJBig2.h" HeaderFileName="ASCImageJBig2.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSImageJBig2_i.c" InterfaceIdentifierFileName="ASCImageJBig2_i.c"
ProxyFileName="AVSImageJBig2_p.c" ProxyFileName="ASCImageJBig2_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -76,12 +76,12 @@ ...@@ -76,12 +76,12 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="$(OutDir)/AVSImageJBig2.dll" OutputFile="$(OutDir)/ASCImageJBig2.dll"
LinkIncremental="2" LinkIncremental="2"
MergedIDLBaseFileName="_AVSImageJBig2.idl" MergedIDLBaseFileName="_ASCImageJBig2.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/AVSImageJBig2.lib" ImportLibrary="$(OutDir)/ASCImageJBig2.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -136,11 +136,11 @@ ...@@ -136,11 +136,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSImageJBig2.tlb" TypeLibraryName="$(IntDir)/ASCImageJBig2.tlb"
HeaderFileName="AVSImageJBig2.h" HeaderFileName="ASCImageJBig2.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSImageJBig2_i.c" InterfaceIdentifierFileName="ASCImageJBig2_i.c"
ProxyFileName="AVSImageJBig2_p.c" ProxyFileName="ASCImageJBig2_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -167,15 +167,15 @@ ...@@ -167,15 +167,15 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="../../../Redist/AVSImageJBig2.dll" OutputFile="../../Redist/ASCImageJBig2.dll"
LinkIncremental="1" LinkIncremental="1"
MergedIDLBaseFileName="_AVSImageJBig2.idl" MergedIDLBaseFileName="_ASCImageJBig2.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSImageJBig2.lib" ImportLibrary="$(OutDir)/ASCImageJBig2.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -212,7 +212,7 @@ ...@@ -212,7 +212,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\AVSImageJBig2.cpp" RelativePath=".\ASCImageJBig2.cpp"
> >
</File> </File>
<File <File
...@@ -2208,11 +2208,11 @@ ...@@ -2208,11 +2208,11 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File <File
RelativePath=".\AVSImageJBig2.rc" RelativePath=".\ASCImageJBig2.rc"
> >
</File> </File>
<File <File
RelativePath=".\AVSImageJBig2.rgs" RelativePath=".\ASCImageJBig2.rgs"
> >
</File> </File>
</Filter> </Filter>
......
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AVSImageJBig2", "AVSImageJBig2_vs2005.vcproj", "{CA273012-D186-450B-ACEA-2619B30F927E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCImageJBig2", "ASCImageJBig2_vs2005.vcproj", "{CA273012-D186-450B-ACEA-2619B30F927E}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8,00"
Name="AVSImageJBig2" Name="ASCImageJBig2"
ProjectGUID="{CA273012-D186-450B-ACEA-2619B30F927E}" ProjectGUID="{CA273012-D186-450B-ACEA-2619B30F927E}"
Keyword="AtlProj" Keyword="AtlProj"
> >
...@@ -41,11 +41,11 @@ ...@@ -41,11 +41,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSImageJBig2.tlb" TypeLibraryName="$(IntDir)/ASCImageJBig2.tlb"
HeaderFileName="AVSImageJBig2.h" HeaderFileName="ASCImageJBig2.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSImageJBig2_i.c" InterfaceIdentifierFileName="ASCImageJBig2_i.c"
ProxyFileName="AVSImageJBig2_p.c" ProxyFileName="ASCImageJBig2_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="$(OutDir)/AVSImageJBig2.dll" OutputFile="$(OutDir)/ASCImageJBig2.dll"
LinkIncremental="2" LinkIncremental="2"
MergedIDLBaseFileName="_AVSImageJBig2.idl" MergedIDLBaseFileName="_ASCImageJBig2.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/AVSImageJBig2.lib" ImportLibrary="$(OutDir)/ASCImageJBig2.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -138,11 +138,11 @@ ...@@ -138,11 +138,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSImageJBig2.tlb" TypeLibraryName="$(IntDir)/ASCImageJBig2.tlb"
HeaderFileName="AVSImageJBig2.h" HeaderFileName="ASCImageJBig2.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSImageJBig2_i.c" InterfaceIdentifierFileName="ASCImageJBig2_i.c"
ProxyFileName="AVSImageJBig2_p.c" ProxyFileName="ASCImageJBig2_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -169,15 +169,15 @@ ...@@ -169,15 +169,15 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="../../../Redist/AVSImageJBig2.dll" OutputFile="../../Redist/ASCImageJBig2.dll"
LinkIncremental="1" LinkIncremental="1"
MergedIDLBaseFileName="_AVSImageJBig2.idl" MergedIDLBaseFileName="_ASCImageJBig2.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSImageJBig2.lib" ImportLibrary="$(OutDir)/ASCImageJBig2.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -236,11 +236,11 @@ ...@@ -236,11 +236,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSImageJBig2.tlb" TypeLibraryName="$(IntDir)/ASCImageJBig2.tlb"
HeaderFileName="AVSImageJBig2.h" HeaderFileName="ASCImageJBig2.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSImageJBig2_i.c" InterfaceIdentifierFileName="ASCImageJBig2_i.c"
ProxyFileName="AVSImageJBig2_p.c" ProxyFileName="ASCImageJBig2_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -269,13 +269,13 @@ ...@@ -269,13 +269,13 @@
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="../../../..\ASC\Redist/ASCImageJBig2.dll" OutputFile="../../../..\ASC\Redist/ASCImageJBig2.dll"
LinkIncremental="1" LinkIncremental="1"
MergedIDLBaseFileName="_AVSImageJBig2.idl" MergedIDLBaseFileName="_ASCImageJBig2.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
ProgramDatabaseFile="$(OutDir)$(TargetName).pdb" ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
SubSystem="2" SubSystem="2"
OptimizeReferences="2" OptimizeReferences="2"
EnableCOMDATFolding="2" EnableCOMDATFolding="2"
ImportLibrary="$(OutDir)/AVSImageJBig2.lib" ImportLibrary="$(OutDir)/ASCImageJBig2.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\AVSImageJBig2.cpp" RelativePath=".\ASCImageJBig2.cpp"
> >
</File> </File>
<File <File
...@@ -2319,11 +2319,11 @@ ...@@ -2319,11 +2319,11 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File <File
RelativePath=".\AVSImageJBig2.rc" RelativePath=".\ASCImageJBig2.rc"
> >
</File> </File>
<File <File
RelativePath=".\AVSImageJBig2.rgs" RelativePath=".\ASCImageJBig2.rgs"
> >
</File> </File>
</Filter> </Filter>
......
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by AVSImageJBig2.rc // Used by ASCImageJBig2.rc
// //
#define IDS_PROJNAME 100 #define IDS_PROJNAME 100
#define IDR_AVSIMAGEJBIG2 101 #define IDR_ASCIMAGEJBIG2 101
// Next default values for new objects // Next default values for new objects
// //
......
...@@ -43,5 +43,5 @@ ...@@ -43,5 +43,5 @@
using namespace ATL; using namespace ATL;
#import "../../../../AVS/Redist/AVSMediaCore3.dll" named_guids rename_namespace("MediaCore"), exclude("tagRECT") #import "../../Redist/ASCMediaCore3.dll" named_guids rename_namespace("MediaCore"), exclude("tagRECT")
#import "../../../../AVS/Redist/AVSMediaFormatSettings3.dll" named_guids rename_namespace("MediaFormat"), exclude("tagRECT") #import "../../Redist/ASCMediaFormatSettings3.dll" named_guids rename_namespace("MediaFormat"), exclude("tagRECT")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment