4.20

7zip/Archive/Split/DllExports.cpp

@@ -1,9 +1,8 @@
-// DLLExports.cpp : Implementation of DLL Exports.
+// DLLExports.cpp
 
 #include "StdAfx.h"
 
-#include <initguid.h>
-
+#include "Common/MyInitGuid.h"
 #include "Common/ComTry.h"
 #include "Windows/PropVariant.h"
 #include "SplitHandler.h"
@@ -57,6 +56,9 @@ STDAPI GetHandlerProperty(PROPID propID, PROPVARIANT *value)
     case NArchive::kUpdate:
       propVariant = false;
       break;
+    case NArchive::kKeepName:
+      propVariant = true;
+      break;
   }
   propVariant.Detach(value);
   return S_OK;

7zip/Archive/Split/Split.dsp

@@ -126,6 +126,14 @@ SOURCE=.\StdAfx.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\..\Common\Alloc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Common\Alloc.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Common\NewHandler.cpp
 # End Source File
 # Begin Source File
@@ -186,6 +194,14 @@ SOURCE=..\..\Compress\Copy\CopyCoder.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\Common\MultiStream.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\Common\MultiStream.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Common\ProgressUtils.cpp
 # End Source File
 # Begin Source File

7zip/Archive/Split/SplitHandler.cpp

@@ -15,6 +15,7 @@
 #include "../../Common/ProgressUtils.h"
 #include "../../Compress/Copy/CopyCoder.h"
 #include "../Common/ItemNameUtils.h"
+#include "../Common/MultiStream.h"
 
 using namespace NWindows;
 using namespace NTime;
@@ -25,7 +26,7 @@ namespace NSplit {
 STATPROPSTG kProperties[] = 
 {
   { NULL, kpidPath, VT_BSTR},
-  { NULL, kpidIsFolder, VT_BOOL},
+//  { NULL, kpidIsFolder, VT_BOOL},
   { NULL, kpidSize, VT_UI8},
   { NULL, kpidPackedSize, VT_UI8},
 };
@@ -36,13 +37,13 @@ STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value)
   return S_OK;
 }
 
-STDMETHODIMP CHandler::GetNumberOfProperties(UINT32 *numProperties)
+STDMETHODIMP CHandler::GetNumberOfProperties(UInt32 *numProperties)
 {
   *numProperties = sizeof(kProperties) / sizeof(kProperties[0]);
   return S_OK;
 }
 
