X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fheader.h;h=e696ce51dfe939143cf783f62159b919027210e3;hp=2bbb8388d7e8d928670605198cb8acab20354550;hb=96c0ef4c9c596b48c4388f5c7a1979531b64cc6d;hpb=86a852652706cfe53087ef839840171bed597ffd diff --git a/include/wimlib/header.h b/include/wimlib/header.h index 2bbb8388..e696ce51 100644 --- a/include/wimlib/header.h +++ b/include/wimlib/header.h @@ -1,26 +1,27 @@ #ifndef _WIMLIB_HEADER_H #define _WIMLIB_HEADER_H +#include + #include "wimlib/resource.h" #include "wimlib/types.h" -#include "wimlib/endianness.h" /* Length of "Globally Unique ID" field in WIM header. */ -#define WIM_GID_LEN 16 +#define WIM_GUID_LEN 16 /* Length of the WIM header on disk. wimlib currently requires that the header * be exactly this size. */ #define WIM_HEADER_DISK_SIZE 208 -/* Default WIM version number. Streams are always compressed independently. */ +/* Default WIM version number. Blobs are always compressed independently. */ #define WIM_VERSION_DEFAULT 0x10d00 -/* Version number used for WIMs that allow multiple streams packed into one - * resource ("solid blocks", marked by WIM_RESHDR_FLAG_PACKED_STREAMS) and also - * a new compression format (LZMS). This version is new as of Windows 8 - * WIMGAPI. Although it is used by Windows 8 web downloader, it is not yet - * properly documented by Microsoft. */ -#define WIM_VERSION_PACKED_STREAMS 0xe00 +/* Version number used for WIMs that allow multiple blobs combined into one + * resource ("solid resources", marked by WIM_RESHDR_FLAG_SOLID) and also a new + * compression format (LZMS). This version is new as of Windows 8 WIMGAPI. + * Although it is used by Windows 8 web downloader, it is not yet documented by + * Microsoft. */ +#define WIM_VERSION_SOLID 0xe00 /* Note: there is another WIM version from Vista pre-releases, but it is not * supported by wimlib. */ @@ -56,39 +57,37 @@ struct wim_header_disk { /* +0x08: Size of the WIM header, in bytes; WIM_HEADER_DISK_SIZE * expected (currently the only supported value). */ - u32 hdr_size; + le32 hdr_size; /* +0x0c: Version of the WIM file. Recognized values are the * WIM_VERSION_* constants from above. */ - u32 wim_version; + le32 wim_version; /* +0x10: Flags for the WIM file (WIM_HDR_FLAG_*). */ - u32 wim_flags; + le32 wim_flags; - /* +0x14: Uncompressed chunk size for compressed resources in the WIM - * other than packed resources, or 0 if the WIM is uncompressed. - * (However wimlib will currently accept any value here if the WIM is - * uncompressed.) */ - u32 chunk_size; + /* +0x14: Uncompressed chunk size for non-solid compressed resources in + * the WIM or 0 if the WIM is uncompressed. */ + le32 chunk_size; /* +0x18: Globally unique identifier for the WIM file. Basically a * bunch of random bytes. */ - u8 guid[WIM_GID_LEN]; + u8 guid[WIM_GUID_LEN]; /* +0x28: Number of this WIM part in the split WIM file, indexed from 1, * or 1 if the WIM is not split. */ - u16 part_number; + le16 part_number; /* +0x2a: Total number of parts of the split WIM file, or 1 if the WIM * is not split. */ - u16 total_parts; + le16 total_parts; /* +0x2c: Number of images in the WIM. WIMGAPI requires that this be at * least 1. wimlib allows 0. */ - u32 image_count; + le32 image_count; - /* +0x30: Location and size of the WIM's lookup table. */ - struct wim_reshdr_disk lookup_table_reshdr; + /* +0x30: Location and size of the WIM's blob table. */ + struct wim_reshdr_disk blob_table_reshdr; /* +0x48: Location and size of the WIM's XML data. */ struct wim_reshdr_disk xml_data_reshdr; @@ -99,7 +98,7 @@ struct wim_header_disk { /* +0x78: 1-based index of the bootable image of the WIM, or 0 if no * image is bootable. */ - u32 boot_idx; + le32 boot_idx; /* +0x7c: Location and size of the WIM's integrity table, or all zeroes * if the WIM has no integrity table. @@ -115,6 +114,7 @@ struct wim_header_disk { /* +0xd0 (208) */ } _packed_attribute; +#define MAX_IMAGES (((INT_MAX < INT32_MAX) ? INT_MAX : INT32_MAX) - 1) /* In-memory representation of a WIM header. See `struct wim_header_disk' for * field descriptions. */ @@ -123,11 +123,11 @@ struct wim_header { u32 wim_version; u32 flags; u32 chunk_size; - u8 guid[WIM_GID_LEN]; + u8 guid[WIM_GUID_LEN]; u16 part_number; u16 total_parts; u32 image_count; - struct wim_reshdr lookup_table_reshdr; + struct wim_reshdr blob_table_reshdr; struct wim_reshdr xml_data_reshdr; struct wim_reshdr boot_metadata_reshdr; u32 boot_idx; @@ -152,14 +152,14 @@ struct wim_header { /* The WIM is part of a split WIM. */ #define WIM_HDR_FLAG_SPANNED 0x00000008 -/* All streams included in the WIM's lookup table are non-metadata (do not have +/* All blobs included in the WIM's blob table are non-metadata (do not have * WIM_RESHDR_FLAG_METADATA set). wimlib ignores this flag and clears it on new * WIM files it writes. */ #define WIM_HDR_FLAG_RESOURCE_ONLY 0x00000010 -/* All streams included in the WIM's lookup table are metadata (have - * WIM_RESHDR_FLAG_METADATA set). wimlib ignores this flag and clears it on - * new WIM files it writes. */ +/* All blobs included in the WIM's blob table are metadata (have + * WIM_RESHDR_FLAG_METADATA set). wimlib ignores this flag and clears it on new + * WIM files it writes. */ #define WIM_HDR_FLAG_METADATA_ONLY 0x00000020 /* The WIM is currently being written or appended to. */ @@ -186,8 +186,8 @@ struct wim_header { /* Resources in the WIM with WIM_RESHDR_FLAG_COMPRESSED set in their headers are * compressed with LZMS compression. Note: this flag is only valid if the WIM - * version is WIM_VERSION_PACKED_STREAMS. Also, this flag is only supported in - * wimlib v1.6.0 and later and WIMGAPI Windows 8 and later. */ + * version is WIM_VERSION_SOLID. Also, this flag is only supported in wimlib + * v1.6.0 and later and WIMGAPI Windows 8 and later. */ #define WIM_HDR_FLAG_COMPRESS_LZMS 0x00080000 /* XPRESS, with small chunk size??? */