MdeModulePkg Lzma: Update LZMA SDK version to 19.00

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3101
New formal release in https://www.7-zip.org/sdk.html is 19.00.

Cc: Liming Gao <gaoliming@byosoft.com.cn>
Signed-off-by: Wei Liu <weix.c.liu@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

11 files changed, 163 insertions, 78 deletions

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt b/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt
index 3f3895b4cf..8095b6edd2 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/LZMA-SDK-README.txt
@@ -1,4 +1,4 @@
-LzmaCustomDecompressLib is based on the LZMA SDK 18.05.

-LZMA SDK 18.05 was placed in the public domain on

-2018-04-30.  It was released on the

+LzmaCustomDecompressLib is based on the LZMA SDK 19.00.

+LZMA SDK 19.00 was placed in the public domain on

+2019-02-21.  It was released on the

 http://www.7-zip.org/sdk.html website.

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
index d789e7dc42..3a0647e7f8 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaArchCustomDecompressLib.inf
@@ -1,11 +1,11 @@
 ## @file

 #  LzmaArchCustomDecompressLib produces LZMA custom decompression algorithm with the converter for the different arch code.

 #

-#  It is based on the LZMA SDK 18.05

-#  LZMA SDK 18.05 was placed in the public domain on 2018-04-30.

+#  It is based on the LZMA SDK 19.00

+#  LZMA SDK 19.00 was placed in the public domain on 2019-02-21.

 #  It was released on the http://www.7-zip.org/sdk.html website.

 #

-#  Copyright (c) 2012 - 2018, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2012 - 2020, Intel Corporation. All rights reserved.<BR>

 #

 #  SPDX-License-Identifier: BSD-2-Clause-Patent

 #

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
index 4ed1d83a40..39e66136c4 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/LzmaCustomDecompressLib.inf
@@ -1,11 +1,11 @@
 ## @file

 #  LzmaCustomDecompressLib produces LZMA custom decompression algorithm.

 #

-#  It is based on the LZMA SDK 18.05.

-#  LZMA SDK 18.05 was placed in the public domain on 2018-04-30.

+#  It is based on the LZMA SDK 19.00.

+#  LZMA SDK 19.00 was placed in the public domain on 2019-02-21.

 #  It was released on the http://www.7-zip.org/sdk.html website.

 #

-#  Copyright (c) 2009 - 2018, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2009 - 2020, Intel Corporation. All rights reserved.<BR>

 #

 #  SPDX-License-Identifier: BSD-2-Clause-Patent

 #

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h
index c89b5c2433..42b7040dd7 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zTypes.h
@@ -1,5 +1,5 @@
 /* 7zTypes.h -- Basic types

-2017-07-17 : Igor Pavlov : Public domain */

+2018-08-04 : Igor Pavlov : Public domain */

 

 #ifndef __7Z_TYPES_H

 #define __7Z_TYPES_H

@@ -107,7 +107,8 @@ typedef UInt32 SizeT;
 typedef size_t SizeT;

 #endif

 

-typedef int Bool;

+typedef int BoolInt;

+/* typedef BoolInt Bool; */

 #define True 1

 #define False 0

 

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zVersion.h b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zVersion.h
index ed3aa94270..0074c64be9 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zVersion.h
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/7zVersion.h
@@ -1,7 +1,7 @@
-#define MY_VER_MAJOR 18

-#define MY_VER_MINOR 05

+#define MY_VER_MAJOR 19

+#define MY_VER_MINOR 00

 #define MY_VER_BUILD 0

-#define MY_VERSION_NUMBERS "18.05"

+#define MY_VERSION_NUMBERS "19.00"

 #define MY_VERSION MY_VERSION_NUMBERS

 

 #ifdef MY_CPU_NAME

@@ -10,7 +10,7 @@
   #define MY_VERSION_CPU MY_VERSION

 #endif

 

-#define MY_DATE "2018-04-30"

+#define MY_DATE "2019-02-21"

 #undef MY_COPYRIGHT

 #undef MY_VERSION_COPYRIGHT_DATE

 #define MY_AUTHOR_NAME "Igor Pavlov"

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/CpuArch.h b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/CpuArch.h
index 7fb27282c7..5f74c1c0cb 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/CpuArch.h
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/CpuArch.h
@@ -1,5 +1,5 @@
 /* CpuArch.h -- CPU specific code

-2017-09-04 : Igor Pavlov : Public domain */