-STDMETHODIMP CHandler::GetPropertyInfo(UINT32 index,     
+STDMETHODIMP CHandler::GetPropertyInfo(UInt32 index,     
       BSTR *name, PROPID *propID, VARTYPE *varType)
 {
   if(index >= sizeof(kProperties) / sizeof(kProperties[0]))
@@ -54,13 +55,13 @@ STDMETHODIMP CHandler::GetPropertyInfo(UINT32 index,
   return S_OK;
 }
 
-STDMETHODIMP CHandler::GetNumberOfArchiveProperties(UINT32 *numProperties)
+STDMETHODIMP CHandler::GetNumberOfArchiveProperties(UInt32 *numProperties)
 {
   *numProperties = 0;
   return S_OK;
 }
 
-STDMETHODIMP CHandler::GetArchivePropertyInfo(UINT32 index,     
+STDMETHODIMP CHandler::GetArchivePropertyInfo(UInt32 index,     
       BSTR *name, PROPID *propID, VARTYPE *varType)
 {
   return E_INVALIDARG;
@@ -141,7 +142,7 @@ public:
 };
 
 STDMETHODIMP CHandler::Open(IInStream *stream, 
-    const UINT64 *maxCheckStartPosition,
+    const UInt64 *maxCheckStartPosition,
     IArchiveOpenCallback *openArchiveCallback)
 {
   COM_TRY_BEGIN
@@ -217,20 +218,21 @@ STDMETHODIMP CHandler::Open(IInStream *stream,
       _subName = prefix.Left(prefix.Length() - 1);
 
     _totalSize = 0;
-    UINT64 size;
+    UInt64 size;
     {
       NCOM::CPropVariant propVariant;
       RINOK(openVolumeCallback->GetProperty(kpidSize, &propVariant));
       if (propVariant.vt != VT_UI8)
         return E_INVALIDARG;
-      size = *(UINT64 *)(&propVariant.uhVal);
+      size = propVariant.uhVal.QuadPart;
     }
     _totalSize += size;
+    _sizes.Add(size);
     
     if (openArchiveCallback != NULL)
     {
       RINOK(openArchiveCallback->SetTotal(NULL, NULL));
-      UINT64 numFiles = _streams.Size();
+      UInt64 numFiles = _streams.Size();
       RINOK(openArchiveCallback->SetCompleted(&numFiles, NULL));
     }
 
@@ -250,13 +252,14 @@ STDMETHODIMP CHandler::Open(IInStream *stream,
         RINOK(openVolumeCallback->GetProperty(kpidSize, &propVariant));
         if (propVariant.vt != VT_UI8)
           return E_INVALIDARG;
-        size = *(UINT64 *)(&propVariant.uhVal);
+        size = propVariant.uhVal.QuadPart;
       }
       _totalSize += size;
+      _sizes.Add(size);
       _streams.Add(nextStream);
       if (openArchiveCallback != NULL)
       {
-        UINT64 numFiles = _streams.Size();
+        UInt64 numFiles = _streams.Size();
         RINOK(openArchiveCallback->SetCompleted(&numFiles, NULL));
       }
     }
@@ -277,13 +280,13 @@ STDMETHODIMP CHandler::Close()
   return S_OK;
 }
 
-STDMETHODIMP CHandler::GetNumberOfItems(UINT32 *numItems)
+STDMETHODIMP CHandler::GetNumberOfItems(UInt32 *numItems)
 {
   *numItems = _streams.IsEmpty() ? 0 : 1;
   return S_OK;
 }
 
-STDMETHODIMP CHandler::GetProperty(UINT32 index, PROPID propID, PROPVARIANT *value)
+STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *value)
 {
   COM_TRY_BEGIN
   NWindows::NCOM::CPropVariant propVariant;
@@ -306,12 +309,12 @@ STDMETHODIMP CHandler::GetProperty(UINT32 index, PROPID propID, PROPVARIANT *val
   COM_TRY_END
 }
 
-STDMETHODIMP CHandler::Extract(const UINT32* indices, UINT32 numItems,
-    INT32 _aTestMode, IArchiveExtractCallback *_anExtractCallback)
+STDMETHODIMP CHandler::Extract(const UInt32* indices, UInt32 numItems,
+    Int32 _aTestMode, IArchiveExtractCallback *_anExtractCallback)
 {
   COM_TRY_BEGIN
 
-  if (numItems != UINT32(-1))
+  if (numItems != UInt32(-1))
   {
     if (numItems != 1)
       return E_INVALIDARG;
@@ -328,15 +331,15 @@ STDMETHODIMP CHandler::Extract(const UINT32* indices, UINT32 numItems,
     return E_FAIL;
   */
 
-  UINT64 currentTotalSize = 0;
-  UINT64 currentItemSize;
+  UInt64 currentTotalSize = 0;
+  UInt64 currentItemSize;
 
   RINOK(extractCallback->SetCompleted(&currentTotalSize));
   CMyComPtr<ISequentialOutStream> realOutStream;
-  INT32 askMode;
+  Int32 askMode;
   askMode = testMode ? NArchive::NExtract::NAskMode::kTest :
   NArchive::NExtract::NAskMode::kExtract;
-  INT32 index = 0;
+  Int32 index = 0;
   RINOK(extractCallback->GetStream(index, &realOutStream, askMode));
   
   RINOK(extractCallback->PrepareOperation(askMode));
@@ -389,4 +392,24 @@ STDMETHODIMP CHandler::Extract(const UINT32* indices, UINT32 numItems,
   COM_TRY_END
 }
 
+STDMETHODIMP CHandler::GetStream(UInt32 index, ISequentialInStream **stream)
+{
+  if (index != 0)
+    return E_INVALIDARG;
+  *stream = 0;
+  CMultiStream *streamSpec = new CMultiStream;
+  CMyComPtr<ISequentialInStream> streamTemp = streamSpec;
+  for (int i = 0; i < _streams.Size(); i++)
+  {
+    CMultiStream::CSubStreamInfo subStreamInfo;
+    subStreamInfo.Stream = _streams[i];
+    subStreamInfo.Pos = 0;
+    subStreamInfo.Size = _sizes[i];
+    streamSpec->Streams.Add(subStreamInfo);
+  }
+  streamSpec->Init();
+  *stream = streamTemp.Detach();
+  return S_OK;
+}
+
 }}

7zip/Archive/Split/SplitHandler.h

@@ -1,7 +1,5 @@
 // Split/Handler.h
 
-#pragma once
-
 #ifndef __SPLIT_HANDLER_H
 #define __SPLIT_HANDLER_H
 
@@ -14,45 +12,49 @@ namespace NSplit {
 
 class CHandler: 
   public IInArchive,
+  public IInArchiveGetStream,
   // public IOutArchive, 
   public CMyUnknownImp
 {
 public:
-  MY_UNKNOWN_IMP1(IOutArchive)
+  MY_UNKNOWN_IMP1(IInArchiveGetStream)
 
   STDMETHOD(Open)(IInStream *stream, 
-      const UINT64 *maxCheckStartPosition,
+      const UInt64 *maxCheckStartPosition,
       IArchiveOpenCallback *openArchiveCallback);  
   STDMETHOD(Close)();  
-  STDMETHOD(GetNumberOfItems)(UINT32 *numItems);  
-  STDMETHOD(GetProperty)(UINT32 index, PROPID propID, PROPVARIANT *value);
-  STDMETHOD(Extract)(const UINT32* indices, UINT32 numItems, 
-      INT32 testMode, IArchiveExtractCallback *extractCallback);
+  STDMETHOD(GetNumberOfItems)(UInt32 *numItems);  
+  STDMETHOD(GetProperty)(UInt32 index, PROPID propID, PROPVARIANT *value);
+  STDMETHOD(Extract)(const UInt32* indices, UInt32 numItems, 
+      Int32 testMode, IArchiveExtractCallback *extractCallback);
   
   STDMETHOD(GetArchiveProperty)(PROPID propID, PROPVARIANT *value);
 
-  STDMETHOD(GetNumberOfProperties)(UINT32 *numProperties);  
-  STDMETHOD(GetPropertyInfo)(UINT32 index,     
+  STDMETHOD(GetNumberOfProperties)(UInt32 *numProperties);  
+  STDMETHOD(GetPropertyInfo)(UInt32 index,     
       BSTR *name, PROPID *propID, VARTYPE *varType);
 
-  STDMETHOD(GetNumberOfArchiveProperties)(UINT32 *numProperties);  
-  STDMETHOD(GetArchivePropertyInfo)(UINT32 index,     
+  STDMETHOD(GetNumberOfArchiveProperties)(UInt32 *numProperties);  
+  STDMETHOD(GetArchivePropertyInfo)(UInt32 index,     
       BSTR *name, PROPID *propID, VARTYPE *varType);
 
-  /*
+  STDMETHOD(GetStream)(UInt32 index, ISequentialInStream **stream);  
+
   // IOutArchiveHandler
-  STDMETHOD(UpdateItems)(IOutStream *outStream, UINT32 numItems,
+  /*
+  STDMETHOD(UpdateItems)(ISequentialOutStream *outStream, UInt32 numItems,
       IArchiveUpdateCallback *updateCallback);
 
-  STDMETHOD(GetFileTimeType)(UINT32 *type);  
+  STDMETHOD(GetFileTimeType)(UInt32 *type);  
   */
 
 private:
   UString _subName;
   UString _name;
   CObjectVector<CMyComPtr<IInStream> > _streams;
+  CRecordVector<UInt64> _sizes;
 
-  UINT64 _totalSize;
+  UInt64 _totalSize;
 };
 
 }}

7zip/Archive/Split/SplitHanlerOut.cpp

@@ -13,14 +13,13 @@ namespace NArchive {
 namespace NSplit {
 
 /*
-STDMETHODIMP CHandler::GetFileTimeType(UINT32 *type)
+STDMETHODIMP CHandler::GetFileTimeType(UInt32 *type)
 {
   *type = NFileTimeType::kWindows;
   return S_OK;
 }
 
-
-STDMETHODIMP CHandler::UpdateItems(IOutStream *outStream, UINT32 numItems,
+STDMETHODIMP CHandler::UpdateItems(ISequentialOutStream *outStream, UInt32 numItems,
     IArchiveUpdateCallback *updateCallback)
 {
   COM_TRY_BEGIN
@@ -28,16 +27,21 @@ STDMETHODIMP CHandler::UpdateItems(IOutStream *outStream, UINT32 numItems,
   if (numItems != 1)
     return E_INVALIDARG;
 
-  UINT64 volumeSize;
-  RINOK(updateCallback->GetVolumeSize(0, &volumeSize));
+  UInt64 volumeSize = 0;
 
-  INT32 newData;
-  INT32 newProperties;
-  UINT32 indexInArchive;
+  CMyComPtr<IArchiveUpdateCallback2> callback2;
+  updateCallback->QueryInterface(IID_IArchiveUpdateCallback2, 
+      (void **)&callback2);
+
+  RINOK(callback2->GetVolumeSize(0, &volumeSize));
+
+  Int32 newData;
+  Int32 newProperties;
+  UInt32 indexInArchive;
   if (!updateCallback)
     return E_FAIL;
 
-  UINT32 fileIndex;
+  UInt32 fileIndex = 0;
   RINOK(updateCallback->GetUpdateItemInfo(fileIndex,
     &newData, &newProperties, &indexInArchive));
 
@@ -72,7 +76,7 @@ STDMETHODIMP CHandler::UpdateItems(IOutStream *outStream, UINT32 numItems,
       }
     }
   }
-  UINT64 newSize;
+  UInt64 newSize;
   bool thereIsCopyData = false;
   if (newData != 0)
   {
@@ -80,11 +84,16 @@ STDMETHODIMP CHandler::UpdateItems(IOutStream *outStream, UINT32 numItems,
     RINOK(updateCallback->GetProperty(fileIndex, kpidSize, &propVariant));
     if (propVariant.vt != VT_UI8)
       return E_INVALIDARG;
-    newSize = *(const UINT64 *)(&propVariant.uhVal);
+    newSize = propVariant.uhVal.QuadPart;
   }
   else
     thereIsCopyData = true;
 
+  UInt64 pos = 0;
+  while(pos < newSize)
+  {
+
+  }
   return S_OK;
   COM_TRY_END
 }

7zip/Archive/Split/StdAfx.cpp

@@ -1,3 +1,3 @@
 // StdAfx.cpp
 
-#include "stdafx.h"
+#include "StdAfx.h"

7zip/Archive/Split/StdAfx.h

@@ -1,8 +1,8 @@
-// stdafx.h
+// StdAfx.h
 
 #ifndef __STDAFX_H
 #define __STDAFX_H
 
-#include <windows.h>
+#include "../../../Common/MyWindows.h"
 
-#endif 
+#endif

7zip/Archive/Split/resource.rc

@@ -75,8 +75,8 @@ IDI_ICON1               ICON    DISCARDABLE     "Split.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,9,2,0
- PRODUCTVERSION 3,9,2,0
+ FILEVERSION 4,14,0,0
+ PRODUCTVERSION 4,14,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -94,14 +94,14 @@ BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "Igor Pavlov\0"
             VALUE "FileDescription", "Split Plugin for 7-Zip\0"
-            VALUE "FileVersion", "3, 9, 2, 0\0"
+            VALUE "FileVersion", "4, 14, 0, 0\0"
             VALUE "InternalName", "split\0"
-            VALUE "LegalCopyright", "Copyright (C) 1999-2003 Igor Pavlov\0"
+            VALUE "LegalCopyright", "Copyright (C) 1999-2005 Igor Pavlov\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "split.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "7-Zip\0"
-            VALUE "ProductVersion", "3, 9, 2, 0\0"
+            VALUE "ProductVersion", "4, 14, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END