4.56 beta

CPP/7zip/UI/Common/ArchiveExtractCallback.cpp

@@ -434,6 +434,7 @@ STDMETHODIMP CArchiveExtractCallback::SetOperationResult(Int32 operationResult)
         (WriteAccessed && _processedFileInfo.IsLastAccessTimeDefined) ? &_processedFileInfo.LastAccessTime : NULL, 
         (WriteModified && _processedFileInfo.IsLastWriteTimeDefined) ? &_processedFileInfo.LastWriteTime : &_utcLastWriteTimeDefault);
     _curSize = _outFileStreamSpec->ProcessedSize;
+    RINOK(_outFileStreamSpec->Close());
     _outFileStream.Release();
   }
   UnpackSize += _curSize;

CPP/7zip/UI/Common/LoadCodecs.cpp

@@ -93,7 +93,8 @@ typedef UInt32 (WINAPI *GetNumberOfMethodsFunc)(UInt32 *numMethods);
 typedef UInt32 (WINAPI *GetNumberOfFormatsFunc)(UInt32 *numFormats);
 typedef UInt32 (WINAPI *GetHandlerPropertyFunc)(PROPID propID, PROPVARIANT *value);
 typedef UInt32 (WINAPI *GetHandlerPropertyFunc2)(UInt32 index, PROPID propID, PROPVARIANT *value);
-typedef UINT32 (WINAPI *CreateObjectFunc)(const GUID *clsID, const GUID *iid, void **outObject);
+typedef UInt32 (WINAPI *CreateObjectFunc)(const GUID *clsID, const GUID *iid, void **outObject);
+typedef UInt32 (WINAPI *SetLargePageModeFunc)();
 
 
 static HRESULT GetCoderClass(GetMethodPropertyFunc getMethodProperty, UInt32 index, 
@@ -332,6 +333,13 @@ int CCodecLib::FindIconIndex(const UString &ext) const
 }
 #endif
 
+#ifdef _7ZIP_LARGE_PAGES
+extern "C" 
+{
+  extern SIZE_T g_LargePageSize;
+}
+#endif
+
 HRESULT CCodecs::LoadDll(const CSysString &dllPath)
 {
   {
@@ -351,6 +359,16 @@ HRESULT CCodecs::LoadDll(const CSysString &dllPath)
     #ifdef NEW_FOLDER_INTERFACE
     lib.LoadIcons();
     #endif
+
+    #ifdef _7ZIP_LARGE_PAGES
+    if (g_LargePageSize != 0)
+    {
+      SetLargePageModeFunc setLargePageMode = (SetLargePageModeFunc)lib.Lib.GetProcAddress("SetLargePageMode");
+      if (setLargePageMode != 0)
+        setLargePageMode();
+    }
+    #endif
+
     lib.CreateObject = (CreateObjectFunc)lib.Lib.GetProcAddress("CreateObject");
     if (lib.CreateObject != 0)
     {

CPP/7zip/UI/Common/Update.cpp

@@ -67,6 +67,7 @@ class COutMultiVolStream:
 
   struct CSubStreamInfo
   {
+    COutFileStream *StreamSpec;
     CMyComPtr<IOutStream> Stream;
     UString Name;
     UInt64 Pos;
@@ -87,6 +88,8 @@ public:
     _length = 0;
   }
 
+  HRESULT Close(); 
+
   MY_UNKNOWN_IMP1(IOutStream)
 
   STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
@@ -96,6 +99,22 @@ public:
 
 // static NSynchronization::CCriticalSection g_TempPathsCS;
 
+HRESULT COutMultiVolStream::Close()
+{
+  HRESULT res = S_OK;
+  for (int i = 0; i < Streams.Size(); i++)
+  {
+    CSubStreamInfo &s = Streams[i];
+    if (s.StreamSpec)
+    {
+      HRESULT res2 = s.StreamSpec->Close();
+      if (res2 != S_OK)
+        res = res2;
+    }
+  }
+  return res;
+}
+
 STDMETHODIMP COutMultiVolStream::Write(const void *data, UInt32 size, UInt32 *processedSize)
 {
   if(processedSize != NULL)
@@ -112,9 +131,9 @@ STDMETHODIMP COutMultiVolStream::Write(const void *data, UInt32 size, UInt32 *pr
       while (res.Length() < 3)
         res = UString(L'0') + res;
       UString name = Prefix + res;
-      COutFileStream *streamSpec = new COutFileStream;
-      subStream.Stream = streamSpec;
-      if(!streamSpec->Create(name, false))
+      subStream.StreamSpec = new COutFileStream;
+      subStream.Stream = subStream.StreamSpec;
+      if(!subStream.StreamSpec->Create(name, false))
         return ::GetLastError();
       {
         // NSynchronization::CCriticalSectionLock lock(g_TempPathsCS);
@@ -362,13 +381,17 @@ static HRESULT Compress(
       throw 1417161;
     NFile::NDirectory::CreateComplexDirectory(resultPath.Left(pos));
   }
+
+  COutFileStream *outStreamSpec = NULL;
+  COutMultiVolStream *volStreamSpec = NULL;
+
   if (volumesSizes.Size() == 0)
   {
     if (stdOutMode)
       outStream = new CStdOutFileStream;
     else
     {
-      COutFileStream *outStreamSpec = new COutFileStream;
+      outStreamSpec = new COutFileStream;
       outStream = outStreamSpec;
       bool isOK = false;
       UString realPath;
@@ -410,7 +433,7 @@ static HRESULT Compress(
   {
     if (stdOutMode)
       return E_FAIL;
-    COutMultiVolStream *volStreamSpec = new COutMultiVolStream;
+    volStreamSpec = new COutMultiVolStream;
     outStream = volStreamSpec;
     volStreamSpec->Sizes = volumesSizes;
     volStreamSpec->Prefix = archivePath.GetFinalPath() + UString(L".");
@@ -440,11 +463,12 @@ static HRESULT Compress(
     }
 
     CMyComPtr<ISequentialOutStream> sfxOutStream;
+    COutFileStream *outStreamSpec = NULL;
     if (volumesSizes.Size() == 0)
       sfxOutStream = outStream;
     else
     {
-      COutFileStream *outStreamSpec = new COutFileStream;
+      outStreamSpec = new COutFileStream;
       sfxOutStream = outStreamSpec;
       UString realPath = archivePath.GetFinalPath();
       if (!outStreamSpec->Create(realPath, false))
@@ -456,10 +480,19 @@ static HRESULT Compress(
       }
     }
     RINOK(CopyBlock(sfxStream, sfxOutStream));
+    if (outStreamSpec)
+    {
+      RINOK(outStreamSpec->Close());
+    }
   }
 
   HRESULT result = outArchive->UpdateItems(outStream, updatePairs2.Size(), updateCallback);
   callback->Finilize();
+  RINOK(result);
+  if (outStreamSpec)
+    result = outStreamSpec->Close();
+  else if (volStreamSpec)
+    result = volStreamSpec->Close();
   return result;
 }