Skip to content

Commit 1b062e1

Browse files
committed
Merge branch 'dev', and fixed faulty license specification (should've been LGPLv3, not GPLv3.
2 parents 3600e15 + 557a1ec commit 1b062e1

File tree

3 files changed

+238
-672
lines changed

3 files changed

+238
-672
lines changed

SevenZip/Formats.cs

+78-3
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,68 @@ public enum InArchiveFormat
175175
/// Microsoft virtual hard disk file format.
176176
/// </summary>
177177
/// <remarks><a href="http://en.wikipedia.org/wiki/VHD_%28file_format%29">Wikipedia information</a></remarks>
178-
Vhd
178+
Vhd,
179+
/// <summary>
180+
/// SquashFS file system format.
181+
/// </summary>
182+
/// <remarks><a href="https://en.wikipedia.org/wiki/SquashFS">Wikipedia information</a></remarks>
183+
SquashFS,
184+
/// <summary>
185+
/// Lzma86 file format.
186+
/// </summary>
187+
Lzma86,
188+
/// <summary>
189+
/// Prediction by Partial Matching by Dmitry algorithm.
190+
/// </summary>
191+
/// <remarks><a href="https://en.wikipedia.org/wiki/Prediction_by_partial_matching">Wikipedia information</a></remarks>
192+
Ppmd,
193+
/// <summary>
194+
/// TE format.
195+
/// </summary>
196+
TE,
197+
/// <summary>
198+
/// UEFIc format.
199+
/// </summary>
200+
/// <remarks><a href="https://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface">Wikipedia information</a></remarks>
201+
UEFIc,
202+
/// <summary>
203+
/// UEFIs format.
204+
/// </summary>
205+
/// <remarks><a href="https://en.wikipedia.org/wiki/Unified_Extensible_Firmware_Interface">Wikipedia information</a></remarks>
206+
UEFIs,
207+
/// <summary>
208+
/// Compressed ROM file system format.
209+
/// </summary>
210+
/// <remarks><a href="https://en.wikipedia.org/wiki/Cramfs">Wikipedia information</a></remarks>
211+
CramFS,
212+
/// <summary>
213+
/// APM format.
214+
/// </summary>
215+
APM,
216+
/// <summary>
217+
/// Swfc format.
218+
/// </summary>
219+
Swfc,
220+
/// <summary>
221+
/// NTFS file system format.
222+
/// </summary>
223+
/// <remarks><a href="https://en.wikipedia.org/wiki/NTFS">Wikipedia information</a></remarks>
224+
Ntfs,
225+
/// <summary>
226+
/// FAT file system format.
227+
/// </summary>
228+
/// <remarks><a href="https://en.wikipedia.org/wiki/File_Allocation_Table">Wikipedia information</a></remarks>
229+
Fat,
230+
/// <summary>
231+
/// MBR format.
232+
/// </summary>
233+
/// <remarks><a href="https://en.wikipedia.org/wiki/Master_boot_record">Wikipedia information</a></remarks>
234+
Mbr,
235+
/// <summary>
236+
/// Mach-O file format.
237+
/// </summary>
238+
/// <remarks><a href="https://en.wikipedia.org/wiki/Mach-O">Wikipedia information</a></remarks>
239+
MachO
179240
}
180241

181242
#if COMPRESS
@@ -311,7 +372,7 @@ internal static int GetMaxValue(Type type)
311372
/// List of readable archive format interface guids for 7-zip COM interop.
312373
/// </summary>
313374
internal static readonly Dictionary<InArchiveFormat, Guid> InFormatGuids =
314-
new Dictionary<InArchiveFormat, Guid>(20)
375+
new Dictionary<InArchiveFormat, Guid>(20)
315376
#region InFormatGuids initialization
316377

317378
{
@@ -346,7 +407,21 @@ internal static int GetMaxValue(Type type)
346407
{InArchiveFormat.PE, new Guid("23170f69-40c1-278a-1000-000110DD0000")},
347408
{InArchiveFormat.Elf, new Guid("23170f69-40c1-278a-1000-000110DE0000")},
348409
{InArchiveFormat.Swf, new Guid("23170f69-40c1-278a-1000-000110D70000")},
349-
{InArchiveFormat.Vhd, new Guid("23170f69-40c1-278a-1000-000110DC0000")}
410+
{InArchiveFormat.Vhd, new Guid("23170f69-40c1-278a-1000-000110DC0000")},
411+
{InArchiveFormat.Flv, new Guid("23170f69-40c1-278a-1000-000110D60000")},
412+
{InArchiveFormat.SquashFS, new Guid("23170f69-40c1-278a-1000-000110D20000")},
413+
{InArchiveFormat.Lzma86, new Guid("23170f69-40c1-278a-1000-0001100B0000")},
414+
{InArchiveFormat.Ppmd, new Guid("23170f69-40c1-278a-1000-0001100D0000")},
415+
{InArchiveFormat.TE, new Guid("23170f69-40c1-278a-1000-000110CF0000")},
416+
{InArchiveFormat.UEFIc, new Guid("23170f69-40c1-278a-1000-000110D00000")},
417+
{InArchiveFormat.UEFIs, new Guid("23170f69-40c1-278a-1000-000110D10000")},
418+
{InArchiveFormat.CramFS, new Guid("23170f69-40c1-278a-1000-000110D30000")},
419+
{InArchiveFormat.APM, new Guid("23170f69-40c1-278a-1000-000110D40000")},
420+
{InArchiveFormat.Swfc, new Guid("23170f69-40c1-278a-1000-000110D80000")},
421+
{InArchiveFormat.Ntfs, new Guid("23170f69-40c1-278a-1000-000110D90000")},
422+
{InArchiveFormat.Fat, new Guid("23170f69-40c1-278a-1000-000110DA0000")},
423+
{InArchiveFormat.Mbr, new Guid("23170f69-40c1-278a-1000-000110DB0000")},
424+
{InArchiveFormat.MachO, new Guid("23170f69-40c1-278a-1000-000110DF0000")}
350425
};
351426

352427
#endregion

0 commit comments

Comments
 (0)