Skip to content

Commit 4e38bb6

Browse files
Liu, WeiX Cmergify[bot]
Liu, WeiX C
authored andcommitted
BaseTools LzmaCompress: Update LZMA to new 19.00 version
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 <[email protected]> Signed-off-by: Wei Liu <[email protected]> Reviewed-by: Liming Gao <[email protected]>
1 parent 1d3d5e3 commit 4e38bb6

12 files changed

+877
-575
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
LzmaCompress is based on the LZMA SDK 18.05. LZMA SDK 18.05
2-
was placed in the public domain on 2018-04-30. It was
1+
LzmaCompress is based on the LZMA SDK 19.00. LZMA SDK 19.00
2+
was placed in the public domain on 2019-02-21. It was
33
released on the http://www.7-zip.org/sdk.html website.

BaseTools/Source/C/LzmaCompress/LzmaCompress.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/** @file
22
LZMA Compress/Decompress tool (LzmaCompress)
33
4-
Based on LZMA SDK 18.05:
4+
Based on LZMA SDK 19.00:
55
LzmaUtil.c -- Test application for LZMA compression
6-
2018-04-30 : Igor Pavlov : Public domain
6+
2019-02-21 : Igor Pavlov : Public domain
77
88
Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>
99
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -39,7 +39,7 @@ const char *kCantAllocateMessage = "Can not allocate memory";
3939
const char *kDataErrorMessage = "Data error";
4040
const char *kInvalidParamValMessage = "Invalid parameter value";
4141

42-
static Bool mQuietMode = False;
42+
static BoolInt mQuietMode = False;
4343
static CONVERTER_TYPE mConType = NoConverter;
4444

4545
UINT64 mDictionarySize = 28;
@@ -244,7 +244,7 @@ int main2(int numArgs, const char *args[], char *rs)
244244
CFileOutStream outStream;
245245
int res;
246246
int encodeMode = 0;
247-
Bool modeWasSet = False;
247+
BoolInt modeWasSet = False;
248248
const char *inputFile = NULL;
249249
const char *outputFile = "file.tmp";
250250
int param;

BaseTools/Source/C/LzmaCompress/Sdk/C/7zTypes.h

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* 7zTypes.h -- Basic types
2-
2017-07-17 : Igor Pavlov : Public domain */
2+
2018-08-04 : Igor Pavlov : Public domain */
33

44
#ifndef __7Z_TYPES_H
55
#define __7Z_TYPES_H
@@ -103,7 +103,8 @@ typedef UInt32 SizeT;
103103
typedef size_t SizeT;
104104
#endif
105105

106-
typedef int Bool;
106+
typedef int BoolInt;
107+
/* typedef BoolInt Bool; */
107108
#define True 1
108109
#define False 0
109110

BaseTools/Source/C/LzmaCompress/Sdk/C/7zVersion.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#define MY_VER_MAJOR 18
2-
#define MY_VER_MINOR 05
1+
#define MY_VER_MAJOR 19
2+
#define MY_VER_MINOR 00
33
#define MY_VER_BUILD 0
4-
#define MY_VERSION_NUMBERS "18.05"
4+
#define MY_VERSION_NUMBERS "19.00"
55
#define MY_VERSION MY_VERSION_NUMBERS
66

77
#ifdef MY_CPU_NAME
@@ -10,7 +10,7 @@
1010
#define MY_VERSION_CPU MY_VERSION
1111
#endif
1212

13-
#define MY_DATE "2018-04-30"
13+
#define MY_DATE "2019-02-21"
1414
#undef MY_COPYRIGHT
1515
#undef MY_VERSION_COPYRIGHT_DATE
1616
#define MY_AUTHOR_NAME "Igor Pavlov"

BaseTools/Source/C/LzmaCompress/Sdk/C/CpuArch.h

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* CpuArch.h -- CPU specific code
2-
2017-09-04 : Igor Pavlov : Public domain */
2+
2018-02-18 : Igor Pavlov : Public domain */
33

44
#ifndef __CPU_ARCH_H
55
#define __CPU_ARCH_H
@@ -318,15 +318,16 @@ enum
318318

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

321-
Bool x86cpuid_CheckAndRead(Cx86cpuid *p);
321+
BoolInt x86cpuid_CheckAndRead(Cx86cpuid *p);
322322
int x86cpuid_GetFirm(const Cx86cpuid *p);
323323

324324
#define x86cpuid_GetFamily(ver) (((ver >> 16) & 0xFF0) | ((ver >> 8) & 0xF))
325325
#define x86cpuid_GetModel(ver) (((ver >> 12) & 0xF0) | ((ver >> 4) & 0xF))
326326
#define x86cpuid_GetStepping(ver) (ver & 0xF)
327327

328-
Bool CPU_Is_InOrder();
329-
Bool CPU_Is_Aes_Supported();
328+
BoolInt CPU_Is_InOrder();
329+
BoolInt CPU_Is_Aes_Supported();
330+
BoolInt CPU_IsSupported_PageGB();
330331

331332
#endif
332333

0 commit comments

Comments
 (0)