4.58 beta

This commit is contained in:
Igor Pavlov
2008-05-05 00:00:00 +00:00
committed by Kornel Lesiński
parent bd1fa36322
commit 3901bf0ab8
326 changed files with 10643 additions and 14913 deletions

View File

@@ -1,19 +0,0 @@
// ARM.cpp
#include "StdAfx.h"
#include "ARM.h"
extern "C"
{
#include "../../../../C/Compress/Branch/BranchARM.h"
}
UInt32 CBC_ARM_Encoder::SubFilter(Byte *data, UInt32 size)
{
return ::ARM_Convert(data, size, _bufferPos, 1);
}
UInt32 CBC_ARM_Decoder::SubFilter(Byte *data, UInt32 size)
{
return ::ARM_Convert(data, size, _bufferPos, 0);
}

View File

@@ -1,10 +0,0 @@
// ARM.h
#ifndef __ARM_H
#define __ARM_H
#include "BranchCoder.h"
MyClassA(BC_ARM, 0x05, 1)
#endif

View File

@@ -1,20 +0,0 @@
// ARMThumb.cpp
#include "StdAfx.h"
#include "ARMThumb.h"
extern "C"
{
#include "../../../../C/Compress/Branch/BranchARMThumb.h"
}
UInt32 CBC_ARMThumb_Encoder::SubFilter(Byte *data, UInt32 size)
{
return ::ARMThumb_Convert(data, size, _bufferPos, 1);
}
UInt32 CBC_ARMThumb_Decoder::SubFilter(Byte *data, UInt32 size)
{
return ::ARMThumb_Convert(data, size, _bufferPos, 0);
}

View File

@@ -1,10 +0,0 @@
// ARMThumb.h
#ifndef __ARMTHUMB_H
#define __ARMTHUMB_H
#include "BranchCoder.h"
MyClassA(BC_ARMThumb, 0x07, 1)
#endif

View File

