diff --git a/CPP/7zip/Archive/7z/7zUpdate.cpp b/CPP/7zip/Archive/7z/7zUpdate.cpp index 3fff3a3f..3ee5eb09 100644 --- a/CPP/7zip/Archive/7z/7zUpdate.cpp +++ b/CPP/7zip/Archive/7z/7zUpdate.cpp @@ -557,7 +557,7 @@ static int CompareEmptyItems(const unsigned *p1, const unsigned *p2, void *param } static const char *g_Exts = - " 7z xz lzma ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha liz tliz lz tlz lz4 tlz4 lz5 tlz5 lzh lzo lzx pak rar rpm sit zoo zst" + " 7z xz lzma lzma2 ace arc arj bz tbz bz2 tbz2 cab deb gz tgz ha lha liz tliz lz tlz lz4 tlz4 lz5 tlz5 lzh lzo lzx pak rar rpm sit zoo zst zstd" " zip jar ear war msi" " 3gp avi mov mpeg mpg mpe wmv" " aac ape fla flac la mp3 m4a mp4 ofr ogg pac ra rm rka shn swa tta wv wma wav" diff --git a/CPP/7zip/Archive/7z/resource.rc b/CPP/7zip/Archive/7z/resource.rc index f79dac08..bc1729af 100644 --- a/CPP/7zip/Archive/7z/resource.rc +++ b/CPP/7zip/Archive/7z/resource.rc @@ -8,4 +8,3 @@ STRINGTABLE BEGIN 100 "7z:0" END - diff --git a/CPP/7zip/Archive/Icons/7z.ico b/CPP/7zip/Archive/Icons/7z.ico index 33f5e663..fa48baf9 100644 Binary files a/CPP/7zip/Archive/Icons/7z.ico and b/CPP/7zip/Archive/Icons/7z.ico differ diff --git a/CPP/7zip/Archive/Icons/apfs.ico b/CPP/7zip/Archive/Icons/apfs.ico index 8af0d677..e508ca53 100644 Binary files a/CPP/7zip/Archive/Icons/apfs.ico and b/CPP/7zip/Archive/Icons/apfs.ico differ diff --git a/CPP/7zip/Archive/Icons/arj.ico b/CPP/7zip/Archive/Icons/arj.ico index dd36f3d0..395f10d2 100644 Binary files a/CPP/7zip/Archive/Icons/arj.ico and b/CPP/7zip/Archive/Icons/arj.ico differ diff --git a/CPP/7zip/Archive/Icons/br.ico b/CPP/7zip/Archive/Icons/br.ico new file mode 100644 index 00000000..df78fb03 Binary files /dev/null and b/CPP/7zip/Archive/Icons/br.ico differ diff --git a/CPP/7zip/Archive/Icons/bz2.ico b/CPP/7zip/Archive/Icons/bz2.ico index 69604f6a..cbef83d8 100644 Binary files a/CPP/7zip/Archive/Icons/bz2.ico and b/CPP/7zip/Archive/Icons/bz2.ico differ diff --git a/CPP/7zip/Archive/Icons/cab.ico b/CPP/7zip/Archive/Icons/cab.ico index b185da32..cd3ee78a 100644 Binary files a/CPP/7zip/Archive/Icons/cab.ico and b/CPP/7zip/Archive/Icons/cab.ico differ diff --git a/CPP/7zip/Archive/Icons/cpio.ico b/CPP/7zip/Archive/Icons/cpio.ico index 43267eed..e7180da4 100644 Binary files a/CPP/7zip/Archive/Icons/cpio.ico and b/CPP/7zip/Archive/Icons/cpio.ico differ diff --git a/CPP/7zip/Archive/Icons/deb.ico b/CPP/7zip/Archive/Icons/deb.ico index 56732d5a..e875e798 100644 Binary files a/CPP/7zip/Archive/Icons/deb.ico and b/CPP/7zip/Archive/Icons/deb.ico differ diff --git a/CPP/7zip/Archive/Icons/dmg.ico b/CPP/7zip/Archive/Icons/dmg.ico index d46a75c2..2a142cfd 100644 Binary files a/CPP/7zip/Archive/Icons/dmg.ico and b/CPP/7zip/Archive/Icons/dmg.ico differ diff --git a/CPP/7zip/Archive/Icons/fat.ico b/CPP/7zip/Archive/Icons/fat.ico index c4ae0dc4..8553e1a0 100644 Binary files a/CPP/7zip/Archive/Icons/fat.ico and b/CPP/7zip/Archive/Icons/fat.ico differ diff --git a/CPP/7zip/Archive/Icons/gz.ico b/CPP/7zip/Archive/Icons/gz.ico index bb740217..7c4734c8 100644 Binary files a/CPP/7zip/Archive/Icons/gz.ico and b/CPP/7zip/Archive/Icons/gz.ico differ diff --git a/CPP/7zip/Archive/Icons/hfs.ico b/CPP/7zip/Archive/Icons/hfs.ico index 7e7ad758..25d97183 100644 Binary files a/CPP/7zip/Archive/Icons/hfs.ico and b/CPP/7zip/Archive/Icons/hfs.ico differ diff --git a/CPP/7zip/Archive/Icons/iso.ico b/CPP/7zip/Archive/Icons/iso.ico index 57d15b53..526e5305 100644 Binary files a/CPP/7zip/Archive/Icons/iso.ico and b/CPP/7zip/Archive/Icons/iso.ico differ diff --git a/CPP/7zip/Archive/Icons/lha.ico b/CPP/7zip/Archive/Icons/lha.ico index 505cddc3..67ddcb49 100644 Binary files a/CPP/7zip/Archive/Icons/lha.ico and b/CPP/7zip/Archive/Icons/lha.ico differ diff --git a/CPP/7zip/Archive/Icons/liz.ico b/CPP/7zip/Archive/Icons/liz.ico index af40f03b..ff7231e2 100644 Binary files a/CPP/7zip/Archive/Icons/liz.ico and b/CPP/7zip/Archive/Icons/liz.ico differ diff --git a/CPP/7zip/Archive/Icons/lz4.ico b/CPP/7zip/Archive/Icons/lz4.ico index 0fe1606e..1a46a901 100644 Binary files a/CPP/7zip/Archive/Icons/lz4.ico and b/CPP/7zip/Archive/Icons/lz4.ico differ diff --git a/CPP/7zip/Archive/Icons/lz5.ico b/CPP/7zip/Archive/Icons/lz5.ico index 2e1522c5..e77319bb 100644 Binary files a/CPP/7zip/Archive/Icons/lz5.ico and b/CPP/7zip/Archive/Icons/lz5.ico differ diff --git a/CPP/7zip/Archive/Icons/lzh.ico b/CPP/7zip/Archive/Icons/lzh.ico index b00736e2..a7236d49 100644 Binary files a/CPP/7zip/Archive/Icons/lzh.ico and b/CPP/7zip/Archive/Icons/lzh.ico differ diff --git a/CPP/7zip/Archive/Icons/lzma.ico b/CPP/7zip/Archive/Icons/lzma.ico index 71b248df..46930e3d 100644 Binary files a/CPP/7zip/Archive/Icons/lzma.ico and b/CPP/7zip/Archive/Icons/lzma.ico differ diff --git a/CPP/7zip/Archive/Icons/lzma2.ico b/CPP/7zip/Archive/Icons/lzma2.ico new file mode 100644 index 00000000..6b900ed1 Binary files /dev/null and b/CPP/7zip/Archive/Icons/lzma2.ico differ diff --git a/CPP/7zip/Archive/Icons/ntfs.ico b/CPP/7zip/Archive/Icons/ntfs.ico index 9dd6b807..3c87d524 100644 Binary files a/CPP/7zip/Archive/Icons/ntfs.ico and b/CPP/7zip/Archive/Icons/ntfs.ico differ diff --git a/CPP/7zip/Archive/Icons/rar.ico b/CPP/7zip/Archive/Icons/rar.ico index 09c94a89..c1f083c7 100644 Binary files a/CPP/7zip/Archive/Icons/rar.ico and b/CPP/7zip/Archive/Icons/rar.ico differ diff --git a/CPP/7zip/Archive/Icons/rpm.ico b/CPP/7zip/Archive/Icons/rpm.ico index 5beed989..73278cff 100644 Binary files a/CPP/7zip/Archive/Icons/rpm.ico and b/CPP/7zip/Archive/Icons/rpm.ico differ diff --git a/CPP/7zip/Archive/Icons/split.ico b/CPP/7zip/Archive/Icons/split.ico index d4868b01..f635daf5 100644 Binary files a/CPP/7zip/Archive/Icons/split.ico and b/CPP/7zip/Archive/Icons/split.ico differ diff --git a/CPP/7zip/Archive/Icons/sqfs.ico b/CPP/7zip/Archive/Icons/sqfs.ico new file mode 100644 index 00000000..7314f94d Binary files /dev/null and b/CPP/7zip/Archive/Icons/sqfs.ico differ diff --git a/CPP/7zip/Archive/Icons/squashfs.ico b/CPP/7zip/Archive/Icons/squashfs.ico deleted file mode 100644 index 8f490d60..00000000 Binary files a/CPP/7zip/Archive/Icons/squashfs.ico and /dev/null differ diff --git a/CPP/7zip/Archive/Icons/tar.ico b/CPP/7zip/Archive/Icons/tar.ico index 04cfd0e8..b844b2a4 100644 Binary files a/CPP/7zip/Archive/Icons/tar.ico and b/CPP/7zip/Archive/Icons/tar.ico differ diff --git a/CPP/7zip/Archive/Icons/vhd.ico b/CPP/7zip/Archive/Icons/vhd.ico index bdeb30e8..c236a7e6 100644 Binary files a/CPP/7zip/Archive/Icons/vhd.ico and b/CPP/7zip/Archive/Icons/vhd.ico differ diff --git a/CPP/7zip/Archive/Icons/wim.ico b/CPP/7zip/Archive/Icons/wim.ico index a8b77472..14a31586 100644 Binary files a/CPP/7zip/Archive/Icons/wim.ico and b/CPP/7zip/Archive/Icons/wim.ico differ diff --git a/CPP/7zip/Archive/Icons/xar.ico b/CPP/7zip/Archive/Icons/xar.ico index e2062946..46b6ef49 100644 Binary files a/CPP/7zip/Archive/Icons/xar.ico and b/CPP/7zip/Archive/Icons/xar.ico differ diff --git a/CPP/7zip/Archive/Icons/xz.ico b/CPP/7zip/Archive/Icons/xz.ico index baa2b32a..8749bd85 100644 Binary files a/CPP/7zip/Archive/Icons/xz.ico and b/CPP/7zip/Archive/Icons/xz.ico differ diff --git a/CPP/7zip/Archive/Icons/z.ico b/CPP/7zip/Archive/Icons/z.ico index 9acfb697..a9cc8780 100644 Binary files a/CPP/7zip/Archive/Icons/z.ico and b/CPP/7zip/Archive/Icons/z.ico differ diff --git a/CPP/7zip/Archive/Icons/zip.ico b/CPP/7zip/Archive/Icons/zip.ico index f46a91ee..a0a0b012 100644 Binary files a/CPP/7zip/Archive/Icons/zip.ico and b/CPP/7zip/Archive/Icons/zip.ico differ diff --git a/CPP/7zip/Archive/Icons/zst.ico b/CPP/7zip/Archive/Icons/zst.ico index 2e788ef8..4cc6c6eb 100644 Binary files a/CPP/7zip/Archive/Icons/zst.ico and b/CPP/7zip/Archive/Icons/zst.ico differ diff --git a/CPP/7zip/Archive/Icons/zstd.ico b/CPP/7zip/Archive/Icons/zstd.ico new file mode 100644 index 00000000..58c6794e Binary files /dev/null and b/CPP/7zip/Archive/Icons/zstd.ico differ diff --git a/CPP/7zip/Archive/ZstdHandler.cpp b/CPP/7zip/Archive/ZstdHandler.cpp index c00ca011..0657811d 100644 --- a/CPP/7zip/Archive/ZstdHandler.cpp +++ b/CPP/7zip/Archive/ZstdHandler.cpp @@ -368,7 +368,7 @@ STDMETHODIMP CHandler::SetProperties(const wchar_t * const *names, const PROPVAR static const Byte k_Signature[] = "0xFD2FB522..28"; REGISTER_ARC_IO( - "zstd", "zst tzstd", "* .tar", 0x0e, + "zstd", "zstd tzstd", "* .tar", 0x0e, k_Signature, 0, NArcInfoFlags::kKeepName, diff --git a/CPP/7zip/Bundles/Fm/resource.rc b/CPP/7zip/Bundles/Fm/resource.rc index 810829f8..63a71f7a 100644 --- a/CPP/7zip/Bundles/Fm/resource.rc +++ b/CPP/7zip/Bundles/Fm/resource.rc @@ -3,5 +3,5 @@ STRINGTABLE BEGIN - 100 "7z zip rar 001 cab iso xz txz lzma tar cpio bz2 bzip2 tbz2 tbz gz gzip tgz tpz z taz lz tlz lz4 tlz4 lz5 tlz5 lzh lha rpm deb arj vhd vhdx wim swm esd fat ntfs dmg hfs xar squashfs zst apfs" + 100 "7z zip rar 001 cab iso xz txz lzma lzma2 tar cpio bz2 bzip2 tbz2 tbz gz gzip tgz tpz z taz lz tlz lz4 tlz4 lz5 tlz5 lzh lha rpm deb arj vhd vhdx wim swm esd fat ntfs dmg hfs xar squashfs zst zstd apfs br" END diff --git a/CPP/7zip/Bundles/Format7zF/Format7z.dsp b/CPP/7zip/Bundles/Format7zF/Format7z.dsp index bd2ed44d..0ed78be3 100644 --- a/CPP/7zip/Bundles/Format7zF/Format7z.dsp +++ b/CPP/7zip/Bundles/Format7zF/Format7z.dsp @@ -165,7 +165,7 @@ SOURCE=..\..\Archive\Icons\split.ico # End Source File # Begin Source File -SOURCE=..\..\Archive\Icons\squashfs.ico +SOURCE=..\..\Archive\Icons\sqfs.ico # End Source File # Begin Source File diff --git a/CPP/7zip/Bundles/Format7zF/resource.rc b/CPP/7zip/Bundles/Format7zF/resource.rc index e1b3c3f3..a4bc0dfb 100644 --- a/CPP/7zip/Bundles/Format7zF/resource.rc +++ b/CPP/7zip/Bundles/Format7zF/resource.rc @@ -2,7 +2,6 @@ MY_VERSION_INFO_DLL("7z Plugin" , "7z") - 0 ICON "../../Archive/Icons/7z.ico" 1 ICON "../../Archive/Icons/zip.ico" 2 ICON "../../Archive/Icons/bz2.ico" @@ -27,15 +26,17 @@ MY_VERSION_INFO_DLL("7z Plugin" , "7z") 21 ICON "../../Archive/Icons/fat.ico" 22 ICON "../../Archive/Icons/ntfs.ico" 23 ICON "../../Archive/Icons/xz.ico" -24 ICON "../../Archive/Icons/squashfs.ico" +24 ICON "../../Archive/Icons/sqfs.ico" 25 ICON "../../Archive/Icons/zst.ico" 26 ICON "../../Archive/Icons/lz4.ico" 27 ICON "../../Archive/Icons/lz5.ico" 28 ICON "../../Archive/Icons/liz.ico" 29 ICON "../../Archive/Icons/apfs.ico" - +30 ICON "../../Archive/Icons/lzma2.ico" +31 ICON "../../Archive/Icons/zstd.ico" +32 ICON "../../Archive/Icons/br.ico" STRINGTABLE BEGIN - 100 "7z:0 zip:1 rar:3 001:9 cab:7 iso:8 xz:23 txz:23 lzma:16 tar:13 cpio:12 bz2:2 bzip2:2 tbz2:2 tbz:2 gz:14 gzip:14 tgz:14 tpz:14 z:5 taz:5 lz:16 tlz:16 liz:28 lz4:26 lz5:27 lzh:6 lha:6 rpm:10 deb:11 arj:4 vhd:20 vhdx:20 wim:15 swm:15 esd:15 fat:21 ntfs:22 dmg:17 hfs:18 xar:19 squashfs:24 zst:25 apfs:29" + 100 "7z:0 zip:1 rar:3 001:9 cab:7 iso:8 xz:23 txz:23 lzma:16 lzma2:30 tar:13 cpio:12 bz2:2 bzip2:2 tbz2:2 tbz:2 gz:14 gzip:14 tgz:14 tpz:14 z:5 taz:5 lz:16 tlz:16 liz:28 lz4:26 lz5:27 lzh:6 lha:6 rpm:10 deb:11 arj:4 vhd:20 vhdx:20 wim:15 swm:15 esd:15 fat:21 ntfs:22 dmg:17 hfs:18 xar:19 squashfs:24 zst:25 zstd:31 apfs:29 br:32" END