+2018-02-18 : Igor Pavlov : Public domain */

 

 #ifndef __CPU_ARCH_H

 #define __CPU_ARCH_H

@@ -318,15 +318,16 @@ enum
 

 void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d);

 

-Bool x86cpuid_CheckAndRead(Cx86cpuid *p);

+BoolInt x86cpuid_CheckAndRead(Cx86cpuid *p);

 int x86cpuid_GetFirm(const Cx86cpuid *p);

 

 #define x86cpuid_GetFamily(ver) (((ver >> 16) & 0xFF0) | ((ver >> 8) & 0xF))

 #define x86cpuid_GetModel(ver)  (((ver >> 12) &  0xF0) | ((ver >> 4) & 0xF))

 #define x86cpuid_GetStepping(ver) (ver & 0xF)

 

-Bool CPU_Is_InOrder();

-Bool CPU_Is_Aes_Supported();

+BoolInt CPU_Is_InOrder();

+BoolInt CPU_Is_Aes_Supported();

+BoolInt CPU_IsSupported_PageGB();

 

 #endif

 

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.c b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.c
index 8765cbebfc..670a9fab12 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.c
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzFind.c
@@ -1,5 +1,5 @@
 /* LzFind.c -- Match finder for LZ algorithms

-2017-06-10 : Igor Pavlov : Public domain */

+2018-07-08 : Igor Pavlov : Public domain */

 

 #include "Precomp.h"

 

@@ -140,7 +140,7 @@ static void MatchFinder_SetDefaultSettings(CMatchFinder *p)
 

 void MatchFinder_Construct(CMatchFinder *p)

 {

-  UInt32 i;

+  unsigned i;

   p->bufferBase = NULL;

   p->directInput = 0;

   p->hash = NULL;

@@ -149,7 +149,7 @@ void MatchFinder_Construct(CMatchFinder *p)
 

   for (i = 0; i < 256; i++)

   {

-    UInt32 r = i;

+    UInt32 r = (UInt32)i;

     unsigned j;

     for (j = 0; j < 8; j++)

       r = (r >> 1) ^ (kCrcPoly & ((UInt32)0 - (r & 1)));

@@ -370,6 +370,8 @@ static void MatchFinder_Normalize(CMatchFinder *p)
   MatchFinder_ReduceOffsets(p, subValue);

 }

 

+

+MY_NO_INLINE

 static void MatchFinder_CheckLimits(CMatchFinder *p)

 {

   if (p->pos == kMaxValForNormalize)

@@ -381,10 +383,16 @@ static void MatchFinder_CheckLimits(CMatchFinder *p)
   MatchFinder_SetLimits(p);

 }

 

-static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,

+

+/*

+  (lenLimit > maxLen)

+*/

+MY_FORCE_INLINE

+static UInt32 * Hc_GetMatchesSpec(unsigned lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,

     UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,

-    UInt32 *distances, UInt32 maxLen)

+    UInt32 *distances, unsigned maxLen)

 {

+  /*

   son[_cyclicBufferPos] = curMatch;

   for (;;)

   {

@@ -402,7 +410,8 @@ static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos,
             break;

         if (maxLen < len)

         {

-          *distances++ = maxLen = len;

+          maxLen = len;

+          *distances++ = len;

           *distances++ = delta - 1;

           if (len == lenLimit)

             return distances;

@@ -410,15 +419,58 @@ static UInt32 * Hc_GetMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos,
       }

     }

   }

+  */

+

+  const Byte *lim = cur + lenLimit;

+  son[_cyclicBufferPos] = curMatch;

+  do

+  {

+    UInt32 delta = pos - curMatch;

+    if (delta >= _cyclicBufferSize)

+      break;

+    {

+      ptrdiff_t diff;

+      curMatch = son[_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)];

+      diff = (ptrdiff_t)0 - delta;

+      if (cur[maxLen] == cur[maxLen + diff])

+      {

+        const Byte *c = cur;

+        while (*c == c[diff])

+        {

+          if (++c == lim)

+          {

+            distances[0] = (UInt32)(lim - cur);

+            distances[1] = delta - 1;

+            return distances + 2;

+          }

+        }

+        {

+          unsigned len = (unsigned)(c - cur);

+          if (maxLen < len)

+          {

+            maxLen = len;

+            distances[0] = (UInt32)len;

+            distances[1] = delta - 1;

+            distances += 2;

+          }

+        }

+      }

+    }

+  }

