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

4.20

Browse Source
This commit is contained in:
Igor Pavlov
2005-05-30 00:00:00 +00:00
committed by Kornel Lesiński
parent 8c1b5c7b7e
commit 3c510ba80b
926 changed files with 40559 additions and 23519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
7zip/Archive/GZip/GZipHandlerOut.cpp
View File

@@ -1,4 +1,4 @@
// Zip/OutHandler.cpp
// Archive/GZip/OutHandler.cpp
#include "StdAfx.h"
@@ -20,30 +20,30 @@ using namespace NTime;
namespace NArchive {
namespace NGZip {
STDMETHODIMP CHandler::GetFileTimeType(UINT32 *timeType)
STDMETHODIMP CHandler::GetFileTimeType(UInt32 *timeType)
{
*timeType = NFileTimeType::kUnix;
return S_OK;
}
static HRESULT CopyStreams(IInStream *inStream, IOutStream *outStream,
IArchiveUpdateCallback *updateCallback)
static HRESULT CopyStreams(ISequentialInStream *inStream,
ISequentialOutStream *outStream, IArchiveUpdateCallback *updateCallback)
{
CMyComPtr<ICompressCoder> copyCoder = new NCompress::CCopyCoder;
return copyCoder->Code(inStream, outStream, NULL, NULL, NULL);
}
STDMETHODIMP CHandler::UpdateItems(IOutStream *outStream, UINT32 numItems,
STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numItems,
IArchiveUpdateCallback *updateCallback)
{
if (numItems != 1)
return E_INVALIDARG;
UINT64 size;
INT32 newData;
INT32 newProperties;
UINT32 indexInArchive;
UINT32 itemIndex = 0;
UInt64 size;
Int32 newData;
Int32 newProperties;
UInt32 indexInArchive;
UInt32 itemIndex = 0;
if (!updateCallback)
return E_FAIL;
RINOK(updateCallback->GetUpdateItemInfo(0,
@@ -54,7 +54,7 @@ STDMETHODIMP CHandler::UpdateItems(IOutStream *outStream, UINT32 numItems,
newItem.Flags = 0;
if (IntToBool(newProperties))
{
UINT32 attributes;
UInt32 attributes;
FILETIME utcTime;
UString name;
bool isDirectory;
@@ -97,11 +97,8 @@ STDMETHODIMP CHandler::UpdateItems(IOutStream *outStream, UINT32 numItems,
}
if (isDirectory || NFile::NFind::NAttributes::IsDirectory(attributes))
return E_INVALIDARG;
time_t unixTime;
if(!FileTimeToUnixTime(utcTime, unixTime))
if(!FileTimeToUnixTime(utcTime, newItem.Time))
return E_INVALIDARG;
newItem.Time = unixTime;
newItem.Name = UnicodeStringToMultiByte(name, CP_ACP);
int dirDelimiterPos = newItem.Name.ReverseFind('\\');
if (dirDelimiterPos >= 0)
@@ -117,9 +114,9 @@ STDMETHODIMP CHandler::UpdateItems(IOutStream *outStream, UINT32 numItems,
RINOK(updateCallback->GetProperty(itemIndex, kpidSize, &propVariant));
if (propVariant.vt != VT_UI8)
return E_INVALIDARG;
size = *(UINT64 *)(&propVariant.uhVal);
size = propVariant.uhVal.QuadPart;
}
newItem.UnPackSize32 = (UINT32)size;
newItem.UnPackSize32 = (UInt32)size;
return UpdateArchive(m_Stream, size, outStream, newItem,
m_Method, itemIndex, updateCallback);
}
@@ -132,7 +129,7 @@ STDMETHODIMP CHandler::UpdateItems(IOutStream *outStream, UINT32 numItems,
COutArchive outArchive;
outArchive.Create(outStream);
outArchive.WriteHeader(newItem);
RINOK(m_Stream->Seek(m_Item.DataPosition, STREAM_SEEK_SET, NULL));
RINOK(m_Stream->Seek(m_StreamStartPosition + m_DataOffset, STREAM_SEEK_SET, NULL));
}
else
{
@@ -141,13 +138,13 @@ STDMETHODIMP CHandler::UpdateItems(IOutStream *outStream, UINT32 numItems,
return CopyStreams(m_Stream, outStream, updateCallback);
}
static const UINT32 kMatchFastLenNormal = 32;
static const UINT32 kMatchFastLenMX = 64;
static const UInt32 kMatchFastLenNormal = 32;
static const UInt32 kMatchFastLenMX = 64;
static const UINT32 kNumPassesNormal = 1;
static const UINT32 kNumPassesMX = 3;
static const UInt32 kNumPassesNormal = 1;
static const UInt32 kNumPassesMX = 3;
STDMETHODIMP CHandler::SetProperties(const BSTR *names, const PROPVARIANT *values, INT32 numProperties)
STDMETHODIMP CHandler::SetProperties(const wchar_t **names, const PROPVARIANT *values, Int32 numProperties)
{
InitMethodProperties();
for (int i = 0; i < numProperties; i++)
@@ -158,7 +155,7 @@ STDMETHODIMP CHandler::SetProperties(const BSTR *names, const PROPVARIANT *value
if (name[0] == 'X')
{
name.Delete(0);
UINT32 level = 9;
UInt32 level = 9;
if (value.vt == VT_UI4)
{
if (!name.IsEmpty())
@@ -171,10 +168,10 @@ STDMETHODIMP CHandler::SetProperties(const BSTR *names, const PROPVARIANT *value
{
const wchar_t *start = name;
const wchar_t *end;
UINT64 v = ConvertStringToUINT64(start, &end);
UInt64 v = ConvertStringToUInt64(start, &end);
if (end - start != name.Length())
return E_INVALIDARG;
level = (UINT32)v;
level = (UInt32)v;
}
}
else