X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwim.c;h=960a9d50aafc5b85bfd37b1fa9b2302d55d20d55;hb=a0bee8fd4aed91f2ec4da35077dad47582a12a72;hp=292f4cd7b92622c8e2583c2389ed2d956d1c8799;hpb=f95716e01e9237f722b52edfff5638755ace3007;p=wimlib

diff --git a/src/wim.c b/src/wim.c
index 292f4cd7..960a9d50 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -130,8 +130,9 @@ wim_chunk_size_valid(u32 chunk_size, int ctype)
 		return order >= 15 && order <= 21;
 
 	case WIMLIB_COMPRESSION_TYPE_XPRESS:
+		return order >= 12 && order <= 26;
 	case WIMLIB_COMPRESSION_TYPE_LZMS:
-		return order >= 15 && order <= 26;
+		return order >= 15 && order <= 30;
 	}
 	return false;
 }
@@ -224,6 +225,111 @@ out_free:
 	return ret;
 }
 
+static void
+destroy_image_metadata(struct wim_image_metadata *imd,
+		       struct wim_lookup_table *table,
+		       bool free_metadata_lte)
+{
+	free_dentry_tree(imd->root_dentry, table);
+	imd->root_dentry = NULL;
+	free_wim_security_data(imd->security_data);
+	imd->security_data = NULL;
+
+	if (free_metadata_lte) {
+		free_lookup_table_entry(imd->metadata_lte);
+		imd->metadata_lte = NULL;
+	}
+	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);
+	}
+	INIT_LIST_HEAD(&imd->unhashed_streams);
+	INIT_LIST_HEAD(&imd->inode_list);
+#ifdef WITH_NTFS_3G
+	if (imd->ntfs_vol) {
+		do_ntfs_umount(imd->ntfs_vol);
+		imd->ntfs_vol = NULL;
+	}
+#endif
+}
+
+void
+put_image_metadata(struct wim_image_metadata *imd,
+		   struct wim_lookup_table *table)
+{
+	if (imd && --imd->refcnt == 0) {
+		destroy_image_metadata(imd, table, true);
+		FREE(imd);
+	}
+}
+
+/* Appends the specified image metadata structure to the array of image metadata
+ * for a WIM, and increments the image count. */
+int
+append_image_metadata(WIMStruct *wim, struct wim_image_metadata *imd)
+{
+	struct wim_image_metadata **imd_array;
+
+	DEBUG("Reallocating image metadata array for image_count = %u",
+	      wim->hdr.image_count + 1);
+	imd_array = REALLOC(wim->image_metadata,
+			    sizeof(wim->image_metadata[0]) * (wim->hdr.image_count + 1));
+
+	if (imd_array == NULL)
+		return WIMLIB_ERR_NOMEM;
+	wim->image_metadata = imd_array;
+	imd_array[wim->hdr.image_count++] = imd;
+	return 0;
+}
+
+struct wim_image_metadata *
+new_image_metadata(void)
+{
+	struct wim_image_metadata *imd;
+
+	imd = CALLOC(1, sizeof(*imd));
+	if (imd) {
+		imd->refcnt = 1;
+		INIT_LIST_HEAD(&imd->inode_list);
+		INIT_LIST_HEAD(&imd->unhashed_streams);
+		DEBUG("Created new image metadata (refcnt=1)");
+	} else {
+		ERROR_WITH_ERRNO("Failed to allocate new image metadata structure");
+	}
+	return imd;
+}
+
+static struct wim_image_metadata **
+new_image_metadata_array(unsigned num_images)
+{
+	struct wim_image_metadata **imd_array;
+
+	DEBUG("Creating new image metadata array for %u images",
+	      num_images);
+
+	imd_array = CALLOC(num_images, sizeof(imd_array[0]));
+
+	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] == NULL) {
+			for (unsigned j = 0; j < i; j++)
+				put_image_metadata(imd_array[j], NULL);
+			FREE(imd_array);
+			return NULL;
+		}
+	}
+	return imd_array;
+}
+
+
+/* Load the metadata for the specified WIM image into memory and set it as the
+ * WIMStruct's currently selected WIM image.  */
 int
 select_wim_image(WIMStruct *wim, int image)
 {
@@ -253,8 +359,8 @@ select_wim_image(WIMStruct *wim, int image)
 		return WIMLIB_ERR_METADATA_NOT_FOUND;
 	}
 