@@ -1,433 +0,0 @@
# Microsoft Developer Studio Project File - Name="Branch" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **
# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
CFG=Branch - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE
!MESSAGE NMAKE /f "Branch.mak".
!MESSAGE
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "Branch.mak" CFG="Branch - Win32 Debug"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "Branch - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "Branch - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe
!IF "$(CFG)" == "Branch - Win32 Release"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BRANCH_EXPORTS" /YX /FD /c
# ADD CPP /nologo /Gz /MD /W3 /GX /O2 /I "..\..\..\\" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BRANCH_EXPORTS" /FD /c
# SUBTRACT CPP /YX /Yc /Yu
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x419 /d "NDEBUG"
# ADD RSC /l 0x419 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"C:\Program Files\7-Zip\Codecs\Branch.dll" /opt:NOWIN98
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Ignore_Export_Lib 1
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BRANCH_EXPORTS" /YX /FD /GZ /c
# ADD CPP /nologo /Gz /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\\" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "BRANCH_EXPORTS" /Yu"StdAfx.h" /FD /GZ /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x419 /d "_DEBUG"
# ADD RSC /l 0x419 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"C:\Program Files\7-Zip\Codecs\Branch.dll" /pdbtype:sept
!ENDIF
# Begin Target
# Name "Branch - Win32 Release"
# Name "Branch - Win32 Debug"
# Begin Group "Spec"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\Codec.def
# End Source File
# Begin Source File
SOURCE=..\CodecExports.cpp
# End Source File
# Begin Source File
SOURCE=..\DllExports.cpp
# End Source File
# Begin Source File
SOURCE=.\resource.rc
# End Source File
# Begin Source File
SOURCE=.\StdAfx.cpp
# ADD CPP /Yc"StdAfx.h"
# End Source File
# Begin Source File
SOURCE=.\StdAfx.h
# End Source File
# End Group
# Begin Group "Methods"
# PROP Default_Filter ""
# Begin Source File
SOURCE=.\ARM.cpp
!IF "$(CFG)" == "Branch - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ARM.h
# End Source File
# Begin Source File
SOURCE=.\ARMThumb.cpp
!IF "$(CFG)" == "Branch - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\ARMThumb.h
# End Source File
# Begin Source File
SOURCE=.\BCJ2Register.cpp
# End Source File
# Begin Source File
SOURCE=.\BCJRegister.cpp
# End Source File
# Begin Source File
SOURCE=.\BranchCoder.cpp
# End Source File
# Begin Source File
SOURCE=.\BranchCoder.h
# End Source File
# Begin Source File
SOURCE=.\BranchRegister.cpp
# End Source File
# Begin Source File
SOURCE=.\BranchTypes.h
# End Source File
# Begin Source File
SOURCE=.\BranchX86.h
# End Source File
# Begin Source File
SOURCE=.\IA64.cpp
!IF "$(CFG)" == "Branch - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\IA64.h
# End Source File
# Begin Source File
SOURCE=.\PPC.cpp
!IF "$(CFG)" == "Branch - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\PPC.h
# End Source File
# Begin Source File
SOURCE=.\SPARC.cpp
# End Source File
# Begin Source File
SOURCE=.\SPARC.h
# End Source File
# Begin Source File
SOURCE=.\x86.cpp
!IF "$(CFG)" == "Branch - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\x86.h
# End Source File
# Begin Source File
SOURCE=.\x86_2.cpp
!IF "$(CFG)" == "Branch - Win32 Release"
# ADD CPP /O2
# SUBTRACT CPP /YX /Yc /Yu
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=.\x86_2.h
# End Source File
# End Group
# Begin Group "Stream"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Common\InBuffer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Common\InBuffer.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\OutBuffer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Common\OutBuffer.h
# End Source File
# End Group
# Begin Group "RangeCoder"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\RangeCoder\RangeCoder.h
# End Source File
# Begin Source File
SOURCE=..\RangeCoder\RangeCoderBit.h
# End Source File
# End Group
# Begin Group "C"
# PROP Default_Filter ""
# Begin Group "C Branch"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.c
!IF "$(CFG)" == "Branch - Win32 Release"
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARM.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.c
!IF "$(CFG)" == "Branch - Win32 Release"
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchARMThumb.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.c
!IF "$(CFG)" == "Branch - Win32 Release"
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchIA64.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.c
!IF "$(CFG)" == "Branch - Win32 Release"
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchPPC.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.c
!IF "$(CFG)" == "Branch - Win32 Release"
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchSPARC.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchTypes.h
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.c
!IF "$(CFG)" == "Branch - Win32 Release"
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Compress\Branch\BranchX86.h
# End Source File
# End Group
# Begin Source File
SOURCE=..\..\..\..\C\Alloc.c
!IF "$(CFG)" == "Branch - Win32 Release"
!ELSEIF "$(CFG)" == "Branch - Win32 Debug"
# SUBTRACT CPP /YX /Yc /Yu
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\..\..\C\Alloc.h
# End Source File
# End Group
# End Target
# End Project

View File

@@ -1,29 +0,0 @@
Microsoft Developer Studio Workspace File, Format Version 6.00
# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
###############################################################################
Project: "Branch"=.\Branch.dsp - Package Owner=<4>
Package=<5>
{{{
}}}
Package=<4>
{{{
}}}
###############################################################################
Global:
Package=<5>
{{{
}}}
Package=<3>
{{{
}}}
###############################################################################

View File

