X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwim.c;h=b36da84f2adb2196642d210c9436dfcd5a258f77;hp=2f5f5e0e8e27d534c49db96b8af3fad442f9a9f4;hb=5ab0691733e0724ba5cd73bd4f9c0963cfe1d276;hpb=1c19875f1bcbfe341014b20b9bbbc9b5fa0cea4d

diff --git a/src/wim.c b/src/wim.c
index 2f5f5e0e..b36da84f 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -38,6 +38,8 @@
 #include "wimlib/security.h"
 #include "wimlib/wim.h"
 #include "wimlib/xml.h"
+#include "wimlib/compressor_ops.h"
+#include "wimlib/decompressor_ops.h"
 
 #ifdef __WIN32__
 #  include "wimlib/win32.h" /* for realpath() replacement */
@@ -62,14 +64,34 @@ image_print_metadata(WIMStruct *wim)
 				  wim->lookup_table);
 }
 
+static int
+wim_default_pack_compression_type(void)
+{
+	return WIMLIB_COMPRESSION_TYPE_LZMS;
+}
+
+static u32
+wim_default_pack_chunk_size(int ctype) {
+	switch (ctype) {
+	case WIMLIB_COMPRESSION_TYPE_LZMS:
+		/* Note: WIMGAPI uses 1 << 26, but lower sizes are compatible.
+		 * */
+		return 1U << 25; /* 33554432  */
+	default:
+		return 1U << 15; /* 32768     */
+	}
+}
 
 static WIMStruct *
 new_wim_struct(void)
 {
 	WIMStruct *wim = CALLOC(1, sizeof(WIMStruct));
 	if (wim) {
-		wim->in_fd.fd = -1;
-		wim->out_fd.fd = -1;
+		filedes_invalidate(&wim->in_fd);
+		filedes_invalidate(&wim->out_fd);
+		wim->out_pack_compression_type = wim_default_pack_compression_type();
+		wim->out_pack_chunk_size = wim_default_pack_chunk_size(
+						wim->out_pack_compression_type);
 		INIT_LIST_HEAD(&wim->subwims);
 	}
 	return wim;
@@ -108,35 +130,15 @@ wim_chunk_size_valid(u32 chunk_size, int ctype)
 	 * 25		33554432
 	 * 26		67108864
 	 */
+
+	/* See the documentation for the --chunk-size option of `wimlib-imagex
+	 * capture' for information about allowed chunk sizes.  */
 	switch (ctype) {
 	case WIMLIB_COMPRESSION_TYPE_LZX:
-		/* For LZX compression, the chunk size corresponds to the LZX
-		 * window size, which according the LZX specification can be any
-		 * power of 2 between 2^15 and 2^21, inclusively.  All these are
-		 * supported by wimlib; however, unfortunately only 2^15 is
-		 * supported by WIMGAPI[1] so this value is used by default.
-		 *
-		 * [1] WIMGAPI (Windows 7) attempts to decompress LZX chunk
-		 * sizes > 2^15 but seems to have bug(s) that cause it to fail
-		 * or crash.  (I tried several tweaks to the LZX data but none
-		 * resulted in successful decompression.)  WIMGAPI (Windows 8)
-		 * appears to refuse to open WIMs with chunk size > 2^15
-		 * entirely.  */
 		return order >= 15 && order <= 21;
 
 	case WIMLIB_COMPRESSION_TYPE_XPRESS:
-		/* WIMGAPI (Windows 7) didn't seem to support XPRESS chunk size
-		 * below 32768 bytes, but larger power-of-two sizes appear to be
-		 * supported.  67108864 was the largest size that worked.
-		 * (Note, however, that the offsets of XPRESS matches are still
-		 * limited to 65535 bytes even when a much larger chunk size is
-		 * used!)
-		 *
-		 * WIMGAPI (Windows 8) seemed to have removed the support for
-		 * larger XPRESS chunk sizes and will refuse to open such WIMs.
-		 *
-		 * 2^15 = 32768 is the default value used for compatibility, but
-		 * wimlib can actually use up to 2^26.  */
+	case WIMLIB_COMPRESSION_TYPE_LZMS:
 		return order >= 15 && order <= 26;
 	}
 	return false;
@@ -148,14 +150,19 @@ wim_chunk_size_valid(u32 chunk_size, int ctype)
 static u32
 wim_default_chunk_size(int ctype)
 {
-	return 32768;
+	switch (ctype) {
+	case WIMLIB_COMPRESSION_TYPE_LZMS:
+		return 1U << 17; /* 131072  */
+	default:
+		return 1U << 15; /* 32768   */
+	}
 }
 
 /*
- * Calls a function on images in the WIM.  If @image is WIMLIB_ALL_IMAGES, @visitor
- * is called on the WIM once for each image, with each image selected as the
- * current image in turn.  If @image is a certain image, @visitor is called on
- * the WIM only once, with that image selected.
+ * Calls a function on images in the WIM.  If @image is WIMLIB_ALL_IMAGES,
+ * @visitor is called on the WIM once for each image, with each image selected
+ * as the current image in turn.  If @image is a certain image, @visitor is
+ * called on the WIM only once, with that image selected.
  */
 int
 for_image(WIMStruct *wim, int image, int (*visitor)(WIMStruct *))
@@ -200,15 +207,15 @@ wimlib_create_new_wim(int ctype, WIMStruct **wim_ret)
 
 	/* Allocate the WIMStruct. */
 	wim = new_wim_struct();
-	if (!wim)
+	if (wim == NULL)
 		return WIMLIB_ERR_NOMEM;
 
 	ret = init_wim_header(&wim->hdr, ctype, wim_default_chunk_size(ctype));
-	if (ret != 0)
+	if (ret)
 		goto out_free;
 
 	table = new_lookup_table(9001);
-	if (!table) {
+	if (table == NULL) {
 		ret = WIMLIB_ERR_NOMEM;
 		goto out_free;
 	}
@@ -293,6 +300,8 @@ wimlib_get_compression_type_string(int ctype)
 			return T("LZX");
 		case WIMLIB_COMPRESSION_TYPE_XPRESS:
 			return T("XPRESS");
+		case WIMLIB_COMPRESSION_TYPE_LZMS:
+			return T("LZMS");
 		default:
 			return T("Invalid");
 	}
@@ -371,8 +380,8 @@ wimlib_get_wim_info(WIMStruct *wim, struct wimlib_wim_info *info)
 	memcpy(info->guid, wim->hdr.guid, WIMLIB_GUID_LEN);
 	info->image_count = wim->hdr.image_count;
 	info->boot_index = wim->hdr.boot_idx;
-	info->wim_version = WIM_VERSION;
-	info->chunk_size = wim->hdr.chunk_size;
+	info->wim_version = wim->hdr.wim_version;
+	info->chunk_size = wim->chunk_size;
 	info->part_number = wim->hdr.part_number;
 	info->total_parts = wim->hdr.total_parts;
 	info->compression_type = wim->compression_type;
@@ -435,9 +444,8 @@ wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int whic
 	return 0;
 }
 
