Updated LZMA SDK to 9.38 beta.

The webpage says "If you use XZ code from LZMA SDK, it's recommended
to upgrade to new XZ code from 7-Zip 9.38 beta. That new code fixes
some bugs." and we do use the XZ code.

The code is identical to the stock LZMA SDK with the following changes:
  deleted bin/
  added C/Util/Lzma/Android.mk
  added MODULE_LICENSE_PUBLIC_DOMAIN
  added NOTICE
  added xz-embedded/

Change-Id: Ibc5d353748420f7b3ae2877d625d7ddb788bdc6e

1 files changed, 35 insertions, 17 deletions

diff --git a/CPP/7zip/UI/Common/Extract.h b/CPP/7zip/UI/Common/Extract.h
index 70926d7..d42514d 100755..100644
--- a/CPP/7zip/UI/Common/Extract.h
+++ b/CPP/7zip/UI/Common/Extract.h
@@ -3,7 +3,7 @@
 #ifndef __EXTRACT_H

 #define __EXTRACT_H

 

-#include "Windows/FileFind.h"

+#include "../../../Windows/FileFind.h"

 

 #include "../../Archive/IArchive.h"

 

@@ -14,21 +14,37 @@
 

 #include "../Common/LoadCodecs.h"

 

-struct CExtractOptions

+struct CExtractOptionsBase

+{

+  CBoolPair ElimDup;

+  

+  bool PathMode_Force;

+  bool OverwriteMode_Force;

+  NExtract::NPathMode::EEnum PathMode;

+  NExtract::NOverwriteMode::EEnum OverwriteMode;

+  

+  FString OutputDir;

+  CExtractNtOptions NtOptions;

+

+  CExtractOptionsBase():

+      PathMode_Force(false),

+      OverwriteMode_Force(false),

+      PathMode(NExtract::NPathMode::kFullPaths),

+      OverwriteMode(NExtract::NOverwriteMode::kAsk)

+      {}

+};

+

+struct CExtractOptions: public CExtractOptionsBase

 {

   bool StdInMode;

   bool StdOutMode;

   bool YesToAll;

   bool TestMode;

-  bool CalcCrc;

-  NExtract::NPathMode::EEnum PathMode;

-  NExtract::NOverwriteMode::EEnum OverwriteMode;

-  UString OutputDir;

   

   // bool ShowDialog;

   // bool PasswordEnabled;

   // UString Password;

-  #if !defined(_7ZIP_ST) && !defined(_SFX)

+  #ifndef _SFX

   CObjectVector<CProperty> Properties;

   #endif

 

@@ -37,13 +53,10 @@ struct CExtractOptions
   #endif

 

   CExtractOptions():

+      TestMode(false),

       StdInMode(false),

       StdOutMode(false),

-      YesToAll(false),

-      TestMode(false),

-      CalcCrc(false),

-      PathMode(NExtract::NPathMode::kFullPathnames),

-      OverwriteMode(NExtract::NOverwriteMode::kAskBefore)

+      YesToAll(false)

       {}

 };

 

@@ -51,25 +64,30 @@ struct CDecompressStat
 {

   UInt64 NumArchives;

   UInt64 UnpackSize;

+  UInt64 AltStreams_UnpackSize;

   UInt64 PackSize;

   UInt64 NumFolders;

   UInt64 NumFiles;

-  UInt32 CrcSum;

+  UInt64 NumAltStreams;

 

   void Clear()

   {

-    NumArchives = UnpackSize = PackSize = NumFolders = NumFiles = 0;

-    CrcSum = 0;

+    NumArchives = UnpackSize = AltStreams_UnpackSize = PackSize = NumFolders = NumFiles = NumAltStreams = 0;

   }

 };

 

-HRESULT DecompressArchives(

-    CCodecs *codecs, const CIntVector &formatIndices,

+HRESULT Extract(

+    CCodecs *codecs,

+    const CObjectVector<COpenType> &types,

+    const CIntVector &excludedFormats,

     UStringVector &archivePaths, UStringVector &archivePathsFull,

     const NWildcard::CCensorNode &wildcardCensor,

     const CExtractOptions &options,

     IOpenCallbackUI *openCallback,

     IExtractCallbackUI *extractCallback,

+    #ifndef _SFX

+    IHashCalc *hash,

+    #endif

     UString &errorMessage,

     CDecompressStat &stat);