+  while (--cutValue);

+

+  return distances;

 }

 

+

+MY_FORCE_INLINE

 UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,

     UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue,

     UInt32 *distances, UInt32 maxLen)

 {

-  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;

-  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);

-  UInt32 len0 = 0, len1 = 0;

+  CLzRef *ptr0 = son + ((size_t)_cyclicBufferPos << 1) + 1;

+  CLzRef *ptr1 = son + ((size_t)_cyclicBufferPos << 1);

+  unsigned len0 = 0, len1 = 0;

   for (;;)

   {

     UInt32 delta = pos - curMatch;

@@ -428,9 +480,10 @@ UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byt
       return distances;

     }

     {

-      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);

+      CLzRef *pair = son + ((size_t)(_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);

       const Byte *pb = cur - delta;

-      UInt32 len = (len0 < len1 ? len0 : len1);

+      unsigned len = (len0 < len1 ? len0 : len1);

+      UInt32 pair0 = pair[0];

       if (pb[len] == cur[len])

       {

         if (++len != lenLimit && pb[len] == cur[len])

@@ -439,11 +492,12 @@ UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byt
               break;

         if (maxLen < len)

         {

-          *distances++ = maxLen = len;

+          maxLen = (UInt32)len;

+          *distances++ = (UInt32)len;

           *distances++ = delta - 1;

           if (len == lenLimit)

           {

-            *ptr1 = pair[0];

+            *ptr1 = pair0;

             *ptr0 = pair[1];

             return distances;

           }

@@ -470,9 +524,9 @@ UInt32 * GetMatchesSpec1(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byt
 static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const Byte *cur, CLzRef *son,

     UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue)

 {

-  CLzRef *ptr0 = son + (_cyclicBufferPos << 1) + 1;

-  CLzRef *ptr1 = son + (_cyclicBufferPos << 1);

-  UInt32 len0 = 0, len1 = 0;

+  CLzRef *ptr0 = son + ((size_t)_cyclicBufferPos << 1) + 1;

+  CLzRef *ptr1 = son + ((size_t)_cyclicBufferPos << 1);

+  unsigned len0 = 0, len1 = 0;

   for (;;)

   {

     UInt32 delta = pos - curMatch;

@@ -482,9 +536,9 @@ static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const
       return;

     }

     {

-      CLzRef *pair = son + ((_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);

+      CLzRef *pair = son + ((size_t)(_cyclicBufferPos - delta + ((delta > _cyclicBufferPos) ? _cyclicBufferSize : 0)) << 1);

       const Byte *pb = cur - delta;

-      UInt32 len = (len0 < len1 ? len0 : len1);

+      unsigned len = (len0 < len1 ? len0 : len1);

       if (pb[len] == cur[len])

       {

         while (++len != lenLimit)

@@ -522,13 +576,13 @@ static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const
   p->buffer++; \

   if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p);

 

-#define MOVE_POS_RET MOVE_POS return offset;

+#define MOVE_POS_RET MOVE_POS return (UInt32)offset;

 

 static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }

 

 #define GET_MATCHES_HEADER2(minLen, ret_op) \

-  UInt32 lenLimit; UInt32 hv; const Byte *cur; UInt32 curMatch; \

-  lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \

+  unsigned lenLimit; UInt32 hv; const Byte *cur; UInt32 curMatch; \

+  lenLimit = (unsigned)p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \

   cur = p->buffer;

 

 #define GET_MATCHES_HEADER(minLen) GET_MATCHES_HEADER2(minLen, return 0)

@@ -537,22 +591,22 @@ static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; }
 #define MF_PARAMS(p) p->pos, p->buffer, p->son, p->cyclicBufferPos, p->cyclicBufferSize, p->cutValue

 

 #define GET_MATCHES_FOOTER(offset, maxLen) \

-  offset = (UInt32)(GetMatchesSpec1(lenLimit, curMatch, MF_PARAMS(p), \

-  distances + offset, maxLen) - distances); MOVE_POS_RET;

+  offset = (unsigned)(GetMatchesSpec1((UInt32)lenLimit, curMatch, MF_PARAMS(p), \

+  distances + offset, (UInt32)maxLen) - distances); MOVE_POS_RET;

 

 #define SKIP_FOOTER \

-  SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;

+  SkipMatchesSpec((UInt32)lenLimit, curMatch, MF_PARAMS(p)); MOVE_POS;

 

 #define UPDATE_maxLen { \

     ptrdiff_t diff = (ptrdiff_t)0 - d2; \

     const Byte *c = cur + maxLen; \

     const Byte *lim = cur + lenLimit; \

     for (; c != lim; c++) if (*(c + diff) != *c) break; \

-    maxLen = (UInt32)(c - cur); }

+    maxLen = (unsigned)(c - cur); }

 

 static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)

 {

-  UInt32 offset;

+  unsigned offset;

   GET_MATCHES_HEADER(2)

   HASH2_CALC;

   curMatch = p->hash[hv];

@@ -563,7 +617,7 @@ static UInt32 Bt2_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
 

 UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)

 {

-  UInt32 offset;

+  unsigned offset;

   GET_MATCHES_HEADER(3)

   HASH_ZIP_CALC;

   curMatch = p->hash[hv];

@@ -574,7 +628,8 @@ UInt32 Bt3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
 

 static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)

 {

-  UInt32 h2, d2, maxLen, offset, pos;

+  UInt32 h2, d2, pos;

+  unsigned maxLen, offset;

   UInt32 *hash;

   GET_MATCHES_HEADER(3)

 

@@ -596,12 +651,12 @@ static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
   if (d2 < p->cyclicBufferSize && *(cur - d2) == *cur)

   {

     UPDATE_maxLen

-    distances[0] = maxLen;

+    distances[0] = (UInt32)maxLen;

     distances[1] = d2 - 1;

     offset = 2;

     if (maxLen == lenLimit)

     {

-      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));

+      SkipMatchesSpec((UInt32)lenLimit, curMatch, MF_PARAMS(p));

       MOVE_POS_RET;

     }

   }