-/* API function documented in wimlib.h  */
-WIMLIBAPI int
-wimlib_set_output_compression_type(WIMStruct *wim, int ctype)
+static int
+set_out_ctype(int ctype, u8 *out_ctype_p)
 {
 	switch (ctype) {
 	case WIMLIB_COMPRESSION_TYPE_INVALID:
@@ -445,47 +453,86 @@ wimlib_set_output_compression_type(WIMStruct *wim, int ctype)
 	case WIMLIB_COMPRESSION_TYPE_NONE:
 	case WIMLIB_COMPRESSION_TYPE_LZX:
 	case WIMLIB_COMPRESSION_TYPE_XPRESS:
-		wim->out_compression_type = ctype;
-
-		/* Reset the chunk size if it's no longer valid.  */
-		if (!wim_chunk_size_valid(wim->out_chunk_size,
-					  wim->out_compression_type))
-			wim->out_chunk_size = wim_default_chunk_size(wim->out_compression_type);
+	case WIMLIB_COMPRESSION_TYPE_LZMS:
+		*out_ctype_p = ctype;
 		return 0;
 	}
-	return WIMLIB_ERR_INVALID_PARAM;
+	return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
 }
 
 /* API function documented in wimlib.h  */
 WIMLIBAPI int
-wimlib_set_output_chunk_size(WIMStruct *wim, uint32_t chunk_size)
+wimlib_set_output_compression_type(WIMStruct *wim, int ctype)
 {
-	if (!wim_chunk_size_valid(chunk_size, wim->out_compression_type)) {
+	int ret = set_out_ctype(ctype, &wim->out_compression_type);
+	if (ret)
+		return ret;
+
+	/* Reset the chunk size if it's no longer valid.  */
+	if (!wim_chunk_size_valid(ctype, wim->out_chunk_size))
+		wim->out_chunk_size = wim_default_chunk_size(ctype);
+	return 0;
+}
+
+/* API function documented in wimlib.h  */
+WIMLIBAPI int
+wimlib_set_output_pack_compression_type(WIMStruct *wim, int ctype)
+{
+	int ret = set_out_ctype(ctype, &wim->out_pack_compression_type);
+	if (ret)
+		return ret;
+
+	/* Reset the chunk size if it's no longer valid.  */
+	if (!wim_chunk_size_valid(ctype, wim->out_pack_chunk_size))
+		wim->out_pack_chunk_size = wim_default_pack_chunk_size(ctype);
+	return 0;
+}
+
+static int
+set_out_chunk_size(u32 chunk_size, int ctype, u32 *out_chunk_size_p)
+{
+	if (!wim_chunk_size_valid(chunk_size, ctype)) {
 		ERROR("Invalid chunk size (%"PRIu32" bytes) "
 		      "for compression type %"TS"!",
 		      chunk_size,
-		      wimlib_get_compression_type_string(wim->out_compression_type));
-		switch (wim->out_compression_type) {
-		case WIMLIB_COMPRESSION_TYPE_XPRESS:
-			ERROR("Valid chunk sizes for XPRESS are "
-			      "32768, 65536, 131072, ..., 67108864.");
-			break;
-		case WIMLIB_COMPRESSION_TYPE_LZX:
-			ERROR("Valid chunk sizes for LZX are "
-			      "32768, 65536, 131072, ..., 2097152.");
-			break;
-		}
+		      wimlib_get_compression_type_string(ctype));
 		return WIMLIB_ERR_INVALID_CHUNK_SIZE;
 	}
-	if (chunk_size != 32768) {
-		WARNING  ("Changing the compression chunk size to any value other than\n"
-		"          the default of 32768 bytes eliminates compatibility with\n"
-		"          Microsoft's software!");
-	}
-	wim->out_chunk_size = chunk_size;
+
+	*out_chunk_size_p = chunk_size;
 	return 0;
 }
 
