diff options
author | David Srbecky <dsrbecky@google.com> | 2015-05-11 12:31:23 +0100 |
---|---|---|
committer | David Srbecky <dsrbecky@google.com> | 2015-05-13 01:06:58 +0100 |
commit | cd66d540cead3f8200b0c73bad9c276d67896c3d (patch) | |
tree | d25a4a409bd041f18b856e156cf1fa71f6169369 /CPP/7zip/UI/Common/ZipRegistry.h | |
parent | b473eaa2840cccf2fef15d53f00bccf92c41b615 (diff) | |
download | lzma-cd66d540cead3f8200b0c73bad9c276d67896c3d.tar.gz |
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
Diffstat (limited to 'CPP/7zip/UI/Common/ZipRegistry.h')
-rw-r--r--[-rwxr-xr-x] | CPP/7zip/UI/Common/ZipRegistry.h | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/CPP/7zip/UI/Common/ZipRegistry.h b/CPP/7zip/UI/Common/ZipRegistry.h index 1760d9b..df00aac 100755..100644 --- a/CPP/7zip/UI/Common/ZipRegistry.h +++ b/CPP/7zip/UI/Common/ZipRegistry.h @@ -3,8 +3,8 @@ #ifndef __ZIP_REGISTRY_H
#define __ZIP_REGISTRY_H
-#include "Common/MyString.h"
-#include "Common/Types.h"
+#include "../../../Common/MyTypes.h"
+#include "../../../Common/MyString.h"
#include "ExtractMode.h"
@@ -14,12 +14,23 @@ namespace NExtract {
NPathMode::EEnum PathMode;
NOverwriteMode::EEnum OverwriteMode;
- bool ShowPassword;
+ bool PathMode_Force;
+ bool OverwriteMode_Force;
+
+ CBoolPair SplitDest;
+ CBoolPair ElimDup;
+ // CBoolPair AltStreams;
+ CBoolPair NtSecurity;
+ CBoolPair ShowPassword;
+
UStringVector Paths;
void Save() const;
void Load();
};
+
+ void Save_ShowPassword(bool showPassword);
+ bool Read_ShowPassword();
}
namespace NCompression
@@ -57,6 +68,11 @@ namespace NCompression CObjectVector<CFormatOptions> Formats;
+ CBoolPair NtSecurity;
+ CBoolPair AltStreams;
+ CBoolPair HardLinks;
+ CBoolPair SymLinks;
+
void Save() const;
void Load();
};
@@ -76,7 +92,7 @@ namespace NWorkDir struct CInfo
{
NMode::EEnum Mode;
- UString Path;
+ FString Path;
bool ForRemovableOnly;
void SetForRemovableOnlyDefault() { ForRemovableOnly = true; }
@@ -96,6 +112,7 @@ namespace NWorkDir struct CContextMenuInfo
{
bool Cascaded;
+ bool MenuIcons;
UInt32 Flags;
void Save() const;
|