4.59 beta

This commit is contained in:
Igor Pavlov
2008-08-13 00:00:00 +00:00
committed by Kornel Lesiński
parent 3901bf0ab8
commit 173c07e166
781 changed files with 22124 additions and 13650 deletions

View File

@@ -23,12 +23,11 @@ using namespace NTime;
namespace NArchive {
namespace NSplit {
STATPROPSTG kProps[] =
STATPROPSTG kProps[] =
{
{ NULL, kpidPath, VT_BSTR},
// { NULL, kpidIsFolder, VT_BOOL},
{ NULL, kpidSize, VT_UI8},
{ NULL, kpidPackedSize, VT_UI8},
{ NULL, kpidPackSize, VT_UI8},
};
IMP_IInArchive_Props
@@ -38,11 +37,11 @@ class CSeqName
{
public:
UString _unchangedPart;
UString _changedPart;
UString _changedPart;
bool _splitStyle;
UString GetNextName()
{
UString newName;
UString newName;
if (_splitStyle)
{
int i;
@@ -108,7 +107,7 @@ public:
}
};
STDMETHODIMP CHandler::Open(IInStream *stream,
STDMETHODIMP CHandler::Open(IInStream *stream,
const UInt64 * /* maxCheckStartPosition */,
IArchiveOpenCallback *openArchiveCallback)
{
@@ -120,7 +119,7 @@ STDMETHODIMP CHandler::Open(IInStream *stream,
{
CMyComPtr<IArchiveOpenVolumeCallback> openVolumeCallback;
CMyComPtr<IArchiveOpenCallback> openArchiveCallbackWrap = openArchiveCallback;
if (openArchiveCallbackWrap.QueryInterface(IID_IArchiveOpenVolumeCallback,
if (openArchiveCallbackWrap.QueryInterface(IID_IArchiveOpenVolumeCallback,
&openVolumeCallback) != S_OK)
return S_FALSE;
@@ -169,7 +168,7 @@ STDMETHODIMP CHandler::Open(IInStream *stream,
if (numLetters != ext.Length())
return S_FALSE;
}
else
else
return S_FALSE;
_streams.Add(stream);
@@ -197,7 +196,6 @@ STDMETHODIMP CHandler::Open(IInStream *stream,
if (openArchiveCallback != NULL)
{
RINOK(openArchiveCallback->SetTotal(NULL, NULL));
UInt64 numFiles = _streams.Size();
RINOK(openArchiveCallback->SetCompleted(&numFiles, NULL));
}
@@ -261,11 +259,8 @@ STDMETHODIMP CHandler::GetProperty(UInt32 /* index */, PROPID propID, PROPVARIAN
case kpidPath:
prop = _subName;
break;
case kpidIsFolder:
prop = false;
break;
case kpidSize:
case kpidPackedSize:
case kpidPackSize:
prop = _totalSize;
break;
}