Skip to content

Commit 86b61e1

Browse files
clownclown
committed
Merge branch '7z' into unicode
2 parents 4ed62e6 + 6b4b573 commit 86b61e1

File tree

113 files changed

+1802
-929
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+1802
-929
lines changed

‎C/7zArcIn.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* 7zArcIn.c -- 7z Input functions
2-
2017-04-03 : Igor Pavlov : Public domain */
2+
2018-07-04 : Igor Pavlov : Public domain */
33

44
#include "Precomp.h"
55

@@ -1744,7 +1744,7 @@ size_t SzArEx_GetFullNameLen(const CSzArEx *p, size_t fileIndex)
17441744
17451745
UInt16 *SzArEx_GetFullNameUtf16_Back(const CSzArEx *p, size_t fileIndex, UInt16 *dest)
17461746
{
1747-
Bool needSlash;
1747+
BoolInt needSlash;
17481748
if (!p->FileNameOffsets)
17491749
{
17501750
*(--dest) = 0;

‎C/7zDec.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* 7zDec.c -- Decoding from 7z folder
2-
2017-04-03 : Igor Pavlov : Public domain */
2+
2018-07-04 : Igor Pavlov : Public domain */
33

44
#include "Precomp.h"
55

@@ -44,7 +44,7 @@ typedef struct
4444
const Byte *end;
4545
const Byte *begin;
4646
UInt64 processed;
47-
Bool extra;
47+
BoolInt extra;
4848
SRes res;
4949
const ILookInStream *inStream;
5050
} CByteInToLook;
@@ -269,7 +269,7 @@ static SRes SzDecodeCopy(UInt64 inSize, ILookInStream *inStream, Byte *outBuffer
269269
return SZ_OK;
270270
}
271271

272-
static Bool IS_MAIN_METHOD(UInt32 m)
272+
static BoolInt IS_MAIN_METHOD(UInt32 m)
273273
{
274274
switch (m)
275275
{
@@ -286,7 +286,7 @@ static Bool IS_MAIN_METHOD(UInt32 m)
286286
return False;
287287
}
288288

289-
static Bool IS_SUPPORTED_CODER(const CSzCoderInfo *c)
289+
static BoolInt IS_SUPPORTED_CODER(const CSzCoderInfo *c)
290290
{
291291
return
292292
c->NumStreams == 1

‎C/7zTypes.h‎

Lines changed: 3 additions & 2 deletions
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

‎C/7zVersion.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#define MY_VER_MAJOR 18
2-
#define MY_VER_MINOR 05
2+
#define MY_VER_MINOR 06
33
#define MY_VER_BUILD 0
4-
#define MY_VERSION_NUMBERS "18.05"
4+
#define MY_VERSION_NUMBERS "18.06"
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 "2018-12-30"
1414
#undef MY_COPYRIGHT
1515
#undef MY_VERSION_COPYRIGHT_DATE
1616
#define MY_AUTHOR_NAME "Igor Pavlov"

‎C/Bcj2Enc.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* Bcj2Enc.c -- BCJ2 Encoder (Converter for x86 code)
2-
2017-04-28 : Igor Pavlov : Public domain */
2+
2018-07-04 : Igor Pavlov : Public domain */
33

44
#include "Precomp.h"
55

@@ -52,7 +52,7 @@ void Bcj2Enc_Init(CBcj2Enc *p)
5252
p->probs[i] = kBitModelTotal >> 1;
5353
}
5454

55-
static Bool MY_FAST_CALL RangeEnc_ShiftLow(CBcj2Enc *p)
55+
static BoolInt MY_FAST_CALL RangeEnc_ShiftLow(CBcj2Enc *p)
5656
{
5757
if ((UInt32)p->low < (UInt32)0xFF000000 || (UInt32)(p->low >> 32) != 0)
5858
{
@@ -165,7 +165,7 @@ static void Bcj2Enc_Encode_2(CBcj2Enc *p)
165165

166166
{
167167
Byte context = (Byte)(num == 0 ? p->prevByte : src[-1]);
168-
Bool needConvert;
168+
BoolInt needConvert;
169169

170170
p->bufs[BCJ2_STREAM_MAIN] = dest + 1;
171171
p->ip += (UInt32)num + 1;

‎C/BwtSort.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* BwtSort.c -- BWT block sorting
2-
2017-04-03 : Igor Pavlov : Public domain */
2+
2018-07-04 : Igor Pavlov : Public domain */
33

44
#include "Precomp.h"
55

@@ -448,7 +448,7 @@ UInt32 BlockSort(UInt32 *Indices, const Byte *data, UInt32 blockSize)
448448

449449
groupSize = ((Indices[i] & ~0xC0000000) >> kNumBitsMax);
450450
{
451-
Bool finishedGroup = ((Indices[i] & 0x80000000) == 0);
451+
BoolInt finishedGroup = ((Indices[i] & 0x80000000) == 0);
452452
if ((Indices[i] & 0x40000000) != 0)
453453
{
454454
groupSize += ((Indices[(size_t)i + 1] >> kNumBitsMax) << kNumExtra0Bits);

‎C/CpuArch.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* CpuArch.c -- CPU specific code
2-
2016-02-25: Igor Pavlov : Public domain */
2+
2018-07-04: Igor Pavlov : Public domain */
33

44
#include "Precomp.h"
55

@@ -115,7 +115,7 @@ void MyCPUID(UInt32 function, UInt32 *a, UInt32 *b, UInt32 *c, UInt32 *d)
115115
#endif
116116
}
117117

118-
Bool x86cpuid_CheckAndRead(Cx86cpuid *p)
118+
BoolInt x86cpuid_CheckAndRead(Cx86cpuid *p)
119119
{
120120
CHECK_CPUID_IS_SUPPORTED
121121
MyCPUID(0, &p->maxFunc, &p->vendor[0], &p->vendor[2], &p->vendor[1]);
@@ -144,7 +144,7 @@ int x86cpuid_GetFirm(const Cx86cpuid *p)
144144
return -1;
145145
}
146146

147-
Bool CPU_Is_InOrder()
147+
BoolInt CPU_Is_InOrder()
148148
{
149149
Cx86cpuid p;
150150
int firm;
@@ -175,7 +175,7 @@ Bool CPU_Is_InOrder()
175175

176176
#if !defined(MY_CPU_AMD64) && defined(_WIN32)
177177
#include <windows.h>
178-
static Bool CPU_Sys_Is_SSE_Supported()
178+
static BoolInt CPU_Sys_Is_SSE_Supported()
179179
{
180180
OSVERSIONINFO vi;
181181
vi.dwOSVersionInfoSize = sizeof(vi);
@@ -188,7 +188,7 @@ static Bool CPU_Sys_Is_SSE_Supported()
188188
#define CHECK_SYS_SSE_SUPPORT
189189
#endif
190190

191-
Bool CPU_Is_Aes_Supported()
191+
BoolInt CPU_Is_Aes_Supported()
192192
{
193193
Cx86cpuid p;
194194
CHECK_SYS_SSE_SUPPORT

‎C/CpuArch.h‎

Lines changed: 4 additions & 4 deletions
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-07-04 : Igor Pavlov : Public domain */
33

44
#ifndef __CPU_ARCH_H
55
#define __CPU_ARCH_H
@@ -318,15 +318,15 @@ 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();
330330

331331
#endif
332332

0 commit comments

Comments
 (0)