+/* API function documented in wimlib.h  */
+WIMLIBAPI int
+wimlib_set_output_chunk_size(WIMStruct *wim, uint32_t chunk_size)
+{
+	if (chunk_size == 0) {
+		wim->out_chunk_size =
+			wim_default_chunk_size(wim->out_compression_type);
+		return 0;
+	}
+
+	return set_out_chunk_size(chunk_size,
+				  wim->out_compression_type,
+				  &wim->out_chunk_size);
+}
+
+/* API function documented in wimlib.h  */
+WIMLIBAPI int
+wimlib_set_output_pack_chunk_size(WIMStruct *wim, uint32_t chunk_size)
+{
+	if (chunk_size == 0) {
+		wim->out_pack_chunk_size =
+			wim_default_pack_chunk_size(wim->out_pack_compression_type);
+		return 0;
+	}
+
+	return set_out_chunk_size(chunk_size,
+				  wim->out_pack_compression_type,
+				  &wim->out_pack_chunk_size);
+}
+
 static int
 do_open_wim(const tchar *filename, struct filedes *fd_ret)
 {
@@ -535,7 +582,6 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 		wim->in_fd.is_pipe = 1;
 	} else {
 		wimfile = wim_filename_or_fd;
-		DEBUG("Reading the WIM file `%"TS"'", wimfile);
 		ret = do_open_wim(wimfile, &wim->in_fd);
 		if (ret)
 			return ret;
@@ -553,7 +599,7 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 		 * replacement function in win32_replacements.c.
 		 */
 		wim->filename = realpath(wimfile, NULL);
-		if (!wim->filename) {
+		if (wim->filename == NULL) {
 			ERROR_WITH_ERRNO("Failed to resolve WIM filename");
 			if (errno == ENOMEM)
 				return WIMLIB_ERR_NOMEM;
@@ -562,14 +608,15 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 		}
 	}
 
-	ret = read_wim_header(wim->filename, &wim->in_fd, &wim->hdr);
+	ret = read_wim_header(wim, &wim->hdr);
 	if (ret)
 		return ret;
 
 	if (wim->hdr.flags & WIM_HDR_FLAG_WRITE_IN_PROGRESS) {
-		WARNING("The WIM_HDR_FLAG_WRITE_IN_PROGRESS is set in the header of \"%"TS"\".\n"
-			"          It may be being changed by another process, or a process\n"
-			"          may have crashed while writing the WIM.", wimfile);
+		WARNING("The WIM_HDR_FLAG_WRITE_IN_PROGRESS flag is set in the header of\n"
+			"          \"%"TS"\".  It may be being changed by another process,\n"
+			"          or a process may have crashed while writing the WIM.",
+			wimfile);
 	}
 
 	if (open_flags & WIMLIB_OPEN_FLAG_WRITE_ACCESS) {
@@ -595,17 +642,14 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 	/* Check and cache the compression type */
 	if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESSION) {
 		if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZX) {
-			if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
-				ERROR("Multiple compression flags are set in \"%"TS"\"",
-				      wimfile);
-				return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
-			}
 			wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
 		} else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
 			wim->compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