@@ -611,7 +666,8 @@ static UInt32 Bt3_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
 

 static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)

 {

-  UInt32 h2, h3, d2, d3, maxLen, offset, pos;

+  UInt32 h2, h3, d2, d3, pos;

+  unsigned maxLen, offset;

   UInt32 *hash;

   GET_MATCHES_HEADER(4)

 

@@ -634,7 +690,8 @@ static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
 

   if (d2 < p->cyclicBufferSize && *(cur - d2) == *cur)

   {

-    distances[0] = maxLen = 2;

+    maxLen = 2;

+    distances[0] = 2;

     distances[1] = d2 - 1;

     offset = 2;

   }

@@ -650,10 +707,10 @@ static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
   if (offset != 0)

   {

     UPDATE_maxLen

-    distances[(size_t)offset - 2] = maxLen;

+    distances[(size_t)offset - 2] = (UInt32)maxLen;

     if (maxLen == lenLimit)

     {

-      SkipMatchesSpec(lenLimit, curMatch, MF_PARAMS(p));

+      SkipMatchesSpec((UInt32)lenLimit, curMatch, MF_PARAMS(p));

       MOVE_POS_RET;

     }

   }

@@ -743,7 +800,8 @@ static UInt32 Bt5_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
 

 static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)

 {

-  UInt32 h2, h3, d2, d3, maxLen, offset, pos;

+  UInt32 h2, h3, d2, d3, pos;

+  unsigned maxLen, offset;

   UInt32 *hash;

   GET_MATCHES_HEADER(4)

 

@@ -766,7 +824,8 @@ static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
 

   if (d2 < p->cyclicBufferSize && *(cur - d2) == *cur)

   {

-    distances[0] = maxLen = 2;

+    maxLen = 2;

+    distances[0] = 2;

     distances[1] = d2 - 1;

     offset = 2;

   }

@@ -782,7 +841,7 @@ static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
   if (offset != 0)

   {

     UPDATE_maxLen

-    distances[(size_t)offset - 2] = maxLen;

+    distances[(size_t)offset - 2] = (UInt32)maxLen;

     if (maxLen == lenLimit)

     {

       p->son[p->cyclicBufferPos] = curMatch;

@@ -793,7 +852,7 @@ static UInt32 Hc4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
   if (maxLen < 3)

     maxLen = 3;

 

-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),

+  offset = (unsigned)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),

       distances + offset, maxLen) - (distances));

   MOVE_POS_RET

 }

