X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fheader.c;h=e4c6d67c092aa98a1ac3dc71f5cf4ce5090f4a15;hb=5db11cb8825229c4bc3f61c37ac86e4d6561f61a;hp=893874b5e953406fc8b6bf3313462b0c25cf192c;hpb=7cfb9777313e1a2f60a49d6b9ef87910f27f1a51;p=wimlib

diff --git a/src/header.c b/src/header.c
index 893874b5..e4c6d67c 100644
--- a/src/header.c
+++ b/src/header.c
@@ -89,8 +89,10 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
 	if (ret)
 		goto read_error;
 
-	if (disk_hdr.magic != WIM_MAGIC) {
-		if (disk_hdr.magic == PWM_MAGIC) {
+	hdr->magic = le64_to_cpu(disk_hdr.magic);
+
+	if (hdr->magic != WIM_MAGIC) {
+		if (hdr->magic == PWM_MAGIC) {
 			/* Pipable WIM:  Use header at end instead, unless
 			 * actually reading from a pipe.  */
 			if (!in_fd->is_pipe) {
@@ -104,7 +106,6 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
 			return WIMLIB_ERR_NOT_A_WIM_FILE;
 		}
 	}
-	hdr->magic = disk_hdr.magic;
 
 	if (le32_to_cpu(disk_hdr.hdr_size) != sizeof(struct wim_header_disk)) {
 		ERROR("\"%"TS"\": Header size is invalid (%u bytes)",
@@ -116,7 +117,8 @@ read_wim_header(WIMStruct *wim, struct wim_header *hdr)
 	if (hdr->wim_version != WIM_VERSION_DEFAULT &&
 	    hdr->wim_version != WIM_VERSION_PACKED_STREAMS)
 	{
-		ERROR("\"%"TS"\": Unknown WIM version: %u", hdr->wim_version);
+		ERROR("\"%"TS"\": Unknown WIM version: %u",
+		      filename, hdr->wim_version);
 		return WIMLIB_ERR_UNKNOWN_VERSION;
 	}
 
@@ -171,7 +173,7 @@ write_wim_header_at_offset(const struct wim_header *hdr, struct filedes *out_fd,
 	      ((hdr->magic == PWM_MAGIC) ? "pipable " : ""),
 	      offset);
 
-	disk_hdr.magic = hdr->magic;
+	disk_hdr.magic = cpu_to_le64(hdr->magic);
 	disk_hdr.hdr_size = cpu_to_le32(sizeof(struct wim_header_disk));
 	disk_hdr.wim_version = cpu_to_le32(hdr->wim_version);
 	disk_hdr.wim_flags = cpu_to_le32(hdr->flags);
@@ -225,7 +227,8 @@ set_wim_hdr_cflags(int ctype, struct wim_header *hdr)
 			WIM_HDR_FLAG_COMPRESS_LZX |
 			WIM_HDR_FLAG_COMPRESS_RESERVED |
 			WIM_HDR_FLAG_COMPRESS_XPRESS |
-			WIM_HDR_FLAG_COMPRESS_LZMS);
+			WIM_HDR_FLAG_COMPRESS_LZMS |
+			WIM_HDR_FLAG_COMPRESS_XPRESS_2);
 	switch (ctype) {
 
 	case WIMLIB_COMPRESSION_TYPE_NONE:
@@ -256,7 +259,11 @@ init_wim_header(struct wim_header *hdr, int ctype, u32 chunk_size)
 {
 	memset(hdr, 0, sizeof(struct wim_header));
 	hdr->magic = WIM_MAGIC;
-	hdr->wim_version = WIM_VERSION_DEFAULT;
+
+	if (ctype == WIMLIB_COMPRESSION_TYPE_LZMS)
+		hdr->wim_version = WIM_VERSION_PACKED_STREAMS;
+	else
+		hdr->wim_version = WIM_VERSION_DEFAULT;
 	if (set_wim_hdr_cflags(ctype, hdr)) {
 		ERROR("Invalid compression type specified (%d)", ctype);
 		return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
@@ -273,7 +280,7 @@ struct hdr_flag {
 	const char *name;
 };
 struct hdr_flag hdr_flags[] = {
-	{WIM_HDR_FLAG_RESERVED, 	"RESERVED"},
+	{WIM_HDR_FLAG_RESERVED,		"RESERVED"},
 	{WIM_HDR_FLAG_COMPRESSION,	"COMPRESSION"},
 	{WIM_HDR_FLAG_READONLY,		"READONLY"},
 	{WIM_HDR_FLAG_SPANNED,		"SPANNED"},
@@ -284,6 +291,8 @@ struct hdr_flag hdr_flags[] = {
 	{WIM_HDR_FLAG_COMPRESS_RESERVED,"COMPRESS_RESERVED"},
 	{WIM_HDR_FLAG_COMPRESS_LZX,	"COMPRESS_LZX"},
 	{WIM_HDR_FLAG_COMPRESS_XPRESS,	"COMPRESS_XPRESS"},
+	{WIM_HDR_FLAG_COMPRESS_LZMS,	"COMPRESS_LZMS"},
+	{WIM_HDR_FLAG_COMPRESS_XPRESS_2,"COMPRESS_XPRESS_2"},
 };
 
 /* API function documented in wimlib.h  */