mirror of
https://github.com/Xevion/easy7zip.git
synced 2025-12-15 00:11:40 -06:00
4.27 beta
This commit is contained in:
committed by
Kornel Lesiński
parent
31e7b924e8
commit
d66cf2fcf3
@@ -8,9 +8,9 @@
|
||||
#include "../../ICoder.h"
|
||||
#include "GZipHandler.h"
|
||||
|
||||
// {23170F69-40C1-278A-1000-000110030000}
|
||||
// {23170F69-40C1-278A-1000-000110EF0000}
|
||||
DEFINE_GUID(CLSID_CGZipHandler,
|
||||
0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x03, 0x00, 0x00);
|
||||
0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0xEF, 0x00, 0x00);
|
||||
|
||||
// {23170F69-40C1-278B-0401-080000000100}
|
||||
DEFINE_GUID(CLSID_CCompressDeflateEncoder,
|
||||
|
||||
@@ -264,6 +264,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 "Archive Common"
|
||||
|
||||
|
||||
@@ -58,12 +58,14 @@ static const int kNumHostOSes = sizeof(kHostOS) / sizeof(kHostOS[0]);
|
||||
|
||||
static const wchar_t *kUnknownOS = L"Unknown";
|
||||
|
||||
/*
|
||||
enum // PropID
|
||||
{
|
||||
// kpidExtraIsPresent = kpidUserDefined,
|
||||
// kpidExtraFlags,
|
||||
// kpidIsText
|
||||
kpidExtraIsPresent = kpidUserDefined,
|
||||
kpidExtraFlags,
|
||||
kpidIsText
|
||||
};
|
||||
*/
|
||||
|
||||
STATPROPSTG kProperties[] =
|
||||
{
|
||||
|
||||
@@ -8,13 +8,15 @@
|
||||
#include "Common/MyCom.h"
|
||||
#include "Windows/Defs.h"
|
||||
|
||||
#include "../../Common/StreamUtils.h"
|
||||
|
||||
namespace NArchive {
|
||||
namespace NGZip {
|
||||
|
||||
HRESULT CInArchive::ReadBytes(ISequentialInStream *inStream, void *data, UInt32 size)
|
||||
{
|
||||
UInt32 realProcessedSize;
|
||||
RINOK(inStream->Read(data, size, &realProcessedSize));
|
||||
RINOK(ReadStream(inStream, data, size, &realProcessedSize));
|
||||
m_Position += realProcessedSize;
|
||||
if(realProcessedSize != size)
|
||||
return S_FALSE;
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "GZipOut.h"
|
||||
#include "Common/CRC.h"
|
||||
#include "Windows/Defs.h"
|
||||
#include "../../Common/StreamUtils.h"
|
||||
|
||||
namespace NArchive {
|
||||
namespace NGZip {
|
||||
@@ -12,7 +13,7 @@ namespace NGZip {
|
||||
HRESULT COutArchive::WriteBytes(const void *buffer, UInt32 size)
|
||||
{
|
||||
UInt32 processedSize;
|
||||
RINOK(m_Stream->Write(buffer, size, &processedSize));
|
||||
RINOK(WriteStream(m_Stream, buffer, size, &processedSize));
|
||||
if(processedSize != size)
|
||||
return E_FAIL;
|
||||
return S_OK;
|
||||
|
||||
@@ -26,6 +26,7 @@ WIN_OBJS = \
|
||||
|
||||
7ZIP_COMMON_OBJS = \
|
||||
$O\ProgressUtils.obj \
|
||||
$O\StreamUtils.obj \
|
||||
|
||||
AR_COMMON_OBJS = \
|
||||
$O\CodecsPath.obj \
|
||||
|
||||
Reference in New Issue
Block a user