@@ -0,0 +1,39 @@
// BranchMisc.cpp
#include "StdAfx.h"
#include "BranchMisc.h"
extern "C"
{
#include "../../../../C/Bra.h"
}
UInt32 CBC_ARM_Encoder::SubFilter(Byte *data, UInt32 size)
{ return (UInt32)::ARM_Convert(data, size, _bufferPos, 1); }
UInt32 CBC_ARM_Decoder::SubFilter(Byte *data, UInt32 size)
{ return (UInt32)::ARM_Convert(data, size, _bufferPos, 0); }
UInt32 CBC_ARMT_Encoder::SubFilter(Byte *data, UInt32 size)
{ return (UInt32)::ARMT_Convert(data, size, _bufferPos, 1); }
UInt32 CBC_ARMT_Decoder::SubFilter(Byte *data, UInt32 size)
{ return (UInt32)::ARMT_Convert(data, size, _bufferPos, 0); }
UInt32 CBC_PPC_Encoder::SubFilter(Byte *data, UInt32 size)
{ return (UInt32)::PPC_Convert(data, size, _bufferPos, 1); }
UInt32 CBC_PPC_Decoder::SubFilter(Byte *data, UInt32 size)
{ return (UInt32)::PPC_Convert(data, size, _bufferPos, 0); }
UInt32 CBC_SPARC_Encoder::SubFilter(Byte *data, UInt32 size)
{ return (UInt32)::SPARC_Convert(data, size, _bufferPos, 1); }
UInt32 CBC_SPARC_Decoder::SubFilter(Byte *data, UInt32 size)
{ return (UInt32)::SPARC_Convert(data, size, _bufferPos, 0); }
UInt32 CBC_IA64_Encoder::SubFilter(Byte *data, UInt32 size)
{ return (UInt32)::IA64_Convert(data, size, _bufferPos, 1); }
UInt32 CBC_IA64_Decoder::SubFilter(Byte *data, UInt32 size)
{ return (UInt32)::IA64_Convert(data, size, _bufferPos, 0); }

View File

@@ -0,0 +1,14 @@
// BranchMisc.h
#ifndef __BRANCHMISC_H
#define __BRANCHMISC_H
#include "BranchCoder.h"
MyClassA(BC_ARM, 0x05, 1)
MyClassA(BC_ARMT, 0x07, 1)
MyClassA(BC_PPC, 0x02, 5)
MyClassA(BC_SPARC, 0x08, 5)
MyClassA(BC_IA64, 0x04, 1)
#endif

View File

@@ -4,31 +4,27 @@
#include "../../Common/RegisterCodec.h"
#include "PPC.h"
#include "IA64.h"
#include "ARM.h"
#include "ARMThumb.h"
#include "SPARC.h"
#include "BranchMisc.h"
#define CREATE_CODEC(x) \
static void *CreateCodec ## x() { return (void *)(ICompressFilter *)(new C ## x ## _Decoder); } \
static void *CreateCodec ## x ## Out() { return (void *)(ICompressFilter *)(new C ## x ## _Encoder); }
CREATE_CODEC(BC_PPC_B)
CREATE_CODEC(BC_PPC)
CREATE_CODEC(BC_IA64)
CREATE_CODEC(BC_ARM)
CREATE_CODEC(BC_ARMThumb)
CREATE_CODEC(BC_ARMT)
CREATE_CODEC(BC_SPARC)
#define METHOD_ITEM(x, id1, id2, name) { CreateCodec ## x, CreateCodec ## x ## Out, 0x03030000 + (id1 * 256) + id2, name, 1, true }
static CCodecInfo g_CodecsInfo[] =
{
METHOD_ITEM(BC_PPC_B, 0x02, 0x05, L"BC_PPC_B"),
METHOD_ITEM(BC_IA64, 0x04, 1, L"BC_IA64"),
METHOD_ITEM(BC_ARM, 0x05, 1, L"BC_ARM"),
METHOD_ITEM(BC_ARMThumb,0x07, 1, L"BC_ARMThumb"),
METHOD_ITEM(BC_SPARC, 0x08, 0x05, L"BC_SPARC")
METHOD_ITEM(BC_PPC, 0x02, 0x05, L"PPC"),
METHOD_ITEM(BC_IA64, 0x04, 1, L"IA64"),
METHOD_ITEM(BC_ARM, 0x05, 1, L"ARM"),
METHOD_ITEM(BC_ARMT, 0x07, 1, L"ARMT"),
METHOD_ITEM(BC_SPARC, 0x08, 0x05, L"SPARC")
};
REGISTER_CODECS(Branch)

View File

@@ -1,19 +0,0 @@
// IA64.cpp
#include "StdAfx.h"
#include "IA64.h"
extern "C"
{
#include "../../../../C/Compress/Branch/BranchIA64.h"
}
UInt32 CBC_IA64_Encoder::SubFilter(Byte *data, UInt32 size)
{
return ::IA64_Convert(data, size, _bufferPos, 1);
}
UInt32 CBC_IA64_Decoder::SubFilter(Byte *data, UInt32 size)
{
return ::IA64_Convert(data, size, _bufferPos, 0);
}

View File