@@ -879,12 +938,12 @@ static UInt32 Hc5_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)
 

 UInt32 Hc3Zip_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances)

 {

-  UInt32 offset;

+  unsigned offset;

   GET_MATCHES_HEADER(3)

   HASH_ZIP_CALC;

   curMatch = p->hash[hv];

   p->hash[hv] = p->pos;

-  offset = (UInt32)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),

+  offset = (unsigned)(Hc_GetMatchesSpec(lenLimit, curMatch, MF_PARAMS(p),

       distances, 2) - (distances));

   MOVE_POS_RET

 }

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.c b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.c
index a262319928..80fb74525a 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.c
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/C/LzmaDec.c
@@ -1,15 +1,15 @@
 /* LzmaDec.c -- LZMA Decoder

-2018-02-28 : Igor Pavlov : Public domain */

+2018-07-04 : Igor Pavlov : Public domain */

 

 #include "Precomp.h"

 

-/* #include "CpuArch.h" */

-#include "LzmaDec.h"

-

 #ifndef EFIAPI

 #include <string.h>

 #endif

 

+/* #include "CpuArch.h" */

+#include "LzmaDec.h"

+

 #define kNumTopBits 24

 #define kTopValue ((UInt32)1 << kNumTopBits)

 

@@ -21,7 +21,7 @@
 

 #define NORMALIZE if (range < kTopValue) { range <<= 8; code = (code << 8) | (*buf++); }

 

-#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)

+#define IF_BIT_0(p) ttt = *(p); NORMALIZE; bound = (range >> kNumBitModelTotalBits) * (UInt32)ttt; if (code < bound)

 #define UPDATE_0(p) range = bound; *(p) = (CLzmaProb)(ttt + ((kBitModelTotal - ttt) >> kNumMoveBits));

 #define UPDATE_1(p) range -= bound; code -= bound; *(p) = (CLzmaProb)(ttt - (ttt >> kNumMoveBits));

 #define GET_BIT2(p, i, A0, A1) IF_BIT_0(p) \

@@ -68,7 +68,7 @@
 

 #define NORMALIZE_CHECK if (range < kTopValue) { if (buf >= bufLimit) return DUMMY_ERROR; range <<= 8; code = (code << 8) | (*buf++); }

 

-#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * ttt; if (code < bound)

+#define IF_BIT_0_CHECK(p) ttt = *(p); NORMALIZE_CHECK; bound = (range >> kNumBitModelTotalBits) * (UInt32)ttt; if (code < bound)

 #define UPDATE_0_CHECK range = bound;

 #define UPDATE_1_CHECK range -= bound; code -= bound;

 #define GET_BIT2_CHECK(p, i, A0, A1) IF_BIT_0_CHECK(p) \

@@ -541,7 +541,7 @@ int MY_FAST_CALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit
         curLen = ((rem < len) ? (unsigned)rem : len);

         pos = dicPos - rep0 + (dicPos < rep0 ? dicBufSize : 0);

 

-        processedPos += curLen;

+        processedPos += (UInt32)curLen;

 

         len -= curLen;

         if (curLen <= dicBufSize - pos)

@@ -549,7 +549,7 @@ int MY_FAST_CALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit
           Byte *dest = dic + dicPos;

           ptrdiff_t src = (ptrdiff_t)pos - (ptrdiff_t)dicPos;

           const Byte *lim = dest + curLen;

-          dicPos += curLen;

+          dicPos += (SizeT)curLen;

           do

             *(dest) = (Byte)*(dest + src);

           while (++dest != lim);

@@ -574,14 +574,14 @@ int MY_FAST_CALL LZMA_DECODE_REAL(CLzmaDec *p, SizeT limit, const Byte *bufLimit
   p->buf = buf;

   p->range = range;

   p->code = code;

-  p->remainLen = len;

+  p->remainLen = (UInt32)len;

   p->dicPos = dicPos;

   p->processedPos = processedPos;

   p->reps[0] = rep0;

   p->reps[1] = rep1;

   p->reps[2] = rep2;

   p->reps[3] = rep3;

-  p->state = state;

+  p->state = (UInt32)state;

 

   return SZ_OK;

 }