+		} else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZMS) {
+			wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
 		} else {
 			ERROR("The compression flag is set on \"%"TS"\", but "
-			      "neither the XPRESS nor LZX flag is set",
+			      "a flag for a recognized format is not",
 			      wimfile);
 			return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
 		}
@@ -615,7 +659,8 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 	wim->out_compression_type = wim->compression_type;
 
 	/* Check and cache the chunk size.  */
-	wim->chunk_size = wim->out_chunk_size = wim->hdr.chunk_size;
+	wim->chunk_size = wim->hdr.chunk_size;
+	wim->out_chunk_size = wim->chunk_size;
 	if (!wim_chunk_size_valid(wim->chunk_size, wim->compression_type)) {
 		ERROR("Invalid chunk size (%"PRIu32" bytes) "
 		      "for compression type %"TS"!",
@@ -639,18 +684,15 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 
 	if (wim->hdr.image_count != 0 && wim->hdr.part_number == 1) {
 		wim->image_metadata = new_image_metadata_array(wim->hdr.image_count);
-		if (!wim->image_metadata)
+		if (wim->image_metadata == NULL)
 			return WIMLIB_ERR_NOMEM;
 	}
 
 	if (open_flags & WIMLIB_OPEN_FLAG_FROM_PIPE) {
 		wim->lookup_table = new_lookup_table(9001);
-		if (!wim->lookup_table)
+		if (wim->lookup_table == NULL)
 			return WIMLIB_ERR_NOMEM;
 	} else {
-		ret = read_wim_lookup_table(wim);
-		if (ret)
-			return ret;
 
 		ret = read_wim_xml_data(wim);
 		if (ret)
@@ -664,6 +706,11 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 			      "<IMAGE> element per image.", wim->hdr.image_count);
 			return WIMLIB_ERR_IMAGE_COUNT;
 		}
+
+		ret = read_wim_lookup_table(wim);
+		if (ret)
+			return ret;
+
 		DEBUG("Done beginning read of WIM file `%"TS"'.", wimfile);
 	}
 	return 0;
@@ -676,28 +723,29 @@ open_wim_as_WIMStruct(const void *wim_filename_or_fd, int open_flags,
 	WIMStruct *wim;
 	int ret;
 
+	if (open_flags & WIMLIB_OPEN_FLAG_FROM_PIPE)
+		DEBUG("Opening pipable WIM from file descriptor %d.", *(const int*)wim_filename_or_fd);
+	else
+		DEBUG("Opening WIM file \"%"TS"\"", (const tchar*)wim_filename_or_fd);
+
 	wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
 
-	ret = WIMLIB_ERR_INVALID_PARAM;
-	if (!wim_ret)
-		goto out;
+	if (wim_ret == NULL)
+		return WIMLIB_ERR_INVALID_PARAM;
 
-	ret = WIMLIB_ERR_NOMEM;
 	wim = new_wim_struct();
-	if (!wim)
-		goto out;
+	if (wim == NULL)
+		return WIMLIB_ERR_NOMEM;
 
 	ret = begin_read(wim, wim_filename_or_fd, open_flags, progress_func);
-	if (ret)
-		goto out_wimlib_free;
+	if (ret) {
+		wimlib_free(wim);
+		return ret;
+	}
 
-	ret = 0;
+	DEBUG("Successfully opened WIM and created WIMStruct.");
 	*wim_ret = wim;
-	goto out;
-out_wimlib_free:
-	wimlib_free(wim);
-out:
-	return ret;
+	return 0;
 }
 
 /* API function documented in wimlib.h  */
