4.27 beta

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

View File

@@ -125,6 +125,18 @@ SOURCE=..\..\..\Common\Alloc.cpp
SOURCE=..\..\..\Common\Alloc.h
# End Source File
# End Group
# Begin Group "7-Zip Common"
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\Common\StreamUtils.cpp
# End Source File
# Begin Source File
SOURCE=..\..\Common\StreamUtils.h
# End Source File
# End Group
# Begin Source File
SOURCE=.\CopyCoder.cpp

View File

@@ -4,6 +4,7 @@
#include "CopyCoder.h"
#include "../../../Common/Alloc.h"
#include "../../Common/StreamUtils.h"
namespace NCompress {
@@ -34,10 +35,10 @@ STDMETHODIMP CCopyCoder::Code(ISequentialInStream *inStream,
if (outSize != 0)
if (size > *outSize - TotalSize)
size = (UInt32)(*outSize - TotalSize);
RINOK(inStream->ReadPart(_buffer, size, &realProcessedSize));
RINOK(inStream->Read(_buffer, size, &realProcessedSize));
if(realProcessedSize == 0)
break;
RINOK(outStream->Write(_buffer, realProcessedSize, NULL));
RINOK(WriteStream(outStream, _buffer, realProcessedSize, NULL));
TotalSize += realProcessedSize;
if (progress != NULL)
{

View File

@@ -10,10 +10,14 @@ COPY_OBJS = \
COMMON_OBJS = \
$O\Alloc.obj \
7ZIP_COMMON_OBJS = \
$O\StreamUtils.obj \
OBJS = \
$O\StdAfx.obj \
$(COPY_OBJS) \
$(COMMON_OBJS) \
$(7ZIP_COMMON_OBJS) \
$O\resource.res
!include "../../../Build.mak"
@@ -22,3 +26,5 @@ $(COPY_OBJS): $(*B).cpp
$(COMPL)
$(COMMON_OBJS): ../../../Common/$(*B).cpp
$(COMPL)
$(7ZIP_COMMON_OBJS): ../../Common/$(*B).cpp
$(COMPL)