1725888727

Oleh Kulykov · Oleh Kulykov · commit 46b005588aaf · 2024-09-09T15:32:07.000+02:00
diff --git a/src/CPP/7zip/Common/MethodProps.h b/src/CPP/7zip/Common/MethodProps.h
@@ -45,7 +45,7 @@ inline HRESULT ParseMtProp(const UString &name, const PROPVARIANT &prop, UInt32
 }
 
 
-struct CProp
+struct CProp Z7_final
 {
   PROPID Id;
   bool IsOptional;
diff --git a/src/CPP/7zip/Common/OutBuffer.h b/src/CPP/7zip/Common/OutBuffer.h
@@ -14,7 +14,7 @@ struct COutBufferException: public CSystemException
 };
 #endif
 
-class COutBuffer
+class COutBuffer Z7_final
 {
 protected:
   Byte *_buf;
diff --git a/src/CPP/7zip/Common/RegisterArc.h b/src/CPP/7zip/Common/RegisterArc.h
@@ -5,7 +5,7 @@
 
 #include "../Archive/IArchive.h"
 
-struct CArcInfo
+struct CArcInfo Z7_final
 {
   UInt32 Flags;
   Byte Id;
diff --git a/src/CPP/7zip/Common/RegisterCodec.h b/src/CPP/7zip/Common/RegisterCodec.h
@@ -9,7 +9,7 @@
 
 typedef void * (*CreateCodecP)();
 
-struct CCodecInfo
+struct CCodecInfo Z7_final
 {
   CreateCodecP CreateDecoder;
   CreateCodecP CreateEncoder;
@@ -84,7 +84,7 @@ void RegisterCodec(const CCodecInfo *codecInfo) throw();
 
 
 
-struct CHasherInfo
+struct CHasherInfo Z7_final
 {
   IHasher * (*CreateHasher)();
   CMethodId Id;
diff --git a/src/CPP/7zip/Common/StreamBinder.h b/src/CPP/7zip/Common/StreamBinder.h
@@ -27,7 +27,7 @@ The difference for cases where Reading must be closed before Writing closing
   writer thread always will detect closing of reading in latest iteration after all data processing iterations
 */
 
-class CStreamBinder
+class CStreamBinder Z7_final
 {
   NWindows::NSynchronization::CAutoResetEvent _canRead_Event;
   // NWindows::NSynchronization::CAutoResetEvent _canWrite_Event;
diff --git a/src/CPP/7zip/Common/UniqBlocks.h b/src/CPP/7zip/Common/UniqBlocks.h
@@ -6,7 +6,7 @@
 #include "../../Common/MyBuffer.h"
 #include "../../Common/MyString.h"
 
-struct C_UInt32_UString_Map
+struct C_UInt32_UString_Map Z7_final
 {
   CRecordVector<UInt32> Numbers;
   UStringVector Strings;
@@ -22,7 +22,7 @@ struct C_UInt32_UString_Map
 };
 
 
-struct CUniqBlocks
+struct CUniqBlocks Z7_final
 {
   CObjectVector<CByteBuffer> Bufs;
   CUIntVector Sorted;
diff --git a/src/CPP/7zip/Compress/PpmdEncoder.h b/src/CPP/7zip/Compress/PpmdEncoder.h
@@ -14,7 +14,7 @@
 namespace NCompress {
 namespace NPpmd {
 
-struct CEncProps
+struct CEncProps Z7_final
 {
   UInt32 MemSize;
   UInt32 ReduceSize;
diff --git a/src/CPP/7zip/Crypto/7zAes.h b/src/CPP/7zip/Crypto/7zAes.h
@@ -17,7 +17,7 @@ const unsigned kKeySize = 32;
 const unsigned kSaltSizeMax = 16;
 const unsigned kIvSizeMax = 16; // AES_BLOCK_SIZE;
 
-class CKeyInfo
+class CKeyInfo Z7_final
 {
 public:
   unsigned NumCyclesPower;
diff --git a/src/CPP/7zip/Crypto/MyAes.h b/src/CPP/7zip/Crypto/MyAes.h
@@ -77,7 +77,7 @@ class CAesCoder:
 
 
 #ifndef Z7_EXTRACT_ONLY
-struct CAesCbcEncoder: public CAesCoder
+struct CAesCbcEncoder Z7_final: public CAesCoder
 {
   CAesCbcEncoder(unsigned keySize = 0): CAesCoder(keySize)
   {
@@ -88,7 +88,7 @@ struct CAesCbcEncoder: public CAesCoder
 };
 #endif
 
-struct CAesCbcDecoder: public CAesCoder
+struct CAesCbcDecoder Z7_final: public CAesCoder
 {
   CAesCbcDecoder(unsigned keySize = 0): CAesCoder(keySize)
   {
diff --git a/src/CPP/7zip/Crypto/RandGen.h b/src/CPP/7zip/Crypto/RandGen.h
@@ -20,7 +20,7 @@
 
 #else
 
-class CRandomGenerator
+class CRandomGenerator Z7_final
 {
   Byte _buff[SHA256_DIGEST_SIZE];
   bool _needInit;
diff --git a/src/CPP/7zip/IStream.h b/src/CPP/7zip/IStream.h
@@ -117,7 +117,7 @@ Z7_IFACE_CONSTR_STREAM(IOutStreamFinish, 0x07)
 Z7_IFACE_CONSTR_STREAM(IStreamGetProps, 0x08)
 
 
-struct CStreamFileProps
+struct CStreamFileProps Z7_final
 {
   UInt64 Size;
   UInt64 VolID;
diff --git a/src/CPP/Common/MyBuffer.h b/src/CPP/Common/MyBuffer.h
@@ -149,7 +149,7 @@ bool operator!=(const CBuffer<T>& b1, const CBuffer<T>& b2)
 typedef CBuffer<Byte> CByteBuffer;
 
 
-class CByteBuffer_Wipe: public CByteBuffer
+class CByteBuffer_Wipe Z7_final: public CByteBuffer
 {
   Z7_CLASS_NO_COPY(CByteBuffer_Wipe)
 public:
diff --git a/src/CPP/Common/MyBuffer2.h b/src/CPP/Common/MyBuffer2.h
@@ -7,7 +7,7 @@
 
 #include "MyTypes.h"
 
-class CMidBuffer
+class CMidBuffer Z7_final
 {
   Byte *_data;
   size_t _size;
@@ -56,7 +56,7 @@ class CMidBuffer
 };
 
 
-class CAlignedBuffer1
+class CAlignedBuffer1 Z7_final
 {
   Byte *_data;
 
@@ -81,7 +81,7 @@ class CAlignedBuffer1
 };
 
 
-class CAlignedBuffer
+class CAlignedBuffer Z7_final
 {
   Byte *_data;
   size_t _size;
diff --git a/src/CPP/Common/MyString.h b/src/CPP/Common/MyString.h
@@ -505,7 +505,7 @@ class AString
 };
 
 
-class AString_Wipe: public AString
+class AString_Wipe Z7_final: public AString
 {
   Z7_CLASS_NO_COPY(AString_Wipe)
 public:
@@ -797,7 +797,7 @@ class UString
 };
 
 
-class UString_Wipe: public UString
+class UString_Wipe Z7_final: public UString
 {
   Z7_CLASS_NO_COPY(UString_Wipe)
 public:
@@ -856,7 +856,7 @@ void operator-(const UString &s1, unsigned c);
 
 
 
-class UString2
+class UString2 Z7_final
 {
   wchar_t *_chars;
   unsigned _len;
diff --git a/src/CPP/Common/MyTypes.h b/src/CPP/Common/MyTypes.h
@@ -9,7 +9,7 @@
 // typedef int HRes;
 // typedef HRESULT HRes;
 
-struct CBoolPair
+struct CBoolPair Z7_final
 {
   bool Val;
   bool Def;
diff --git a/src/CPP/Common/StdInStream.h b/src/CPP/Common/StdInStream.h
@@ -8,7 +8,7 @@
 #include "MyString.h"
 #include "MyTypes.h"
 
-class CStdInStream
+class CStdInStream Z7_final
 {
   FILE *_stream;
   // bool _streamIsOpen;
diff --git a/src/CPP/Common/StdOutStream.h b/src/CPP/Common/StdOutStream.h
@@ -8,7 +8,7 @@
 #include "MyString.h"
 #include "MyTypes.h"
 
-class CStdOutStream
+class CStdOutStream Z7_final
 {
   FILE *_stream;
   // bool _streamIsOpen;
diff --git a/src/CPP/Common/UTFConvert.h b/src/CPP/Common/UTFConvert.h
@@ -6,7 +6,7 @@
 #include "MyBuffer.h"
 #include "MyString.h"
 
-struct CUtf8Check
+struct CUtf8Check Z7_final
 {
   // Byte MaxByte;     // in original src stream
   bool NonUtf;
diff --git a/src/CPP/Common/Wildcard.h b/src/CPP/Common/Wildcard.h
@@ -30,7 +30,7 @@ bool IsDriveColonName(const wchar_t *s);
 unsigned GetNumPrefixParts_if_DrivePath(UStringVector &pathParts);
 #endif
 
-struct CItem
+struct CItem Z7_final
 {
   UStringVector PathParts;
   bool Recursive;
@@ -57,7 +57,7 @@ const Byte kMark_FileOrDir = 0;
 const Byte kMark_StrictFile = 1;
 const Byte kMark_StrictFile_IfWildcard = 2;
 
-struct CCensorPathProps
+struct CCensorPathProps Z7_final
 {
   bool Recursive;
   bool WildcardMatching;
@@ -71,7 +71,7 @@ struct CCensorPathProps
 };
 
 
-class CCensorNode  MY_UNCOPYABLE
+class CCensorNode Z7_final MY_UNCOPYABLE
 {
   CCensorNode *Parent;
   
@@ -153,7 +153,7 @@ class CCensorNode  MY_UNCOPYABLE
 };
 
 
-struct CPair  MY_UNCOPYABLE
+struct CPair Z7_final MY_UNCOPYABLE
 {
   UString Prefix;
   CCensorNode Head;
@@ -170,7 +170,7 @@ enum ECensorPathMode
 };
 
 
-struct CCensorPath
+struct CCensorPath Z7_final
 {
   UString Path;
   bool Include;
@@ -182,7 +182,7 @@ struct CCensorPath
 };
 
 
-class CCensor  MY_UNCOPYABLE
+class CCensor Z7_final MY_UNCOPYABLE
 {
   int FindPairForPrefix(const UString &prefix) const;
 public:
diff --git a/src/CPP/Windows/FileDir.h b/src/CPP/Windows/FileDir.h
@@ -79,7 +79,7 @@ bool MyGetTempPath(FString &resultPath);
 
 bool CreateTempFile2(CFSTR prefix, bool addRandom, AString &postfix, NIO::COutFile *outFile);
 
-class CTempFile  MY_UNCOPYABLE
+class CTempFile Z7_final MY_UNCOPYABLE
 {
   bool _mustBeDeleted;
   FString _path;
@@ -96,7 +96,7 @@ class CTempFile  MY_UNCOPYABLE
 
 
 #ifdef _WIN32
-class CTempDir  MY_UNCOPYABLE
+class CTempDir Z7_final MY_UNCOPYABLE
 {
   bool _mustBeDeleted;
   FString _path;
@@ -112,7 +112,7 @@ class CTempDir  MY_UNCOPYABLE
 
 
 #if !defined(UNDER_CE)
-class CCurrentDirRestorer  MY_UNCOPYABLE
+class CCurrentDirRestorer Z7_final MY_UNCOPYABLE
 {
   FString _path;
 public:
diff --git a/src/CPP/Windows/FileFind.h b/src/CPP/Windows/FileFind.h
@@ -159,7 +159,7 @@ class CFileInfoBase
   }
 };
 
-struct CFileInfo: public CFileInfoBase
+struct CFileInfo Z7_final: public CFileInfoBase
 {
   FString Name;
   #if defined(_WIN32) && !defined(UNDER_CE)
@@ -211,7 +211,7 @@ struct CStreamInfo
   bool IsMainStream() const throw();
 };
 
-class CFindStream: public CFindFileBase
+class CFindStream Z7_final: public CFindFileBase
 {
 public:
   bool FindFirst(CFSTR filePath, CStreamInfo &streamInfo);
@@ -232,7 +232,7 @@ class CStreamEnumerator  MY_UNCOPYABLE
 #endif // defined(_WIN32) && !defined(UNDER_CE)
 
 
-class CEnumerator  MY_UNCOPYABLE
+class CEnumerator Z7_final MY_UNCOPYABLE
 {
   CFindFile _findFile;
   FString _wildcard;
@@ -245,7 +245,7 @@ class CEnumerator  MY_UNCOPYABLE
 };
 
 
-class CFindChangeNotification  MY_UNCOPYABLE
+class CFindChangeNotification Z7_final MY_UNCOPYABLE
 {
   HANDLE _handle;
 public:
@@ -276,7 +276,7 @@ typedef CFileInfo CDirEntry;
 #else // WIN32
 
 #if !defined(LIBPLZMA)
-struct CDirEntry
+struct CDirEntry Z7_final
 {
   ino_t iNode;
 #if !defined(_AIX) && !defined(__sun)
@@ -297,7 +297,7 @@ struct CDirEntry
   bool IsDots() const throw();
 };
 
-class CEnumerator  MY_UNCOPYABLE
+class CEnumerator Z7_final MY_UNCOPYABLE
 {
   DIR *_dir;
   FString _wildcard;
diff --git a/src/CPP/Windows/FileIO.h b/src/CPP/Windows/FileIO.h

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ inline HRESULT ParseMtProp(const UString &name, const PROPVARIANT &prop, UInt32`
`45`	`45`	`}`
`46`	`46`
`47`	`47`
`48`		`-struct CProp`
	`48`	`+struct CProp Z7_final`
`49`	`49`	`{`
`50`	`50`	`PROPID Id;`
`51`	`51`	`bool IsOptional;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ struct COutBufferException: public CSystemException`
`14`	`14`	`};`
`15`	`15`	`#endif`
`16`	`16`
`17`		`-class COutBuffer`
	`17`	`+class COutBuffer Z7_final`
`18`	`18`	`{`
`19`	`19`	`protected:`
`20`	`20`	`Byte *_buf;`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`#include "../Archive/IArchive.h"`
`7`	`7`
`8`		`-struct CArcInfo`
	`8`	`+struct CArcInfo Z7_final`
`9`	`9`	`{`
`10`	`10`	`UInt32 Flags;`
`11`	`11`	`Byte Id;`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`typedef void * (*CreateCodecP)();`
`11`	`11`
`12`		`-struct CCodecInfo`
	`12`	`+struct CCodecInfo Z7_final`
`13`	`13`	`{`
`14`	`14`	`CreateCodecP CreateDecoder;`
`15`	`15`	`CreateCodecP CreateEncoder;`
`@@ -84,7 +84,7 @@ void RegisterCodec(const CCodecInfo *codecInfo) throw();`
`84`	`84`
`85`	`85`
`86`	`86`
`87`		`-struct CHasherInfo`
	`87`	`+struct CHasherInfo Z7_final`
`88`	`88`	`{`
`89`	`89`	`IHasher * (*CreateHasher)();`
`90`	`90`	`CMethodId Id;`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ The difference for cases where Reading must be closed before Writing closing`
`27`	`27`	`writer thread always will detect closing of reading in latest iteration after all data processing iterations`
`28`	`28`	`*/`
`29`	`29`
`30`		`-class CStreamBinder`
	`30`	`+class CStreamBinder Z7_final`
`31`	`31`	`{`
`32`	`32`	`NWindows::NSynchronization::CAutoResetEvent _canRead_Event;`
`33`	`33`	`// NWindows::NSynchronization::CAutoResetEvent _canWrite_Event;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#include "../../Common/MyBuffer.h"`
`7`	`7`	`#include "../../Common/MyString.h"`
`8`	`8`
`9`		`-struct C_UInt32_UString_Map`
	`9`	`+struct C_UInt32_UString_Map Z7_final`
`10`	`10`	`{`
`11`	`11`	`CRecordVector<UInt32> Numbers;`
`12`	`12`	`UStringVector Strings;`
`@@ -22,7 +22,7 @@ struct C_UInt32_UString_Map`
`22`	`22`	`};`
`23`	`23`
`24`	`24`
`25`		`-struct CUniqBlocks`
	`25`	`+struct CUniqBlocks Z7_final`
`26`	`26`	`{`
`27`	`27`	`CObjectVector<CByteBuffer> Bufs;`
`28`	`28`	`CUIntVector Sorted;`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`namespace NCompress {`
`15`	`15`	`namespace NPpmd {`
`16`	`16`
`17`		`-struct CEncProps`
	`17`	`+struct CEncProps Z7_final`
`18`	`18`	`{`
`19`	`19`	`UInt32 MemSize;`
`20`	`20`	`UInt32 ReduceSize;`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ const unsigned kKeySize = 32;`
`17`	`17`	`const unsigned kSaltSizeMax = 16;`
`18`	`18`	`const unsigned kIvSizeMax = 16; // AES_BLOCK_SIZE;`
`19`	`19`
`20`		`-class CKeyInfo`
	`20`	`+class CKeyInfo Z7_final`
`21`	`21`	`{`
`22`	`22`	`public:`
`23`	`23`	`unsigned NumCyclesPower;`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ class CAesCoder:`
`77`	`77`
`78`	`78`
`79`	`79`	`#ifndef Z7_EXTRACT_ONLY`
`80`		`-struct CAesCbcEncoder: public CAesCoder`
	`80`	`+struct CAesCbcEncoder Z7_final: public CAesCoder`
`81`	`81`	`{`
`82`	`82`	`CAesCbcEncoder(unsigned keySize = 0): CAesCoder(keySize)`
`83`	`83`	`{`
`@@ -88,7 +88,7 @@ struct CAesCbcEncoder: public CAesCoder`
`88`	`88`	`};`
`89`	`89`	`#endif`
`90`	`90`
`91`		`-struct CAesCbcDecoder: public CAesCoder`
	`91`	`+struct CAesCbcDecoder Z7_final: public CAesCoder`
`92`	`92`	`{`
`93`	`93`	`CAesCbcDecoder(unsigned keySize = 0): CAesCoder(keySize)`
`94`	`94`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`#else`
`22`	`22`
`23`		`-class CRandomGenerator`
	`23`	`+class CRandomGenerator Z7_final`
`24`	`24`	`{`
`25`	`25`	`Byte _buff[SHA256_DIGEST_SIZE];`
`26`	`26`	`bool _needInit;`