@@ -724,7 +772,7 @@ destroy_image_metadata(struct wim_image_metadata *imd,
 		free_lookup_table_entry(imd->metadata_lte);
 		imd->metadata_lte = NULL;
 	}
-	if (!table) {
+	if (table == NULL) {
 		struct wim_lookup_table_entry *lte, *tmp;
 		list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list)
 			free_lookup_table_entry(lte);
@@ -761,7 +809,7 @@ append_image_metadata(WIMStruct *wim, struct wim_image_metadata *imd)
 	imd_array = REALLOC(wim->image_metadata,
 			    sizeof(wim->image_metadata[0]) * (wim->hdr.image_count + 1));
 
-	if (!imd_array)
+	if (imd_array == NULL)
 		return WIMLIB_ERR_NOMEM;
 	wim->image_metadata = imd_array;
 	imd_array[wim->hdr.image_count++] = imd;
@@ -796,14 +844,14 @@ new_image_metadata_array(unsigned num_images)
 
 	imd_array = CALLOC(num_images, sizeof(imd_array[0]));
 
-	if (!imd_array) {
+	if (imd_array == NULL) {
 		ERROR("Failed to allocate memory for %u image metadata structures",
 		      num_images);
 		return NULL;
 	}
 	for (unsigned i = 0; i < num_images; i++) {
 		imd_array[i] = new_image_metadata();
-		if (!imd_array[i]) {
+		if (imd_array[i] == NULL) {
 			for (unsigned j = 0; j < i; j++)
 				put_image_metadata(imd_array[j], NULL);
 			FREE(imd_array);
@@ -828,9 +876,12 @@ wim_checksum_unhashed_streams(WIMStruct *wim)
 		struct wim_lookup_table_entry *lte, *tmp;
 		struct wim_image_metadata *imd = wim->image_metadata[i];
 		image_for_each_unhashed_stream_safe(lte, tmp, imd) {
-			ret = hash_unhashed_stream(lte, wim->lookup_table, NULL);
+			struct wim_lookup_table_entry *new_lte;
+			ret = hash_unhashed_stream(lte, wim->lookup_table, &new_lte);
 			if (ret)
 				return ret;
+			if (new_lte != lte)
+				free_lookup_table_entry(lte);
 		}
 	}
 	return 0;
@@ -899,7 +950,7 @@ can_delete_from_wim(WIMStruct *wim)
 WIMLIBAPI void
 wimlib_free(WIMStruct *wim)
 {
-	if (!wim)
+	if (wim == NULL)
 		return;
 
 	DEBUG("Freeing WIMStruct (filename=\"%"TS"\", image_count=%u)",
@@ -919,10 +970,10 @@ wimlib_free(WIMStruct *wim)
 	if (filedes_valid(&wim->out_fd))
 		filedes_close(&wim->out_fd);
 
-	wimlib_lzx_free_context(wim->lzx_context);
-
 	free_lookup_table(wim->lookup_table);
 
+	wimlib_free_decompressor(wim->decompressor);
+
 	FREE(wim->filename);
 	free_wim_info(wim->wim_info);
 	if (wim->image_metadata) {
@@ -953,7 +1004,6 @@ WIMLIBAPI int
 wimlib_global_init(int init_flags)
 {
 	static bool already_inited = false;
-	int ret;
 
 	if (already_inited)
 		return 0;
@@ -966,14 +1016,19 @@ wimlib_global_init(int init_flags)
 	#endif
 	}
 #ifdef __WIN32__
-	ret = win32_global_init(init_flags);
-	if (ret)
-		return ret;
-#else
-	ret = 0;
+	{
+		int ret = win32_global_init(init_flags);
+		if (ret)
+			return ret;
+	}
 #endif
+	init_upcase();
+	if (init_flags & WIMLIB_INIT_FLAG_DEFAULT_CASE_SENSITIVE)
+		default_ignore_case = false;
+	else if (init_flags & WIMLIB_INIT_FLAG_DEFAULT_CASE_INSENSITIVE)
+		default_ignore_case = true;
 	already_inited = true;
-	return ret;
+	return 0;
 }
 
 /* API function documented in wimlib.h  */
@@ -985,4 +1040,6 @@ wimlib_global_cleanup(void)
 #ifdef __WIN32__
 	win32_global_cleanup();
 #endif
+	cleanup_decompressor_params();
+	cleanup_compressor_params();
 }