xevion/easy7zip
1
0
Fork 0
mirror of https://github.com/Xevion/easy7zip.git synced 2025-12-15 16:11:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

4.27 beta

Browse Source
This commit is contained in:
Igor Pavlov
2005-09-21 00:00:00 +00:00
committed by Kornel Lesiński
parent 31e7b924e8
commit d66cf2fcf3
393 changed files with 17345 additions and 4743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
7zip/Archive/Arj/Arj.dsp
View File

@@ -213,19 +213,19 @@ SOURCE=.\ArjItem.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Compress\Arj\Decoder1.cpp
SOURCE=..\..\Compress\Arj\ArjDecoder1.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Arj\Decoder1.h
SOURCE=..\..\Compress\Arj\ArjDecoder1.h
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Arj\Decoder2.cpp
SOURCE=..\..\Compress\Arj\ArjDecoder2.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Compress\Arj\Decoder2.h
SOURCE=..\..\Compress\Arj\ArjDecoder2.h
# End Source File
# End Group
# Begin Group "LZ"
@@ -278,12 +278,28 @@ SOURCE=..\..\Common\MSBFDecoder.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\OutBuffer.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Common\OutBuffer.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\ProgressUtils.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Common\ProgressUtils.h
# End Source File
# Begin Source File
SOURCE=..\..\Common\StreamUtils.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Common\StreamUtils.h
# End Source File
# End Group
# Begin Group "Archive Common"

4
7zip/Archive/Arj/ArjHandler.cpp
View File

@@ -19,8 +19,8 @@
#include "../../Common/LimitedStreams.h"
#include "../../Compress/Copy/CopyCoder.h"
#include "../../Compress/Arj/Decoder1.h"
#include "../../Compress/Arj/Decoder2.h"
#include "../../Compress/Arj/ArjDecoder1.h"
#include "../../Compress/Arj/ArjDecoder2.h"
#include "../Common/ItemNameUtils.h"
#include "../Common/OutStreamWithCRC.h"

6
7zip/Archive/Arj/ArjIn.cpp
View File

@@ -6,6 +6,8 @@
#include "Common/Buffer.h"
#include "Common/CRC.h"
#include "../../Common/StreamUtils.h"
#include "ArjIn.h"
namespace NArchive {
@@ -14,7 +16,7 @@ namespace NArj {
HRESULT CInArchive::ReadBytes(void *data, UInt32 size, UInt32 *processedSize)
{
UInt32 realProcessedSize;
HRESULT result = _stream->Read(data, size, &realProcessedSize);
HRESULT result = ReadStream(_stream, data, size, &realProcessedSize);
if(processedSize != NULL)
*processedSize = realProcessedSize;
IncreasePositionValue(realProcessedSize);
@@ -162,7 +164,7 @@ bool CInArchive::ReadBlock()
{
_blockPos = 0;
_blockSize = SafeReadUInt16();
if (_blockSize == 0)
if (_blockSize == 0 || _blockSize > kMaxBlockSize)
return false;
SafeReadBytes(_block, _blockSize);
UInt32 crcFromFile = SafeReadUInt32();

4
7zip/Archive/Arj/DllExports.cpp
View File

@@ -8,9 +8,9 @@
#include "../../ICoder.h"
#include "ArjHandler.h"
// {23170F69-40C1-278A-1000-0001100A0000}
// {23170F69-40C1-278A-1000-000110040000}
DEFINE_GUID(CLSID_CArjHandler,
0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x0A, 0x00, 0x00);
0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x04, 0x00, 0x00);
extern "C"
BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)

6
7zip/Archive/Arj/makefile
View File

@@ -22,15 +22,17 @@ WIN_OBJS = \
7ZIP_COMMON_OBJS = \
$O\InBuffer.obj \
$O\LimitedStreams.obj \
$O\OutBuffer.obj \
$O\ProgressUtils.obj \
$O\StreamUtils.obj \
AR_COMMON_OBJS = \
$O\ItemNameUtils.obj \
$O\OutStreamWithCRC.obj \
COMPRESS_ARJ_OBJS = \
$O\Decoder1.obj \
$O\Decoder2.obj \
$O\ArjDecoder1.obj \
$O\ArjDecoder2.obj \
OBJS = \
$O\StdAfx.obj \