@@ -1,10 +0,0 @@
// IA64.h
#ifndef __IA64_H
#define __IA64_H
#include "BranchCoder.h"
MyClassA(BC_IA64, 0x04, 1)
#endif

View File

@@ -1,19 +0,0 @@
// PPC.cpp
#include "StdAfx.h"
#include "PPC.h"
extern "C"
{
#include "../../../../C/Compress/Branch/BranchPPC.h"
}
UInt32 CBC_PPC_B_Encoder::SubFilter(Byte *data, UInt32 size)
{
return ::PPC_B_Convert(data, size, _bufferPos, 1);
}
UInt32 CBC_PPC_B_Decoder::SubFilter(Byte *data, UInt32 size)
{
return ::PPC_B_Convert(data, size, _bufferPos, 0);
}

View File

@@ -1,10 +0,0 @@
// PPC.h
#ifndef __PPC_H
#define __PPC_H
#include "BranchCoder.h"
MyClassA(BC_PPC_B, 0x02, 5)
#endif

View File

@@ -1,19 +0,0 @@
// SPARC.cpp
#include "StdAfx.h"
#include "SPARC.h"
extern "C"
{
#include "../../../../C/Compress/Branch/BranchSPARC.h"
}
UInt32 CBC_SPARC_Encoder::SubFilter(Byte *data, UInt32 size)
{
return ::SPARC_Convert(data, size, _bufferPos, 1);
}
UInt32 CBC_SPARC_Decoder::SubFilter(Byte *data, UInt32 size)
{
return ::SPARC_Convert(data, size, _bufferPos, 0);
}

View File

@@ -1,10 +0,0 @@
// SPARC.h
#ifndef __SPARC_H
#define __SPARC_H
#include "BranchCoder.h"
MyClassA(BC_SPARC, 0x08, 5)
#endif

View File

@@ -1,63 +0,0 @@
PROG = Branch.dll
DEF_FILE = ../Codec.def
CFLAGS = $(CFLAGS) -I ../../../
LIBS = $(LIBS) oleaut32.lib
COMPRESS_OBJS = \
$O\CodecExports.obj \
$O\DllExports.obj \
BRANCH_OPT_OBJS = \
$O\ARM.obj \
$O\ARMThumb.obj \
$O\BranchCoder.obj \
$O\IA64.obj \
$O\PPC.obj \
$O\SPARC.obj \
$O\x86.obj \
$O\x86_2.obj \
$O\BranchRegister.obj \
$O\BCJRegister.obj \
$O\BCJ2Register.obj \
C_OBJS = \
$O\Alloc.obj \
C_BRANCH_OBJS = \
$O\BranchARM.obj \
$O\BranchARMThumb.obj \
$O\BranchIA64.obj \
$O\BranchPPC.obj \
$O\BranchSPARC.obj \
$O\BranchX86.obj \
7ZIP_COMMON_OBJS = \
$O\InBuffer.obj \
$O\OutBuffer.obj \
OBJS = \
$O\StdAfx.obj \
$(COMPRESS_OBJS) \
$(BRANCH_OPT_OBJS) \
$(7ZIP_COMMON_OBJS) \
$O\RangeCoderBit.obj \
$(C_OBJS) \
$(C_BRANCH_OBJS) \
$O\resource.res
!include "../../../Build.mak"
$(COMPRESS_OBJS): ../$(*B).cpp
$(COMPL)
$(BRANCH_OPT_OBJS): $(*B).cpp
$(COMPL_O2)
$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp
$(COMPL)
$O\RangeCoderBit.obj: ../RangeCoder/$(*B).cpp
$(COMPL)
$(C_OBJS): ../../../../C/$(*B).c
$(COMPL_O2)
$(C_BRANCH_OBJS): ../../../../C/Compress/Branch/$(*B).c
$(COMPL_O2)

View File

@@ -1,3 +0,0 @@
#include "../../MyVersionInfo.rc"
MY_VERSION_INFO_DLL("Branch Filter", "Branch")

View File

@@ -6,7 +6,7 @@
#include "BranchCoder.h"
extern "C"
{
#include "../../../../C/Compress/Branch/BranchX86.h"
#include "../../../../C/Bra.h"
}
struct CBranch86