-	/* If a valid image is currently selected, it can be freed if it is not
-	 * modified.  */
+	/* If a valid image is currently selected, its metadata can be freed if
+	 * it has not been modified.  */
 	if (wim->current_image != WIMLIB_NO_IMAGE) {
 		imd = wim_get_current_image_metadata(wim);
 		if (!imd->modified) {
@@ -351,13 +457,6 @@ wimlib_print_available_images(const WIMStruct *wim, int image)
 		print_image_info(wim->wim_info, i);
 }
 
-/* TODO: Deprecated; remove this.  */
-WIMLIBAPI int
-wimlib_print_metadata(WIMStruct *wim, int image)
-{
-	return WIMLIB_ERR_UNSUPPORTED;
-}
-
 /* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_get_wim_info(WIMStruct *wim, struct wimlib_wim_info *info)
@@ -413,10 +512,8 @@ wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int whic
 	if (ret)
 		return ret;
 
-	if (which & WIMLIB_CHANGE_GUID) {
-		memcpy(wim->hdr.guid, info->guid, WIM_GID_LEN);
-		wim->guid_set_explicitly = 1;
-	}
+	if (which & WIMLIB_CHANGE_GUID)
+		memcpy(wim->hdr.guid, info->guid, WIM_GUID_LEN);
 
 	if (which & WIMLIB_CHANGE_BOOT_INDEX) {
 		if (info->boot_index > wim->hdr.image_count) {
@@ -618,7 +715,8 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 	if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESSION) {
 		if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZX) {
 			wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
-		} else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
+		} else if (wim->hdr.flags & (WIM_HDR_FLAG_COMPRESS_XPRESS |
+					     WIM_HDR_FLAG_COMPRESS_XPRESS_2)) {
 			wim->compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
 		} else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZMS) {
 			wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
@@ -737,109 +835,6 @@ wimlib_open_wim(const tchar *wimfile, int open_flags,
 				     progress_func);
 }
 
-void
-destroy_image_metadata(struct wim_image_metadata *imd,
-		       struct wim_lookup_table *table,
-		       bool free_metadata_lte)
-{
-	free_dentry_tree(imd->root_dentry, table);
-	imd->root_dentry = NULL;
-	free_wim_security_data(imd->security_data);
-	imd->security_data = NULL;
-
-	if (free_metadata_lte) {
-		free_lookup_table_entry(imd->metadata_lte);
-		imd->metadata_lte = NULL;
-	}
-	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);
-	}
-	INIT_LIST_HEAD(&imd->unhashed_streams);
-	INIT_LIST_HEAD(&imd->inode_list);
-#ifdef WITH_NTFS_3G
-	if (imd->ntfs_vol) {
-		do_ntfs_umount(imd->ntfs_vol);
-		imd->ntfs_vol = NULL;
-	}
-#endif
-}
-
-void
-put_image_metadata(struct wim_image_metadata *imd,
-		   struct wim_lookup_table *table)
-{
-	if (imd && --imd->refcnt == 0) {
-		destroy_image_metadata(imd, table, true);
-		FREE(imd);
-	}
-}
-
-/* Appends the specified image metadata structure to the array of image metadata
- * for a WIM, and increments the image count. */
-int
-append_image_metadata(WIMStruct *wim, struct wim_image_metadata *imd)
-{
-	struct wim_image_metadata **imd_array;
-
-	DEBUG("Reallocating image metadata array for image_count = %u",
-	      wim->hdr.image_count + 1);
-	imd_array = REALLOC(wim->image_metadata,
-			    sizeof(wim->image_metadata[0]) * (wim->hdr.image_count + 1));
-
-	if (imd_array == NULL)
-		return WIMLIB_ERR_NOMEM;
-	wim->image_metadata = imd_array;
-	imd_array[wim->hdr.image_count++] = imd;
-	return 0;
-}
-
-
-struct wim_image_metadata *
-new_image_metadata(void)
-{
-	struct wim_image_metadata *imd;
-
-	imd = CALLOC(1, sizeof(*imd));
-	if (imd) {
-		imd->refcnt = 1;
-		INIT_LIST_HEAD(&imd->inode_list);
-		INIT_LIST_HEAD(&imd->unhashed_streams);
-		DEBUG("Created new image metadata (refcnt=1)");
-	} else {
-		ERROR_WITH_ERRNO("Failed to allocate new image metadata structure");
-	}
-	return imd;
-}
-
-struct wim_image_metadata **
-new_image_metadata_array(unsigned num_images)
-{
-	struct wim_image_metadata **imd_array;
-
-	DEBUG("Creating new image metadata array for %u images",
-	      num_images);
-
-	imd_array = CALLOC(num_images, sizeof(imd_array[0]));
-
-	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] == NULL) {
-			for (unsigned j = 0; j < i; j++)
-				put_image_metadata(imd_array[j], NULL);
-			FREE(imd_array);
-			return NULL;
-		}
-	}
-	return imd_array;
-}
-
 /* Checksum all streams that are unhashed (other than the metadata streams),
  * merging them into the lookup table as needed.  This is a no-op unless the
  * library has previously used to add or mount an image using the same