Skip to content

O
onlyoffice_core
Commit c4ec731e authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov
Browse files
Options

git-svn-id:... 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@52464 954022d7-b5bf-4e40-9824-e11837661b57
parent 51c2dd54
Show whitespace changes
Inline Side-by-side
Showing with 63 additions and 68 deletions
ASCImageStudio3/ASCImageJpeg2000/ASCImageJpeg2000.cpp
View file @ c4ec731e
// AVSImageJpeg2000.cpp : Implementation of DLL Exports. // ASCImageJpeg2000.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 = "{46CD51A0-31DA-44A1-B4DD-490F2AA2530E}", [ module(dll, uuid = "{46CD51A0-31DA-44A1-B4DD-490F2AA2530E}",
name = "AVSImageJpeg2000", name = "ASCImageJpeg2000",
helpstring = "AVSImageJpeg2000 1.0 Type Library", helpstring = "ASCImageJpeg2000 1.0 Type Library",
resource_name = "IDR_AVSIMAGEJPEG2000") ] resource_name = "IDR_ASCIMAGEJPEG2000") ]
class CAVSImageJpeg2000Module class CAVSImageJpeg2000Module
{ {
public: public:
......
ASCImageStudio3/ASCImageJpeg2000/ASCImageJpeg2000.rc
View file @ c4ec731e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// //
#include "resource.h" #include "resource.h"
#define COMPONENT_NAME "ImageJpeg2000" #define COMPONENT_NAME "ImageJpeg2000"
#include "../../../../Common/FileInfo.h" #include "../../Common/FileInfo.h"
#include "version.h" #include "version.h"
#define APSTUDIO_READONLY_SYMBOLS #define APSTUDIO_READONLY_SYMBOLS
...@@ -86,10 +86,10 @@ END ...@@ -86,10 +86,10 @@ END
STRINGTABLE STRINGTABLE
BEGIN BEGIN
IDS_PROJNAME "AVSImageJpeg2000" IDS_PROJNAME "ASCImageJpeg2000"
END END
IDR_AVSIMAGEJPEG2000 REGISTRY "AVSImageJpeg2000.rgs" IDR_ASCIMAGEJPEG2000 REGISTRY "ASCImageJpeg2000.rgs"
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
......
ASCImageStudio3/ASCImageJpeg2000/ASCImageJpeg2000.rgs
View file @ c4ec731e
...@@ -2,8 +2,8 @@ HKCR ...@@ -2,8 +2,8 @@ HKCR
{ {
NoRemove AppID NoRemove AppID
{ {
'%APPID%' = s 'AVSImageJpeg2000' '%APPID%' = s 'ASCImageJpeg2000'
'AVSImageJpeg2000.DLL' 'ASCImageJpeg2000.DLL'
{ {
val AppID = s '%APPID%' val AppID = s '%APPID%'
} }
......
ASCImageStudio3/ASCImageJpeg2000/ASCImageJpeg2000.sln
View file @ c4ec731e
 
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}") = "AVSImageJpeg2000", "AVSImageJpeg2000.vcproj", "{30AA46FD-CB61-4521-A0DE-176D37E139F0}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCImageJpeg2000", "ASCImageJpeg2000.vcproj", "{30AA46FD-CB61-4521-A0DE-176D37E139F0}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
ASCImageStudio3/ASCImageJpeg2000/ASCImageJpeg2000.vcproj
View file @ c4ec731e
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="9.00" Version="9.00"
Name="AVSImageJpeg2000" Name="ASCImageJpeg2000"
ProjectGUID="{30AA46FD-CB61-4521-A0DE-176D37E139F0}" ProjectGUID="{30AA46FD-CB61-4521-A0DE-176D37E139F0}"
RootNamespace="AVSImageJpeg2000" RootNamespace="ASCImageJpeg2000"
Keyword="AtlProj" Keyword="AtlProj"
TargetFrameworkVersion="196613" TargetFrameworkVersion="196613"
> >
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSImageJpeg2000.tlb" TypeLibraryName="$(IntDir)/ASCImageJpeg2000.tlb"
HeaderFileName="AVSImageJpeg2000.h" HeaderFileName="ASCImageJpeg2000.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSImageJpeg2000_i.c" InterfaceIdentifierFileName="ASCImageJpeg2000_i.c"
ProxyFileName="AVSImageJpeg2000_p.c" ProxyFileName="ASCImageJpeg2000_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -77,12 +77,12 @@ ...@@ -77,12 +77,12 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="$(OutDir)/AVSImageJpeg2000.dll" OutputFile="$(OutDir)/ASCImageJpeg2000.dll"
LinkIncremental="2" LinkIncremental="2"
MergedIDLBaseFileName="_AVSImageJpeg2000.idl" MergedIDLBaseFileName="_ASCImageJpeg2000.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/AVSImageJpeg2000.lib" ImportLibrary="$(OutDir)/ASCImageJpeg2000.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -137,11 +137,11 @@ ...@@ -137,11 +137,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSImageJpeg2000.tlb" TypeLibraryName="$(IntDir)/ASCImageJpeg2000.tlb"
HeaderFileName="AVSImageJpeg2000.h" HeaderFileName="ASCImageJpeg2000.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSImageJpeg2000_i.c" InterfaceIdentifierFileName="ASCImageJpeg2000_i.c"
ProxyFileName="AVSImageJpeg2000_p.c" ProxyFileName="ASCImageJpeg2000_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -168,15 +168,15 @@ ...@@ -168,15 +168,15 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="../../../Redist/AVSImageJpeg2000.dll" OutputFile="../../Redist/ASCImageJpeg2000.dll"
LinkIncremental="1" LinkIncremental="1"
MergedIDLBaseFileName="_AVSImageJpeg2000.idl" MergedIDLBaseFileName="_ASCImageJpeg2000.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)/AVSImageJpeg2000.lib" ImportLibrary="$(OutDir)/ASCImageJpeg2000.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\AVSImageJpeg2000.cpp" RelativePath=".\ASCImageJpeg2000.cpp"
> >
</File> </File>
<File <File
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File <File
RelativePath=".\AVSImageJpeg2000.rc" RelativePath=".\ASCImageJpeg2000.rc"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath=".\AVSImageJpeg2000.rgs" RelativePath=".\ASCImageJpeg2000.rgs"
> >
</File> </File>
</Filter> </Filter>
......
ASCImageStudio3/ASCImageJpeg2000/ASCImageJpeg2000_vs2005.sln
View file @ c4ec731e
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}") = "AVSImageJpeg2000", "AVSImageJpeg2000_vs2005.vcproj", "{30AA46FD-CB61-4521-A0DE-176D37E139F0}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCImageJpeg2000", "ASCImageJpeg2000_vs2005.vcproj", "{30AA46FD-CB61-4521-A0DE-176D37E139F0}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
ASCImageStudio3/ASCImageJpeg2000/ASCImageJpeg2000_vs2005.vcproj
View file @ c4ec731e
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8,00" Version="8,00"
Name="AVSImageJpeg2000" Name="ASCImageJpeg2000"
ProjectGUID="{30AA46FD-CB61-4521-A0DE-176D37E139F0}" ProjectGUID="{30AA46FD-CB61-4521-A0DE-176D37E139F0}"
RootNamespace="AVSImageJpeg2000" RootNamespace="ASCImageJpeg2000"
Keyword="AtlProj" Keyword="AtlProj"
> >
<Platforms> <Platforms>
...@@ -42,11 +42,11 @@ ...@@ -42,11 +42,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSImageJpeg2000.tlb" TypeLibraryName="$(IntDir)/ASCImageJpeg2000.tlb"
HeaderFileName="AVSImageJpeg2000.h" HeaderFileName="ASCImageJpeg2000.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSImageJpeg2000_i.c" InterfaceIdentifierFileName="ASCImageJpeg2000_i.c"
ProxyFileName="AVSImageJpeg2000_p.c" ProxyFileName="ASCImageJpeg2000_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -76,13 +76,13 @@ ...@@ -76,13 +76,13 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="$(OutDir)/AVSImageJpeg2000.dll" OutputFile="$(OutDir)/ASCImageJpeg2000.dll"
LinkIncremental="2" LinkIncremental="2"
IgnoreDefaultLibraryNames="libc.lib" IgnoreDefaultLibraryNames="libc.lib"
MergedIDLBaseFileName="_AVSImageJpeg2000.idl" MergedIDLBaseFileName="_ASCImageJpeg2000.idl"
GenerateDebugInformation="true" GenerateDebugInformation="true"
SubSystem="2" SubSystem="2"
ImportLibrary="$(OutDir)/AVSImageJpeg2000.lib" ImportLibrary="$(OutDir)/ASCImageJpeg2000.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -140,11 +140,11 @@ ...@@ -140,11 +140,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSImageJpeg2000.tlb" TypeLibraryName="$(IntDir)/ASCImageJpeg2000.tlb"
HeaderFileName="AVSImageJpeg2000.h" HeaderFileName="ASCImageJpeg2000.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSImageJpeg2000_i.c" InterfaceIdentifierFileName="ASCImageJpeg2000_i.c"
ProxyFileName="AVSImageJpeg2000_p.c" ProxyFileName="ASCImageJpeg2000_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -171,16 +171,16 @@ ...@@ -171,16 +171,16 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="../../../Redist/AVSImageJpeg2000.dll" OutputFile="../../Redist/ASCImageJpeg2000.dll"
LinkIncremental="1" LinkIncremental="1"
IgnoreDefaultLibraryNames="libc.lib" IgnoreDefaultLibraryNames="libc.lib"
MergedIDLBaseFileName="_AVSImageJpeg2000.idl" MergedIDLBaseFileName="_ASCImageJpeg2000.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)/AVSImageJpeg2000.lib" ImportLibrary="$(OutDir)/ASCImageJpeg2000.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -239,11 +239,11 @@ ...@@ -239,11 +239,11 @@
MkTypLibCompatible="false" MkTypLibCompatible="false"
TargetEnvironment="1" TargetEnvironment="1"
GenerateStublessProxies="true" GenerateStublessProxies="true"
TypeLibraryName="$(IntDir)/AVSImageJpeg2000.tlb" TypeLibraryName="$(IntDir)/ASCImageJpeg2000.tlb"
HeaderFileName="AVSImageJpeg2000.h" HeaderFileName="ASCImageJpeg2000.h"
DLLDataFileName="" DLLDataFileName=""
InterfaceIdentifierFileName="AVSImageJpeg2000_i.c" InterfaceIdentifierFileName="ASCImageJpeg2000_i.c"
ProxyFileName="AVSImageJpeg2000_p.c" ProxyFileName="ASCImageJpeg2000_p.c"
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
...@@ -270,15 +270,15 @@ ...@@ -270,15 +270,15 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
IgnoreImportLibrary="true" IgnoreImportLibrary="true"
OutputFile="../../../..\ASC\Redist/ASCImageJpeg2000.dll" OutputFile="../../Redist/ASCImageJpeg2000.dll"
LinkIncremental="1" LinkIncremental="1"
MergedIDLBaseFileName="_AVSImageJpeg2000.idl" MergedIDLBaseFileName="_ASCImageJpeg2000.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)/AVSImageJpeg2000.lib" ImportLibrary="$(OutDir)/ASCImageJpeg2000.lib"
TargetMachine="1" TargetMachine="1"
/> />
<Tool <Tool
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File <File
RelativePath=".\AVSImageJpeg2000.cpp" RelativePath=".\ASCImageJpeg2000.cpp"
> >
</File> </File>
<File <File
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}" UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
> >
<File <File
RelativePath=".\AVSImageJpeg2000.rc" RelativePath=".\ASCImageJpeg2000.rc"
> >
<FileConfiguration <FileConfiguration
Name="Debug|Win32" Name="Debug|Win32"
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
</FileConfiguration> </FileConfiguration>
</File> </File>
<File <File
RelativePath=".\AVSImageJpeg2000.rgs" RelativePath=".\ASCImageJpeg2000.rgs"
> >
</File> </File>
</Filter> </Filter>
......
ASCImageStudio3/ASCImageJpeg2000/J2kFile.cpp
View file @ c4ec731e
...@@ -107,8 +107,6 @@ int check_j2000_type(HANDLE hFile) ...@@ -107,8 +107,6 @@ int check_j2000_type(HANDLE hFile)
STDMETHODIMP CJ2kFile::J2kToInterface(BSTR bsSrcPath, IUnknown **ppImage, BSTR bsXmlOptions) STDMETHODIMP CJ2kFile::J2kToInterface(BSTR bsSrcPath, IUnknown **ppImage, BSTR bsXmlOptions)
{ {
if ( !CRegistratorClient::IsRegistered() )
return S_FALSE;
Image *pImage = NULL; Image *pImage = NULL;
bool bOpenResult = FALSE; bool bOpenResult = FALSE;
...@@ -413,8 +411,6 @@ STDMETHODIMP CJ2kFile::J2kToInterface(BSTR bsSrcPath, IUnknown **ppImage, BSTR b ...@@ -413,8 +411,6 @@ STDMETHODIMP CJ2kFile::J2kToInterface(BSTR bsSrcPath, IUnknown **ppImage, BSTR b
STDMETHODIMP CJ2kFile::InterfaceToJ2k(IUnknown **ppImage, BSTR bsDstPath, BSTR bsXmlOptions) STDMETHODIMP CJ2kFile::InterfaceToJ2k(IUnknown **ppImage, BSTR bsDstPath, BSTR bsXmlOptions)
{ {
if ( !CRegistratorClient::IsRegistered() )
return S_FALSE;
CStringA sFilePath( bsDstPath ); CStringA sFilePath( bsDstPath );
......
ASCImageStudio3/ASCImageJpeg2000/J2kFile.h
View file @ c4ec731e
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
#pragma once #pragma once
#include "resource.h" // main symbols #include "resource.h" // main symbols
#include "Registration.h" #include "..\..\Common\XmlUtils.h"
#include "XmlUtils.h"
#include "Types.h" #include "Types.h"
#define PROGRESS_MAX 1000000 #define PROGRESS_MAX 1000000
......
ASCImageStudio3/ASCImageJpeg2000/Resource.h
View file @ c4ec731e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
// //
#define IDS_PROJNAME 100 #define IDS_PROJNAME 100
#define IDR_AVSIMAGEJPEG2000 101 #define IDR_ASCIMAGEJPEG2000 101
// Next default values for new objects // Next default values for new objects
// //
......
ASCImageStudio3/ASCImageJpeg2000/stdafx.h
View file @ c4ec731e
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
using namespace ATL; using namespace ATL;
#import "..\..\..\Redist\AVSMediaCore3.dll" named_guids rename_namespace("MediaCore"), exclude("tagRECT") #import "..\..\Redist\ASCMediaCore3.dll" named_guids rename_namespace("MediaCore"), exclude("tagRECT")
#import "..\..\..\Redist\AVSMediaFormatSettings3.dll" named_guids rename_namespace("MediaFormat"), exclude("tagRECT") #import "..\..\Redist\ASCMediaFormatSettings3.dll" named_guids rename_namespace("MediaFormat"), exclude("tagRECT")
#include "..\Common\AVSUtils.h" #include "..\..\Common\ASCUtils.h"
#include "..\..\AVSVideoStudio3\Common\VideoFileErrorDescription.h" #include "..\..\Common\VideoFileErrorDescription.h"
#include "..\..\AVSVideoStudio3\Common\FourCCDefines.h" #include "..\..\Common\FourCCDefines.h"
\ No newline at end of file \ No newline at end of file
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7