@@ -603,8 +603,8 @@ static void MY_FAST_CALL LzmaDec_WriteRem(CLzmaDec *p, SizeT limit)
     if (p->checkDicSize == 0 && p->prop.dicSize - p->processedPos <= len)

       p->checkDicSize = p->prop.dicSize;

 

-    p->processedPos += len;

-    p->remainLen -= len;

+    p->processedPos += (UInt32)len;

+    p->remainLen -= (UInt32)len;

     while (len != 0)

     {

       len--;

@@ -852,7 +852,7 @@ static ELzmaDummy LzmaDec_TryDummy(const CLzmaDec *p, const Byte *buf, SizeT inS
 }

 

 

-void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState)

+void LzmaDec_InitDicAndState(CLzmaDec *p, BoolInt initDic, BoolInt initState)

 {

   p->remainLen = kMatchSpecLenStart + 1;

   p->tempBufSize = 0;

@@ -981,10 +981,10 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr
         p->tempBufSize = rem;

         if (rem < LZMA_REQUIRED_INPUT_MAX || checkEndMarkNow)

         {

-          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, rem);

+          int dummyRes = LzmaDec_TryDummy(p, p->tempBuf, (SizeT)rem);

           if (dummyRes == DUMMY_ERROR)

           {

-            (*srcLen) += lookAhead;

+            (*srcLen) += (SizeT)lookAhead;

             *status = LZMA_STATUS_NEEDS_MORE_INPUT;

             return SZ_OK;

           }

@@ -1007,9 +1007,9 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr
             return SZ_ERROR_FAIL; /* some internal error */

           lookAhead -= rem;

         }

-        (*srcLen) += lookAhead;

+        (*srcLen) += (SizeT)lookAhead;

         src += lookAhead;

-        inSize -= lookAhead;

+        inSize -= (SizeT)lookAhead;

         p->tempBufSize = 0;

       }

   }

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-history.txt b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-history.txt
index 5ad9a5b1b9..96090b2b45 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-history.txt
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-history.txt
@@ -1,6 +1,28 @@
 HISTORY of the LZMA SDK

 -----------------------

 

+19.00          2019-02-21

+-------------------------

+- Encryption strength for 7z archives was increased:

+  the size of random initialization vector was increased from 64-bit to 128-bit,

+  and the pseudo-random number generator was improved.

+- The bug in 7zIn.c code was fixed.

+

+

+18.06          2018-12-30

+-------------------------

+- The speed for LZMA/LZMA2 compressing was increased by 3-10%,

+  and there are minor changes in compression ratio.

+- Some bugs were fixed.

+- The bug in 7-Zip 18.02-18.05 was fixed:

+  There was memory leak in multithreading xz decoder - XzDecMt_Decode(),

+  if xz stream contains only one block.

+- The changes for MSVS compiler makefiles:

+   - the makefiles now use "PLATFORM" macroname with values (x64, x86, arm64)

+     instead of "CPU" macroname with values (AMD64, ARM64).

+   - the makefiles by default now use static version of the run-time library.

+

+

 18.05          2018-04-30

 -------------------------

 - The speed for LZMA/LZMA2 compressing was increased

diff --git a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-sdk.txt b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-sdk.txt
index bf0b3a5ee6..6bb6fa194e 100644
--- a/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-sdk.txt
+++ b/MdeModulePkg/Library/LzmaCustomDecompressLib/Sdk/DOC/lzma-sdk.txt
@@ -1,4 +1,4 @@
-LZMA SDK 18.05

+LZMA SDK 19.00

 --------------

 

 LZMA SDK provides the documentation, samples, header files,

diff --git a/MdeModulePkg/MdeModulePkg.ci.yaml b/MdeModulePkg/MdeModulePkg.ci.yaml
index 20d53fc5a5..45783f12c1 100644
--- a/MdeModulePkg/MdeModulePkg.ci.yaml
+++ b/MdeModulePkg/MdeModulePkg.ci.yaml
@@ -20,7 +20,9 @@
         ## Both file path and directory path are accepted.

         "IgnoreFiles": [

             "Library/BrotliCustomDecompressLib/brotli",

-            "Universal/RegularExpressionDxe/oniguruma"

+            "Universal/RegularExpressionDxe/oniguruma",

+            "Library/LzmaCustomDecompressLib/Sdk/DOC",

+            "Library/LzmaCustomDecompressLib/Sdk/C"

         ]

     },

     ## options defined ci/Plugin/CompilerPlugin