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

@@ -8,9 +8,9 @@
#include "../../ICoder.h"
#include "RpmHandler.h"
// {23170F69-40C1-278A-1000-000110090000}
// {23170F69-40C1-278A-1000-000110EB0000}
DEFINE_GUID(CLSID_CRpmHandler,
0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x09, 0x00, 0x00);
0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0xEB, 0x00, 0x00);
extern "C"
BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)

View File

@@ -140,6 +140,14 @@ SOURCE=..\..\Common\ProgressUtils.cpp
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 "Compress"

View File

@@ -9,6 +9,8 @@
#include "Windows/Defs.h"
#include "Common/MyCom.h"
#include "../../Common/StreamUtils.h"
namespace NArchive {
namespace NRpm {
@@ -31,7 +33,7 @@ static HRESULT RedSigHeaderSig(IInStream *inStream, CSigHeaderSig &h)
char dat[kCSigHeaderSigSize];
char *cur = dat;
UInt32 processedSize;
RINOK(inStream->Read(dat, kCSigHeaderSigSize, &processedSize));
RINOK(ReadStream(inStream, dat, kCSigHeaderSigSize, &processedSize));
if (kCSigHeaderSigSize != processedSize)
return S_FALSE;
memmove(h.Magic, cur, 4);
@@ -50,7 +52,7 @@ HRESULT OpenArchive(IInStream *inStream)
char *cur = leadData;
CLead lead;
UInt32 processedSize;
RINOK(inStream->Read(leadData, kLeadSize, &processedSize));
RINOK(ReadStream(inStream, leadData, kLeadSize, &processedSize));
if (kLeadSize != processedSize)
return S_FALSE;
memmove(lead.Magic, cur, 4);

View File

@@ -17,6 +17,7 @@ WIN_OBJS = \
7ZIP_COMMON_OBJS = \
$O\ProgressUtils.obj \
$O\StreamUtils.obj \
OBJS = \
$O\StdAfx.obj \